INTEGRATION: CWS swwarnings (1.22.222); FILE MERGED

2007/05/29 13:02:35 os 1.22.222.4: RESYNC: (1.22-1.23); FILE MERGED
2007/04/13 12:17:58 tl 1.22.222.3: #i69287# binfilter related comments removed
2007/04/03 13:01:11 tl 1.22.222.2: #i69287# warning-free code
2007/03/26 12:09:04 tl 1.22.222.1: #i69287# warning-free code

1 files changed, 108 insertions, 186 deletions

diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 2f225b16b20e..89024a0dd38a 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: tmpdlg.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: kz $ $Date: 2007-05-10 16:17:37 $
+ *  last change: $Author: hr $ $Date: 2007-09-27 11:50:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -52,36 +52,15 @@
 #ifndef _SV_MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
 #endif
-//CHINA001 #ifndef _SVX_CHARDLG_HXX //autogen
-//CHINA001 #include <svx/chardlg.hxx>
-//CHINA001 #endif
-//CHINA001 #ifndef _SVX_PARAGRPH_HXX //autogen
-//CHINA001 #include <svx/paragrph.hxx>
-//CHINA001 #endif
-//CHINA001 #ifndef _SVX_BACKGRND_HXX //autogen
-//CHINA001 #include <svx/backgrnd.hxx>
-//CHINA001 #endif
-//CHINA001 #ifndef _SVX_TABSTPGE_HXX //autogen
-//CHINA001 #include <svx/tabstpge.hxx>
-//CHINA001 #endif
 #ifndef _SVX_HDFT_HXX //autogen
 #include <svx/hdft2.hxx>
 #endif
 #ifndef _SVX_FLSTITEM_HXX //autogen
 #include <svx/flstitem.hxx>
 #endif
-//CHINA001 #ifndef _SVX_PAGE_HXX //autogen
-//CHINA001 #include <svx/page.hxx>
-//CHINA001 #endif
-//CHINA001 #ifndef _SVX_BORDER_HXX //autogen
-//CHINA001 #include <svx/border.hxx>
-//CHINA001 #endif
 #ifndef _SVX_HTMLMODE_HXX //autogen
 #include <svx/htmlmode.hxx>
 #endif
-//CHINA001 #ifndef _SVX_NUMPAGES_HXX //autogen
-//CHINA001 #include <svx/numpages.hxx>
-//CHINA001 #endif
 #include <svx/htmlcfg.hxx>
 #ifndef _SVTOOLS_CJKOPTIONS_HXX
 #include <svtools/cjkoptions.hxx>
@@ -140,7 +119,7 @@
 #ifndef _CCOLL_HXX
 #include <ccoll.hxx>        // CondColl
 #endif
-#include <swuiccoll.hxx> //CHINA001
+#include <swuiccoll.hxx>
 #ifndef _DOCSTYLE_HXX
 #include <docstyle.hxx>     //
 #endif
@@ -175,16 +154,17 @@
 #ifndef _SWSTYLENAMEMAPPER_HXX
 #include <SwStyleNameMapper.hxx>
 #endif
