Remove pointless comments and ASCII art

Change-Id: I387d7b301643f359f2d6a4c5f51a4dd7f5e1c296

4 files changed, 222 insertions, 279 deletions

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 0e7f1785b387..b2a5fbb2b342 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -19,7 +19,6 @@
 #ifndef _SW_ABSTDLG_HXX
 #define _SW_ABSTDLG_HXX
 
-
 #include <tools/solar.h>
 #include <tools/string.hxx>
 #include <sfx2/sfxdlg.hxx>
@@ -72,7 +71,7 @@ class SwChildWinWrapper;
 struct SfxChildWinInfo;
 class SwTOXMark;
 struct SwDocStat;
-#include <cnttab.hxx> //add for struct CurTOXType
+#include <cnttab.hxx>
 
 namespace com{namespace sun{namespace star{
     namespace frame{
@@ -93,14 +92,14 @@ typedef   void (*SwLabDlgMethod) (::com::sun::star::uno::Reference< ::com::sun::
 typedef String      (*GlossaryGetCurrGroup)();
 typedef void        (*GlossarySetActGroup)(const String& rNewGroup);
 
-class AbstractGlossaryDlg : public VclAbstractDialog  //add for SwGlossaryDlg
+class AbstractGlossaryDlg : public VclAbstractDialog
 {
 public:
     virtual String          GetCurrGrpName() const = 0;
     virtual String          GetCurrShortName() const = 0;
 };
 
-class AbstractFldInputDlg : public VclAbstractDialog  //add for SwFldInputDlg
+class AbstractFldInputDlg : public VclAbstractDialog
 {
 public:
     //from class SalFrame
@@ -108,7 +107,7 @@ public:
     virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0;
 };
 
-class AbstractInsFootNoteDlg : public VclAbstractDialog  //add for SwInsFootNoteDlg
+class AbstractInsFootNoteDlg : public VclAbstractDialog
 {
 public:
     virtual String          GetFontName() = 0;
@@ -119,7 +118,7 @@ public:
     virtual void    SetText( const OUString& rStr ) = 0;
 };
 
-class AbstractInsTableDlg : public VclAbstractDialog  //add for SwInsTableDlg
+class AbstractInsTableDlg : public VclAbstractDialog
 {
 public:
     virtual void            GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol,
@@ -127,7 +126,7 @@ public:
                                 SwTableAutoFmt *& prTAFmt ) = 0;
 };
 
-class AbstractJavaEditDialog : public VclAbstractDialog  //add for SwJavaEditDialog
+class AbstractJavaEditDialog : public VclAbstractDialog
 {
 public:
     virtual OUString                GetText() = 0;
@@ -137,7 +136,7 @@ public:
     virtual bool                IsUpdate() = 0;
 };
 
-class AbstractMailMergeDlg : public VclAbstractDialog  //add for SwMailMergeDlg
+class AbstractMailMergeDlg : public VclAbstractDialog
 {
 public:
     virtual sal_uInt16  GetMergeType() = 0;
@@ -150,18 +149,18 @@ public:
     virtual String GetPath() const = 0;
 
 };
-class AbstractMailMergeCreateFromDlg : public VclAbstractDialog  //add for SwMailMergeCreateFromDlg
+class AbstractMailMergeCreateFromDlg : public VclAbstractDialog
 {
 public:
     virtual sal_Bool    IsThisDocument() const = 0;
 };
-class AbstractMailMergeFieldConnectionsDlg : public VclAbstractDialog  //add for SwMailMergeFieldConnectionsDlg
+class AbstractMailMergeFieldConnectionsDlg : public VclAbstractDialog
 {
 public:
     virtual sal_Bool    IsUseExistingConnections() const = 0;
 };
 
-class AbstractMultiTOXTabDialog : public VclAbstractDialog  //add for SwMultiTOXTabDialog
+class AbstractMultiTOXTabDialog : public VclAbstractDialog
 {
 public:
     virtual SwForm*             GetForm(CurTOXType eType) = 0;
@@ -171,12 +170,12 @@ public:
     virtual const SfxItemSet*   GetOutputItemSet() const = 0;
 };
 
-class AbstractEditRegionDlg : public VclAbstractDialog  //add for SwEditRegionDlg
+class AbstractEditRegionDlg : public VclAbstractDialog
 {
 public:
     virtual void    SelectSection(const String& rSectionName) = 0;
 };
-class AbstractInsertSectionTabDialog : public VclAbstractDialog  //add for SwInsertSectionTabDialog
+class AbstractInsertSectionTabDialog : public VclAbstractDialog
 {
 public:
     virtual void     SetSectionData(SwSectionData const& rSect) = 0;
@@ -190,21 +189,21 @@ public:
     virtual Window *    GetWindow() = 0; //this method is added for return a Window type pointer
 };
 
-class AbstractSwInsertAbstractDlg : public VclAbstractDialog    // add for SwInsertAbstractDlg
+class AbstractSwInsertAbstractDlg : public VclAbstractDialog
 {
 public:
     virtual sal_uInt8   GetLevel() const = 0;
     virtual sal_uInt8   GetPara() const = 0;
 };
 
-class AbstractSwAsciiFilterDlg : public VclAbstractDialog // add for SwAsciiFilterDlg
+class AbstractSwAsciiFilterDlg : public VclAbstractDialog
 {
 public:
     virtual void FillOptions( SwAsciiOptions& rOptions ) = 0;
 
 };
 
-class AbstractSwBreakDlg : public VclAbstractDialog // add for SwBreakDlg
+class AbstractSwBreakDlg : public VclAbstractDialog
 {
 public:
     virtual String  GetTemplateName() = 0;
@@ -219,7 +218,7 @@ public:
     virtual sal_uInt16 GetSplitMode() = 0;
 };
 
-class AbstractSwConvertTableDlg :  public VclAbstractDialog // add for SwConvertTableDlg
+class AbstractSwConvertTableDlg :  public VclAbstractDialog
 {
 public:
     virtual void GetValues( sal_Unicode& rDelim,
@@ -227,7 +226,7 @@ public:
                     SwTableAutoFmt const*& prTAFmt ) = 0;
 };
 
-class AbstractSwInsertDBColAutoPilot :  public VclAbstractDialog // add for SwInsertDBColAutoPilot
+class AbstractSwInsertDBColAutoPilot :  public VclAbstractDialog
 {
 public:
 
@@ -237,21 +236,21 @@ public:
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet) = 0;
 };
 
-class AbstractDropDownFieldDialog : public VclAbstractDialog //add for DropDownFieldDialog
+class AbstractDropDownFieldDialog : public VclAbstractDialog
 {
 public:
      virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow
      virtual void         SetWindowState( const OString & rStr ) =0;//this method inherit from SystemWindow
 };
 
-class AbstractSwLabDlg  : public SfxAbstractTabDialog //add for SwLabDlg
+class AbstractSwLabDlg  : public SfxAbstractTabDialog
 {
 public:
      virtual const OUString& GetBusinessCardStr() const = 0;
      virtual Printer *GetPrt() =0;
 };
 
-class AbstractSwSelGlossaryDlg : public VclAbstractDialog //add for SwSelGlossaryDlg
+class AbstractSwSelGlossaryDlg : public VclAbstractDialog
 {
 public:
     virtual void InsertGlos(const String &rRegion, const String &rGlosName) = 0;    // inline
@@ -259,13 +258,13 @@ public:
     virtual void SelectEntryPos(sal_uInt16 nIdx) = 0;   // inline
 };
 
-class AbstractSwAutoFormatDlg : public VclAbstractDialog //add for SwAutoFormatDlg
+class AbstractSwAutoFormatDlg : public VclAbstractDialog
 {
 public:
     virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const = 0;
 };
 
-class AbstractSwFldDlg : public SfxAbstractTabDialog //add for SwFldDlg
+class AbstractSwFldDlg : public SfxAbstractTabDialog
 {
 public:
     virtual void                Start( sal_Bool bShow = sal_True ) = 0;  //this method from sfxtabdialog
@@ -276,7 +275,7 @@ public:
     virtual Window *            GetWindow() = 0; //this method is added for return a Window type pointer
 };
 
-class AbstractSwRenameXNamedDlg : public VclAbstractDialog //add for SwRenameXNamedDlg
+class AbstractSwRenameXNamedDlg : public VclAbstractDialog
 {
 public:
     virtual void    SetForbiddenChars( const String& rSet ) = 0;
@@ -285,13 +284,13 @@ public:
              ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird ) = 0;
 };
 
-class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog //add for SwModalRedlineAcceptDlg
+class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog
 {
 public:
     virtual void            AcceptAll( sal_Bool bAccept ) = 0;
 };
 
-class AbstractMarkFloatDlg : public VclAbstractDialog     //add for SwIndexMarkFloatDlg & SwAuthMarkFloatDlg
+class AbstractMarkFloatDlg : public VclAbstractDialog
 {
 public:
     virtual void    ReInitDlg(SwWrtShell& rWrtShell) = 0;
@@ -317,14 +316,12 @@ public:
     virtual sal_uInt16          GetRestartPage() const = 0;
 };
 
-
-// Swabstract fractory
 class SwAbstractDialogFactory
 {
 public:
     static SwAbstractDialogFactory*     Create();
 
-    virtual SfxAbstractDialog*              CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
+    virtual SfxAbstractDialog*              CreateSfxDialog( Window* pParent,
                                                                         const SfxItemSet& rAttr,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
                                                                         sal_uInt32 nResId
@@ -332,36 +329,34 @@ public:
     virtual AbstractSwWordCountFloatDlg* CreateSwWordCountDialog(SfxBindings* pBindings,
         SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo) = 0;
 
-    virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) = 0; // add for SwInsertAbstractDlg
+    virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent) = 0;
     virtual AbstractSwAsciiFilterDlg*  CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,
-                                                                SvStream* pStream ) = 0;// add for SwAsciiFilterDlg
-    virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0;// add for SwInsertBookmarkDlg
+                                                                SvStream* pStream ) = 0;
+    virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId ) = 0;
 
