[Libreoffice-commits] core.git: 2 commits - sc/source

[Markus Mohrhard]

 sc/source/core/data/conditio.cxx |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 71ed03b9ad45e7da8ac454377701d265ce11cca1
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Feb 14 15:49:40 2013 +0100

    assert if there is a wrong index, a warning is not enough
    
    Change-Id: I5fe16f24fab0b0c29cb9acb279e13db499bd3d1c

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 907fbda..93127c4 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1271,6 +1271,7 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn
                                         sal_uLong nNumFmt,
                                         const FormulaGrammar::Grammar eGrammar ) const
 {
+    assert( nIndex <= 1);
     rtl::OUString aRet;
 
     if ( FormulaGrammar::isEnglish( eGrammar) && nNumFmt == 0 )
@@ -1314,16 +1315,13 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn
         else
             mpDoc->GetFormatTable()->GetInputLineString(nVal2, nNumFmt, aRet);
     }
-    else
-    {
-        SAL_WARN("sc", "GetExpression: falscher Index");
-    }
 
     return aRet;
 }
 
 ScTokenArray* ScConditionEntry::CreateTokenArry( sal_uInt16 nIndex ) const
 {
+    assert(nIndex <= 1);
     ScTokenArray* pRet = NULL;
     ScAddress aAddr;
 
@@ -1353,10 +1351,6 @@ ScTokenArray* ScConditionEntry::CreateTokenArry( sal_uInt16 nIndex ) const
                 pRet->AddDouble( nVal2 );
         }
     }
-    else
-    {
-        SAL_WARN("sc", "GetExpression: falscher Index");
-    }
 
     return pRet;
 }
commit 4eb7d128b0379d64b083ca5d27dcb25d3d38d97f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu Feb 14 15:47:13 2013 +0100

    another case of wrong escaping for "
    
    Change-Id: Id302f224346e2e3db3480a3a3aed97e7f25a7280

diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 9bb6977..907fbda 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1307,9 +1307,9 @@ rtl::OUString ScConditionEntry::GetExpression( const ScAddress& rCursor, sal_uIn
         }
         else if (bIsStr2)
         {
-            aRet = """";
+            aRet = "\"";
             aRet += aStrVal2;
-            aRet += """";
+            aRet += "\"";
         }
         else
             mpDoc->GetFormatTable()->GetInputLineString(nVal2, nNumFmt, aRet);