sc/source/core/data/documen3.cxx | 3 ++- sc/source/ui/docshell/docsh5.cxx | 2 +- sc/source/ui/unoobj/nameuno.cxx | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-)
New commits: commit 7067d930c8390203f49d989b502e4b4ba85f463d Author: Eike Rathke <[email protected]> Date: Fri Oct 31 15:28:41 2014 +0100 coverity#735311 Unchecked return value assert if fouled Change-Id: Id3a160ff08907cc7792e93eea9f91997bcc0e2c3 diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 453c8d6..c5602d9 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -137,7 +137,8 @@ void ScDocument::SetAllRangeNames( const boost::ptr_map<OUString, ScRangeName>& { const ScRangeName* pName = itr->second; SCTAB nTab; - GetTable(itr->first, nTab); + bool bFound = GetTable(itr->first, nTab); + assert(bFound); (void)bFound; // fouled up? if (pName->empty()) SetRangeName( nTab, NULL ); else commit 016636450ca2fd0675c2f32f28a30b154705584b Author: Eike Rathke <[email protected]> Date: Fri Oct 31 15:24:54 2014 +0100 coverity#735320 Unchecked return value assert if fouled Change-Id: I1bc38690c755b8bc6eab16c8aa33c8f568e0c854 diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 54b4d9f..6f8e648 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -139,7 +139,8 @@ SCTAB ScNamedRangeObj::GetTab_Impl() ScDocument& rDoc = pDocShell->GetDocument(); SCTAB nTab; OUString sName = mxSheet->getName(); - rDoc.GetTable(sName, nTab); + bool bFound = rDoc.GetTable(sName, nTab); + assert(bFound); (void)bFound; // fouled up? return nTab; } else commit 36705670efc894094f9f987661fa8022bea2e01b Author: Eike Rathke <[email protected]> Date: Fri Oct 31 15:03:02 2014 +0100 coverity#735811 Dereference after null check We always have a DB collection. Change-Id: I8933be3a01b4c2e63b852361d5d2438e6fca4d05 diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index c1ac703..dd6d9f2 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -122,7 +122,7 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe // benannter DB-Bereich dort gesucht werden. ScDBCollection* pColl = aDocument.GetDBCollection(); ScDBData* pData = aDocument.GetDBAtArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ); - if (!pData && pColl) + if (!pData) pData = pColl->GetDBNearCursor(nCol, nRow, nTab ); bool bSelected = ( eSel == SC_DBSEL_FORCE_MARK || _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