-#include <svx/svxids.hrc> //add CHINA001
-#include <svtools/stritem.hxx>//add CHINA001
-#include <svtools/aeitem.hxx> //add CHINA001
-#include <svtools/slstitm.hxx> //add CHINA001
-#include <svtools/eitem.hxx> //add CHINA001
-#include <svtools/intitem.hxx> //add CHINA001
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
-#include <svx/flagsdef.hxx> //CHINA001
-extern SwWrtShell* GetActiveWrtShell();
+#include <svx/svxids.hrc>
+#include <svtools/stritem.hxx>
+#include <svtools/aeitem.hxx>
+#include <svtools/slstitm.hxx>
+#include <svtools/eitem.hxx>
+#include <svtools/intitem.hxx>
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
+#include <svx/flagsdef.hxx>
+
+extern SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell();
 
 /*--------------------------------------------------------------------
     Beschreibung:   Der Traeger des Dialoges
@@ -209,33 +189,33 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
 
     nHtmlMode = ::GetHtmlMode(pWrtShell->GetView().GetDocShell());
     SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
-    DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+    DBG_ASSERT(pFact, "Dialogdiet fail!");
     // TabPages zusammenfieseln
     switch( nRegion )
     {
         // Zeichenvorlagen
         case SFX_STYLE_FAMILY_CHAR:
         {
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) , "GetTabPageRangesFunc fail!");//CHINA001
-            AddTabPage(TP_CHAR_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) );  //CHINA001 AddTabPage(TP_CHAR_STD,  SvxCharNamePage::Create,
-                                        //CHINA001 SvxCharNamePage::GetRanges );
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) , "GetTabPageRangesFunc fail!");//CHINA001
-            AddTabPage(TP_CHAR_EXT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) );  //CHINA001 AddTabPage(TP_CHAR_EXT,    SvxCharEffectsPage::Create,
-                                        //CHINA001 SvxCharEffectsPage::GetRanges );
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) , "GetTabPageRangesFunc fail!");//CHINA001
-            AddTabPage(TP_CHAR_POS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) );  //CHINA001 AddTabPage(TP_CHAR_POS,  SvxCharPositionPage::Create,
-                                        //CHINA001 SvxCharPositionPage::GetRanges );
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!");//CHINA001
-            AddTabPage(TP_CHAR_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) );  //CHINA001 AddTabPage(TP_CHAR_TWOLN,  SvxCharTwoLinesPage::Create,
-                                        //CHINA001 SvxCharTwoLinesPage::GetRanges );
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) , "GetTabPageRangesFunc fail!");//CHINA001
-            AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); //CHINA001 AddTabPage(TP_BACKGROUND,     SvxBackgroundTabPage::Create,
-                                        //CHINA001 SvxBackgroundTabPage::GetRanges );
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) , "GetTabPageRangesFunc fail!");
+            AddTabPage(TP_CHAR_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) );
+
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) , "GetTabPageRangesFunc fail!");
+            AddTabPage(TP_CHAR_EXT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) );
+
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) , "GetTabPageRangesFunc fail!");
+            AddTabPage(TP_CHAR_POS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) );
+
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!");
+            AddTabPage(TP_CHAR_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) );
+
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) , "GetTabPageRangesFunc fail!");
+            AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
+
             SvtCJKOptions aCJKOptions;
             if(nHtmlMode & HTMLMODE_ON || !aCJKOptions.IsDoubleLinesEnabled())
                 RemoveTabPage(TP_CHAR_TWOLN);
@@ -244,55 +224,41 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
         // Absatzvorlagen
         case SFX_STYLE_FAMILY_PARA:
         {
-                //CHINA001  AddTabPage(TP_PARA_STD,     SvxStdParagraphTabPage::Create,
-                //CHINA001                              SvxStdParagraphTabPage::GetRanges );
-                DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!");//CHINA001
-                DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageRangesFunc fail!");//CHINA001
+                DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageCreatorFunc fail!");
+                DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH), "GetTabPageRangesFunc fail!");
                 AddTabPage( TP_PARA_STD,    pFact->GetTabPageCreatorFunc(RID_SVXPAGE_STD_PARAGRAPH),        pFact->GetTabPageRangesFunc(RID_SVXPAGE_STD_PARAGRAPH) );
-            //CHINA001 AddTabPage(TP_PARA_ALIGN,    SvxParaAlignTabPage::Create,
-            //CHINA001                          SvxParaAlignTabPage::GetRanges );
 
-                DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageCreatorFunc fail!");//CHINA001
-                DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageRangesFunc fail!");//CHINA001
+                DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageCreatorFunc fail!");
+                DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH), "GetTabPageRangesFunc fail!");
                 AddTabPage( TP_PARA_ALIGN,  pFact->GetTabPageCreatorFunc(RID_SVXPAGE_ALIGN_PARAGRAPH),      pFact->GetTabPageRangesFunc(RID_SVXPAGE_ALIGN_PARAGRAPH) );
-            //CHINA001 AddTabPage(TP_PARA_EXT,      SvxExtParagraphTabPage::Create,
-            //CHINA001                          SvxExtParagraphTabPage::GetRanges );
 
-                DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!");//CHINA001
-                DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!");//CHINA001
+                DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageCreatorFunc fail!");
+                DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH), "GetTabPageRangesFunc fail!");
                 AddTabPage( TP_PARA_EXT,    pFact->GetTabPageCreatorFunc(RID_SVXPAGE_EXT_PARAGRAPH),        pFact->GetTabPageRangesFunc(RID_SVXPAGE_EXT_PARAGRAPH) );
 
+                DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!");
+                DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!");
+                AddTabPage( TP_PARA_ASIAN,  pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),       pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
 
-            //CHINA001 AddTabPage(TP_PARA_ASIAN,    SvxAsianTabPage::Create,
-            //CHINA001                          SvxAsianTabPage::GetRanges);
+                DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");
+                DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!");
+                AddTabPage(TP_CHAR_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) );
 
-                DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!");//CHINA001
-                DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!");//CHINA001
-                AddTabPage( TP_PARA_ASIAN,  pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN),       pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
+                DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");
+                DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!");
+                AddTabPage(TP_CHAR_EXT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) );
+
+                DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), "GetTabPageCreatorFunc fail!");
+                DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) , "GetTabPageRangesFunc fail!");
+                AddTabPage(TP_CHAR_POS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) );
 
+                DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), "GetTabPageCreatorFunc fail!");
+                DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!");
+                AddTabPage(TP_CHAR_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) );
 
-                DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");//CHINA001
-                DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!");//CHINA001
-                AddTabPage(TP_CHAR_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) ); //CHINA001 AddTabPage(TP_CHAR_STD,   SvxCharNamePage::Create,
-                                        //CHINA001 SvxCharNamePage::GetRanges );
-                DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");//CHINA001
-                DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!");//CHINA001
-                AddTabPage(TP_CHAR_EXT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) ); //CHINA001 AddTabPage(TP_CHAR_EXT,     SvxCharEffectsPage::Create,
-                                        //CHINA001 SvxCharEffectsPage::GetRanges );
-                DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), "GetTabPageCreatorFunc fail!");//CHINA001
-                DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) , "GetTabPageRangesFunc fail!");//CHINA001
-                AddTabPage(TP_CHAR_POS, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_POSITION ) ); //CHINA001 AddTabPage(TP_CHAR_POS,   SvxCharPositionPage::Create,
-                                        //CHINA001 SvxCharPositionPage::GetRanges );
-                DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), "GetTabPageCreatorFunc fail!");//CHINA001
-                DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) , "GetTabPageRangesFunc fail!");//CHINA001
-                AddTabPage(TP_CHAR_TWOLN, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_TWOLINES ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_TWOLINES ) ); //CHINA001 AddTabPage(TP_CHAR_TWOLN,   SvxCharTwoLinesPage::Create,
-                                        //CHINA001 SvxCharTwoLinesPage::GetRanges );
-
-
-            //CHINA001 AddTabPage(TP_TABULATOR,     SvxTabulatorTabPage::Create,
-            //CHINA001                          SvxTabulatorTabPage::GetRanges );
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!");//CHINA001
+
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR), "GetTabPageRangesFunc fail!");
             AddTabPage( TP_TABULATOR,   pFact->GetTabPageCreatorFunc(RID_SVXPAGE_TABULATOR),        pFact->GetTabPageRangesFunc(RID_SVXPAGE_TABULATOR) );
 
 
@@ -300,14 +266,12 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
                                     SwParagraphNumTabPage::GetRanges);
             AddTabPage(TP_DROPCAPS,     SwDropCapsPage::Create,
                                         SwDropCapsPage::GetRanges );
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");//CHINA001
-            AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); //CHINA001 AddTabPage(TP_BACKGROUND,     SvxBackgroundTabPage::Create,
-                                        //CHINA001 SvxBackgroundTabPage::GetRanges );
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");//CHINA001
-            AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );//CHINA001 AddTabPage(TP_BORDER,      SvxBorderTabPage::Create,
-                                        //CHINA001 SvxBorderTabPage::GetRanges );
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
+            AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
+            AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
 
             AddTabPage( TP_CONDCOLL,    SwCondCollPage::Create,
                                         SwCondCollPage::GetRanges );
@@ -351,14 +315,12 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
                                         SwFrmAddPage::GetRanges );
             AddTabPage(TP_FRM_WRAP,     SwWrapTabPage::Create,
                                         SwWrapTabPage::GetRanges );
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");//CHINA001
-            AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); //CHINA001 AddTabPage(TP_BACKGROUND, SvxBackgroundTabPage::Create,
-                                        //CHINA001 SvxBackgroundTabPage::GetRanges );
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");//CHINA001
-            AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); //CHINA001 AddTabPage(TP_BORDER,         SvxBorderTabPage::Create,
-                                        //CHINA001 SvxBorderTabPage::GetRanges );
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
+            AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
+            AddTabPage(TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
 
             AddTabPage(TP_COLUMN,       SwColumnPage::Create,
                                         SwColumnPage::GetRanges );
@@ -379,10 +341,9 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
         // Seitenvorlagen
         case SFX_STYLE_FAMILY_PAGE:
         {
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");//CHINA001
-            AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); //CHINA001 AddTabPage(TP_BACKGROUND,         SvxBackgroundTabPage::Create,
-                                            //CHINA001 SvxBackgroundTabPage::GetRanges );
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
+            AddTabPage(TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
             AddTabPage(TP_HEADER_PAGE,      String(SW_RES(STR_PAGE_HEADER)),
                                             SvxHeaderPage::Create,
                                             SvxHeaderPage::GetRanges );
@@ -392,21 +353,19 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
             if(bColumn)
                 SetCurPageId(TP_COLUMN);
 
-            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!");//CHINA001
-            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!");//CHINA001
+            DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!");
+            DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!");
             AddTabPage(TP_PAGE_STD,         String(SW_RES(STR_PAGE_STD)),
-                                            pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), //CHINA001 SvxPageDescPage::Create,
-                                            pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), //CHINA001 SvxPageDescPage::GetRanges,
+                                            pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ),
+                                            pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ),
                                             FALSE,
                                             1 ); // nach der Verwalten-Page
             if(!pActShell || 0 == ::GetHtmlMode(pWrtShell->GetView().GetDocShell()))
             {
-                DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");//CHINA001
-                DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");//CHINA001
+                DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
+                DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
                 AddTabPage(TP_BORDER,           String(SW_RES(STR_PAGE_BORDER)),
                                 pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
-                                                //CHINA001 SvxBorderTabPage::Create,
-                                                //CHINA001 SvxBorderTabPage::GetRanges );
                 AddTabPage(TP_COLUMN,           String(SW_RES(STR_PAGE_COLUMN)),
                                                 SwColumnPage::Create,
                                                 SwColumnPage::GetRanges );
@@ -427,12 +386,12 @@ SwTemplateDlg::SwTemplateDlg(Window*            pParent,
         // Numerierungsvorlagen
         case SFX_STYLE_FAMILY_PSEUDO:
         {
-            AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );//CHINA001 AddTabPage(RID_SVXPAGE_PICK_SINGLE_NUM,    &SvxSingleNumPickTabPage::Create, 0);
-            AddTabPage( RID_SVXPAGE_PICK_BULLET );//CHINA001 AddTabPage(RID_SVXPAGE_PICK_BULLET, &SvxBulletPickTabPage::Create, 0);
-            AddTabPage( RID_SVXPAGE_PICK_NUM );//CHINA001 AddTabPage(RID_SVXPAGE_PICK_NUM,  &SvxNumPickTabPage::Create, 0);
-            AddTabPage( RID_SVXPAGE_PICK_BMP);//CHINA001 AddTabPage(RID_SVXPAGE_PICK_BMP,   &SvxBitmapPickTabPage::Create, 0);
-            AddTabPage( RID_SVXPAGE_NUM_OPTIONS );//CHINA001 AddTabPage(RID_SVXPAGE_NUM_OPTIONS, &SvxNumOptionsTabPage::Create, 0);
-            AddTabPage( RID_SVXPAGE_NUM_POSITION );//CHINA001 AddTabPage(RID_SVXPAGE_NUM_POSITION,&SvxNumPositionTabPage::Create, 0);
+            AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
+            AddTabPage( RID_SVXPAGE_PICK_BULLET );
+            AddTabPage( RID_SVXPAGE_PICK_NUM );
+            AddTabPage( RID_SVXPAGE_PICK_BMP);
+            AddTabPage( RID_SVXPAGE_NUM_OPTIONS );
+            AddTabPage( RID_SVXPAGE_NUM_POSITION );
 
 
 /*          const SfxPoolItem* pItem;
@@ -511,7 +470,7 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
     String sNumCharFmt, sBulletCharFmt;
     SwStyleNameMapper::FillUIName( RES_POOLCHR_NUM_LEVEL, sNumCharFmt);
     SwStyleNameMapper::FillUIName( RES_POOLCHR_BUL_LEVEL, sBulletCharFmt);
-    SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); //CHINA001
+    SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
 
     switch( nId )
     {
@@ -522,15 +481,12 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
                 SvxFontListItem aFontListItem( *( (SvxFontListItem*)::GetActiveView()->
                     GetDocShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) ) );
 
-                //CHINA001 ((SvxCharNamePage&)rPage).SetFontList(aFontListItem);
                 aSet.Put (SvxFontListItem( aFontListItem.GetFontList(), SID_ATTR_CHAR_FONTLIST));
                 UINT32 nFlags = 0;
                 if(rPage.GetItemSet().GetParent() && 0 == (nHtmlMode & HTMLMODE_ON ))
                     nFlags = SVX_RELATIVE_MODE;
-                    //CHINA001 ((SvxCharNamePage&)rPage).EnableRelativeMode();
                 if( SFX_STYLE_FAMILY_CHAR == nType )
                     nFlags = nFlags|SVX_PREVIEW_CHARACTER;
-                    //CHINA001 ((SvxCharNamePage&)rPage).SetPreviewBackgroundToCharacter();
                 aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlags));
                 rPage.PageCreated(aSet);
             }
@@ -538,9 +494,6 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
 
         case TP_CHAR_EXT:
             {
-            //CHINA001 ((SvxCharEffectsPage&)rPage).EnableFlash();
-            //CHINA001 if( SFX_STYLE_FAMILY_CHAR == nType )
-                //CHINA001 ((SvxCharEffectsPage&)rPage).SetPreviewBackgroundToCharacter();
             UINT32 nFlags = SVX_ENABLE_FLASH;
             if( SFX_STYLE_FAMILY_CHAR == nType )
                 nFlags = nFlags|SVX_PREVIEW_CHARACTER;
@@ -551,7 +504,6 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
 
         case TP_CHAR_POS:
             if( SFX_STYLE_FAMILY_CHAR == nType )
-                //CHINA001 ((SvxCharPositionPage&)rPage).SetPreviewBackgroundToCharacter();
             {
                 aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_PREVIEW_CHARACTER));
                 rPage.PageCreated(aSet);
@@ -560,7 +512,6 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
 
         case TP_CHAR_TWOLN:
             if( SFX_STYLE_FAMILY_CHAR == nType )
-                //CHINA001 ((SvxCharTwoLinesPage&)rPage).SetPreviewBackgroundToCharacter();
             {
                 aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_PREVIEW_CHARACTER));
                 rPage.PageCreated(aSet);
@@ -571,23 +522,9 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
             {
                 if( rPage.GetItemSet().GetParent() )
                 {
-                    /* CHINA001 different bit represent call to different method of SvxStdParagraphTabPage
-                        0x0001 --->EnableRelativeMode()
-                        0x0002 --->EnableRegisterMode()
-                        0x0004 --->EnableAutoFirstLine()
-                        0x0008 --->EnableNegativeMode()
-
-
-                    */
-                    //CHINA001 ((SvxStdParagraphTabPage&)rPage).EnableRelativeMode();
-                    //CHINA001 ((SvxStdParagraphTabPage&)rPage).EnableRegisterMode();
-                    //CHINA001 ((SvxStdParagraphTabPage&)rPage).EnableAutoFirstLine();
-                    //CHINA001 ((SvxStdParagraphTabPage&)rPage).EnableAbsLineDist(MM50/2);
-                    //CHINA001 ((SvxStdParagraphTabPage&)rPage).EnableNegativeMode();
-
                     aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_ABSLINEDIST,MM50/2));
                     aSet.Put(SfxUInt32Item(SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,0x000F));
