Remove ASCII art and useless comments from sw module

Change-Id: I3ba4ac78fd4810e006b1034bbe7c28b1803895d2
Reviewed-on: https://gerrit.libreoffice.org/9494
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

48 files changed, 147 insertions, 469 deletions

diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 1c8258ceee40..cb9b0f55094b 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -65,10 +65,7 @@ IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, ClickHdl)
 }
 IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, ClickHdl)
 
-/*------------------------------------------------------------------------
- Description:   Handler for Change Page Number
-------------------------------------------------------------------------*/
-
+// Handler for Change Page Number
 IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
 {
     if(pBox->IsChecked())
@@ -79,10 +76,7 @@ IMPL_LINK_INLINE_START( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
 }
 IMPL_LINK_INLINE_END( SwBreakDlg, PageNumHdl, CheckBox *, pBox )
 
-/*------------------------------------------------------------------------
- Description:   By changing the Page number the checkbox is checked.
-------------------------------------------------------------------------*/
-
+// By changing the Page number the checkbox is checked.
 IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, PageNumModifyHdl)
 {
     m_pPageNumBox->Check();
@@ -90,13 +84,11 @@ IMPL_LINK_NOARG_INLINE_START(SwBreakDlg, PageNumModifyHdl)
 }
 IMPL_LINK_NOARG_INLINE_END(SwBreakDlg, PageNumModifyHdl)
 
-/*------------------------------------------------------------------------
- Description:   Ok-Handler;
-                checks whether pagenumber nPage is a legal pagenumber
-                (left pages with even numbers etc. for a page template
-                with alternating pages)
-------------------------------------------------------------------------*/
-
+/*
+ * Ok-Handler;
+ * checks whether pagenumber nPage is a legal pagenumber (left pages with even
+ * numbers etc. for a page template with alternating pages)
+ */
 IMPL_LINK_NOARG(SwBreakDlg, OkHdl)
 {
     if(m_pPageNumBox->IsChecked()) {
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index ee145956bac5..33bd0fbb4441 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -97,10 +97,7 @@ SwCharDlg::~SwCharDlg()
 {
 }
 
-/*--------------------------------------------------------------------
-    Description:    set FontList
- --------------------------------------------------------------------*/
-
+// set FontList
 void SwCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index c549fb379542..240d5d704146 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -33,8 +33,6 @@
 
 #include <app.hrc>
 
-// Globals ******************************************************************
-
 static const sal_uInt16 aPageRg[] = {
     FN_NUMBER_NEWSTART, FN_NUMBER_NEWSTART_AT,
     0
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 42a261c65b60..5a5fb9cc0b9a 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -40,8 +40,6 @@ using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::uno;
 using namespace ::std;
 
-// struct CompatibilityItem ----------------------------------------------
-
 struct CompatibilityItem
 {
     OUString    m_sName;
@@ -93,8 +91,6 @@ struct SwCompatibilityOptPage_Impl
     SwCompatibilityItemList     m_aList;
 };
 
-// class SwCompatibilityOptPage ------------------------------------------
-
 SwCompatibilityOptPage::SwCompatibilityOptPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptCompatPage",
         "modules/swriter/ui/optcompatpage.ui", rSet)
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 097e31aa53b1..5436f899f4f3 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -68,10 +68,8 @@
 
 using namespace ::com::sun::star;
 
-/*--------------------------------------------------------
- Tools->Options->Writer->View
- Tools->Options->Writer/Web->View
---------------------------------------------------------- */
+// Tools->Options->Writer->View
+// Tools->Options->Writer/Web->View
 SwContentOptPage::SwContentOptPage( Window* pParent,
                                       const SfxItemSet& rCoreSet ) :
     SfxTabPage(pParent, "ViewOptionsPage",
@@ -283,9 +281,8 @@ IMPL_LINK( SwContentOptPage, AnyRulerHdl, CheckBox*, pBox)
     VertRulerHdl(m_pVRulerCBox);
     return 0;
 }
-/*------------------------------------------------------
- TabPage Printer additional settings
--------------------------------------------------------*/
+
+// TabPage Printer additional settings
 SwAddPrinterTabPage::SwAddPrinterTabPage(Window* pParent,
     const SfxItemSet& rCoreSet)
     : SfxTabPage(pParent, "PrintOptionsPage",
@@ -507,9 +504,7 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet)
     }
 }
 
-/*--------------------------------------------------
-    Tabpage Standardfonts
---------------------------------------------------*/
+// Tabpage Standardfonts
 SwStdFontTabPage::SwStdFontTabPage( Window* pParent,
                                        const SfxItemSet& rSet ) :
     SfxTabPage( pParent, "OptFontTabPage" , "modules/swriter/ui/optfonttabpage.ui" , rSet),
@@ -1446,9 +1441,7 @@ void SwShdwCrsrOptionsTabPage::Reset( const SfxItemSet& rSet )
     }
 }
 
-/*--------------------------------------------------
- TabPage for Redlining
---------------------------------------------------*/
+// TabPage for Redlining
 struct CharAttr
 {
     sal_uInt16 nItemId;
@@ -1482,9 +1475,7 @@ static sal_uInt16 aDeletedAttrMap[] = { 0, 1, 2, 5, 6, 7, 8, 9, 10 };
 // not used
 static sal_uInt16 aChangedAttrMap[] = { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 };
 
-/*-----------------------------------------------------------------------
-    Description: Preview of selection
- -----------------------------------------------------------------------*/
+// Preview of selection
 SwMarkPreview::SwMarkPreview( Window *pParent, WinBits nWinBits ) :
 
     Window(pParent, nWinBits),
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index a0f915e6f287..59fdfad0f6d5 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -198,10 +198,8 @@ OUString SwMailMergeWizard::getStateDisplayName( WizardState _nState ) const
     }
     return OUString();
 }
-/*----------------------------------------------------------------------
-    enables/disables pages in the roadmap depending on the current
-    page and state
-  -----------------------------------------------------------------------*/
+
+// enables/disables pages in the roadmap depending on the current page and state
 void SwMailMergeWizard::UpdateRoadmap()
 {
 /*
@@ -271,10 +269,8 @@ void SwMailMergeWizard::UpdateRoadmap()
         enableState( nPage, bEnable );
     }
 }
-/*-- --------------------------------------------------------------------
-    enables/disables pages in the roadmap depending on the current
-    page and state
-  -----------------------------------------------------------------------*/
+
+// enables/disables pages in the roadmap depending on the current page and state
 void SwMailMergeWizard::CreateTargetDocument()
 {
     GetSwView()->GetWrtShell().GetDBManager()->
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 1e9da5fa3a70..e03f303bf054 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -879,9 +879,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendAsHdl_Impl, PushButton*, pButton)
     return 0;
 }
 
-/*-------------------------------------------------------------------------
-    Send documents as e-mail
-  -----------------------------------------------------------------------*/
+// Send documents as e-mail
 IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
diff --git a/sw/source/ui/dbui/mmpreparemergepage.cxx b/sw/source/ui/dbui/mmpreparemergepage.cxx
index ec0407b189f0..272ae0f6cb8e 100644
--- a/sw/source/ui/dbui/mmpreparemergepage.cxx
+++ b/sw/source/ui/dbui/mmpreparemergepage.cxx
@@ -136,9 +136,7 @@ void  SwMailMergePrepareMergePage::ActivatePage()
     MoveHdl_Impl(m_pRecordED);
 }
 
-/*-------------------------------------------------------------------------
-    merge the data into a new file
-  -----------------------------------------------------------------------*/
+// merge the data into a new file
 bool SwMailMergePrepareMergePage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 9f5385fd1734..ba690d6e391e 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -126,10 +126,7 @@ static void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox& rSubRegions, Combo
     }
 }
 
-/*----------------------------------------------------------------------------
- Description: user data class for region information
-----------------------------------------------------------------------------*/
-
+// user data class for region information
 class SectRepr
 {
 private:
@@ -305,9 +302,7 @@ OUString SectRepr::GetSubRegion() const
     return sLinkFile;
 }
 
-/*----------------------------------------------------------------------------
- Description: dialog edit regions
-----------------------------------------------------------------------------*/
+// dialog edit regions
 SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh )
     : SfxModalDialog(pParent, "EditSectionDialog",
         "modules/swriter/ui/editsectiondialog.ui")
@@ -439,14 +434,11 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
     return bRet;
 }
 
-/*---------------------------------------------------------------------
-    Description: recursively look for child-sections
----------------------------------------------------------------------*/
+// recursively look for child-sections
 void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry )
 {
     SwSection* pSect = 0;
     SvTreeListEntry* pSelEntry = 0;
-
     if (!pFmt)
     {
         const sal_uInt16 nCount=rSh.GetSectionFmtCount();
@@ -551,11 +543,8 @@ void    SwEditRegionDlg::SelectSection(const OUString& rSectionName)
     }
 }
 
-/*---------------------------------------------------------------------
-    Description:    selected entry in TreeListBox is showed in
-                    Edit window
-                    in case of multiselection some controls are disabled
----------------------------------------------------------------------*/
+// selected entry in TreeListBox is showed in Edit window in case of
+// multiselection some controls are disabled
 IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox )
 {
     bDontCheckPasswd = true;
@@ -740,10 +729,7 @@ IMPL_LINK( SwEditRegionDlg, DeselectHdl, SvTreeListBox *, pBox )
     return 0;
 }
 
-/*---------------------------------------------------------------------
-    Description:    in OkHdl the modified settings are being applied
-                    and reversed regions are deleted
----------------------------------------------------------------------*/
+// in OkHdl the modified settings are being applied and reversed regions are deleted
 IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl)
 {
     // temp. Array because during changing of a region the position
@@ -821,9 +807,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl)
     return 0;
 }
 
-/*---------------------------------------------------------------------
- Description: Toggle protect
----------------------------------------------------------------------*/
+// Toggle protect
 IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox )
 {
     if(!CheckPasswd(pBox))
@@ -847,9 +831,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox )
     return 0;
 }
 
-/*---------------------------------------------------------------------
- Description: Toggle hide
----------------------------------------------------------------------*/
+// Toggle hide
 IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox )
 {
     if(!CheckPasswd(pBox))
@@ -876,9 +858,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox )
     return 0;
 }
 
-/*---------------------------------------------------------------------
- Description: Toggle edit in readonly
----------------------------------------------------------------------*/
+// Toggle edit in readonly
 IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox )
 {
     if(!CheckPasswd(pBox))
@@ -897,9 +877,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox )
     return 0;
 }
 
-/*---------------------------------------------------------------------
- Description: clear selected region
----------------------------------------------------------------------*/
+// clear selected region
 IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl)
 {
     if(!CheckPasswd())
@@ -964,9 +942,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl)
     return 0;
 }
 
-/*---------------------------------------------------------------------
- Description: link CheckBox to file?
----------------------------------------------------------------------*/
+// link CheckBox to file?
 IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
 {
     if(!CheckPasswd(pBox))
@@ -1023,14 +999,11 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
     return 0;
 }
 
-/*---------------------------------------------------------------------
-    Description: call dialog paste file
----------------------------------------------------------------------*/
+// call dialog paste file
 IMPL_LINK_NOARG(SwEditRegionDlg, FileSearchHdl)
 {
     if(!CheckPasswd(0))
         return 0;
-
     m_pOldDefDlgParent = Application::GetDefDialogParent();
     Application::SetDefDialogParent( this );
     delete m_pDocInserter;
@@ -1140,10 +1113,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl)
     return 0;
 }
 
-/*---------------------------------------------------------------------
-    Description:    Applying of the filename or the
-                    linked region
----------------------------------------------------------------------*/
+// Applying of the filename or the linked region
 IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit )
 {
     Selection aSelect = pEdit->GetSelection();
@@ -1295,11 +1265,8 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox )
     return 0;
 }
 
-/*---------------------------------------------------------------------
-    Description:    the current region name is being added to the
-                    TreeListBox immediately during editing, with empty
-                    string no Ok()
----------------------------------------------------------------------*/
+// the current region name is being added to the TreeListBox immediately during
+// editing, with empty string no Ok()
 IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl)
 {
     if(!CheckPasswd(0))
@@ -1402,9 +1369,7 @@ Image SwEditRegionDlg::BuildBitmap( bool bProtect, bool bHidden )
     return rImgLst.GetImage((int(!bHidden)+((bProtect ? 1 : 0)<<1)) + 1);
 }
 
-/*--------------------------------------------------------------------
-    Description:    helper function - read region names from medium
- --------------------------------------------------------------------*/
+// helper function - read region names from medium
 static void lcl_ReadSections( SfxMedium& rMedium, ComboBox& rBox )
 {
     rBox.Clear();
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 8a62fff1eaf3..760c9c278d59 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -326,14 +326,10 @@ IMPL_LINK( SwEnvFmtPage, EditHdl, MenuButton *, pButton )
     return 0;
 }
 