-    virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) = 0; // add for SwBreakDlg
-    virtual VclAbstractDialog   * CreateSwChangeDBDlg(SwView& rVw) = 0; //add for SwChangeDBDlg
+    virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) = 0;
+    virtual VclAbstractDialog   * CreateSwChangeDBDlg(SwView& rVw) = 0;
     virtual SfxAbstractTabDialog *  CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
-        sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) = 0;  // add for SwCharDlg
-    virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0; //add for SwConvertTableDlg
-    virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0; //add for SwCaptionDialog
+        sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) = 0;
+    virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0;
+    virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0;
 
-    virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, // add for SwInsertDBColAutoPilot
+    virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView,
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
         com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp,
         const SwDBData& rData) = 0;
-    virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) = 0;//add for  SwFootNoteOptionDlg
+    virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh) = 0;
 
-    //add for DropDownFieldDialog
     virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog(Window *pParent, SwWrtShell &rSh,
         SwField* pField, sal_Bool bNextButton = sal_False) = 0;
-    virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) = 0; //add for SwEnvDlg
+    virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ) = 0;
 
-
-    virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
+    virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
                                                      SwNewDBMgr* pNewDBMgr, bool bLabel) = 0;
 
-    virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;//add for SwLabDlg
+    virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;
 
-    virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, //add for SwParaDlg
+    virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent,
                                                     SwView& rVw,
                                                     const SfxItemSet& rCoreSet,
                                                     sal_uInt8 nDialogMode,
@@ -369,35 +364,35 @@ public:
                                                     sal_Bool bDraw = sal_False,
                                                     OString sDefPage = OString() ) = 0;
 
-    virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName) = 0; //add for SwSelGlossaryDlg
+    virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName) = 0;
 
-    virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) = 0; //add for  SwTableHeightDlg SwSortDlg
-    virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) = 0; //add for  SwSplitTblDlg
+    virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ) = 0;
+    virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ) = 0;
 
-    virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
+    virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell,
                                                             sal_Bool bSetAutoFmt = sal_True,
                                                             const SwTableAutoFmt* pSelFmt = 0 ) = 0;
-    virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) = 0; //add for SwWrapDlg
+    virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) = 0;
 
-    virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) = 0; //add for SwTableWidthDlg
+    virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc) = 0;
     virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
-        const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0; //add for SwTableTabDlg
+        const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0;
 
-    virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) = 0; //add for SwFldDlg
-    virtual SfxAbstractDialog*   CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; //add for SwFldEditDlg
-    virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent, //add for SwRenameXNamedDlg
+    virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) = 0;
+    virtual SfxAbstractDialog*   CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0;
+    virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) = 0;
     virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) = 0;
 
-    virtual VclAbstractDialog*          CreateTblMergeDialog( Window* pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg
+    virtual VclAbstractDialog*          CreateTblMergeDialog( Window* pParent, sal_Bool& rWithPrev ) = 0;
     virtual SfxAbstractTabDialog*       CreateFrmTabDialog(const OString &rDialogType,
                                                 SfxViewFrame *pFrame, Window *pParent,
                                                 const SfxItemSet& rCoreSet,
                                                 bool bNewFrm = true,
                                                 bool bFmt = false,
                                                 OString sDefPage = OString(),
-                                                const OUString* pFmtStr = 0) = 0;  //add for SwFrmDlg
+                                                const OUString* pFmtStr = 0) = 0;
     // @param nSlot
     // Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
     // Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
@@ -407,60 +402,59 @@ public:
                                                 sal_uInt16          nRegion,
                                                 OString             sPage = OString(),
                                                 SwWrtShell*         pActShell = 0,
-                                                bool                bNew = false) = 0; //add for SwTemplateDlg
+                                                bool                bNew = false) = 0;
     virtual AbstractGlossaryDlg*        CreateGlossaryDlg(SfxViewFrame* pViewFrame,
                                                 SwGlossaryHdl* pGlosHdl,
-                                                SwWrtShell *pWrtShell) = 0; //add for SwGlossaryDlg
+                                                SwWrtShell *pWrtShell) = 0;
     virtual AbstractFldInputDlg*        CreateFldInputDlg(Window *pParent,
-        SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0; //add for SwFldInputDlg
+        SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0;
     virtual AbstractInsFootNoteDlg*     CreateInsFootNoteDlg(Window * pParent,
-        SwWrtShell &rSh, sal_Bool bEd = sal_False) = 0; //add for SwInsFootNoteDlg
+        SwWrtShell &rSh, sal_Bool bEd = sal_False) = 0;
     virtual VclAbstractDialog*          CreateTitlePageDlg ( Window * pParent ) = 0;
-    virtual VclAbstractDialog *         CreateVclSwViewDialog(SwView& rView) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
-    virtual AbstractInsTableDlg*        CreateInsTableDlg(SwView& rView) = 0; //add for SwInsTableDlg
+    virtual VclAbstractDialog *         CreateVclSwViewDialog(SwView& rView) = 0;
+    virtual AbstractInsTableDlg*        CreateInsTableDlg(SwView& rView) = 0;
     virtual AbstractJavaEditDialog*     CreateJavaEditDialog(Window* pParent,
-        SwWrtShell* pWrtSh) = 0; //add for SwJavaEditDialog
+        SwWrtShell* pWrtSh) = 0;
     virtual AbstractMailMergeDlg*       CreateMailMergeDlg( int nResId,
                                                 Window* pParent, SwWrtShell& rSh,
                                                  const String& rSourceName,
                                                 const String& rTblName,
                                                 sal_Int32 nCommandType,
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
-                                                ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0; //add for SwMailMergeDlg
+                                                ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0;
     virtual AbstractMailMergeCreateFromDlg*     CreateMailMergeCreateFromDlg(Window* pParent) = 0;
-    virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent) = 0; //add for SwMailMergeFieldConnectionsDlg
+    virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent) = 0;
     virtual VclAbstractDialog*          CreateMultiTOXMarkDlg( int nResId,
-                                                Window* pParent, SwTOXMgr &rTOXMgr ) = 0; //add for SwMultiTOXMarkDlg
+                                                Window* pParent, SwTOXMgr &rTOXMgr ) = 0;
     virtual SfxAbstractTabDialog*       CreateSwTabDialog( int nResId,
                                                 Window* pParent,
                                                 const SfxItemSet* pSwItemSet,
-                                                SwWrtShell &) = 0; //add for SwSvxNumBulletTabDialog, SwOutlineTabDialog
+                                                SwWrtShell &) = 0;
     virtual AbstractMultiTOXTabDialog*      CreateMultiTOXTabDialog(
                                                 Window* pParent, const SfxItemSet& rSet,
                                                 SwWrtShell &rShell,
                                                 SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX,
-                                                sal_Bool bGlobal = sal_False) = 0; //add for SwMultiTOXTabDialog
-    virtual AbstractEditRegionDlg*      CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) = 0; //add for SwEditRegionDlg
+                                                sal_Bool bGlobal = sal_False) = 0;
+    virtual AbstractEditRegionDlg*      CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) = 0;
     virtual AbstractInsertSectionTabDialog*     CreateInsertSectionTabDialog(
-        Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) = 0; //add for SwInsertSectionTabDialog
+        Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) = 0;
     virtual AbstractMarkFloatDlg*       CreateIndexMarkFloatDlg(
                                                     SfxBindings* pBindings,
                                                        SfxChildWindow* pChild,
                                                        Window *pParent,
                                                     SfxChildWinInfo* pInfo,
-                                                       sal_Bool bNew=sal_True) = 0; //add for SwIndexMarkFloatDlg
+                                                       sal_Bool bNew=sal_True) = 0;
     virtual AbstractMarkFloatDlg*       CreateAuthMarkFloatDlg(
                                                     SfxBindings* pBindings,
                                                        SfxChildWindow* pChild,
                                                        Window *pParent,
                                                     SfxChildWinInfo* pInfo,
-                                                       sal_Bool bNew=sal_True) = 0; //add for SwAuthMarkFloatDlg
+                                                       sal_Bool bNew=sal_True) = 0;
     virtual VclAbstractDialog *         CreateIndexMarkModalDlg(
-                                                Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) = 0; //add for SwIndexMarkModalDlg
+                                                Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark) = 0;
 
     virtual AbstractMailMergeWizard*    CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) = 0;
 
