From 8ec5b1a267b229aec50c40c6d2acec1ad48da4b1 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 6 Nov 2014 14:59:49 +0000
Subject: refactor MasterLayoutDialog::remove to SdPage::DestroyDefaultPresObj

Change-Id: If4edb16b2e94396249f3e2ba99381fcd8341d790
---
 sd/source/core/sdpage.cxx            | 19 +++++++++++++++++++
 sd/source/ui/dlg/masterlayoutdlg.cxx | 18 +++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'sd/source')

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 75e41fb8b085..355400b1eb90 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1019,6 +1019,25 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
     }
 }
 
+void SdPage::DestroyDefaultPresObj(PresObjKind eObjKind)
+{
+    SdrObject* pObject = GetPresObj( eObjKind );
+
+    if( pObject )
+    {
+        SdDrawDocument *pDoc = static_cast<SdDrawDocument*>(pModel);
+
+        const bool bUndo = pDoc->IsUndoEnabled();
+        if( bUndo )
+            pDoc->AddUndo(pDoc->GetSdrUndoFactory().CreateUndoDeleteObject(*pObject));
+        SdrObjList* pOL = pObject->GetObjList();
+        pOL->RemoveObject(pObject->GetOrdNumDirect());
+
+        if( !bUndo )
+            SdrObject::Free(pObject);
+    }
+}
+
 /*************************************************************************
 |*
 |* return title area
diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx
index d9e525f39a2f..840037256ef2 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -121,26 +121,14 @@ void MasterLayoutDialog::applyChanges()
     mpDoc->EndUndo();
 }
 
-void MasterLayoutDialog::create( PresObjKind eKind )
+void MasterLayoutDialog::create(PresObjKind eKind)
 {
-    mpCurrentPage->CreateDefaultPresObj( eKind, true );
+    mpCurrentPage->CreateDefaultPresObj(eKind, true);
 }
 
 void MasterLayoutDialog::remove( PresObjKind eKind )
 {
-    SdrObject* pObject = mpCurrentPage->GetPresObj( eKind );
-
-    if( pObject )
-    {
-        const bool bUndo = mpDoc->IsUndoEnabled();
-        if( bUndo )
-            mpDoc->AddUndo(mpDoc->GetSdrUndoFactory().CreateUndoDeleteObject(*pObject));
-        SdrObjList* pOL =pObject->GetObjList();
-        pOL->RemoveObject(pObject->GetOrdNumDirect());
-
-        if( !bUndo )
-            SdrObject::Free(pObject);
-    }
+    mpCurrentPage->DestroyDefaultPresObj(eKind);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-- 
cgit