[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sc/source

[Markus Mohrhard]

 sc/source/ui/condformat/condformatdlg.cxx |    3 +++
 sc/source/ui/unoobj/chart2uno.cxx         |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 34027323e0177145eaa5519d1b289f2fc4f435f7
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
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 03028fc..00cbee8 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();
commit f2c3eaacad5a17d6a7745b2e29c491c3fd6a1162
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
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 e653ca5..486dcb1 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;