-    //add for static func in SwGlossaryDlg
     virtual GlossaryGetCurrGroup        GetGlossaryCurrGroupFunc() = 0;
     virtual GlossarySetActGroup         SetGlossaryActGroupFunc() = 0;
 
@@ -473,4 +467,5 @@ protected:
 };
 
 #endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 825ab3f683a8..c7009710b016 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -23,7 +23,7 @@
 #include <tools/string.hxx>
 #include <filter/msfilter/msdffimp.hxx>
 #include <editeng/frmdir.hxx>
-#include <fltshell.hxx>         // fuer den Attribut Stack
+#include <fltshell.hxx>
 
 #include <vector>
 #include <stack>
@@ -1263,7 +1263,7 @@ private:
                             //     the very 1st Line Numbering and ignore the rest)
 
     bool bFirstPara;        // first paragraph?
-    bool bFirstParaOfPage;//cs2c--xushanchuan add for bug11210
+    bool bFirstParaOfPage;
     bool bParaAutoBefore;
     bool bParaAutoAfter;
 
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 8ec2ab27cd7c..e07cc8b483c2 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -34,59 +34,59 @@
 #include <regionsw.hrc>
 
 #include <wordcountdialog.hxx>
-#include "abstract.hxx" // add for SwInsertAbstractDlg
-#include "addrdlg.hxx" // add for SwAddrDlg
-#include "ascfldlg.hxx" // add for SwAsciiFilterDlg
-#include "bookmark.hxx" //add for SwInsertBookmarkDlg
-#include "break.hxx" //add for SwBreakDlg
-#include "changedb.hxx" //add for SwChangeDBDlg
-#include "chrdlg.hxx" // add for SwCharDlg
-#include "convert.hxx" //add for SwConvertTableDlg
-#include "cption.hxx" //add for SwCaptionDialog
-#include "dbinsdlg.hxx" //add for  SwInsertDBColAutoPilot
-#include "docfnote.hxx" //add for SwFootNoteOptionDlg
-#include "docstdlg.hxx" //add for SwDocStatPage
-#include "DropDownFieldDialog.hxx" //add for DropDownFieldDialog
-#include "envlop.hxx" //add for SwEnvDlg
-#include "label.hxx" //add for SwLabDlg
-#include "drpcps.hxx" //add for SwDropCapsDlg
-#include "swuipardlg.hxx" //add for SwParaDlg
-#include "pattern.hxx" //add for SwBackgroundDlg
-#include "rowht.hxx" //add for SwTableHeightDlg
-#include "selglos.hxx" //add for SwSelGlossaryDlg
-#include "splittbl.hxx" //add for SwSplitTblDlg
-#include "srtdlg.hxx" //add for SwSortDlg
-#include "tautofmt.hxx" //add for SwAutoFormatDlg
-#include "tblnumfm.hxx" //add for SwNumFmtDlg
-#include "wrap.hxx" //add for SwWrapDlg
-#include "colwd.hxx" //add for SwTableWidthDlg
-#include "tabledlg.hxx" //add for SwTableTabDlg
-#include "fldtdlg.hxx" //add for SwFldDlg
-#include "fldedt.hxx" //add for SwFldEditDlg
-#include "swrenamexnameddlg.hxx" //add for SwRenameXNamedDlg
-#include "swmodalredlineacceptdlg.hxx" //add for SwModalRedlineAcceptDlg
-#include <frmdlg.hxx> //add for SwFrmDlg
-#include <tmpdlg.hxx> //add for SwTemplateDlg
-#include <glossary.hxx> //add for SwGlossaryDlg
-#include <inpdlg.hxx> //add for SwFldInputDlg
-#include <insfnote.hxx> //add for SwInsFootNoteDlg
-#include <instable.hxx> //add for SwInsTableDlg
-#include <javaedit.hxx> //add for SwJavaEditDialog
-#include <linenum.hxx> //add for SwLineNumberingDlg
-#include <titlepage.hxx> //add for SwTitlePageDlg
-#include <mailmrge.hxx> //add for SwMailMergeDlg, SwMailMergeCreateFromDlg, SwMailMergeFieldConnectionsDlg
-#include <mergetbl.hxx> //add for SwMergeTblDlg
-#include <multmrk.hxx> //add for SwMultiTOXMarkDlg
-#include <num.hxx> //add for SwSvxNumBulletTabDialog
-#include <outline.hxx> //add for SwOutlineTabDialog
-#include <column.hxx> //add for SwColumnDlg
-#include <cnttab.hxx> //add for SwMultiTOXTabDialog
-#include <swuicnttab.hxx> //add for SwMultiTOXTabDialog
-#include <regionsw.hxx> //add for SwEditRegionDlg, SwInsertSectionTabDialog
-#include <optcomp.hxx> //add for SwCompatibilityOptPage
-#include <optload.hxx> //add for SwLoadOptPage
-#include <optpage.hxx> //add for OptPage
-#include <swuiidxmrk.hxx> //add for SwIndexMarkDlg, SwAuthMarkDlg, SwIndexMarkModalDlg, SwAuthMarkModalDlg
+#include "abstract.hxx"
+#include "addrdlg.hxx"
+#include "ascfldlg.hxx"
+#include "bookmark.hxx"
+#include "break.hxx"
+#include "changedb.hxx"
+#include "chrdlg.hxx"
+#include "convert.hxx"
+#include "cption.hxx"
+#include "dbinsdlg.hxx"
+#include "docfnote.hxx"
+#include "docstdlg.hxx"
+#include "DropDownFieldDialog.hxx"
+#include "envlop.hxx"
+#include "label.hxx"
+#include "drpcps.hxx"
+#include "swuipardlg.hxx"
+#include "pattern.hxx"
+#include "rowht.hxx"
+#include "selglos.hxx"
+#include "splittbl.hxx"
+#include "srtdlg.hxx"
+#include "tautofmt.hxx"
+#include "tblnumfm.hxx"
+#include "wrap.hxx"
+#include "colwd.hxx"
+#include "tabledlg.hxx"
+#include "fldtdlg.hxx"
+#include "fldedt.hxx"
+#include "swrenamexnameddlg.hxx"
+#include "swmodalredlineacceptdlg.hxx"
+#include <frmdlg.hxx>
+#include <tmpdlg.hxx>
+#include <glossary.hxx>
+#include <inpdlg.hxx>
+#include <insfnote.hxx>
+#include <instable.hxx>
+#include <javaedit.hxx>
+#include <linenum.hxx>
+#include <titlepage.hxx>
+#include <mailmrge.hxx>
+#include <mergetbl.hxx>
+#include <multmrk.hxx>
+#include <num.hxx>
+#include <outline.hxx>
+#include <column.hxx>
+#include <cnttab.hxx>
+#include <swuicnttab.hxx>
+#include <regionsw.hxx>
+#include <optcomp.hxx>
+#include <optload.hxx>
+#include <optpage.hxx>
+#include <swuiidxmrk.hxx>
 #include <svx/dialogs.hrc>
 #include <mailmergewizard.hxx>
 #include <mailconfigpage.hxx>
@@ -99,17 +99,17 @@ IMPL_ABSTDLG_BASE(SwAbstractSfxDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractSwAsciiFilterDlg_Impl);
 IMPL_ABSTDLG_BASE(VclAbstractDialog_Impl);
 IMPL_ABSTDLG_BASE(AbstractSplitTableDialog_Impl);
-IMPL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl); //add for SwBreakDlg
-IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); //add for SwCharDlg, SwFootNoteOptionDlg, SwEnvDlg  SwParaDlg SwTableTabDlg
-IMPL_ABSTDLG_BASE(AbstractSwConvertTableDlg_Impl); //add for SwConvertTableDlg
-IMPL_ABSTDLG_BASE(AbstractSwInsertDBColAutoPilot_Impl); //add for SwInsertDBColAutoPilot
-IMPL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl); //add for DropDownFieldDialog
-IMPL_ABSTDLG_BASE(AbstractSwLabDlg_Impl);//add for SwLabDlg
-IMPL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl);//add for SwSelGlossaryDlg
-IMPL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl); //add for SwAutoFormatDlg
-IMPL_ABSTDLG_BASE(AbstractSwFldDlg_Impl); //add for SwFldDlg
-IMPL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl); //add for SwRenameXNamedDlg
-IMPL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl); //add for SwModalRedlineAcceptDlg
+IMPL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwConvertTableDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwInsertDBColAutoPilot_Impl);
+IMPL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwLabDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwFldDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl);
+IMPL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractGlossaryDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractFldInputDlg_Impl);
 IMPL_ABSTDLG_BASE(AbstractInsFootNoteDlg_Impl);
@@ -177,12 +177,12 @@ sal_uInt8 AbstractSwInsertAbstractDlg_Impl::GetLevel() const
 {
     return pDlg->GetLevel();
 }
+
 sal_uInt8 AbstractSwInsertAbstractDlg_Impl::GetPara() const
 {
     return pDlg->GetPara();
 }
 
-//add for SwAddrDlg, SwDropCapsDlg ,SwBackgroundDlg, SwNumFmtDlg SwWrapDlg  SwFldEditDlg begin
 const SfxItemSet* SwAbstractSfxDialog_Impl::GetOutputItemSet() const
 {
     return pDlg->GetOutputItemSet();
@@ -371,6 +371,7 @@ Window* AbstractSwFldDlg_Impl::GetWindow()
 {
     return (Window*)pDlg;
 }
+
 void AbstractSwFldDlg_Impl::ShowReferencePage()
 {
     pDlg->ShowReferencePage();
@@ -417,6 +418,7 @@ String AbstractInsFootNoteDlg_Impl::GetFontName()
 {
     return pDlg->GetFontName();
 }
+
 sal_Bool AbstractInsFootNoteDlg_Impl::IsEndNote()
 {
     return pDlg->IsEndNote();
@@ -426,6 +428,7 @@ String AbstractInsFootNoteDlg_Impl::GetStr()
 {
     return pDlg->GetStr();
 }
+
 void AbstractInsFootNoteDlg_Impl::SetHelpId( const OString& sHelpId )
 {
     pDlg->SetHelpId( sHelpId );
@@ -452,14 +455,17 @@ String AbstractJavaEditDialog_Impl::GetType()
 {
     return pDlg->GetType();
 }
+
 sal_Bool AbstractJavaEditDialog_Impl::IsUrl()
 {
     return pDlg->IsUrl();
 }
+
 sal_Bool AbstractJavaEditDialog_Impl::IsNew()
 {
     return pDlg->IsNew();
 }
+
 bool AbstractJavaEditDialog_Impl::IsUpdate()
 {
     return pDlg->IsUpdate();
@@ -484,18 +490,22 @@ uno::Reference< sdbc::XResultSet> AbstractMailMergeDlg_Impl::GetResultSet() cons
 {
     return pDlg->GetResultSet();
 }
+
 bool AbstractMailMergeDlg_Impl::IsSaveIndividualDocs() const
 {
     return pDlg->IsSaveIndividualDocs();
 }
+
 bool AbstractMailMergeDlg_Impl::IsGenerateFromDataBase() const
 {
     return pDlg->IsGenerateFromDataBase();
 }
+
 String AbstractMailMergeDlg_Impl::GetColumnName() const
 {
     return pDlg->GetColumnName();
 }
+
 String AbstractMailMergeDlg_Impl::GetPath() const
 {
     return pDlg->GetPath();
@@ -562,7 +572,6 @@ Window* AbstractAuthMarkFloatDlg_Impl::GetWindow()
     return (Window*)pDlg;
 }
 
-
 Window* AbstractSwWordCountFloatDlg_Impl::GetWindow()
 {
     return (Window*)pDlg;
@@ -615,6 +624,7 @@ const String&       AbstractMailMergeWizard_Impl::GetReloadDocument() const
 {
     return pDlg->GetReloadDocument();
 }
+
 sal_Bool AbstractMailMergeWizard_Impl::ShowPage( sal_uInt16 nLevel )
 {
     return pDlg->skipUntil(nLevel);
@@ -703,7 +713,7 @@ VclAbstractDialog   * SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg(SwView&
     return new VclAbstractDialog_Impl(pDlg);
 }
 
- // add for SwCharDlg
+
 SfxAbstractTabDialog *  SwAbstractDialogFactory_Impl::CreateSwCharDlg(Window* pParent, SwView& pVw,
     const SfxItemSet& rCoreSet, sal_uInt8 nDialogMode, const OUString* pFmtStr)
 {
@@ -736,7 +746,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateSwCaptionDialog ( Window
     return 0;
 }
 
-AbstractSwInsertDBColAutoPilot* SwAbstractDialogFactory_Impl::CreateSwInsertDBColAutoPilot( SwView& rView, // add for SwInsertDBColAutoPilot
+AbstractSwInsertDBColAutoPilot* SwAbstractDialogFactory_Impl::CreateSwInsertDBColAutoPilot( SwView& rView,
         uno::Reference< sdbc::XDataSource> rxSource,
         uno::Reference<sdbcx::XColumnsSupplier> xColSupp,
         const SwDBData& rData)
@@ -751,7 +761,6 @@ SfxAbstractTabDialog *  SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(
     return new AbstractTabDialog_Impl( pDlg );
 }
 
-//add for DropDownFieldDialog
 AbstractDropDownFieldDialog *  SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(Window *pParent,
     SwWrtShell &rSh, SwField* pField, sal_Bool bNextButton)
 {
@@ -761,13 +770,13 @@ AbstractDropDownFieldDialog *  SwAbstractDialogFactory_Impl::CreateDropDownField
 
 SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet,
                                                                  SwWrtShell* pWrtSh, Printer* pPrt,
-                                                                 sal_Bool bInsert ) //add for SwEnvDlg
+                                                                 sal_Bool bInsert )
 {
     SfxTabDialog* pDlg = new SwEnvDlg( pParent, rSet, pWrtSh,pPrt, bInsert  );
     return new AbstractTabDialog_Impl( pDlg );
 }
 
-AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
+AbstractSwLabDlg* SwAbstractDialogFactory_Impl::CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
                                                      SwNewDBMgr* pNewDBMgr, bool bLabel)
 {
     SwLabDlg* pDlg = new SwLabDlg(pParent, rSet, pNewDBMgr, bLabel);
@@ -901,7 +910,7 @@ AbstractSwModalRedlineAcceptDlg * SwAbstractDialogFactory_Impl::CreateSwModalRed
     return new AbstractSwModalRedlineAcceptDlg_Impl( pDlg );
 }
 
-VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev) //add for SwMergeTblDlg
+VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev)
 {
     Dialog* pDlg = new SwMergeTblDlg( pParent, rWithPrev );
     return new VclAbstractDialog_Impl( pDlg );
@@ -913,7 +922,7 @@ SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateFrmTabDialog(const OSt
                                                 bool        bNewFrm,
                                                 bool        bFmt,
                                                 OString     sDefPage,
-                                                const OUString* pFmtStr ) //add for SwFrmDlg
+                                                const OUString* pFmtStr )
 {
     SfxTabDialog* pDlg = new SwFrmDlg(pFrame, pParent, rCoreSet, bNewFrm, rDialogType, bFmt, sDefPage, pFmtStr);
     return new AbstractTabDialog_Impl(pDlg);
@@ -925,7 +934,7 @@ SfxAbstractApplyTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog(
                                                 sal_uInt16          nRegion,
                                                 OString             sPage,
                                                 SwWrtShell*         pActShell,
-                                                bool                bNew ) //add for SwTemplateDlg
+                                                bool                bNew )
 {
     SfxTabDialog* pDlg = new SwTemplateDlg( pParent, rBase, nRegion, sPage, pActShell, bNew );
     return new AbstractApplyTabDialog_Impl( pDlg );
@@ -933,21 +942,21 @@ SfxAbstractApplyTabDialog* SwAbstractDialogFactory_Impl::CreateTemplateDialog(
 
 AbstractGlossaryDlg* SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFrame* pViewFrame,
                                                 SwGlossaryHdl* pGlosHdl,
-                                                SwWrtShell *pWrtShell) //add for SwGlossaryDlg
+                                                SwWrtShell *pWrtShell)
 {
     SwGlossaryDlg* pDlg = new SwGlossaryDlg(pViewFrame, pGlosHdl, pWrtShell);
     return new AbstractGlossaryDlg_Impl( pDlg );
 }
 
 AbstractFldInputDlg* SwAbstractDialogFactory_Impl::CreateFldInputDlg(Window *pParent,
-    SwWrtShell &rSh, SwField* pField, bool bNextButton) //add for SwFldInputDlg
+    SwWrtShell &rSh, SwField* pField, bool bNextButton)
 {
     SwFldInputDlg* pDlg = new SwFldInputDlg( pParent, rSh, pField, bNextButton );
     return new AbstractFldInputDlg_Impl( pDlg );
 }
 
 AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg(
-    Window * pParent, SwWrtShell &rSh, sal_Bool bEd ) //add for SwInsFootNoteDlg
+    Window * pParent, SwWrtShell &rSh, sal_Bool bEd )
 {
     SwInsFootNoteDlg* pDlg = new SwInsFootNoteDlg(pParent, rSh, bEd);
     return new AbstractInsFootNoteDlg_Impl( pDlg );
@@ -967,14 +976,14 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateVclSwViewDialog(SwView&
     return new VclAbstractDialog_Impl( pDlg );
 }
 
-AbstractInsTableDlg * SwAbstractDialogFactory_Impl::CreateInsTableDlg(SwView& rView) //add for SwInsTableDlg
+AbstractInsTableDlg * SwAbstractDialogFactory_Impl::CreateInsTableDlg(SwView& rView)
 {
     SwInsTableDlg* pDlg = new SwInsTableDlg(rView);
     return new AbstractInsTableDlg_Impl( pDlg );
 }
 
 AbstractJavaEditDialog * SwAbstractDialogFactory_Impl::CreateJavaEditDialog(
-    Window* pParent, SwWrtShell* pWrtSh) //add for SwJavaEditDialog
+    Window* pParent, SwWrtShell* pWrtSh)
 {
     SwJavaEditDialog* pDlg = new SwJavaEditDialog(pParent, pWrtSh);
     return new AbstractJavaEditDialog_Impl( pDlg );
@@ -986,7 +995,7 @@ AbstractMailMergeDlg * SwAbstractDialogFactory_Impl::CreateMailMergeDlg( int nRe
                                                 const String& rTblName,
                                                 sal_Int32 nCommandType,
                                                 const uno::Reference< sdbc::XConnection>& xConnection,
-                                                uno::Sequence< uno::Any >* pSelection ) //add for SwMailMergeDlg
+                                                uno::Sequence< uno::Any >* pSelection )
 {
     SwMailMergeDlg* pDlg=NULL;
     switch ( nResId )
@@ -1008,14 +1017,14 @@ AbstractMailMergeCreateFromDlg * SwAbstractDialogFactory_Impl::CreateMailMergeCr
     return new AbstractMailMergeCreateFromDlg_Impl(pDlg);
 }
 
-AbstractMailMergeFieldConnectionsDlg * SwAbstractDialogFactory_Impl::CreateMailMergeFieldConnectionsDlg(Window* pParent) //add for SwMailMergeFieldConnectionsDlg
+AbstractMailMergeFieldConnectionsDlg * SwAbstractDialogFactory_Impl::CreateMailMergeFieldConnectionsDlg(Window* pParent)
 {
     SwMailMergeFieldConnectionsDlg* pDlg = new SwMailMergeFieldConnectionsDlg( pParent );
     return new AbstractMailMergeFieldConnectionsDlg_Impl( pDlg );
 }
 
 VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg( int nResId,
-                                                Window* pParent, SwTOXMgr &rTOXMgr ) //add for SwMultiTOXMarkDlg
+                                                Window* pParent, SwTOXMgr &rTOXMgr )
 {
     Dialog* pDlg=NULL;
     switch ( nResId )
@@ -1034,7 +1043,7 @@ VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg( int nRe
 SfxAbstractTabDialog* SwAbstractDialogFactory_Impl::CreateSwTabDialog( int nResId,
                                                 Window* pParent,
                                                 const SfxItemSet* pSwItemSet,
-                                                SwWrtShell & rWrtSh ) //add for SwSvxNumBulletTabDialog, SwOutlineTabDialog
+                                                SwWrtShell & rWrtSh )
 {
     SfxTabDialog* pDlg=NULL;
     switch ( nResId )
@@ -1058,20 +1067,20 @@ AbstractMultiTOXTabDialog * SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialo
                                                 Window* pParent, const SfxItemSet& rSet,
                                                 SwWrtShell &rShell,
                                                 SwTOXBase* pCurTOX, sal_uInt16 nToxType,
-                                                sal_Bool bGlobal) //add for SwMultiTOXTabDialog
+                                                sal_Bool bGlobal)
 {
     SwMultiTOXTabDialog* pDlg = new SwMultiTOXTabDialog( pParent, rSet, rShell, pCurTOX, nToxType, bGlobal );
     return new AbstractMultiTOXTabDialog_Impl( pDlg );
 }
 
-AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh) //add for SwEditRegionDlg
+AbstractEditRegionDlg * SwAbstractDialogFactory_Impl::CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh)
 {
     SwEditRegionDlg* pDlg = new SwEditRegionDlg( pParent, rWrtSh );
     return new AbstractEditRegionDlg_Impl( pDlg );
 }
 
 AbstractInsertSectionTabDialog * SwAbstractDialogFactory_Impl::CreateInsertSectionTabDialog(
-                                                    Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh) //add for SwInsertSectionTabDialog
+                                                    Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh)
 {
     SwInsertSectionTabDialog* pDlg = new SwInsertSectionTabDialog(pParent, rSet, rSh);
     return new AbstractInsertSectionTabDialog_Impl(pDlg);
@@ -1082,7 +1091,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateIndexMarkFloatDlg(
                                                        SfxChildWindow* pChild,
                                                        Window *pParent,
                                                     SfxChildWinInfo* pInfo,
-                                                       sal_Bool bNew ) //add for SwIndexMarkFloatDlg
+                                                       sal_Bool bNew )
 {
     SwIndexMarkFloatDlg* pDlg = new SwIndexMarkFloatDlg(pBindings, pChild, pParent, pInfo, bNew);
     return new AbstractIndexMarkFloatDlg_Impl(pDlg);
@@ -1093,7 +1102,7 @@ AbstractMarkFloatDlg * SwAbstractDialogFactory_Impl::CreateAuthMarkFloatDlg(
                                                        SfxChildWindow* pChild,
                                                        Window *pParent,
                                                     SfxChildWinInfo* pInfo,
-                                                       sal_Bool bNew) //add for SwAuthMarkFloatDlg
+                                                       sal_Bool bNew)
 {
     SwAuthMarkFloatDlg* pDlg = new SwAuthMarkFloatDlg( pBindings, pChild, pParent, pInfo, bNew );
     return new AbstractAuthMarkFloatDlg_Impl( pDlg );
@@ -1109,22 +1118,19 @@ AbstractSwWordCountFloatDlg * SwAbstractDialogFactory_Impl::CreateSwWordCountDia
     return new AbstractSwWordCountFloatDlg_Impl( pDlg );
 }
 
-//add for SwIndexMarkModalDlg begin
 VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg(
-                                                Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ) //add for SwIndexMarkModalDlg
+                                                Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark )
 {
     Dialog* pDlg = new SwIndexMarkModalDlg( pParent, rSh, pCurTOXMark );
     return new VclAbstractDialog_Impl( pDlg );
 }
 
-//add for SwIndexMarkModalDlg end
 AbstractMailMergeWizard*    SwAbstractDialogFactory_Impl::CreateMailMergeWizard(
                                     SwView& rView, SwMailMergeConfigItem& rConfigItem)
 {
     return new AbstractMailMergeWizard_Impl( new SwMailMergeWizard(rView, rConfigItem));
 }
 
-//add for static func in SwGlossaryDlg
 GlossaryGetCurrGroup    SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc()
 {
     return SwGlossaryDlg::GetCurrGroup;
@@ -1135,7 +1141,6 @@ GlossarySetActGroup SwAbstractDialogFactory_Impl::SetGlossaryActGroupFunc()
     return SwGlossaryDlg::SetActGroup;
 }
 
-
 //------------------ Factories for TabPages
 CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId )
 {
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 91413ce1324b..77aa49c5c2f9 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -74,7 +74,6 @@ class AbstractSwWordCountFloatDlg_Impl : public AbstractSwWordCountFloatDlg
     virtual Window *            GetWindow(); //this method is added for return a Window type pointer
 };
 
-//add for SwInsertAbstractDlg begin
 class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwInsertAbstractDlg_Impl,SwInsertAbstractDlg)
@@ -82,9 +81,6 @@ class AbstractSwInsertAbstractDlg_Impl : public AbstractSwInsertAbstractDlg
     virtual sal_uInt8   GetPara() const ;
 };
 
-//add for SwInsertAbstractDlg end
-
-// add for SwAddrDlg, SwDropCapsDlg, SwBackgroundDlg SwNumFmtDlg  SwWrapDlg, SwFldEditDlg  begin
 class SfxNoLayoutSingleTabDialog;
 class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
 {
@@ -93,26 +89,20 @@ class SwAbstractSfxDialog_Impl :public SfxAbstractDialog
     virtual void        SetText( const OUString& rStr );
     virtual OUString    GetText() const;
 };
-// add for SwAddrDlg,SwDropCapsDlg , SwBackgroundDlg  SwNumFmtDlg SwWrapDlg, SwFldEditDlg  end
 
-// add for SwAsciiFilterDlg begin
 class AbstractSwAsciiFilterDlg_Impl : public AbstractSwAsciiFilterDlg
 {
     DECL_ABSTDLG_BASE( AbstractSwAsciiFilterDlg_Impl,SwAsciiFilterDlg )
     virtual void FillOptions( SwAsciiOptions& rOptions );
 
 };
-// add for SwAsciiFilterDlg end
 
-// add for SwInsertBookmarkDlg  SwChangeDBDlg, SwTableHeightDlg, SwSplitTblDlg  SwSortDlg   SwTableWidthDlgbegin
 class VclAbstractDialog_Impl : public VclAbstractDialog
 {
     DECL_ABSTDLG_BASE(VclAbstractDialog_Impl,Dialog)
 };
-// add for SwInsertBookmarkDlg SwChangeDBDlg, SwTableHeightDlg SwSplitTblDlg  SwSortDlg   SwTableWidthDlg end
 
-// add for SwBreakDlg begin
-class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg // add for SwBreakDlg
+class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwBreakDlg_Impl,SwBreakDlg)
     virtual String  GetTemplateName();
@@ -126,9 +116,6 @@ class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for
     virtual sal_uInt16 GetSplitMode();
 };
 
-// add for SwBreakDlg end
-
-//add for SwCharDlg , SwEnvDlg , SwFootNoteOptionDlg SwParaDlg  SwTableTabDlg begin
 class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog
 {
     DECL_ABSTDLG_BASE( AbstractTabDialog_Impl,SfxTabDialog )
@@ -141,7 +128,6 @@ class AbstractTabDialog_Impl : virtual public SfxAbstractTabDialog
     virtual void        SetText( const OUString& rStr );
     virtual OUString    GetText() const;
 };
-//add for SwCharDlg, SwEnvDlg ,SwFootNoteOptionDlg SwParaDlg  SwTableTabDlg end
 
 class AbstractApplyTabDialog_Impl : public AbstractTabDialog_Impl, virtual public SfxAbstractApplyTabDialog
 {
@@ -156,17 +142,14 @@ private:
     virtual void                SetApplyHdl( const Link& rLink );
 };
 
-//add for SwConvertTableDlg begin
-class AbstractSwConvertTableDlg_Impl :  public AbstractSwConvertTableDlg // add for SwConvertTableDlg
+class AbstractSwConvertTableDlg_Impl :  public AbstractSwConvertTableDlg
 {
     DECL_ABSTDLG_BASE( AbstractSwConvertTableDlg_Impl,SwConvertTableDlg)
     virtual void GetValues( sal_Unicode& rDelim,SwInsertTableOptions& rInsTblFlags,
                     SwTableAutoFmt const*& prTAFmt);
 };
-//add for SwConvertTableDlg end
 
-//add for SwInsertDBColAutoPilot begin
-class AbstractSwInsertDBColAutoPilot_Impl :  public AbstractSwInsertDBColAutoPilot // add for SwInsertDBColAutoPilot
+class AbstractSwInsertDBColAutoPilot_Impl :  public AbstractSwInsertDBColAutoPilot
 {
     DECL_ABSTDLG_BASE( AbstractSwInsertDBColAutoPilot_Impl,SwInsertDBColAutoPilot)
     virtual void DataToDoc( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rSelection,
@@ -174,17 +157,13 @@ class AbstractSwInsertDBColAutoPilot_Impl :  public AbstractSwInsertDBColAutoPil
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xResultSet);
 };
-//add for SwInsertDBColAutoPilot end
 
-//add for DropDownFieldDialog begin
-class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog //add for DropDownFieldDialog
+class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog
 {
     DECL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl, sw::DropDownFieldDialog)
     virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow
     virtual void         SetWindowState( const OString& rStr );//this method inherit from SystemWindow
 };
-//add for DropDownFieldDialog end
-
 
 class AbstractSwLabDlg_Impl  : public AbstractSwLabDlg
 {
@@ -200,9 +179,7 @@ class AbstractSwLabDlg_Impl  : public AbstractSwLabDlg
     virtual const OUString& GetBusinessCardStr() const;
     virtual Printer *GetPrt();
 };
-//add for SwLabDlg end
 
-//add for SwSelGlossaryDlg begin
 class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwSelGlossaryDlg_Impl,SwSelGlossaryDlg)
@@ -210,19 +187,14 @@ class AbstractSwSelGlossaryDlg_Impl : public AbstractSwSelGlossaryDlg
     virtual sal_uInt16 GetSelectedIdx() const;  // inline
     virtual void SelectEntryPos(sal_uInt16 nIdx);   // inline
 };
-//add for SwSelGlossaryDlg end
 
-//add for SwAutoFormatDlg begin
 class AbstractSwAutoFormatDlg_Impl : public AbstractSwAutoFormatDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwAutoFormatDlg_Impl,SwAutoFormatDlg )
     virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const;
 };
-//add for SwAutoFormatDlg end
-
-//add for SwFldDlg begin
 
-class AbstractSwFldDlg_Impl : public AbstractSwFldDlg //add for SwFldDlg
+class AbstractSwFldDlg_Impl : public AbstractSwFldDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwFldDlg_Impl,SwFldDlg )
     virtual void                SetCurPageId( sal_uInt16 nId );
@@ -240,9 +212,7 @@ class AbstractSwFldDlg_Impl : public AbstractSwFldDlg //add for SwFldDlg
     virtual void                ActivateDatabasePage();
     virtual Window *            GetWindow(); //this method is added for return a Window type pointer
 };
-//add for SwFldD end
 
-//add for SwRenameXNamedDlg begin
 class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwRenameXNamedDlg_Impl,SwRenameXNamedDlg )
