sc/source/ui/condformat/condformatdlg.cxx | 3 +++ sc/source/ui/unoobj/chart2uno.cxx | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit 555a8955c71f28f93b032e8dd2c627ab3e794b02 Author: Markus Mohrhard <[email protected]> Date: Mon Jun 25 01:22:04 2012 +0200 handle also COLLAPSEd in switch this case can never happen Change-Id: Ib1284edb798945a2f6f5ee6268e9426e29b0bd76 diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index f0f677c..6f5ca81 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -628,6 +628,9 @@ void ScCondFrmtEntry::Select() case FORMULA: SetFormulaType(); break; + default: + //should not happen + break; } SwitchToType(meType); mbActive = true; commit 904596e935144e97d762d09942fa0d35068882ce Author: Markus Mohrhard <[email protected]> Date: Mon Jun 25 01:19:26 2012 +0200 we still need to check that we have a token, fdo#51326 also fixed another dbgutil crash with gcc safe iterators Change-Id: I5e6675a26f24329125906849c0c2286ea74e9211 diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 35408af..7f17f84 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -308,11 +308,11 @@ Chart2PositionMap::Chart2PositionMap(SCCOL nAllColCount, SCROW nAllRowCount, { FormulaTokenMap* pCol = it1->second; FormulaTokenMap::const_iterator it2 = pCol->begin(); - for (SCROW nRow = 0; !bFoundValues && nRow < nSmallestValueRowIndex; ++nRow) + for (SCROW nRow = 0; !bFoundValues && nRow < nSmallestValueRowIndex && it2 != pCol->end(); ++nRow) { - if (it2 != pCol->end() && nRow>=nHeaderRowCount) + FormulaToken* pToken = it2->second; + if (pToken && nRow>=nHeaderRowCount) { - FormulaToken* pToken = it2->second; ScRange aRange; bool bExternal = false; StackVar eType = pToken->GetType(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
