From 9b4d6050c9829b1d7c7edf952b70bc62b0a01a95 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kyoshida@novell.com>
Date: Tue, 15 Mar 2011 18:48:16 -0400
Subject: Common part into an own method.

---
 sc/inc/undorangename.hxx            |  1 +
 sc/source/ui/undo/undorangename.cxx | 51 +++++++++++++++----------------------
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/sc/inc/undorangename.hxx b/sc/inc/undorangename.hxx
index eb3d5aabad0f..8b6e8f6efe09 100644
--- a/sc/inc/undorangename.hxx
+++ b/sc/inc/undorangename.hxx
@@ -54,6 +54,7 @@ public:
     virtual String GetComment() const;
 
 private:
+    void DoChange(const ScRangeName& rGlobal, const ScRangeName::TabNameMap& rLocal);
 
 private:
     ScRangeName maOldGlobalNames;
diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx
index 220d9cf8c972..25b6c2ed696d 100644
--- a/sc/source/ui/undo/undorangename.cxx
+++ b/sc/source/ui/undo/undorangename.cxx
@@ -72,39 +72,42 @@ ScUndoAllRangeNames::~ScUndoAllRangeNames()
 
 void ScUndoAllRangeNames::Undo()
 {
-    ScDocument& rDoc = *pDocShell->GetDocument();
-
-    rDoc.CompileNameFormula(true);
+    DoChange(maOldGlobalNames, maOldLocalNames);
+}
 
-    // Global names.
-    if (maOldGlobalNames.empty())
-        rDoc.SetRangeName(NULL);
-    else
-        rDoc.SetRangeName(new ScRangeName(maOldGlobalNames));
+void ScUndoAllRangeNames::Redo()
+{
+    DoChange(maNewGlobalNames, maNewLocalNames);
+}
 
-    ScRangeName::TabNameCopyMap aCopy;
-    ScRangeName::copyLocalNames(maOldLocalNames, aCopy);
-    rDoc.SetAllTabRangeNames(aCopy);
+void ScUndoAllRangeNames::Repeat(SfxRepeatTarget& /*rTarget*/)
+{
+}
 
-    rDoc.CompileNameFormula(true);
+BOOL ScUndoAllRangeNames::CanRepeat(SfxRepeatTarget& /*rTarget*/) const
+{
+    return false;
+}
 
-    SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED));
+String ScUndoAllRangeNames::GetComment() const
+{
+    return ScGlobal::GetRscString(STR_UNDO_RANGENAMES);
 }
 
-void ScUndoAllRangeNames::Redo()
+void ScUndoAllRangeNames::DoChange(const ScRangeName& rGlobal, const ScRangeName::TabNameMap& rLocal)
 {
     ScDocument& rDoc = *pDocShell->GetDocument();
 
     rDoc.CompileNameFormula(true);
 
     // Global names.
-    if (maOldGlobalNames.empty())
+    if (rGlobal.empty())
         rDoc.SetRangeName(NULL);
     else
-        rDoc.SetRangeName(new ScRangeName(maNewGlobalNames));
+        rDoc.SetRangeName(new ScRangeName(rGlobal));
 
     ScRangeName::TabNameCopyMap aCopy;
-    ScRangeName::copyLocalNames(maNewLocalNames, aCopy);
+    ScRangeName::copyLocalNames(rLocal, aCopy);
     rDoc.SetAllTabRangeNames(aCopy);
 
     rDoc.CompileNameFormula(true);
@@ -112,17 +115,3 @@ void ScUndoAllRangeNames::Redo()
     SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED));
 }
 
-void ScUndoAllRangeNames::Repeat(SfxRepeatTarget& /*rTarget*/)
-{
-}
-
-BOOL ScUndoAllRangeNames::CanRepeat(SfxRepeatTarget& /*rTarget*/) const
-{
-    return false;
-}
-
-String ScUndoAllRangeNames::GetComment() const
-{
-    return ScGlobal::GetRscString(STR_UNDO_RANGENAMES);
-}
-
-- 
cgit