-/*------------------------------------------------------------------------
-  Description: A temporary Itemset that gets discarded at abort
-------------------------------------------------------------------------*/
-
+// A temporary Itemset that gets discarded at abort
 SfxItemSet *SwEnvFmtPage::GetCollItemSet(SwTxtFmtColl* pColl, bool bSender)
 {
     SfxItemSet *&pAddrSet = bSender ? GetParentSwEnvDlg()->pSenderSet : GetParentSwEnvDlg()->pAddresseeSet;
-
     if (!pAddrSet)
     {
         // determine range (merge both Itemsets' ranges)
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index bacc89652263..777cdf25d00b 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -28,8 +28,6 @@
 
 class SwTxtFmtColl;
 
-// class SwEnvFmtPage ---------------------------------------------------------
-
 class SwEnvFmtPage : public SfxTabPage
 {
     MetricField*  m_pAddrLeftField;
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 8b0f3eaee87e..73eb2ddc5e45 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -32,8 +32,6 @@
 
 class SwEnvDlg;
 
-// class SwEnvPrtPage ---------------------------------------------------------
-
 class SwEnvPrtPage : public SfxTabPage
 {
     ToolBox*     m_pAlignBox;
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 0570ae151ac1..2582e5baf2ac 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -227,12 +227,10 @@ void SwLabPreview::Paint(const Rectangle &)
     }
 }
 
-// Arror or interval character --------------------------------------------
-
+// Arrow or interval character
 void SwLabPreview::DrawArrow(const Point &rP1, const Point &rP2, bool bArrow)
 {
     DrawLine(rP1, rP2);
-
     if (bArrow)
     {
         Point aArr[3];
@@ -377,7 +375,7 @@ IMPL_LINK_NOARG_INLINE_START(SwLabFmtPage, PreviewHdl)
 }
 IMPL_LINK_NOARG_INLINE_END(SwLabFmtPage, PreviewHdl)
 
-// LoseFocus-Handler: Update on change --------------------------
+// LoseFocus-Handler: Update on change
 IMPL_LINK_INLINE_START( SwLabFmtPage, LoseFocusHdl, Control *, pControl )
 {
     if (((Edit*) pControl)->IsModified())
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index da9727cb7f05..27d93db4e9bb 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -24,8 +24,6 @@
 #include <vcl/msgbox.hxx>
 class SwLabFmtPage;
 
-// class SwLabPreview -------------------------------------------------------
-
 class SwLabPreview : public Window
 {
     Color aGrayColor;
@@ -68,8 +66,6 @@ public:
     void UpdateItem(const SwLabItem& rItem);
 };
 
-// class SwLabFmtPage -------------------------------------------------------
-
 class SwLabFmtPage : public SfxTabPage
 {
     FixedText*    m_pMakeFI;
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 5b8a24b99c23..4cd62fbc3176 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -29,8 +29,6 @@
 class SwLabDlg;
 class SwLabItem;
 
-// class SwLabPrtPage -------------------------------------------------------
-
 class SwLabPrtPage : public SfxTabPage
 {
     Printer*      pPrinter;             // for the shaft setting - unfortunately
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index e06bdbd7a0de..2b2bc537026c 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -84,9 +84,6 @@ struct SwMailMergeDlg_Impl
     uno::Reference<XSelectionSupplier> xSelSupp;
 };
 
-/* --------------------------------------------------------------------------
-    helper classes
-----------------------------------------------------------------------------*/
 class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper1
 <
     view::XSelectionChangeListener
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 3d32f7391de7..08cdc8817235 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -29,9 +29,7 @@
 
 using namespace ::com::sun::star;
 
-/*--------------------------------------------------------------------
-    Description: edit insert-field
- --------------------------------------------------------------------*/
+// edit insert-field
 sw::DropDownFieldDialog::DropDownFieldDialog(Window *pParent, SwWrtShell &rS,
                               SwField* pField, bool bNextButton)
     : SvxStandardDialog(pParent, "DropdownFieldDialog",
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 8ef135a83572..8f073beaca27 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -49,9 +49,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::uno;
 
-/*--------------------------------------------------------------------
-    Description: edit insert-field
- --------------------------------------------------------------------*/
+// edit insert-field
 SwChangeDBDlg::SwChangeDBDlg(SwView& rVw)
     : SvxStandardDialog(&rVw.GetViewFrame()->GetWindow(), "ExchangeDatabasesDialog",
         "modules/swriter/ui/exchangedatabases.ui")
@@ -85,14 +83,11 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw)
     TreeSelectHdl();
 }
 
-/*--------------------------------------------------------------------
-    Description: initialise database listboxes
- --------------------------------------------------------------------*/
+// initialise database listboxes
 void SwChangeDBDlg::FillDBPopup()
 {
     Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
     Reference<XDatabaseContext> xDBContext = DatabaseContext::create(xContext);
-
     const SwDBData& rDBData = pSh->GetDBData();
     m_pAvailDBTLB->Select(rDBData.sDataSource, rDBData.sCommand, aEmptyOUStr);
 
@@ -165,22 +160,16 @@ SvTreeListEntry* SwChangeDBDlg::Insert(const OUString& rDBName)
     return pRet;
 }
 
-/*--------------------------------------------------------------------
-    Description: destroy dialog
- --------------------------------------------------------------------*/
+// destroy dialog
 SwChangeDBDlg::~SwChangeDBDlg()
 {
     delete pMgr;
 }
-
-/*--------------------------------------------------------------------
-     Description:   close
- --------------------------------------------------------------------*/
+// close
 void SwChangeDBDlg::Apply()
 {
     UpdateFlds();
 }
-
 void SwChangeDBDlg::UpdateFlds()
 {
     std::vector<OUString> aDBNames;
@@ -243,9 +232,7 @@ IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl)
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Description: convert database name for display
- --------------------------------------------------------------------*/
+// convert database name for display
 void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData)
 {
     if (rDBData.sDataSource.isEmpty() && rDBData.sCommand.isEmpty())
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 966ab35e6481..935403bbc76d 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -76,9 +76,7 @@ SwFldDBPage::~SwFldDBPage()
 {
 }
 
-/*--------------------------------------------------------------------
-    Description: initialise TabPage
- --------------------------------------------------------------------*/
+// initialise TabPage
 void SwFldDBPage::Reset(const SfxItemSet&)
 {
     Init(); // Allgemeine initialisierung
@@ -469,9 +467,7 @@ IMPL_LINK_NOARG(SwFldDBPage, AddDBHdl)
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Description: Modify
- --------------------------------------------------------------------*/
+// Modify
 IMPL_LINK_NOARG(SwFldDBPage, ModifyHdl)
 {
     CheckInsert();
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 8fc8170ed32f..45bf150b9f0f 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -101,9 +101,7 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw)
     Init();
 }
 
-/*--------------------------------------------------------------------
-    Description: initialise controls
- --------------------------------------------------------------------*/
+// initialise controls
 void SwFldEditDlg::Init()
 {
     SwFldPage* pTabPage = (SwFldPage*)GetTabPage();
@@ -212,9 +210,7 @@ void SwFldEditDlg::InsertHdl()
     GetOKButton()->Click();
 }
 
-/*--------------------------------------------------------------------
-     Description: kick off changing of the field
- --------------------------------------------------------------------*/
+// kick off changing of the field
 IMPL_LINK_NOARG(SwFldEditDlg, OKHdl)
 {
     if (GetOKButton()->IsEnabled())
@@ -237,9 +233,7 @@ short SwFldEditDlg::Execute()
     return GetTabPage() ? Dialog::Execute() : static_cast<short>(RET_CANCEL);
 }
 
-/*--------------------------------------------------------------------
-    Description: Traveling between fields of the same type
- --------------------------------------------------------------------*/
+// Traveling between fields of the same type
 IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton )
 {
     bool bNext = pButton == m_pNextBT;
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index f4c476262bbf..00a37dac4419 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -453,9 +453,7 @@ IMPL_LINK_NOARG(SwFldFuncPage, ListEnableHdl)
     return 0;
 }
 
-/*--------------------------------------------------------------------
-     Description: renew types in SelectionBox
- --------------------------------------------------------------------*/
+// renew types in SelectionBox
 void SwFldFuncPage::UpdateSubType()
 {
     const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
@@ -498,14 +496,11 @@ void SwFldFuncPage::UpdateSubType()
     m_pSelectionLB->SetUpdateMode(true);
 }
 
-/*--------------------------------------------------------------------
-    Description: call MacroBrowser, fill Listbox with Macros
- --------------------------------------------------------------------*/
+// call MacroBrowser, fill Listbox with Macros
 IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn )
 {
     Window* pDefModalDlgParent = Application::GetDefDialogParent();
     Application::SetDefDialogParent( pBtn );
-
     const OUString sMacro(TurnMacroString(m_pNameED->GetText()).replaceAll(".", ";"));
     if (GetFldMgr().ChooseMacro(sMacro))
         UpdateSubType();
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index f3a4c4220285..d9575534024b 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -60,10 +60,7 @@ SwFldPage::~SwFldPage()
 {
 }
 
-/*--------------------------------------------------------------------
-    Description: initialise TabPage
- --------------------------------------------------------------------*/
-
+// initialise TabPage
 void SwFldPage::Init()
 {
     SwDocShell* pDocSh = (SwDocShell*)SfxObjectShell::Current();
@@ -98,19 +95,13 @@ void SwFldPage::Init()
     }
 }
 
-/*--------------------------------------------------------------------
-     Description: newly initialise page
- --------------------------------------------------------------------*/
-
+// newly initialise page
 void SwFldPage::ActivatePage()
 {
     EnableInsert(m_bInsert);
 }
 
-/*--------------------------------------------------------------------
-     Description: complete reset; edit new field
- --------------------------------------------------------------------*/
-
+// complete reset; edit new field
 void SwFldPage::EditNewField( bool bOnlyActivate )
 {
     if( !bOnlyActivate )
@@ -123,10 +114,7 @@ void SwFldPage::EditNewField( bool bOnlyActivate )
     m_bRefresh = false;
 }
 
-/*--------------------------------------------------------------------
-     Description: insert field
- --------------------------------------------------------------------*/
-
+// insert field
 bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUString& rPar1,
                             const OUString& rPar2, sal_uLong nFormatId,
                             sal_Unicode cSeparator, bool bIsAutomaticLanguage)
@@ -318,14 +306,10 @@ void SwFldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3)
             (*ppLB)->SelectEntryPos( nPos );
 }
 
-/*--------------------------------------------------------------------
-     Description: Insert new fields
- --------------------------------------------------------------------*/
-
+// Insert new fields
 IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn )
 {
     SwFldDlg *pDlg = (SwFldDlg*)GetTabDialog();
-
     if (pDlg)
     {
         pDlg->InsertHdl();
@@ -342,14 +326,10 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn )
     return 0;
 }
 
-/*--------------------------------------------------------------------
-     Description: enable/disable "Insert"-Button
- --------------------------------------------------------------------*/
-
+// enable/disable "Insert"-Button
 void SwFldPage::EnableInsert(bool bEnable)
 {
     SwFldDlg *pDlg = (SwFldDlg*)GetTabDialog();
-
     if (pDlg)
     {
         if (pDlg->GetCurTabPage() == this)
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index af5582a306ff..65aa5df431b5 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -441,10 +441,7 @@ IMPL_LINK_NOARG(SwFldRefPage, SubTypeHdl)
     return 0;
 }
 
-/*--------------------------------------------------------------------
-     Description: renew types in SelectionLB
- --------------------------------------------------------------------*/
-
+// renew types in SelectionLB
 void SwFldRefPage::UpdateSubType()
 {
     SwWrtShell *pSh = GetWrtShell();
@@ -738,10 +735,7 @@ sal_Int32 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId)
     return nSize;
 }
 
-/*--------------------------------------------------------------------
-    Description: Modify
- --------------------------------------------------------------------*/
-
+// Modify
 IMPL_LINK_NOARG(SwFldRefPage, ModifyHdl)
 {
     OUString aName(m_pNameED->GetText());
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index bc39b2392b8f..fe6829a999d5 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -46,10 +46,7 @@
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 
-/*--------------------------------------------------------------------
-    Description:    carrier of the dialog
- --------------------------------------------------------------------*/
-
+// carrier of the dialog
 SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent)
     : SfxTabDialog(pParent, "FieldDialog", "modules/swriter/ui/fielddialog.ui")
     , m_pChildWin(pCW)
@@ -182,10 +179,7 @@ SfxItemSet* SwFldDlg::CreateInputItemSet( sal_uInt16 nID  )
         return 0;
 }
 
-/*--------------------------------------------------------------------
-     Description: kick off inserting of new fields
- --------------------------------------------------------------------*/
-
+// kick off inserting of new fields
 IMPL_LINK_NOARG(SwFldDlg, OKHdl)
 {
     if (GetOKButton().IsEnabled())
@@ -205,10 +199,7 @@ IMPL_LINK_NOARG(SwFldDlg, CancelHdl)
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Description: newly initialise dialog after Doc-Switch
- --------------------------------------------------------------------*/
-
+// newly initialise dialog after Doc-Switch
 void SwFldDlg::ReInitDlg()
 {
     SwDocShell* pDocSh = (SwDocShell*)SfxObjectShell::Current();
@@ -242,22 +233,15 @@ void SwFldDlg::ReInitDlg()
     m_pChildWin->SetOldDocShell(pDocSh);
 }
 
-/*--------------------------------------------------------------------
-    Description: newly initialise TabPage after Doc-Switch
- --------------------------------------------------------------------*/
-
+// newly initialise TabPage after Doc-Switch
 void SwFldDlg::ReInitTabPage( sal_uInt16 nPageId, bool bOnlyActivate )
 {
     SwFldPage* pPage = (SwFldPage* )GetTabPage(nPageId);
-
     if ( pPage )
         pPage->EditNewField( bOnlyActivate );   // newly initialise TabPage
 }
 
-/*--------------------------------------------------------------------
-    Description: newly initialise after activation of a few TabPages
- --------------------------------------------------------------------*/
-
+// newly initialise after activation of a few TabPages
 void SwFldDlg::Activate()
 {
     SwView* pView = ::GetActiveView();
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 24b0b8fab082..1079a22bb483 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -566,14 +566,11 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox )
     return 0;
 }
 
-/*--------------------------------------------------------------------
-     Description: renew types in SelectionBox
- --------------------------------------------------------------------*/
+// renew types in SelectionBox
 void SwFldVarPage::UpdateSubType()
 {
     OUString sOldSel;
     const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)m_pTypeLB->GetEntryData(GetTypeSel());
-
     SetSelectionSel(m_pSelectionLB->GetSelectEntryPos());
     if(GetSelectionSel() != LISTBOX_ENTRY_NOTFOUND)
         sOldSel = m_pSelectionLB->GetEntry(GetSelectionSel());
@@ -800,9 +797,7 @@ sal_Int32 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId)
     return nSize;
 }
 
-/*--------------------------------------------------------------------
-    Description: Modify
- --------------------------------------------------------------------*/
+// Modify
 IMPL_LINK_NOARG(SwFldVarPage, ModifyHdl)
 {
     OUString sValue(m_pValueED->GetText());
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 2a1d5ea5cca8..958748a9051f 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -30,10 +30,7 @@
 
 #include <fldui.hrc>
 
-/*--------------------------------------------------------------------
-    Description: edit field-insert
- --------------------------------------------------------------------*/
-
+// edit field-insert
 SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS,
                               SwField* pField, bool bNextButton )
     : SvxStandardDialog( pParent, "InputFieldDialog",
@@ -116,14 +113,10 @@ void SwFldInputDlg::StateChanged( StateChangedType nType )
     SvxStandardDialog::StateChanged( nType );
 }
 
-/*--------------------------------------------------------------------
-     Description:   Close
- --------------------------------------------------------------------*/
-
+// Close
 void SwFldInputDlg::Apply()
 {
     OUString aTmp(comphelper::string::remove(m_pEditED->GetText(), '\r'));
-
     rSh.StartAllAction();
     bool bModified = false;
     if(pInpFld)
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 68412714a77b..c9f5bc90a174 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -38,10 +38,6 @@
 
 using namespace ::com::sun::star;
 
-// static ----------------------------------------------------------------
-
-// class SwJavaEditDialog ------------------------------------------------
-
 SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) :
     SvxStandardDialog(pParent, "InsertScriptDialog", "modules/swriter/ui/insertscript.ui"),
 
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index a6bed3525b99..0d346b289765 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -68,10 +68,7 @@
 
 extern SW_DLLPUBLIC SwWrtShell* GetActiveWrtShell();
 
-/*--------------------------------------------------------------------
-    Description:    the dialog's carrier
- --------------------------------------------------------------------*/
-
+// the dialog's carrier
 SwTemplateDlg::SwTemplateDlg(Window* pParent,
                              SfxStyleSheetBase& rBase,
                              sal_uInt16 nRegion,
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index d32551aef89a..ab22c2824587 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -72,10 +72,7 @@ using namespace ::com::sun::star;
 
 #define FRAME_FORMAT_WIDTH 1000
 
-/*--------------------------------------------------------------------
-    Description:  static data
- --------------------------------------------------------------------*/
-
+// static data
 static const sal_uInt16 nVisCols = 3;
 
 inline bool IsMarkInSameSection( SwWrtShell& rWrtSh, const SwSection* pSect )
@@ -395,9 +392,7 @@ void SwColumnPage::ResetColWidth()
 
 }
 
-/*--------------------------------------------------------------------
-    Description:    Now as TabPage
- --------------------------------------------------------------------*/
+// Now as TabPage
 SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet)
     : SfxTabPage(pParent, "ColumnPage", "modules/swriter/ui/columnpage.ui", rSet)
     , pColMgr(0)
@@ -626,17 +621,12 @@ void SwColumnPage::Reset(const SfxItemSet &rSet)
     ActivatePage( rSet );
 }
 
-/*--------------------------------------------------------------------
-    Description:    create TabPage
- --------------------------------------------------------------------*/
+// create TabPage
 SfxTabPage* SwColumnPage::Create(Window *pParent, const SfxItemSet &rSet)
 {
     return new SwColumnPage(pParent, rSet);
 }
-
-/*--------------------------------------------------------------------
-    Description:    stuff attributes into the Set when OK
- --------------------------------------------------------------------*/
+// stuff attributes into the Set when OK
 bool SwColumnPage::FillItemSet(SfxItemSet &rSet)
 {
     if(m_pCLNrEdt->HasChildPathFocus())
@@ -666,9 +656,7 @@ bool SwColumnPage::FillItemSet(SfxItemSet &rSet)
     return true;
 }
 
-/*--------------------------------------------------------------------
-    Description:    update ColumnManager
- --------------------------------------------------------------------*/
+// update ColumnManager
 IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
 {
     long nGutterWidth = pColMgr->GetGutterWidth();
@@ -773,9 +761,6 @@ IMPL_LINK( SwColumnPage, UpdateColMgr, void *, /*pField*/ )
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Description:   Initialisation
-------------------------------------------------------------------------*/
 void SwColumnPage::Init()
 {
     m_pCLNrEdt->SetValue(nCols);
@@ -845,15 +830,13 @@ bool SwColumnPage::isLineNotNone() const
     return nPos != LISTBOX_ENTRY_NOTFOUND && nPos != 0;
 }
 
-/*------------------------------------------------------------------------
- Description:   The number of columns has changed -- here the controls for
-                editing of the columns are en- or disabled according to the
-                column number.
-                In case there are more than nVisCols (=3) all Edit are being
-                enabled and the buttons for scrolling too.
-                Otherwise Edits are being enabled according to the column
-                numbers; one column can not be edited.
-------------------------------------------------------------------------*/
+/*
+ * The number of columns has changed -- here the controls for editing of the
+ * columns are en- or disabled according to the column number. In case there are
+ * more than nVisCols (=3) all Edit are being enabled and the buttons for
+ * scrolling too. Otherwise Edits are being enabled according to the column
+ * numbers; one column can not be edited.
+ */
 void SwColumnPage::UpdateCols()
 {
     bool bEnableBtns= false;
@@ -938,11 +921,11 @@ void SwColumnPage::SetLabels( sal_uInt16 nVis )
         sDist.replaceFirst("%1", sLbl2).replaceFirst("%2", sLbl3));
 }
 
-/*------------------------------------------------------------------------
- Description:   Handler that is called at alteration of the column number.
-                An alteration of the column number overwrites potential
-                user's width settings; all columns are equally wide.
-------------------------------------------------------------------------*/
+/*
+ * Handler that is called at alteration of the column number. An alteration of
+ * the column number overwrites potential user's width settings; all columns
+ * are equally wide.
+ */
 IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF )
 {
     nCols = (sal_uInt16)m_pCLNrEdt->GetValue();
@@ -969,14 +952,12 @@ IMPL_LINK( SwColumnPage, ColModify, NumericField *, pNF )
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Description:   Modify handler for an alteration of the column width or
-                the column gap.
-                These changes take effect time-displaced. With an
-                alteration of the column width the automatic calculation
-                of the column width is overruled; only an alteration
-                of the column number leads back to that default.
-------------------------------------------------------------------------*/
+/*
+ * Modify handler for an alteration of the column width or the column gap.
+ * These changes take effect time-displaced. With an alteration of the column
+ * width the automatic calculation of the column width is overruled; only an
+ * alteration of the column number leads back to that default.
+ */
 IMPL_LINK( SwColumnPage, GapModify, MetricField*, pMetricFld )
 {
     if (nCols < 2)
@@ -1053,11 +1034,8 @@ IMPL_LINK( SwColumnPage, EdModify, MetricField *, pMetricFld )
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Description:   Handler behind the Checkbox for automatic width.
-                When the box is checked no expicit values for the column
-                width can be entered.
-------------------------------------------------------------------------*/
+// Handler behind the Checkbox for automatic width. When the box is checked
+// no expicit values for the column width can be entered.
 IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox )
 {
     long nDist = static_cast< long >(aDistEd1.DenormalizePercent(aDistEd1.GetValue(FUNIT_TWIP)));
@@ -1075,9 +1053,7 @@ IMPL_LINK( SwColumnPage, AutoWidthHdl, CheckBox *, pBox )
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Description:   scroll up the contents of the edits
-------------------------------------------------------------------------*/
+// scroll up the contents of the edits
 IMPL_LINK_NOARG(SwColumnPage, Up)
 {
     if( nFirstVis )
@@ -1089,9 +1065,7 @@ IMPL_LINK_NOARG(SwColumnPage, Up)
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Description:   scroll down the contents of the edits.
-------------------------------------------------------------------------*/
+// scroll down the contents of the edits.
 IMPL_LINK_NOARG(SwColumnPage, Down)
 {
     if( nFirstVis + nVisCols < nCols )
@@ -1103,11 +1077,8 @@ IMPL_LINK_NOARG(SwColumnPage, Down)
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Description:   relict from ancient times - now directly without time
-                handler; triggered by an alteration of the column width
-                or the column gap.
-------------------------------------------------------------------------*/
+// relict from ancient times - now directly without time handler; triggered by
+// an alteration of the column width or the column gap.
 void SwColumnPage::Timeout()
 {
     if(pModifiedField)
@@ -1149,9 +1120,7 @@ void SwColumnPage::Timeout()
     Update();
 }
 
-/*------------------------------------------------------------------------
- Description:   Update the view
-------------------------------------------------------------------------*/
+// Update the view
 void SwColumnPage::Update()
 {
     m_pBalanceColsCB->Enable(nCols > 1);
@@ -1182,9 +1151,7 @@ void SwColumnPage::Update()
     UpdateColMgr(0);
 }
 
-/*--------------------------------------------------------------------
-    Description:    Update Bsp
- --------------------------------------------------------------------*/
+// Update Bsp
 void SwColumnPage::ActivatePage(const SfxItemSet& rSet)
 {
     if(!bFrm)
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 30a373ef8fd8..1526eb10bafb 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -526,9 +526,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryBox(Window* pParent
     return pCategoryBox;
 }
 
-/*-------------------------------------------------------------------------
-    //#i61007# order of captions
-  -----------------------------------------------------------------------*/
+// #i61007# order of captions
 void SwCaptionDialog::ApplyCaptionOrder()
 {
     m_pNumberingSeparatorFT->Enable(bOrderNumberingFirst);
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index c6ee60133c98..5968d8214fc8 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -43,9 +43,7 @@
 #include <svx/xfillit0.hxx>
 #include <svx/xflgrit.hxx>
 
-/*--------------------------------------------------------------------
-    Description:    the dialog's carrier
- --------------------------------------------------------------------*/
+// the dialog's carrier
 SwFrmDlg::SwFrmDlg( SfxViewFrame*       pViewFrame,
                     Window*             pParent,
                     const SfxItemSet&   rCoreSet,
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index cdf91ac4b1e8..a1b72dbcf44d 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -268,14 +268,11 @@ void SwWrapTabPage::Reset(const SfxItemSet &rSet)
     ActivatePage( rSet );
 }
 
-/*--------------------------------------------------------------------
-    Description:    stuff attributes into the set when OK
- --------------------------------------------------------------------*/
+// stuff attributes into the set when OK
 bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
 {
     bool bModified = false;
     const SfxPoolItem* pOldItem;
-
     const SwFmtSurround& rOldSur = (const SwFmtSurround&)GetItemSet().Get(RES_SURROUND);
     SwFmtSurround aSur( rOldSur );
 
@@ -373,9 +370,7 @@ bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet)
     return bModified;
 }
 
-/*--------------------------------------------------------------------
-    Description:    example update
- --------------------------------------------------------------------*/
+// example update
 void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
 {
     // anchor
@@ -569,14 +564,11 @@ int SwWrapTabPage::DeactivatePage(SfxItemSet* _pSet)
     return sal_True;
 }
 
-/*--------------------------------------------------------------------
-    Description:    range check
- --------------------------------------------------------------------*/
+// range check
 IMPL_LINK( SwWrapTabPage, RangeModifyHdl, MetricField *, pEdit )
 {
         sal_Int64 nValue = pEdit->GetValue();
         MetricField *pOpposite = 0;
-
         if (pEdit == m_pLeftMarginED)
             pOpposite = m_pRightMarginED;
         else if (pEdit == m_pRightMarginED)
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx
index a3b147289712..e125eeeb25c8 100644
--- a/sw/source/ui/index/multmrk.cxx
+++ b/sw/source/ui/index/multmrk.cxx
@@ -61,10 +61,6 @@ void SwMultiTOXMarkDlg::Apply()
     rMgr.SetCurTOXMark(nPos);
 }
 
-/*--------------------------------------------------
- overload dtor
---------------------------------------------------*/
-
 SwMultiTOXMarkDlg::~SwMultiTOXMarkDlg() {}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 1a837d001822..94b0c0ac1730 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -76,9 +76,7 @@ using namespace com::sun::star::util;
 using namespace ::comphelper;
 using namespace ::com::sun::star;
 
-/*--------------------------------------------------------------------
-     Description:   dialog to insert a directory selection
- --------------------------------------------------------------------*/
+// dialog to insert a directory selection
 SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg,
     SwWrtShell& rWrtShell)
     : m_rDialog(rDialog)
@@ -171,9 +169,7 @@ SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, bool bNewDlg,
     m_pEntryED->GrabFocus();
 }
 
-/*--------------------------------------------------------------------
-     Description: Newly initialise controls with the new selection
- --------------------------------------------------------------------*/
+// Newly initialise controls with the new selection
 void SwIndexMarkPane::InitControls()
 {
     OSL_ENSURE(pSh && pTOXMgr, "no shell?");
@@ -345,9 +341,7 @@ OUString SwIndexMarkPane::GetDefaultPhoneticReading( const OUString& rText )
     return xExtendedIndexEntrySupplier->getPhoneticCandidate(rText, LanguageTag::convertToLocale( nLangForPhoneticReading ));
 }
 
-/* --------------------------------------------------
-    Change the content of m_pEntryED if text is selected
- --------------------------------------------------*/
+// Change the content of m_pEntryED if text is selected
 void    SwIndexMarkPane::Activate()
 {
     // display current selection (first element) ????
@@ -373,9 +367,7 @@ void    SwIndexMarkPane::Activate()
     }
 }
 
-/*--------------------------------------------------------------------
-     Description:   evaluate Ok-Button
- --------------------------------------------------------------------*/
+// evaluate Ok-Button
 void SwIndexMarkPane::Apply()
 {
     InsertUpdate();
@@ -383,14 +375,11 @@ void SwIndexMarkPane::Apply()
         pSh->ResetSelect(0, false);
 }
 
-/*--------------------------------------------------------------------
-    Description: apply changes
- --------------------------------------------------------------------*/
+// apply changes
 void SwIndexMarkPane::InsertUpdate()
 {
     pSh->StartUndo(bDel ? UNDO_INDEX_ENTRY_DELETE : UNDO_INDEX_ENTRY_INSERT);
     pSh->StartAllAction();
-
     SwRewriter aRewriter;
 
     if( bNewMark )
@@ -422,9 +411,7 @@ void SwIndexMarkPane::InsertUpdate()
     nKey2Pos = m_pKey2DCB->GetEntryPos(m_pKey2DCB->GetText());
 }
 
-/*--------------------------------------------------------------------
-     Description:   insert mark
- --------------------------------------------------------------------*/
+// insert mark
 static void lcl_SelectSameStrings(SwWrtShell& rSh, bool bWordOnly, bool bCaseSensitive)
 {
     rSh.Push();
@@ -498,9 +485,7 @@ void SwIndexMarkPane::InsertMark()
     pSh->EndAllAction();
 }
 
-/*--------------------------------------------------------------------
-     Description:   update mark
- --------------------------------------------------------------------*/
+// update mark
 void SwIndexMarkPane::UpdateMark()
 {
     OUString  aAltText(m_pEntryED->GetText());
@@ -540,14 +525,11 @@ void SwIndexMarkPane::UpdateMark()
     pTOXMgr->UpdateTOXMark(aDesc);
 }
 
-/*--------------------------------------------------------------------
-    Description: insert new keys
- --------------------------------------------------------------------*/
+// insert new keys
 void SwIndexMarkPane::UpdateKeyBoxes()
 {
     OUString aKey(m_pKey1DCB->GetText());
     sal_Int32 nPos = m_pKey1DCB->GetEntryPos(aKey);
-
     if(nPos == COMBOBOX_ENTRY_NOTFOUND && !aKey.isEmpty())
     {   // create new key
         m_pKey1DCB->InsertEntry(aKey);
@@ -642,9 +624,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, CloseHdl)
     return 0;
 }
 
-/*--------------------------------------------------------------------
-     Description:   select index type only when inserting
- --------------------------------------------------------------------*/
+// select index type only when inserting
 IMPL_LINK( SwIndexMarkPane, ModifyHdl, ListBox *, pBox )
 {
     if (m_pTypeDCB == pBox)
@@ -773,9 +753,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, DelHdl)
     return 0;
 }
 
-/*--------------------------------------------------------------------
-     Description: renew dialog view
- --------------------------------------------------------------------*/
+// renew dialog view
 void SwIndexMarkPane::UpdateDialog()
 {
     OSL_ENSURE(pSh && pTOXMgr, "no shell?");
@@ -877,9 +855,7 @@ void SwIndexMarkPane::UpdateDialog()
     pSh->EndCrsrMove();
 }
 
-/*--------------------------------------------------------------------
-     Remind whether the edit boxes for Phonetic reading are changed manually
- --------------------------------------------------------------------*/
+// Remind whether the edit boxes for Phonetic reading are changed manually
 IMPL_LINK( SwIndexMarkPane, PhoneticEDModifyHdl, Edit *, pEdit )
 {
     if (m_pPhoneticED0 == pEdit)
@@ -897,9 +873,7 @@ IMPL_LINK( SwIndexMarkPane, PhoneticEDModifyHdl, Edit *, pEdit )
     return 0;
 }
 
-/*--------------------------------------------------------------------
-     Description: Enable Disable of the 2nd key
- --------------------------------------------------------------------*/
+// Enable Disable of the 2nd key
 IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox )
 {
     if (m_pKey1DCB == pBox)
@@ -955,9 +929,6 @@ IMPL_LINK( SwIndexMarkPane, KeyDCBModifyHdl, ComboBox *, pBox )
     return 0;
 }
 
-/*--------------------------------------------------
- overload dtor
---------------------------------------------------*/
 SwIndexMarkPane::~SwIndexMarkPane()
 {
     delete pTOXMgr;
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 8405492215f5..86507168f199 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -63,9 +63,7 @@ IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox )
     return 0;
 }
 
-/*------------------------------------------------------------------------
-     Description: callback to delete a text mark
- -----------------------------------------------------------------------*/
+// callback to delete a text mark
 IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl)
 {
     // remove text marks from the ComboBox
@@ -80,10 +78,8 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, DeleteHdl)
     return 0;
 }
 
-/*------------------------------------------------------------------------
-     Description: callback for OKButton. Inserts a new text mark to the
-     current position. Deleted text marks are also deleted in the model.
- -----------------------------------------------------------------------*/
+// callback for OKButton. Inserts a new text mark to the current position.
+// Deleted text marks are also deleted in the model.
 void SwInsertBookmarkDlg::Apply()
 {
     //at first remove deleted bookmarks to prevent multiple bookmarks with the same
@@ -198,14 +194,11 @@ sal_Int32 BookmarkCombo::GetSelectEntryCount() const
     return nCnt;
 }
 
-/*------------------------------------------------------------------------
-     Description: position inside of the listbox (the ComboBox)
- -----------------------------------------------------------------------*/
+// position inside of the listbox (the ComboBox)
 sal_Int32 BookmarkCombo::GetSelectEntryPos( sal_Int32 nSelIndex ) const
 {
     sal_Int32 nCnt = 0;
     sal_Int32 nPos = GetFirstSelEntryPos();
-
     while (nPos != COMBOBOX_ENTRY_NOTFOUND)
     {
         if (nSelIndex == nCnt)
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 04d223afa9c2..1f5c0f9d2174 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -228,11 +228,8 @@ SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet &rSet
     return new SwEndNoteOptionPage( pParent, true, rSet );
 }
 
-/*------------------------------------------------------------------------
- Description:  Different kinds of numbering; because the Listbox has
-               varying numbers of entries, here are functions to
-               set and query the intended kind of numbering.
-------------------------------------------------------------------------*/
+// Different kinds of numbering; because the Listbox has varying numbers of
+// entries, here are functions to set and query the intended kind of numbering.
 void SwEndNoteOptionPage::SelectNumbering(int eNum)
 {
     OUString sSelect;
@@ -275,11 +272,8 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
                         pSh->GetView().GetDocShell());
 }
 
-/*------------------------------------------------------------------------
- Description:  Handler behind the button to collect the footnote at the
-               page. In this case all kinds of numbering can be used.
-------------------------------------------------------------------------*/
-
+// Handler behind the button to collect the footnote at the page. In this case
+// all kinds of numbering can be used.
 IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl)
 {
     const SwFtnNum eNum = (const SwFtnNum)GetNumbering();
@@ -309,12 +303,8 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl)
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Description:  Handler behind the button to collect the footnote at the
-               chapter or end of the document. In this case no pagewise
-               numbering can be used.
-------------------------------------------------------------------------*/
-
+// Handler behind the button to collect the footnote at the chapter or end of
+// the document. In this case no pagewise numbering can be used.
 IMPL_LINK_NOARG_INLINE_START(SwEndNoteOptionPage, PosChapterHdl)
 {
     if ( !bPosDoc )
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index f794f537897f..e989d124cd9f 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -112,9 +112,7 @@ struct GroupUserData
           bReadonly(false)  {}
 };
 
-/*------------------------------------------------------------------------
- Description:   dialog for new block name
-------------------------------------------------------------------------*/
+// dialog for new block name
 class SwNewGlosNameDlg : public ModalDialog
 {
     Edit*        m_pNewName;
@@ -156,9 +154,7 @@ SwNewGlosNameDlg::SwNewGlosNameDlg(Window* pParent,
     m_pNewName->GrabFocus();
 }
 
-/*------------------------------------------------------------------------
- Description:   query / set currently set group
-------------------------------------------------------------------------*/
+// query / set currently set group
 OUString SwGlossaryDlg::GetCurrGroup()
 {
     if( !::GetCurrGlosGroup().isEmpty() )
@@ -237,9 +233,7 @@ SwGlossaryDlg::~SwGlossaryDlg()
     delete pExampleFrame;
 }
 
-/*------------------------------------------------------------------------
- Description:   select new group
-------------------------------------------------------------------------*/
+// select new group
 IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox )
 {
     SvTreeListEntry* pEntry = pBox->FirstSelected();
@@ -312,9 +306,7 @@ void SwGlossaryDlg::EnableShortName(bool bOn)
     m_pShortNameEdit->Enable(bOn);
 }
 
-/* --------------------------------------------------
- * does the title exist in the selected group?
- * --------------------------------------------------*/
+// does the title exist in the selected group?
 SvTreeListEntry* SwGlossaryDlg::DoesBlockExist(const OUString& rBlock,
                 const OUString& rShort)
 {
@@ -586,9 +578,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
     return 1;
 }
 
-/*--------------------------------------------------------------------
-     Description:   dialog manage regions
- --------------------------------------------------------------------*/
+// dialog manage regions
 IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl)
 {
     SwGlossaries* pGloss = ::GetGlossaries();
@@ -664,9 +654,7 @@ IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl)
     return 0;
 }
 
-/*------------------------------------------------------------------------
- Description:   initialisation; from Ctor and after editing regions
-------------------------------------------------------------------------*/
+// initialisation; from Ctor and after editing regions
 void SwGlossaryDlg::Init()
 {
     m_pCategoryBox->SetUpdateMode( false );
@@ -775,14 +763,11 @@ IMPL_LINK_NOARG_INLINE_START(SwGlossaryDlg, EditHdl)
 }
 IMPL_LINK_NOARG_INLINE_END(SwGlossaryDlg, EditHdl)
 
-/*------------------------------------------------------------------------
- Description:   KeyInput for ShortName - Edits without Spaces
-------------------------------------------------------------------------*/
+// KeyInput for ShortName - Edits without Spaces
 IMPL_LINK( SwNewGlosNameDlg, Modify, Edit *, pBox )
 {
     OUString aName(m_pNewName->GetText());
     SwGlossaryDlg* pDlg = (SwGlossaryDlg*)GetParent();
-
     if (pBox == m_pNewName)
         m_pNewShort->SetText( lcl_GetValidShortCut( aName ) );
 
@@ -821,9 +806,7 @@ IMPL_LINK( SwGlossaryDlg, CheckBoxHdl, CheckBox *, pBox )
     return 0;
 }
 
-/* --------------------------------------------------
- * TreeListBox for groups and blocks
- * --------------------------------------------------*/
+// TreeListBox for groups and blocks
 SwGlTreeListBox::SwGlTreeListBox(Window* pParent, WinBits nBits)
     : SvTreeListBox(pParent, nBits)
     , sReadonly(SW_RESSTR(SW_STR_READONLY)),
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index cacc4eb4ff84..93ac3107d689 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -42,14 +42,10 @@
 
 static bool bFootnote = true;
 
-/*------------------------------------------------------------------------
- Description:   inserting a footnote with OK
-------------------------------------------------------------------------*/
-
+// inserting a footnote with OK
 void SwInsFootNoteDlg::Apply()
 {
     OUString aStr;
-
     if ( m_pNumberCharBtn->IsChecked() )
         aStr = m_pNumberCharEdit->GetText();
 
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index d37c1d66ebbd..3fdff721ad21 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -186,9 +186,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl)
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Description: modify
- --------------------------------------------------------------------*/
+// modify
 IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl)
 {
     bool bEnable = m_pNumberingOnCB->IsChecked() && !m_pDivisorED->GetText().isEmpty();
@@ -200,9 +198,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl)
     return 0;
 }
 
-/*--------------------------------------------------------------------
-    Description: On/Off
- --------------------------------------------------------------------*/
+// On/Off
 IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl)
 {
     bool bEnable = m_pNumberingOnCB->IsChecked();
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index bea294d65fa4..5b710792451d 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -48,10 +48,8 @@ static const sal_uInt16 aPageRg[] = {
     0
 };
 
-/*------------------------------------------------------------------------
- Description:  handler to switch between the different possibilities
-               how the footnote region's height can be set.
-------------------------------------------------------------------------*/
+// handler to switch between the different possibilities how the footnote
+// region's height can be set.
 IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightPage)
 {
     m_pMaxHeightEdit->Enable(false);
@@ -67,9 +65,7 @@ IMPL_LINK_NOARG_INLINE_START(SwFootNotePage, HeightMetric)
 }
 IMPL_LINK_NOARG_INLINE_END(SwFootNotePage, HeightMetric)
 
-/*------------------------------------------------------------------------
- Description:   handler limit values
-------------------------------------------------------------------------*/
+// handler limit values
 IMPL_LINK_NOARG(SwFootNotePage, HeightModify)
 {
     m_pMaxHeightEdit->SetMax(m_pMaxHeightEdit->Normalize(lMaxHeight -
@@ -257,9 +253,7 @@ void SwFootNotePage::Reset(const SfxItemSet &rSet)
     delete pDefFtnInfo;
 }
 
-/*--------------------------------------------------------------------
-    Description:    stuff attributes into the set, when OK
- --------------------------------------------------------------------*/
+// stuff attributes into the set, when OK
 bool SwFootNotePage::FillItemSet(SfxItemSet &rSet)
 {
     SwPageFtnInfoItem aItem((const SwPageFtnInfoItem&)GetItemSet().Get(FN_PARAM_FTN_INFO));
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index a4e78417e704..53dcebb77344 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -76,9 +76,7 @@ static void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox )
     rLstBox.Clear();
 }
 
-/*--------------------------------------------------------------------
-     Description: determine lines and columns for table selection
- --------------------------------------------------------------------*/
+// determine lines and columns for table selection
 static bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
 {
     const SwTableNode* pTblNd = rSh.IsCrsrInTbl();
@@ -103,9 +101,7 @@ static bool lcl_GetSelTbl( SwWrtShell &rSh, sal_uInt16& rX, sal_uInt16& rY )
     return true;
 }
 
-/*--------------------------------------------------------------------
-     Description: init list
- --------------------------------------------------------------------*/
+// init list
 SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell)
     : SvxStandardDialog(pParent, "SortDialog", "modules/swriter/ui/sortdialog.ui")
     , aColTxt(SW_RES(STR_COL))
@@ -270,9 +266,7 @@ sal_Unicode SwSortDlg::GetDelimChar() const
     return cRet;
 }
 
-/*--------------------------------------------------------------------
-    Description: pass on to the Core
- --------------------------------------------------------------------*/
+// pass on to the Core
 void SwSortDlg::Apply()
 {
     // save all settings
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 0efd198edcdb..f3c11884f6df 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -487,8 +487,6 @@ IMPL_LINK_NOARG_INLINE_START(SwAutoFormatDlg, OkHdl)
 }
 IMPL_LINK_NOARG_INLINE_END(SwAutoFormatDlg, OkHdl)
 
-// AutoFmtPreview
-
 AutoFmtPreview::AutoFmtPreview(Window* pParent) :
         Window          ( pParent ),
         aCurData        ( OUString() ),
diff --git a/sw/source/ui/vba/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx
index 6db5ee674e3f..5df2d9b18230 100644
--- a/sw/source/ui/vba/vbaautotextentry.hxx
+++ b/sw/source/ui/vba/vbaautotextentry.hxx
@@ -46,7 +46,6 @@ public:
     virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE;
 };
 
-/* class SwVbaAutoTextEntries */
 typedef CollTestImplHelper< ooo::vba::word::XAutoTextEntries > SwVbaAutoTextEntries_BASE;
 
 class SwVbaAutoTextEntries : public SwVbaAutoTextEntries_BASE
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 83b3ad164187..e40779d282fc 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -67,7 +67,6 @@ SwVbaField::getServiceNames()
     return aServiceNames;
 }
 
-// SwVbaReadFieldParams
 // FIXME? copy and paste code
 // the codes are copied from ww8par5.cxx
 class SwVbaReadFieldParams
diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx
index 922ca8959ac5..f20893fdc71b 100644
--- a/sw/source/ui/vba/vbafield.hxx
+++ b/sw/source/ui/vba/vbafield.hxx
@@ -40,8 +40,6 @@ public:
     virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE;
 };
 
-// *** SwVbaFields ***********************************************
-
 typedef CollTestImplHelper< ov::word::XFields > SwVbaFields_BASE;
 
 class SwVbaFields : public SwVbaFields_BASE
diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx
index a996dd795d62..bb2859f7d259 100644
--- a/sw/source/ui/vba/vbaglobals.cxx
+++ b/sw/source/ui/vba/vbaglobals.cxx
@@ -30,8 +30,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::ooo::vba;
 
-// SwVbaGlobals
-
 SwVbaGlobals::SwVbaGlobals(  uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : SwVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "WordDocumentContext" )
 {
     OSL_TRACE("SwVbaGlobals::SwVbaGlobals()");
diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx
index d98d55c34e45..f8c4fdb29329 100644
--- a/sw/source/ui/vba/vbaglobals.hxx
+++ b/sw/source/ui/vba/vbaglobals.hxx
@@ -31,8 +31,6 @@
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbaglobalbase.hxx>
 
-// class SwVbaGlobals
-
 typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE;
 
 class SwVbaGlobals : public SwVbaGlobals_BASE
diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx
index b03491059f1c..f136343a1640 100644
--- a/sw/source/ui/vba/vbaparagraph.hxx
+++ b/sw/source/ui/vba/vbaparagraph.hxx
@@ -49,7 +49,6 @@ public:
     virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE;
 };
 
-/* class SwVbaParagraphs */
 typedef CollTestImplHelper< ooo::vba::word::XParagraphs > SwVbaParagraphs_BASE;
 
 class SwVbaParagraphs : public SwVbaParagraphs_BASE