[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - sc/source

[Libreoffice Gerrit user]

 sc/source/core/data/column.cxx |    3 +--
 sc/source/ui/app/scmod.cxx     |    3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 399af06742cf7bd0838a9e987a77ac532efce365
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Jan 30 21:00:48 2013 -0500

    Fix the build.
    
    Change-Id: Iea8a02ceab7b603b5363b9df74e1381f152d70e1

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index cc5a5c6..31ead19 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2103,7 +2103,7 @@ bool ScColumn::CompileErrorCells(sal_uInt16 nErrCode)
             continue;
 
         pFCell->GetCode()->SetCodeError(0);
-        OUStringBuffer aBuf;
+        rtl::OUStringBuffer aBuf;
         pFCell->GetFormula(aBuf, pDocument->GetGrammar());
         pFCell->Compile(aBuf.makeStringAndClear(), false, pDocument->GetGrammar());
 
commit 5f7e5fd62233cfd37d31d059480685f341063a0e
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Jan 30 20:49:15 2013 -0500

    Don't overwrite bCalcAll when it's already set & remove SetCompile().
    
    Change-Id: Ieaf84e8d36efa8314729903be029f83c31bcbdf3

diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index df78d02..cc5a5c6 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2103,7 +2103,6 @@ bool ScColumn::CompileErrorCells(sal_uInt16 nErrCode)
             continue;
 
         pFCell->GetCode()->SetCodeError(0);
-        pFCell->SetCompile(true);
         OUStringBuffer aBuf;
         pFCell->GetFormula(aBuf, pDocument->GetGrammar());
         pFCell->Compile(aBuf.makeStringAndClear(), false, pDocument->GetGrammar());
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index e76370c..04b2f6c 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1343,7 +1343,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
         // Re-compile cells with name error, and recalc if at least one cell
         // has been re-compiled.  In the future we may want to find a way to
         // recalc only those that are affected.
-        bCalcAll = pDoc->CompileErrorCells(ScErrorCodes::errNoName);
+        if (pDoc->CompileErrorCells(ScErrorCodes::errNoName))
+            bCalcAll = true;
     }
 
     if ( pDoc && bCalcAll )