-                    rPage.PageCreated(aSet);//add CHINA001
+                    rPage.PageCreated(aSet);
                 }
 
             }
@@ -610,10 +547,8 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
         break;
         case TP_PARA_ALIGN:
             {
-                //CHINA001 ((SvxParaAlignTabPage&)rPage).EnableJustifyExt();
-
                 aSet.Put(SfxBoolItem(SID_SVXPARAALIGNTABPAGE_ENABLEJUSTIFYEXT,TRUE));
-                rPage.PageCreated(aSet);//add CHINA001
+                rPage.PageCreated(aSet);
             }
             break;
 
@@ -667,17 +602,16 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
                     SfxStyleSheetBasePool* pStyleSheetPool = pWrtShell->
                                 GetView().GetDocShell()->GetStyleSheetPool();
                     pStyleSheetPool->SetSearchMask(SFX_STYLE_FAMILY_PARA);
-                    SfxStyleSheetBase *pStyle = pStyleSheetPool->First();
-                    while(pStyle)
+                    SfxStyleSheetBase *pFirstStyle = pStyleSheetPool->First();
+                    while(pFirstStyle)
                     {
-                        aList.Insert( new String(pStyle->GetName()),
+                        aList.Insert( new String(pFirstStyle->GetName()),
                                         aList.Count());
-                        pStyle = pStyleSheetPool->Next();
+                        pFirstStyle = pStyleSheetPool->Next();
                     }
                 }
