summaryrefslogtreecommitdiff
path: root/sc/source/ui/docshell
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-04-07 14:13:20 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-04-07 14:43:16 -0400
commit355baf573425165cbc1c789a6271eb29940e1f76 (patch)
tree42050f8ac0a293b75e3745d511fe2e086e88cd42 /sc/source/ui/docshell
parent137c288978fb8f4aee259fabfdcb9252b1b011d3 (diff)
fdo#75741: Re-implement CompileNameFormula for formula groups.
Change-Id: I57e1e464ac5f7abc10ce5ea5752e036ddb6cf6d7
Diffstat (limited to 'sc/source/ui/docshell')
-rw-r--r--sc/source/ui/docshell/docfunc.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 74c34673531f..5950a9ddd111 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4846,13 +4846,13 @@ bool ScDocFunc::SetNewRangeNames( ScRangeName* pNewRanges, bool bModifyDoc, SCTA
bool bCompile = ( !pDoc->IsImportingXML() && pDoc->GetNamedRangesLockCount() == 0 );
if ( bCompile )
- pDoc->CompileNameFormula( true ); // CreateFormulaString
+ pDoc->PreprocessRangeNameUpdate();
if (nTab >= 0)
pDoc->SetRangeName( nTab, pNewRanges ); // takes ownership
else
pDoc->SetRangeName( pNewRanges ); // takes ownership
if ( bCompile )
- pDoc->CompileNameFormula( false ); // CompileFormulaString
+ pDoc->PostprocessRangeNameUpdate();
if (bModifyDoc)
{
@@ -4876,12 +4876,9 @@ void ScDocFunc::ModifyAllRangeNames( const boost::ptr_map<OUString, ScRangeName>
new ScUndoAllRangeNames(&rDocShell, aOldRangeMap, rRangeMap));
}
- pDoc->CompileNameFormula(true);
-
- // set all range names
+ pDoc->PreprocessRangeNameUpdate();
pDoc->SetAllRangeNames(rRangeMap);
-
- pDoc->CompileNameFormula(false);
+ pDoc->PostprocessRangeNameUpdate();
aModificator.SetDocumentModified();
SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED));