[Libreoffice-commits] .: sc/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Jan 30 17:49:12 PST 2013


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

New commits:
commit 11cfcf401a68cbaf5dfe0a309fd482d3a3fbdff6
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 b74d325..f29dc2d 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2160,7 +2160,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 38fc9ec..8506f12 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1327,7 +1327,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 )


More information about the Libreoffice-commits mailing list