-                //CHINA001 ((SvxPageDescPage&)rPage).SetCollectionList(&aList);
-                aSet.Put (SfxStringListItem(SID_COLLECT_LIST, &aList)); //CHINA001
-                rPage.PageCreated(aSet); //CHINA001
+                aSet.Put (SfxStringListItem(SID_COLLECT_LIST, &aList));
+                rPage.PageCreated(aSet);
                 for( USHORT i = (USHORT)aList.Count(); i; --i )
                     delete (String*)aList.Remove(i);
             }
@@ -689,27 +623,22 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
 
         case RID_SVXPAGE_PICK_NUM:
             {
-
-                //CHINA001 ((SvxNumPickTabPage&)rPage).SetCharFmtNames(sNumCharFmt, sBulletCharFmt);
-                aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));//add CHINA001
-                aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); //add CHINA001
-                rPage.PageCreated(aSet);//add CHINA001
+                aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
+                aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
+                rPage.PageCreated(aSet);
             }
         break;
         case RID_SVXPAGE_NUM_OPTIONS:
         {
 
-            //CHINA001 ((SvxNumOptionsTabPage&)rPage).SetCharFmts(sNumCharFmt, sBulletCharFmt);
-            aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));//add CHINA001
-            aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); //add CHINA001
-            //CHINA001 ListBox& rCharFmtLB = ((SvxNumOptionsTabPage&)rPage).GetCharFmtListBox();
+            aSet.Put (SfxStringItem(SID_NUM_CHAR_FMT,sNumCharFmt));
+            aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
             // Zeichenvorlagen sammeln
-            ListBox rCharFmtLB(this); //add CHINA001
+            ListBox rCharFmtLB(this);
             rCharFmtLB.Clear();
             rCharFmtLB.InsertEntry( ViewShell::GetShellRes()->aStrNone );
             SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell();
             ::FillCharStyleListBox(rCharFmtLB,  pDocShell);
-            //add CHINA001 begin
             List aList;
             for(USHORT j = 0; j < rCharFmtLB.GetEntryCount(); j++)
             {
@@ -717,11 +646,9 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
                  aList.Insert( new XubString(rCharFmtLB.GetEntry(j)), LIST_APPEND );
             }
             aSet.Put( SfxStringListItem( SID_CHAR_FMT_LIST_BOX,&aList ) ) ;
-            //add end of CHINA001
             FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell));
-            //CHINA001 ((SvxNumOptionsTabPage&)rPage).SetMetric(eMetric);
-            aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,eMetric));//add CHINA001
-            rPage.PageCreated(aSet);//add CHINA001
+            aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< USHORT >(eMetric)));
+            rPage.PageCreated(aSet);
             for( USHORT i = (USHORT)aList.Count(); i; --i )
                     delete (XubString*)aList.Remove(i);
             aList.Clear();
@@ -731,18 +658,15 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
         {
             SwDocShell* pDocShell = ::GetActiveWrtShell()->GetView().GetDocShell();
             FieldUnit eMetric = ::GetDfltMetric(0 != PTR_CAST(SwWebDocShell, pDocShell));
-            //CHINA001 ((SvxNumPositionTabPage&)rPage).SetMetric(eMetric);
 
-            aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,eMetric));//add CHINA001
-            rPage.PageCreated(aSet);//add CHINA001
+            aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM, static_cast< USHORT >(eMetric)));
+            rPage.PageCreated(aSet);
         }
         break;
         case  RID_SVXPAGE_PICK_BULLET :
             {
-
-                //CHINA001 ((SvxBulletPickTabPage&)rPage).SetCharFmtName(sBulletCharFmt);
-                aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt)); //add CHINA001
-                rPage.PageCreated(aSet);//add CHINA001
+                aSet.Put (SfxStringItem(SID_BULLET_CHAR_FMT,sBulletCharFmt));
+                rPage.PageCreated(aSet);
             }
         break;
         case  TP_HEADER_PAGE:
@@ -756,12 +680,10 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
         case TP_BORDER :
             if( SFX_STYLE_FAMILY_PARA == nType )
             {
-             //CHINA001   ((SvxBorderTabPage&)rPage).SetSWMode(SW_BORDER_MODE_PARA);
                 aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_PARA));
             }
             else if( SFX_STYLE_FAMILY_FRAME == nType )
             {
-               //CHINA001 ((SvxBorderTabPage&)rPage).SetSWMode(SW_BORDER_MODE_FRAME);
                 aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,SW_BORDER_MODE_FRAME));
             }
             rPage.PageCreated(aSet);