INTEGRATION: CWS dialogdiet01 (1.3.420); FILE MERGED

2004/02/27 06:06:43 mwu 1.3.420.1: dialogdiet01 2004_02_27

2 files changed, 49 insertions, 19 deletions

diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index 0738be95b575..d861bd1e4e48 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pattern.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: vg $ $Date: 2003-04-17 15:31:17 $
+ *  last change: $Author: hr $ $Date: 2004-05-10 16:27:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,11 +62,11 @@
 
 #pragma hdrstop
 
-#ifndef _SVX_BACKGRND_HXX //autogen
-#include <svx/backgrnd.hxx>
-#endif
-
-
+//CHINA001 #ifndef _SVX_BACKGRND_HXX //autogen
+//CHINA001 #include <svx/backgrnd.hxx>
+//CHINA001 #endif
+#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/dialogs.hrc> //CHINA001
 #include "swtypes.hxx"
 #include "pattern.hxx"
 #include "frmui.hrc"
@@ -84,7 +84,16 @@ SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet) :
 
 {
     SetText(SW_RESSTR(STR_FRMUI_PATTERN));
-    SetTabPage(SvxBackgroundTabPage::Create(this, rSet));
+    //CHINA001 SetTabPage(SvxBackgroundTabPage::Create(this, rSet));
+    SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+    DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+    ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND );
+    if ( fnCreatePage )
+    {
+        SfxTabPage* pPage = (*fnCreatePage)( this, rSet );
+        SetTabPage(pPage);
+    }
+
 }
 
 /****************************************************************************
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 0ac9c7a6166d..62232f56bd76 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: uiborder.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: vg $ $Date: 2003-04-17 15:31:29 $
+ *  last change: $Author: hr $ $Date: 2004-05-10 16:27:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,10 +62,18 @@
 
 #pragma hdrstop
 
-#ifndef _SVX_BORDER_HXX //autogen
-#include <svx/border.hxx>
-#endif
-
+//CHINA001 #ifndef _SVX_BORDER_HXX //autogen
+//CHINA001 #include <svx/border.hxx>
+//CHINA001 #endif
+#include <svx/svxdlg.hxx> //CHINA001
+#include <svx/svxids.hrc> //CHINA001
+#include <svx/dialogs.hrc> //CHINA001
+#include <svtools/itemset.hxx> //CHINA001
+#include <svx/flagsdef.hxx> //CHINA001
+#include <sfx2/tabdlg.hxx> //CHINA001
+#ifndef _SFXINTITEM_HXX //CHINA001
+#include <svtools/intitem.hxx> //CHINA001
+#endif //CHINA001
 
 #include "swtypes.hxx"
 #include "uiborder.hxx"
@@ -82,11 +90,24 @@ SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, USHORT nType) :
     SetText(SW_RESSTR(STR_FRMUI_BORDER));
 
     // TabPage erzeugen
-    SvxBorderTabPage* pPage = (SvxBorderTabPage*) SvxBorderTabPage::Create(this, rSet);
-    pPage->SetSWMode(nType);
-    if(SW_BORDER_MODE_TABLE == nType)
-        pPage->HideShadowControls();
-    SetTabPage(pPage);
+    //CHINA001 SvxBorderTabPage* pPage = (SvxBorderTabPage*) SvxBorderTabPage::Create(this, rSet);
+    //CHINA001 pPage->SetSWMode(nType);
+    //CHINA001 if(SW_BORDER_MODE_TABLE == nType)
+        //CHINA001 pPage->HideShadowControls();
+    //CHINA001 SetTabPage(pPage);
+    SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+    DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+    ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER );
+    if ( fnCreatePage )
+    {
+        SfxTabPage* pPage = (*fnCreatePage)( this, rSet );
+        SfxAllItemSet aSet(*(rSet.GetPool()));
+        aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,nType));
+        if(SW_BORDER_MODE_TABLE == nType)
+            aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_HIDESHADOWCTL));
+        pPage->PageCreated(aSet);
+        SetTabPage(pPage);
+    }
 }