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

[Eike Rathke]

 sc/source/core/data/column3.cxx     |    3 +--
 sc/source/filter/excel/xestream.cxx |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 31e4419ac7581aa7864905bcd4ce42e14df6c9bb
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Apr 2 16:54:17 2014 +0200

    resolved fdo#76949 correct grammar is GRAM_OOXML
    
    Regression introduced with ca8ca8c28742879220f3ff88ae0d71c8d69b11cd that
    used GRAM_ENGLISH_XL_OOX instead, which is English UI function names
    with OOXML reference syntax.
    
    Change-Id: If6b73e85a45e57f6ef281d1edf8e34dec7cb9bb8

diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index d5bf89d..04a8298 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -821,7 +821,7 @@ OUString XclXmlUtils::ToOUString(
     ScDocument& rDocument, const ScAddress& rAddress, const ScTokenArray* pTokenArray )
 {
     ScCompiler aCompiler( &rDocument, rAddress, const_cast<ScTokenArray&>(*pTokenArray));
-    aCompiler.SetGrammar(FormulaGrammar::GRAM_ENGLISH_XL_OOX);
+    aCompiler.SetGrammar(FormulaGrammar::GRAM_OOXML);
 
     OUStringBuffer aBuffer( pTokenArray->GetLen() * 5 );
     aCompiler.CreateStringFromTokenArray( aBuffer );
commit cc911e8bc428b16cff9fdc77c10d470110c4531b
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Apr 1 15:59:45 2014 +0200

    just nitpicking on scope
    
    Change-Id: I01969fb4596e7866ddb348d026a22f45deeef0c8

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 86ee9a2..38a92c0 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -2710,7 +2710,6 @@ class MaxNumStringLenHandler
 
         OUString aString;
         OUString aSep;
-        sal_Int32 nLen;
         sal_uInt16 nPrec;
         sal_uInt32 nFormat = static_cast<const SfxUInt32Item*>(
                 mrColumn.GetAttr(nRow, ATTR_VALUE_FORMAT))->GetValue();
@@ -2748,7 +2747,7 @@ class MaxNumStringLenHandler
             nPrec = SvNumberFormatter::UNLIMITED_PRECISION;
         }
 
-        nLen = aString.getLength();
+        sal_Int32 nLen = aString.getLength();
         if (nLen <= 0)
             // Ignore empty string.
             return;