INTEGRATION: CWS swwarnings (1.7.222); FILE MERGED

2007/04/13 12:18:00 tl 1.7.222.2: #i69287# binfilter related comments removed
2007/02/27 09:03:48 os 1.7.222.1: #i69287# warnings removed

2 files changed, 21 insertions, 36 deletions

diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index 8f250a05aef0..38f5cecd3a73 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: pattern.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 23:02:42 $
+ *  last change: $Author: hr $ $Date: 2007-09-27 11:52:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -42,11 +42,8 @@
 
 
 
-//CHINA001 #ifndef _SVX_BACKGRND_HXX //autogen
-//CHINA001 #include <svx/backgrnd.hxx>
-//CHINA001 #endif
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
 #include "swtypes.hxx"
 #include "pattern.hxx"
 #include "frmui.hrc"
@@ -64,14 +61,12 @@ SwBackgroundDlg::SwBackgroundDlg(Window* pParent, const SfxItemSet& rSet) :
 
 {
     SetText(SW_RESSTR(STR_FRMUI_PATTERN));
-    //CHINA001 SetTabPage(SvxBackgroundTabPage::Create(this, rSet));
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-    DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+    DBG_ASSERT(pFact, "Dialogdiet fail!");
     ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND );
     if ( fnCreatePage )
     {
-        SfxTabPage* pPage = (*fnCreatePage)( this, rSet );
-        SetTabPage(pPage);
+        SetTabPage((*fnCreatePage)( this, rSet ));
     }
 
 }
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 7316ec182fb9..0d287ee027ee 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: uiborder.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 23:02:56 $
+ *  last change: $Author: hr $ $Date: 2007-09-27 11:52:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -40,20 +40,15 @@
 #undef SW_DLLIMPLEMENTATION
 #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 <svx/svxdlg.hxx>
+#include <svx/svxids.hrc>
+#include <svx/dialogs.hrc>
+#include <svtools/itemset.hxx>
+#include <svx/flagsdef.hxx>
+#include <sfx2/tabdlg.hxx>
+#ifndef _SFXINTITEM_HXX
+#include <svtools/intitem.hxx>
+#endif
 
 #include "swtypes.hxx"
 #include "uiborder.hxx"
@@ -70,23 +65,18 @@ SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet& rSet, USHORT nType) :
     SetText(SW_RESSTR(STR_FRMUI_BORDER));
 
     // TabPage erzeugen
-    //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
+    DBG_ASSERT(pFact, "Dialogdiet fail!");
     ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER );
     if ( fnCreatePage )
     {
-        SfxTabPage* pPage = (*fnCreatePage)( this, rSet );
+        SfxTabPage* pNewPage = (*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);
+        pNewPage->PageCreated(aSet);
+        SetTabPage(pNewPage);
     }
 }