@@ -251,16 +221,13 @@ class AbstractSwRenameXNamedDlg_Impl : public AbstractSwRenameXNamedDlg
              ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xSecond,
              ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xThird );
 };
-//add for SwRenameXNamedDlg end
-//add for SwModalRedlineAcceptDlg begin
+
 class AbstractSwModalRedlineAcceptDlg_Impl : public AbstractSwModalRedlineAcceptDlg
 {
     DECL_ABSTDLG_BASE(AbstractSwModalRedlineAcceptDlg_Impl,SwModalRedlineAcceptDlg )
     virtual void            AcceptAll( sal_Bool bAccept );
 };
-//add for SwModalRedlineAcceptDlg end
 
-//for SwGlossaryDlg begin
 class SwGlossaryDlg;
 class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg
 {
@@ -268,9 +235,7 @@ class AbstractGlossaryDlg_Impl : public AbstractGlossaryDlg
     virtual String          GetCurrGrpName() const;
     virtual String          GetCurrShortName() const;
 };
-//for SwGlossaryDlg end
 
-//for SwFldInputDlg begin
 class SwFldInputDlg;
 class AbstractFldInputDlg_Impl : public AbstractFldInputDlg
 {
@@ -279,9 +244,7 @@ class AbstractFldInputDlg_Impl : public AbstractFldInputDlg
     virtual void         SetWindowState( const OString & rStr ) ;
     virtual OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ;
 };
-//for SwFldInputDlg end
 
-//for SwInsFootNoteDlg begin
 class SwInsFootNoteDlg;
 class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
 {
@@ -293,9 +256,7 @@ class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg
     virtual void    SetHelpId( const OString& sHelpId );
     virtual void    SetText( const OUString& rStr );
 };
-//for SwInsFootNoteDlg end
 
-//for SwInsTableDlg begin
 class SwInsTableDlg;
 class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
 {
@@ -304,9 +265,7 @@ class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
                                 SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName,
                                 SwTableAutoFmt *& prTAFmt );
 };
-//for SwInsTableDlg end
 
-//for SwJavaEditDialog begin
 class SwJavaEditDialog;
 class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
 {
@@ -317,9 +276,7 @@ class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
     virtual sal_Bool                IsNew();
     virtual bool                IsUpdate();
 };
-//for SwJavaEditDialog end
 
-//for SwMailMergeDlg begin
 class SwMailMergeDlg;
 class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
 {
@@ -333,25 +290,21 @@ class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg
     virtual String GetColumnName() const;
     virtual String GetPath() const;
 };
-//for SwMailMergeDlg end
-//for SwMailMergeCreateFromDlg begin
+
 class SwMailMergeCreateFromDlg;
 class AbstractMailMergeCreateFromDlg_Impl : public AbstractMailMergeCreateFromDlg
 {
     DECL_ABSTDLG_BASE(AbstractMailMergeCreateFromDlg_Impl,SwMailMergeCreateFromDlg)
     virtual sal_Bool    IsThisDocument() const ;
 };
-//for SwMailMergeCreateFromDlg end
-//for SwMailMergeFieldConnectionsDlg begin
+
 class SwMailMergeFieldConnectionsDlg;
 class AbstractMailMergeFieldConnectionsDlg_Impl : public AbstractMailMergeFieldConnectionsDlg
 {
     DECL_ABSTDLG_BASE(AbstractMailMergeFieldConnectionsDlg_Impl,SwMailMergeFieldConnectionsDlg)
     virtual sal_Bool    IsUseExistingConnections() const ;
 };
-//for SwMailMergeFieldConnectionsDlg end
 
-//for SwMultiTOXTabDialog begin
 class SwMultiTOXTabDialog;
 class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog
 {
@@ -362,26 +315,21 @@ class AbstractMultiTOXTabDialog_Impl : public AbstractMultiTOXTabDialog
     //from SfxTabDialog
     virtual const SfxItemSet*   GetOutputItemSet() const;
 };
-//for SwMultiTOXTabDialog end
 
-//for SwEditRegionDlg begin
 class SwEditRegionDlg;
 class AbstractEditRegionDlg_Impl : public AbstractEditRegionDlg
 {
     DECL_ABSTDLG_BASE(AbstractEditRegionDlg_Impl,SwEditRegionDlg)
     virtual void    SelectSection(const String& rSectionName);
 };
-//for SwEditRegionDlg end
-//for SwInsertSectionTabDialog begin
+
 class SwInsertSectionTabDialog;
 class AbstractInsertSectionTabDialog_Impl : public AbstractInsertSectionTabDialog
 {
     DECL_ABSTDLG_BASE(AbstractInsertSectionTabDialog_Impl,SwInsertSectionTabDialog)
     virtual void        SetSectionData(SwSectionData const& rSect);
 };
-//for SwInsertSectionTabDialog end
 
-//for SwIndexMarkFloatDlg begin
 class SwIndexMarkFloatDlg;
 class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg
 {
@@ -389,9 +337,7 @@ class AbstractIndexMarkFloatDlg_Impl : public AbstractMarkFloatDlg
     virtual void    ReInitDlg(SwWrtShell& rWrtShell);
     virtual Window *            GetWindow(); //this method is added for return a Window type pointer
 };
-//for SwIndexMarkFloatDlg end
 
-//for SwAuthMarkFloatDlg begin
 class SwAuthMarkFloatDlg;
 class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg
 {
@@ -399,7 +345,6 @@ class AbstractAuthMarkFloatDlg_Impl : public AbstractMarkFloatDlg
     virtual void    ReInitDlg(SwWrtShell& rWrtShell);
     virtual Window *            GetWindow(); //this method is added for return a Window type pointer
 };
-//for SwAuthMarkFloatDlg end
 
 class SwMailMergeWizard;
 class AbstractMailMergeWizard_Impl : public AbstractMailMergeWizard
@@ -430,7 +375,7 @@ class SwAbstractDialogFactory_Impl : public SwAbstractDialogFactory
 public:
     virtual ~SwAbstractDialogFactory_Impl() {}
 
-    virtual SfxAbstractDialog*              CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
+    virtual SfxAbstractDialog*              CreateSfxDialog( Window* pParent,
                                                                         const SfxItemSet& rAttr,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame,
                                                                         sal_uInt32 nResId
@@ -439,30 +384,29 @@ public:
         SfxChildWindow* pChild, Window *pParent, SfxChildWinInfo* pInfo);
     virtual AbstractSwInsertAbstractDlg * CreateSwInsertAbstractDlg(Window* pParent);
     virtual AbstractSwAsciiFilterDlg*  CreateSwAsciiFilterDlg ( Window* pParent, SwDocShell& rDocSh,
-                                                                SvStream* pStream ); //add for SwAsciiFilterDlg
-    virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId );//add for SwInsertBookmarkDlg
-    virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh); // add for SwBreakDlg
-    virtual VclAbstractDialog   * CreateSwChangeDBDlg(SwView& rVw); //add for SwChangeDBDlg
+                                                                SvStream* pStream );
+    virtual VclAbstractDialog * CreateSwInsertBookmarkDlg( Window *pParent, SwWrtShell &rSh, SfxRequest& rReq, int nResId );
+    virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh);
+    virtual VclAbstractDialog   * CreateSwChangeDBDlg(SwView& rVw);
     virtual SfxAbstractTabDialog *  CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
-        sal_uInt8 nDialogMode, const OUString* pFmtStr = 0); // add for SwCharDlg
-    virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable); //add for SwConvertTableDlg
-    virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId); //add for SwCaptionDialog
+        sal_uInt8 nDialogMode, const OUString* pFmtStr = 0);
+    virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable);
+    virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId);
 
-    virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView, // add for SwInsertDBColAutoPilot
+    virtual AbstractSwInsertDBColAutoPilot* CreateSwInsertDBColAutoPilot(SwView& rView,
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> rxSource,
         com::sun::star::uno::Reference<com::sun::star::sdbcx::XColumnsSupplier> xColSupp,
         const SwDBData& rData);
-    virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh);//add for  SwFootNoteOptionDlg
+    virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg(Window *pParent, SwWrtShell &rSh);
 
-    //add for DropDownFieldDialog
     virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog (Window *pParent, SwWrtShell &rSh,
         SwField* pField, sal_Bool bNextButton = sal_False);
