[Libreoffice-commits] core.git: sd/source

Caolán McNamara caolanm at redhat.com
Tue Sep 17 06:12:12 PDT 2013


 sd/source/ui/dlg/dlgpage.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit e2aa5ab249edaeb8e9e3603ba8ae09faea90122c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 17 14:11:25 2013 +0100

    tweak AddTabPage to use the factory directly
    
    to facilitate easier .ui conversion
    
    Change-Id: Icee821b37c1fe1801937066f9defbff4a05fc9e2

diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index 5e1dbca..e0bae00 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -27,6 +27,7 @@
 #include "DrawDocShell.hxx"
 #include <svl/aeitem.hxx>
 #include <svx/flagsdef.hxx>
+#include <svx/svxdlg.hxx>
 #include <editeng/svxenum.hxx>
 
 /**
@@ -52,8 +53,11 @@ SdPageDlg::SdPageDlg( SfxObjectShell* pDocSh, Window* pParent, const SfxItemSet*
 
     FreeResource();
 
-    AddTabPage( RID_SVXPAGE_PAGE);
-    AddTabPage( RID_SVXPAGE_AREA);
+    SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+    OSL_ENSURE(pFact, "Dialogdiet fail!");
+
+    AddTabPage( RID_SVXPAGE_PAGE, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), 0 );
+    AddTabPage( RID_SVXPAGE_AREA, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_AREA ), 0 );
 
     if(!bAreaPage)  // I have to add the page before I remove it !
         RemoveTabPage( RID_SVXPAGE_AREA );


More information about the Libreoffice-commits mailing list