-    virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert ); //add for SwEnvDlg
-    virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg
+    virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert );
+    virtual AbstractSwLabDlg* CreateSwLabDlg(Window* pParent, const SfxItemSet& rSet,
                                                      SwNewDBMgr* pNewDBMgr, bool bLabel);
 
-    virtual SwLabDlgMethod GetSwLabDlgStaticMethod (); //add for SwLabDlg
-    virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, //add for SwParaDlg
+    virtual SwLabDlgMethod GetSwLabDlgStaticMethod ();
+    virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent,
                                                     SwView& rVw,
                                                     const SfxItemSet& rCoreSet,
                                                     sal_uInt8 nDialogMode,
@@ -470,93 +414,92 @@ public:
                                                     sal_Bool bDraw = sal_False,
                                                     OString sDefPage = OString() );
 
-    virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName); //add for SwSelGlossaryDlg
-    virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId ); //add for  SwTableHeightDlg SwSortDlg
-    virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh ); //add for  SwSplitTblDlg
+    virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(Window * pParent, const String &rShortName);
+    virtual VclAbstractDialog * CreateVclAbstractDialog ( Window * pParent, SwWrtShell &rSh, int nResId );
+    virtual AbstractSplitTableDialog * CreateSplitTblDialog ( Window * pParent, SwWrtShell &rSh );
 
-    virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg
+    virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell,
                                                             sal_Bool bSetAutoFmt = sal_True,
                                                             const SwTableAutoFmt* pSelFmt = 0 );
 
-    virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ); //add for SwWrapDlg
+    virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId );
     virtual VclAbstractDialog * CreateSwTableWidthDlg(Window *pParent, SwTableFUNC &rFnc);
     virtual SfxAbstractTabDialog* CreateSwTableTabDlg(Window* pParent, SfxItemPool& Pool,
-        const SfxItemSet* pItemSet, SwWrtShell* pSh); //add for SwTableTabDlg
-    virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent); //add for SwFldDlg
-    virtual SfxAbstractDialog*   CreateSwFldEditDlg ( SwView& rVw, int nResId ); //add for SwFldEditDlg
-    virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent, //add for SwRenameXNamedDlg
+        const SfxItemSet* pItemSet, SwWrtShell* pSh);
+    virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent);
+    virtual SfxAbstractDialog*   CreateSwFldEditDlg ( SwView& rVw, int nResId );
+    virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess);
-    virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent); //add for SwModalRedlineAcceptDlg
+    virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent);
 
-    virtual VclAbstractDialog*          CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev); //add for SwMergeTblDlg
+    virtual VclAbstractDialog*          CreateTblMergeDialog(Window* pParent, sal_Bool& rWithPrev);
     virtual SfxAbstractTabDialog*       CreateFrmTabDialog( const OString &rDialogType,
                                                 SfxViewFrame *pFrame, Window *pParent,
                                                 const SfxItemSet& rCoreSet,
                                                 bool bNewFrm  = true,
                                                 bool bFmt     = false,
                                                 OString sDefPage = OString(),
-                                                const OUString*   pFmtStr  = 0); //add for SwFrmDlg
+                                                const OUString*   pFmtStr  = 0);
     virtual SfxAbstractApplyTabDialog*  CreateTemplateDialog(
                                                 Window*             pParent,
                                                 SfxStyleSheetBase&  rBase,
                                                 sal_uInt16          nRegion,
                                                 OString             sPage = OString(),
                                                 SwWrtShell*         pActShell = 0,
-                                                bool                bNew = false); //add for SwTemplateDlg
+                                                bool                bNew = false);
     virtual AbstractGlossaryDlg*        CreateGlossaryDlg(SfxViewFrame* pViewFrame,
                                                 SwGlossaryHdl* pGlosHdl,
-                                                SwWrtShell *pWrtShell); //add for SwGlossaryDlg
+                                                SwWrtShell *pWrtShell);
     virtual AbstractFldInputDlg*        CreateFldInputDlg(Window *pParent,
-        SwWrtShell &rSh, SwField* pField, bool bNextButton = false); //add for SwFldInputDlg
+        SwWrtShell &rSh, SwField* pField, bool bNextButton = false);
     virtual AbstractInsFootNoteDlg*     CreateInsFootNoteDlg(
-        Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False); //add for SwInsFootNoteDlg
+        Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False);
     virtual VclAbstractDialog *         CreateTitlePageDlg ( Window * pParent );
-    virtual VclAbstractDialog *         CreateVclSwViewDialog(SwView& rView); //add for SwInsRowColDlg, SwLineNumberingDlg
-    virtual AbstractInsTableDlg*        CreateInsTableDlg(SwView& rView); //add for SwInsTableDlg
+    virtual VclAbstractDialog *         CreateVclSwViewDialog(SwView& rView);
+    virtual AbstractInsTableDlg*        CreateInsTableDlg(SwView& rView);
     virtual AbstractJavaEditDialog*     CreateJavaEditDialog(Window* pParent,
-        SwWrtShell* pWrtSh); //add for SwJavaEditDialog
+        SwWrtShell* pWrtSh);
     virtual AbstractMailMergeDlg*       CreateMailMergeDlg( int nResId,
                                                 Window* pParent, SwWrtShell& rSh,
                                                  const String& rSourceName,
                                                 const String& rTblName,
                                                 sal_Int32 nCommandType,
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
-                                                ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ); //add for SwMailMergeDlg
+                                                ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 );
     virtual AbstractMailMergeCreateFromDlg*     CreateMailMergeCreateFromDlg(Window* pParent);
-    virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent); //add for SwMailMergeFieldConnectionsDlg
+    virtual AbstractMailMergeFieldConnectionsDlg* CreateMailMergeFieldConnectionsDlg(Window* pParent);
     virtual VclAbstractDialog*          CreateMultiTOXMarkDlg( int nResId,
-                                                Window* pParent, SwTOXMgr &rTOXMgr ); //add for SwMultiTOXMarkDlg
+                                                Window* pParent, SwTOXMgr &rTOXMgr );
     virtual SfxAbstractTabDialog*       CreateSwTabDialog( int nResId,
                                                 Window* pParent,
                                                 const SfxItemSet* pSwItemSet,
-                                                SwWrtShell &); //add for SwSvxNumBulletTabDialog, SwOutlineTabDialog
+                                                SwWrtShell &);
     virtual AbstractMultiTOXTabDialog*      CreateMultiTOXTabDialog(
                                                 Window* pParent, const SfxItemSet& rSet,
                                                 SwWrtShell &rShell,
                                                 SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX,
-                                                sal_Bool bGlobal = sal_False); //add for SwMultiTOXTabDialog
-    virtual AbstractEditRegionDlg*      CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh); //add for SwEditRegionDlg
+                                                sal_Bool bGlobal = sal_False);
+    virtual AbstractEditRegionDlg*      CreateEditRegionDlg(Window* pParent, SwWrtShell& rWrtSh);
     virtual AbstractInsertSectionTabDialog*     CreateInsertSectionTabDialog(
-        Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh); //add for SwInsertSectionTabDialog
+        Window* pParent, const SfxItemSet& rSet, SwWrtShell& rSh);
     virtual AbstractMarkFloatDlg*       CreateIndexMarkFloatDlg(
                                                     SfxBindings* pBindings,
                                                        SfxChildWindow* pChild,
                                                        Window *pParent,
                                                     SfxChildWinInfo* pInfo,
-                                                       sal_Bool bNew=sal_True); //add for SwIndexMarkFloatDlg
+                                                       sal_Bool bNew=sal_True);
     virtual AbstractMarkFloatDlg*       CreateAuthMarkFloatDlg(
                                                     SfxBindings* pBindings,
                                                        SfxChildWindow* pChild,
                                                        Window *pParent,
                                                     SfxChildWinInfo* pInfo,
-                                                       sal_Bool bNew=sal_True); //add for SwAuthMarkFloatDlg
+                                                       sal_Bool bNew=sal_True);
     virtual VclAbstractDialog *         CreateIndexMarkModalDlg(
-                                                Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark ); //add for SwIndexMarkModalDlg
+                                                Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark );
 
     virtual AbstractMailMergeWizard*    CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem);
 
-    //add for static func in SwGlossaryDlg
     virtual GlossaryGetCurrGroup        GetGlossaryCurrGroupFunc();
     virtual GlossarySetActGroup         SetGlossaryActGroupFunc();