[Libreoffice-commits] core.git: sw/inc sw/source

Chris Laplante mostthingsweb at gmail.com
Mon May 26 23:47:08 PDT 2014


 sw/inc/IDocumentDrawModelAccess.hxx                         |    2 
 sw/inc/IDocumentRedlineAccess.hxx                           |    2 
 sw/inc/IDocumentUndoRedo.hxx                                |    2 
 sw/inc/authfld.hxx                                          |    1 
 sw/inc/cmdid.h                                              |   87 +------
 sw/inc/dbfld.hxx                                            |   60 +----
 sw/inc/dbmgr.hxx                                            |    4 
 sw/inc/ddefld.hxx                                           |   10 
 sw/inc/dobjfac.hxx                                          |    2 
 sw/inc/docsh.hxx                                            |   12 -
 sw/inc/docstyle.hxx                                         |   13 -
 sw/inc/docufld.hxx                                          |  132 +-----------
 sw/inc/expfld.hxx                                           |    5 
 sw/inc/fchrfmt.hxx                                          |    2 
 sw/inc/fmtautofmt.hxx                                       |    2 
 sw/inc/format.hxx                                           |    2 
 sw/inc/istyleaccess.hxx                                     |    6 
 sw/inc/node.hxx                                             |    4 
 sw/inc/section.hxx                                          |    2 
 sw/inc/swabstdlg.hxx                                        |    6 
 sw/inc/swddetbl.hxx                                         |    2 
 sw/inc/swerror.h                                            |    2 
 sw/inc/tblafmt.hxx                                          |   18 -
 sw/inc/tox.hxx                                              |   29 --
 sw/inc/txatbase.hxx                                         |    2 
 sw/inc/txtatr.hxx                                           |    4 
 sw/inc/txtflcnt.hxx                                         |    3 
 sw/inc/txtfld.hxx                                           |    2 
 sw/inc/txtftn.hxx                                           |    2 
 sw/inc/txtinet.hxx                                          |    2 
 sw/inc/txtrfmrk.hxx                                         |    2 
 sw/inc/txttxmrk.hxx                                         |    2 
 sw/inc/unotxdoc.hxx                                         |   12 -
 sw/inc/viewopt.hxx                                          |   14 -
 sw/source/core/access/accpreview.cxx                        |    2 
 sw/source/core/attr/calbck.cxx                              |    8 
 sw/source/core/attr/cellatr.cxx                             |    6 
 sw/source/core/attr/swatrset.cxx                            |    4 
 sw/source/core/bastyp/index.cxx                             |    4 
 sw/source/core/crsr/viscrs.cxx                              |    3 
 sw/source/core/doc/doc.cxx                                  |    5 
 sw/source/core/doc/docbm.cxx                                |    2 
 sw/source/core/doc/doclay.cxx                               |   15 -
 sw/source/core/doc/docruby.cxx                              |    4 
 sw/source/core/doc/doctxm.cxx                               |    3 
 sw/source/core/doc/list.cxx                                 |    1 
 sw/source/core/doc/tblrwcl.cxx                              |   26 +-
 sw/source/core/docnode/ndtbl.cxx                            |    4 
 sw/source/core/docnode/node.cxx                             |    2 
 sw/source/core/docnode/section.cxx                          |    4 
 sw/source/core/draw/dcontact.cxx                            |    6 
 sw/source/core/draw/dview.cxx                               |    2 
 sw/source/core/edit/autofmt.cxx                             |    1 
 sw/source/core/fields/chpfld.cxx                            |    2 
 sw/source/core/fields/dbfld.cxx                             |    6 
 sw/source/core/fields/docufld.cxx                           |   18 -
 sw/source/core/frmedt/tblsel.cxx                            |    3 
 sw/source/core/graphic/grfatr.cxx                           |    6 
 sw/source/core/inc/UndoDraw.hxx                             |    2 
 sw/source/core/inc/node2lay.hxx                             |    4 
 sw/source/core/inc/pamtyp.hxx                               |    8 
 sw/source/core/inc/tocntntanchoredobjectposition.hxx        |    1 
 sw/source/core/inc/txmsrt.hxx                               |   15 -
 sw/source/core/layout/anchoreddrawobject.cxx                |    2 
 sw/source/core/layout/anchoredobject.cxx                    |    2 
 sw/source/core/layout/atrfrm.cxx                            |   63 +----
 sw/source/core/layout/calcmove.cxx                          |    4 
 sw/source/core/layout/dbg_lay.cxx                           |    5 
 sw/source/core/objectpositioning/anchoredobjectposition.cxx |    5 
 sw/source/core/ole/ndole.cxx                                |    4 
 sw/source/core/para/paratr.cxx                              |    7 
 sw/source/core/table/swtable.cxx                            |    2 
 sw/source/core/text/itrform2.cxx                            |    8 
 sw/source/core/text/porfld.cxx                              |    2 
 sw/source/core/tox/tox.cxx                                  |   23 --
 sw/source/core/tox/txmsrt.cxx                               |   38 ---
 sw/source/core/txtnode/SwGrammarContact.cxx                 |   23 +-
 sw/source/core/txtnode/ndtxt.cxx                            |    2 
 sw/source/core/uibase/app/docshini.cxx                      |    2 
 sw/source/core/uibase/app/docst.cxx                         |   14 -
 sw/source/core/uibase/app/docstyle.cxx                      |    1 
 sw/source/core/uibase/config/cfgitems.cxx                   |   20 -
 sw/source/core/uibase/config/dbconfig.cxx                   |    4 
 sw/source/core/uibase/config/prtopt.cxx                     |    5 
 sw/source/core/uibase/config/uinums.cxx                     |    7 
 sw/source/core/uibase/dbui/dbmgr.cxx                        |   37 ---
 sw/source/core/uibase/dbui/dbtree.cxx                       |    4 
 sw/source/core/uibase/dochdl/gloshdl.cxx                    |    1 
 sw/source/core/uibase/docvw/edtwin.cxx                      |    3 
 sw/source/core/uibase/fldui/fldmgr.cxx                      |  112 ++--------
 sw/source/core/uibase/fldui/fldwrap.cxx                     |   12 -
 sw/source/core/uibase/fldui/xfldui.cxx                      |    7 
 sw/source/core/uibase/frmdlg/colex.cxx                      |    5 
 sw/source/core/uibase/frmdlg/colmgr.cxx                     |   27 --
 sw/source/core/uibase/frmdlg/frmmgr.cxx                     |   48 +---
 sw/source/core/uibase/inc/DropDownFieldDialog.hxx           |    4 
 sw/source/core/uibase/inc/actctrl.hxx                       |   16 -
 sw/source/core/uibase/inc/bmpwin.hxx                        |    4 
 sw/source/core/uibase/inc/bookctrl.hxx                      |    2 
 sw/source/core/uibase/inc/cfgitems.hxx                      |   25 --
 sw/source/core/uibase/inc/changedb.hxx                      |    4 
 sw/source/core/uibase/inc/colmgr.hxx                        |    1 
 sw/source/core/uibase/inc/column.hxx                        |    4 
 sw/source/core/uibase/inc/dbinsdlg.hxx                      |    4 
 sw/source/core/uibase/inc/docstdlg.hxx                      |    4 
 sw/source/core/uibase/inc/drpcps.hxx                        |    4 
 sw/source/core/uibase/inc/edtwin.hxx                        |    4 
 sw/source/core/uibase/inc/envimg.hxx                        |    4 
 sw/source/core/uibase/inc/envlop.hxx                        |    3 
 sw/source/core/uibase/inc/fldmgr.hxx                        |   10 
 sw/source/core/uibase/inc/fldwrap.hxx                       |    5 
 sw/source/core/uibase/inc/formedt.hxx                       |    4 
 sw/source/core/uibase/inc/frmdlg.hxx                        |    4 
 sw/source/core/uibase/inc/frmpage.hxx                       |    4 
 sw/source/core/uibase/inc/glosdoc.hxx                       |    1 
 sw/source/core/uibase/inc/gloshdl.hxx                       |    1 
 sw/source/core/uibase/inc/inpdlg.hxx                        |    5 
 sw/source/core/uibase/inc/javaedit.hxx                      |    2 
 sw/source/core/uibase/inc/labimg.hxx                        |    2 
 sw/source/core/uibase/inc/mailmergehelper.hxx               |   13 -
 sw/source/core/uibase/inc/multmrk.hxx                       |    6 
 sw/source/core/uibase/inc/navipi.hxx                        |    5 
 sw/source/core/uibase/inc/numpara.hxx                       |    8 
 sw/source/core/uibase/inc/optcomp.hxx                       |    1 
 sw/source/core/uibase/inc/optpage.hxx                       |   26 --
 sw/source/core/uibase/inc/pgfnote.hxx                       |    4 
 sw/source/core/uibase/inc/pggrid.hxx                        |    4 
 sw/source/core/uibase/inc/pview.hxx                         |    1 
 sw/source/core/uibase/inc/swlbox.hxx                        |    8 
 sw/source/core/uibase/inc/swuiidxmrk.hxx                    |    5 
 sw/source/core/uibase/inc/tabledlg.hxx                      |    4 
 sw/source/core/uibase/inc/tmpdlg.hxx                        |    8 
 sw/source/core/uibase/inc/tmplctrl.hxx                      |    1 
 sw/source/core/uibase/inc/toxmgr.hxx                        |    8 
 sw/source/core/uibase/inc/uiitems.hxx                       |    4 
 sw/source/core/uibase/inc/uinums.hxx                        |    1 
 sw/source/core/uibase/inc/uivwimp.hxx                       |    2 
 sw/source/core/uibase/inc/view.hxx                          |    9 
 sw/source/core/uibase/inc/viewlayoutctrl.hxx                |    1 
 sw/source/core/uibase/inc/wrap.hxx                          |    5 
 sw/source/core/uibase/index/toxmgr.cxx                      |   30 --
 sw/source/core/uibase/lingu/hyp.cxx                         |    5 
 sw/source/core/uibase/misc/glosdoc.cxx                      |   44 +---
 sw/source/core/uibase/misc/redlndlg.cxx                     |    8 
 sw/source/core/uibase/sidebar/WrapPropertyPanel.hxx         |    2 
 sw/source/core/uibase/utlui/content.cxx                     |    2 
 sw/source/core/undo/docundo.cxx                             |    2 
 sw/source/core/undo/unins.cxx                               |    4 
 sw/source/core/undo/unsort.cxx                              |    5 
 sw/source/core/unocore/unochart.cxx                         |    2 
 sw/source/core/unocore/unocrsrhelper.cxx                    |    8 
 sw/source/core/unocore/unoevent.cxx                         |    6 
 sw/source/core/unocore/unoobj.cxx                           |    1 
 sw/source/core/unocore/unotbl.cxx                           |    4 
 sw/source/core/unocore/unotextmarkup.cxx                    |    6 
 sw/source/core/view/printdata.cxx                           |    4 
 sw/source/filter/ww1/fltshell.cxx                           |    3 
 sw/source/filter/ww1/w1par.hxx                              |    1 
 sw/source/filter/ww8/WW8TableInfo.cxx                       |    4 
 sw/source/filter/ww8/wrtw8sty.cxx                           |    6 
 sw/source/filter/ww8/ww8atr.cxx                             |    2 
 sw/source/filter/ww8/ww8par.cxx                             |    7 
 sw/source/filter/ww8/ww8scan.cxx                            |   18 -
 sw/source/filter/ww8/ww8scan.hxx                            |   10 
 sw/source/filter/ww8/ww8struc.hxx                           |    2 
 sw/source/filter/xml/XMLRedlineImportHelper.cxx             |    1 
 sw/source/ui/chrdlg/break.cxx                               |   22 --
 sw/source/ui/chrdlg/chardlg.cxx                             |    5 
 sw/source/ui/chrdlg/numpara.cxx                             |    2 
 sw/source/ui/config/optcomp.cxx                             |    4 
 sw/source/ui/config/optpage.cxx                             |   23 --
 sw/source/ui/dbui/mailmergewizard.cxx                       |   12 -
 sw/source/ui/dbui/mmoutputpage.cxx                          |    4 
 sw/source/ui/dbui/mmpreparemergepage.cxx                    |    4 
 sw/source/ui/dialog/uiregionsw.cxx                          |   67 +-----
 sw/source/ui/envelp/envfmt.cxx                              |    6 
 sw/source/ui/envelp/envfmt.hxx                              |    2 
 sw/source/ui/envelp/envprt.hxx                              |    2 
 sw/source/ui/envelp/labfmt.cxx                              |    6 
 sw/source/ui/envelp/labfmt.hxx                              |    4 
 sw/source/ui/envelp/labprt.hxx                              |    2 
 sw/source/ui/envelp/mailmrge.cxx                            |    3 
 sw/source/ui/fldui/DropDownFieldDialog.cxx                  |    4 
 sw/source/ui/fldui/changedb.cxx                             |   23 --
 sw/source/ui/fldui/flddb.cxx                                |    8 
 sw/source/ui/fldui/fldedt.cxx                               |   12 -
 sw/source/ui/fldui/fldfunc.cxx                              |    9 
 sw/source/ui/fldui/fldpage.cxx                              |   32 --
 sw/source/ui/fldui/fldref.cxx                               |   10 
 sw/source/ui/fldui/fldtdlg.cxx                              |   26 --
 sw/source/ui/fldui/fldvar.cxx                               |    9 
 sw/source/ui/fldui/inpdlg.cxx                               |   11 -
 sw/source/ui/fldui/javaedit.cxx                             |    4 
 sw/source/ui/fmtui/tmpdlg.cxx                               |    5 
 sw/source/ui/frmdlg/column.cxx                              |   95 ++------
 sw/source/ui/frmdlg/cption.cxx                              |    4 
 sw/source/ui/frmdlg/frmdlg.cxx                              |    4 
 sw/source/ui/frmdlg/wrap.cxx                                |   14 -
 sw/source/ui/index/multmrk.cxx                              |    4 
 sw/source/ui/index/swuiidxmrk.cxx                           |   53 +---
 sw/source/ui/misc/bookmark.cxx                              |   15 -
 sw/source/ui/misc/docfnote.cxx                              |   22 --
 sw/source/ui/misc/glossary.cxx                              |   33 ---
 sw/source/ui/misc/insfnote.cxx                              |    6 
 sw/source/ui/misc/linenum.cxx                               |    8 
 sw/source/ui/misc/pgfnote.cxx                               |   14 -
 sw/source/ui/misc/srtdlg.cxx                                |   12 -
 sw/source/ui/table/tautofmt.cxx                             |    2 
 sw/source/ui/vba/vbaautotextentry.hxx                       |    1 
 sw/source/ui/vba/vbafield.cxx                               |    1 
 sw/source/ui/vba/vbafield.hxx                               |    2 
 sw/source/ui/vba/vbaglobals.cxx                             |    2 
 sw/source/ui/vba/vbaglobals.hxx                             |    2 
 sw/source/ui/vba/vbaparagraph.hxx                           |    1 
 214 files changed, 485 insertions(+), 1681 deletions(-)

New commits:
commit 0a3fe4c281be942e75b498073378b39a6e1a8ba7
Author: Chris Laplante <mostthingsweb at gmail.com>
Date:   Sun May 25 21:26:51 2014 -0400

    Remove ASCII art and useless comments from sw module
    
    Change-Id: I3ba4ac78fd4810e006b1034bbe7c28b1803895d2
    Reviewed-on: https://gerrit.libreoffice.org/9494
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx
index 496f03b..4c76292 100644
--- a/sw/inc/IDocumentDrawModelAccess.hxx
+++ b/sw/inc/IDocumentDrawModelAccess.hxx
@@ -25,8 +25,6 @@
 class SdrModel;
 class SdrPageView;
 
-/** IDocumentDrawModelAccess
- */
 class IDocumentDrawModelAccess
 {
 public:
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 50cbdcb..dac4b65 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -78,8 +78,6 @@ namespace nsRedlineType_t
     const RedlineType_t REDLINE_FORM_AUTOFMT = 0x80;// Can be a flag in RedlineType.
 }
 
-/** IDocumentRedlineAccess
-*/
 class IDocumentRedlineAccess
 {
      // Static helper functions
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 86e70a0..ee67ba0 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -32,8 +32,6 @@ namespace sw {
     class RepeatContext;
 }
 
-/** IDocumentUndoRedo
-*/
 class IDocumentUndoRedo
 {
 public:
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index e7f63e7..e2b006b 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -170,7 +170,6 @@ public:
     virtual OUString GetDescription() const SAL_OVERRIDE;
 };
 
-// --- inlines -----------------------------------------------------------
 inline OUString SwAuthEntry::GetAuthorField(ToxAuthorityField ePos) const
 {
     SAL_WARN_IF(AUTH_FIELD_END <= ePos, "sw", "wrong index");
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 8f49675..a7674e1 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -60,9 +60,7 @@
 #define FN_UNO_RANGE_BEGIN      FN_FORMAT2
 #define FN_UNO_RANGE_END        (FN_PARAM2 + 199)
 
-/*--------------------------------------------------------------------
-    Region: File
- --------------------------------------------------------------------*/
+// Region: File
 #define FN_NEW_GLOBAL_DOC       (FN_FILE + 4 )    /* Create Global Document */
 #define FN_OPEN_FILE            (FN_FILE + 7 )    /* Open */
 
@@ -71,9 +69,7 @@
 
 #define FN_NEW_HTML_DOC         (FN_FILE + 40 ) /* Create HTML document */
 
-/*--------------------------------------------------------------------
-    Region: Edit
- --------------------------------------------------------------------*/
+// Region: Edit
 #define FN_EDIT_FIELD           (FN_EDIT + 4 )    /* Edit field */
 #define FN_EDIT_LINK_DLG        (FN_EDIT + 9 )    /* Edit link dialog */
 
@@ -84,9 +80,7 @@
 #define FN_EDIT_FORMULA         (FN_EDIT + 28)    /* Edit formula in RibbonBar */
 #define FN_CALC_TABLE           (FN_EDIT + 29)
 
-/*--------------------------------------------------------------------
-    Region: Bullets
- --------------------------------------------------------------------*/
+// Region: Bullets
 #define FN_NUM_BULLET_DOWN      (FN_EDIT + 30)  /* Bullet down */
 #define FN_NUM_BULLET_UP        (FN_EDIT + 31)  /* Bullet up */
 #define FN_NUM_BULLET_PREV      (FN_EDIT + 32)  /* to previous bullet */
@@ -164,14 +158,10 @@
 #define FN_REDLINE_NEXT_CHANGE       (FN_EDIT2 + 41)    /* Go to the next change */
 #define FN_REDLINE_PREV_CHANGE       (FN_EDIT2 + 42)    /* Go to the previous change */
 
-/*--------------------------------------------------------------------
-    Region: Edit
- --------------------------------------------------------------------*/
-
+// Region: Edit
 #define FN_REFRESH_VIEW         (FN_VIEW + 1)   /* Refresh/Redraw */
 
 #define FN_DRAW_WRAP_DLG        (FN_VIEW + 3)   /* Draw Umlauf-Dlg */
-
 #define FN_RULER                (FN_VIEW + 11)  /* Horizontal ruler */
 
 #define FN_VIEW_GRAPHIC         (FN_VIEW + 13)  /* View graphic */
@@ -221,10 +211,7 @@
 #define FN_SCROLL_PREV          (FN_VIEW + 57)  /* uno:ScrollToPrevious */
 #define FN_SCROLL_NEXT          (FN_VIEW + 58)  /* uno:ScrollToNext */
 
-/*--------------------------------------------------------------------
-    Region: Insert
- --------------------------------------------------------------------*/
-
+// Region: Insert
 #define FN_INSERT_BOOKMARK      (FN_INSERT + 2 )  /* Bookmark */
 
 #define FN_INSERT_BREAK_DLG     (FN_INSERT + 4 )  /* Break */
@@ -285,10 +272,7 @@
 #define FN_INSERT_FLD_AUTHOR    (FN_INSERT + 98)
 #define FN_INSERT_FOOTNOTE      (FN_INSERT + 99)
 
-/*--------------------------------------------------------------------
-    Region: Paste (Part 2)
- --------------------------------------------------------------------*/
-
+// Region: Paste (Part 2)
 #define FN_MAILMERGE_SENDMAIL_CHILDWINDOW (FN_INSERT2 + 5)  /* child window provided by mailmerge */
 
 #define FN_SBA_BRW_UPDATE       (FN_INSERT2 + 7)    /* insert records into fields */
@@ -306,10 +290,7 @@
 #define FN_INSERT_MULTI_TOX         (FN_INSERT2 + 20)   /* insert any TOX */
 #define FN_INSERT_AUTH_ENTRY_DLG    (FN_INSERT2 + 21)   /* insert entry for table of authorities*/
 
-/*--------------------------------------------------------------------
-    Region: Format
- --------------------------------------------------------------------*/
-
+// Region: Format
 #define FN_AUTOFORMAT_APPLY     (FN_FORMAT + 1 ) /* apply autoformat options */
 #define FN_AUTOFORMAT_AUTO      (FN_FORMAT + 2 ) /* apply autoformat during user input */
 #define FN_GROW_FONT_SIZE       (FN_FORMAT + 3 ) /* size */
@@ -380,9 +361,7 @@
 #define FN_CONVERT_TABLE_TO_TEXT    (FN_FORMAT + 132)  /* convert a table to text */
 #define FN_TABLE_SORT_DIALOG        (FN_FORMAT + 133)  /* sorting in tables*/
 
-/*--------------------------------------------------------------------
-    Region: Page Template
- --------------------------------------------------------------------*/
+// Region: Page Template
 #define FN_PAGE_STYLE_SET_LR_MARGIN (FN_FORMAT + 130) /* left / right margin */
 #define FN_PAGE_STYLE_SET_UL_MARGIN (FN_FORMAT + 131) /* upper / lower margin */
 #define FN_PAGE_STYLE_SET_PAPER_SIZE (FN_FORMAT + 135) /* */
@@ -400,14 +379,10 @@
 
 #define FN_TABLE_HEADLINE_COUNT     (FN_FORMAT + 147) /* number of repeated headlines of tables */
 
-/*--------------------------------------------------------------------
-    Region: Ribbon
- --------------------------------------------------------------------*/
-
+// Region: Ribbon
 #define FN_FORMULA_CALC             (FN_FORMAT + 156)  /* select formula */
 #define FN_FORMULA_CANCEL           (FN_FORMAT + 157)  /* don't apply formula */
 #define FN_FORMULA_APPLY            (FN_FORMAT + 158)  /* apply formula */
-
 #define FN_TABLE_UNSET_READ_ONLY    (FN_FORMAT + 159)  /* undo cell protection for table */
 
 #define FN_FRAME_WRAP_IDEAL         (FN_FORMAT + 163)  /* frame ideal wrapping */
@@ -492,10 +467,7 @@
 #define FN_REMOVE_DIRECT_CHAR_FORMATS       (FN_FORMAT2 + 159)
 //free (160)
 
-/*--------------------------------------------------------------------
-    Region: Extras
- --------------------------------------------------------------------*/
-
+// Region: Extras
 #define FN_LINE_NUMBERING_DLG       (FN_EXTRA + 2 )   /* */
 #define FN_HYPHENATE_OPT_DLG        (FN_EXTRA + 5 )   /* */
 #define FN_ADD_UNKNOWN              (FN_EXTRA + 6 )   /* learn words */
@@ -655,12 +627,8 @@
 #define FN_UNO_HIDDEN                       (FN_EXTRA2 + 122)
 #define FN_UNO_STYLE_INTEROP_GRAB_BAG       (FN_EXTRA2 + 123)
 
-/*------------------------------------------------ --------------------
-    Area: Help
- -------------------------------------------------- ------------------*/
-/*------------------------------------------------ --------------------
-    Region: Traveling & Selection
- -------------------------------------------------- ------------------*/
+// Area: Help
+// Region: Traveling & Selection
 #define FN_CHAR_LEFT                (FN_SELECTION + 1 ) /* */
 #define FN_CHAR_RIGHT               (FN_SELECTION + 2 ) /* */
 #define FN_LINE_UP                  (FN_SELECTION + 3 ) /* */
@@ -747,14 +715,10 @@
 #define FN_SELECTION_MODE_DEFAULT   (FN_SELECTION + 90)   /* use default selection mode - not block mode */
 #define FN_SELECTION_MODE_BLOCK     (FN_SELECTION + 91)   /* switch on block selection */
 
-/*--------------------------------------------------------------------
-    QUERY-Block
- --------------------------------------------------------------------*/
-
+// QUERY-Block
 #define FN_TXTATR_INET              (FN_QUERY +29)      /* INet-Attribut */
 
 #define FN_GET_PRINT_AREA           (FN_QUERY +32)      /* Get attribute for printable area of page */
-
 #define FN_DB_CONNECTION_ANY            (FN_QUERY2 + 3)
 #define FN_DB_COLUMN_ANY                (FN_QUERY2 + 4)
 #define FN_DB_DATA_SOURCE_ANY           (FN_QUERY2 + 5)
@@ -764,10 +728,7 @@
 #define FN_DB_DATA_SELECTION_ANY        (FN_QUERY2 + 9)
 #define FN_DB_DATA_CURSOR_ANY           (FN_QUERY2 + 10)
 
-/*--------------------------------------------------------------------
-    Region: Envelope
- --------------------------------------------------------------------*/
-
+// Region: Envelope
 #define FN_ENVELOP                  (FN_ENVELP    )
 
 #define FN_DELETE_NOTE_AUTHOR       (FN_NOTES+1)
@@ -787,10 +748,7 @@
 #define FN_PAGEBREAK_EDIT           (FN_PAGEBREAK+1)
 #define FN_PAGEBREAK_DELETE         (FN_PAGEBREAK+2)
 
-/*--------------------------------------------------------------------
-    Region: Parameter
- --------------------------------------------------------------------*/
-
+// Region: Parameter
 #define FN_PARAM_MOVE_COUNT         (FN_PARAM+2)
 #define FN_PARAM_MOVE_SELECTION     (FN_PARAM+3)
 
@@ -856,10 +814,7 @@
 #define FN_SHAPE_ENDPOSITION_IN_HORI_L2R   (FN_PARAM2+26)
 #define FN_PARAM_PAM                    (FN_PARAM2+27) /* Point and Mark */
 
-/*--------------------------------------------------------------------
-    Description: Status: not more than 19!
- --------------------------------------------------------------------*/
-
+// Status: not more than 19!
 #define FN_STAT_PAGE                (FN_STAT + 1)
 #define FN_STAT_TEMPLATE            (FN_STAT + 2)
 #define FN_STAT_ZOOM                (FN_STAT + 3)
@@ -867,10 +822,7 @@
 #define FN_STAT_BOOKMARK            (FN_STAT + 8)  /* For Popup Bookmarks*/
 #define FN_STAT_WORDCOUNT           (FN_STAT + 9)
 
-/*--------------------------------------------------------------------
-    Region: Page preview
- --------------------------------------------------------------------*/
-
+// Region: Page preview
 #define FN_SHOW_TWO_PAGES           (FN_PGPREVIEW + 1)
 #ifndef FN_SHOW_MULTIPLE_PAGES
 #define FN_SHOW_MULTIPLE_PAGES      (FN_PGPREVIEW + 2)
@@ -879,10 +831,7 @@
 #define FN_CLOSE_PAGEPREVIEW        (FN_PGPREVIEW + 4)
 #define FN_SHOW_BOOKVIEW            (FN_PGPREVIEW + 5)
 
-/*--------------------------------------------------------------------
-    Region: Setting Attributes
- --------------------------------------------------------------------*/
-
+// Region: Setting Attributes
 #define FN_OPAQUE                       (FN_FRAME + 1)
 #define FN_SET_PROTECT                  (FN_FRAME + 2)
 #define FN_SURROUND                     (FN_FRAME + 3)
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 53548f4..8677265 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -27,10 +27,7 @@ class SwDoc;
 class SwTxtFld;
 class SwFrm;
 
-/*--------------------------------------------------------------------
-    Database field.
- --------------------------------------------------------------------*/
-
+// Database field.
 class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType
 {
     SwDBData    aDBData;
@@ -56,11 +53,8 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Classes derived from SwFields. They overlay the expand-function.
-    Content is formated according to the format (if available).
- --------------------------------------------------------------------*/
-
+// Classes derived from SwFields. They overlay the expand-function.
+// Content is formated according to the format (if available).
 class SW_DLLPUBLIC SwDBField : public SwValueField
 {
     OUString aContent;
@@ -124,10 +118,7 @@ inline  void SwDBField::SetExpansion(const OUString& rStr)
 inline void SwDBField::ChgBodyTxtFlag( bool bIsInBody )
     { bIsInBodyTxt = bIsInBody; }
 
-/*--------------------------------------------------------------------
-    Base class for all other database fields.
- --------------------------------------------------------------------*/
-
+// Base class for all other database fields.
 class SW_DLLPUBLIC SwDBNameInfField : public SwField
 {
     SwDBData    aDBData;
@@ -154,10 +145,7 @@ public:
     virtual void            SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Database field next record.
- --------------------------------------------------------------------*/
-
+// Database field next record.
 class SW_DLLPUBLIC SwDBNextSetFieldType : public SwFieldType
 {
 public:
@@ -166,10 +154,7 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Next data record with condition.
- --------------------------------------------------------------------*/
-
+// Next data record with condition.
 class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField
 {
     OUString  aCond;
@@ -199,10 +184,7 @@ inline bool SwDBNextSetField::IsCondValid() const
 inline void SwDBNextSetField::SetCondValid(bool bCond)
     { bCondValid = bCond; }
 
-/*--------------------------------------------------------------------
-    Database field next record.
- --------------------------------------------------------------------*/
-
+// Database field next record.
 class SwDBNumSetFieldType : public SwFieldType
 {
 public:
@@ -211,11 +193,8 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Data record with number xxx.
-    Number is in nFormat (bit of a misuse!)
- --------------------------------------------------------------------*/
-
+// Data record with number xxx.
+// Number is in nFormat (bit of a misuse!)
 class SwDBNumSetField : public SwDBNameInfField
 {
     OUString  aCond;
@@ -251,10 +230,7 @@ inline bool SwDBNumSetField::IsCondValid() const
 inline void SwDBNumSetField::SetCondValid(bool bCond)
     { bCondValid = bCond; }
 
-/*--------------------------------------------------------------------
-    Database name.
- --------------------------------------------------------------------*/
-
+// Database name.
 class SwDBNameFieldType : public SwFieldType
 {
         SwDoc *pDoc;
@@ -265,10 +241,7 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Database field.
- --------------------------------------------------------------------*/
-
+// Database field.
 class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField
 {
 public:
@@ -280,10 +253,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Number of data record.
- --------------------------------------------------------------------*/
-
+// Number of data record.
 class SW_DLLPUBLIC SwDBSetNumberFieldType : public SwFieldType
 {
 public:
@@ -292,14 +262,10 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Database field.
- --------------------------------------------------------------------*/
-
+// Database field.
 class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField
 {
     long    nNumber;
-
 public:
     SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
 
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index d2b2eb7..c4c6ad1 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -83,9 +83,7 @@ enum DBManagerOptions
     DBMGR_MERGE_SINGLE_FILE  ///< Save merge as single file.
 };
 
-/*--------------------------------------------------------------------
-     Administration of (new) logical databases.
- --------------------------------------------------------------------*/
+// Administration of (new) logical databases.
 #define SW_DB_SELECT_UNKNOWN    0
 #define SW_DB_SELECT_TABLE      1
 #define SW_DB_SELECT_QUERY      2
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index b4f5b3d..4417c0e 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -25,10 +25,7 @@
 
 class SwDoc;
 
-/*--------------------------------------------------------------------
-    FieldType for DDE
- --------------------------------------------------------------------*/
-
+// FieldType for DDE
 class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType
 {
     OUString aName;
@@ -83,10 +80,7 @@ public:
     void SetCRLFDelFlag( bool bFlag = true )    { bCRLFFlag = bFlag; }
 };
 
-/*--------------------------------------------------------------------
-    DDE-field
- --------------------------------------------------------------------*/
-
+// DDE-field
 class SwDDEField : public SwField
 {
 private:
diff --git a/sw/inc/dobjfac.hxx b/sw/inc/dobjfac.hxx
index b76fb54..d078795 100644
--- a/sw/inc/dobjfac.hxx
+++ b/sw/inc/dobjfac.hxx
@@ -21,8 +21,6 @@
 
 #include <tools/link.hxx>
 
-// class SwObjectFactory
-
 class SdrObjFactory;
 
 class SwObjectFactory
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 78ea8a1..9760272 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -104,9 +104,9 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
 
     /// Methods for StyleSheets
 
-    // @param nSlot
-    // Only used for nFamily == SFX_STYLE_FAMILY_PAGE. Identifies optional Slot by which the edit is triggered.
-    // Used to activate certain dialog pane
+    /// @param nSlot
+    /// Only used for nFamily == SFX_STYLE_FAMILY_PAGE. Identifies optional Slot by which the edit is triggered.
+    /// Used to activate certain dialog pane
     SAL_DLLPRIVATE sal_uInt16 Edit(
         const OUString &rName,
         const OUString& rParent,
@@ -242,9 +242,9 @@ public:
 
     void _LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocument );
 
-    // Show page style format dialog
-    // @param nSlot
-    // Identifies slot by which the dialog is triggered. Used to activate certain dialog pane
+    /// Show page style format dialog
+    /// @param nSlot
+    /// Identifies slot by which the dialog is triggered. Used to activate certain dialog pane
     void FormatPage(
         const OUString& rPage,
         const OString& rPageId,
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index fe2f411..c93984d 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -36,9 +36,7 @@ class SwTxtFmtColl;
 class SwFrmFmt;
 class SwNumRule;
 
-/*--------------------------------------------------------------------
-    Local helper class.
- --------------------------------------------------------------------*/
+// Local helper class.
 class SwPoolFmtList : public std::vector<OUString>
 {
 public:
@@ -47,9 +45,7 @@ public:
     void Erase();
 };
 
-/*--------------------------------------------------------------------
-    Temporary StyleSheet.
- --------------------------------------------------------------------*/
+// Temporary StyleSheet.
 class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
 {
     friend class SwDocStyleSheetPool;
@@ -147,10 +143,7 @@ public:
     virtual bool            IsUsed() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-   Iterator for Pool.
- --------------------------------------------------------------------*/
-
+// Iterator for Pool.
 class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
 {
     rtl::Reference< SwDocStyleSheet > mxIterSheet;
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index ad3ea83..246971f 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -43,10 +43,7 @@ enum SwAuthorFormat
     AF_FIXED = 0x8000
 };
 
-/*--------------------------------------------------------------------
-    Subtype of document statistics.
- --------------------------------------------------------------------*/
-
+// Subtype of document statistics.
 enum SwDocStatSubType
 {
     DS_BEGIN,
@@ -132,10 +129,6 @@ enum SwJumpEditFormat
     JE_FMT_OLE
 };
 
-/*--------------------------------------------------------------------
-    Page number.
- --------------------------------------------------------------------*/
-
 class SwPageNumberFieldType : public SwFieldType
 {
     sal_Int16   nNumberingType;
@@ -151,10 +144,7 @@ public:
     virtual SwFieldType* Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Page numbering.
- --------------------------------------------------------------------*/
-
+// Page numbering.
 class SW_DLLPUBLIC SwPageNumberField : public SwField
 {
     OUString sUserStr;
@@ -187,10 +177,6 @@ public:
     void SetUserString( const OUString& rS )  { sUserStr = rS; }
 };
 
-/*--------------------------------------------------------------------
-    Authors.
- --------------------------------------------------------------------*/
-
 class SwAuthorFieldType : public SwFieldType
 {
 public:
@@ -200,10 +186,6 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Author field.
- --------------------------------------------------------------------*/
-
 class SwAuthorField : public SwField
 {
     OUString aContent;
@@ -221,10 +203,6 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Filename
- --------------------------------------------------------------------*/
-
 class SwFileNameFieldType : public SwFieldType
 {
     SwDoc *pDoc;
@@ -235,10 +213,6 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    FileNameField
- --------------------------------------------------------------------*/
-
 class SW_DLLPUBLIC SwFileNameField : public SwField
 {
     OUString aContent;
@@ -256,10 +230,6 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    TemplName
- --------------------------------------------------------------------*/
-
 class SwTemplNameFieldType : public SwFieldType
 {
     SwDoc *pDoc;
@@ -270,10 +240,6 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    TemplNameField
- --------------------------------------------------------------------*/
-
 class SW_DLLPUBLIC SwTemplNameField : public SwField
 {
 public:
@@ -285,10 +251,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Document statistics
- --------------------------------------------------------------------*/
-
+// Document statistics
 class SwDocStatFieldType : public SwFieldType
 {
     SwDoc*          pDoc;
@@ -302,10 +265,6 @@ public:
     inline void             SetNumFormat( sal_Int16 eFmt )  { nNumberingType = eFmt; }
 };
 
-/*--------------------------------------------------------------------
-    DocStatField
- --------------------------------------------------------------------*/
-
 class SW_DLLPUBLIC SwDocStatField : public SwField
 {
     sal_uInt16 nSubType;
@@ -325,10 +284,6 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Hidden text.
- --------------------------------------------------------------------*/
-
 class SwHiddenTxtFieldType : public SwFieldType
 {
     bool bHidden;
@@ -341,10 +296,6 @@ public:
     inline bool             GetHiddenFlag() const { return bHidden; }
 };
 
-/*--------------------------------------------------------------------
-    HiddenTxtField
- --------------------------------------------------------------------*/
-
 class SwHiddenTxtField : public SwField
 {
     OUString aTRUETxt;         ///< Text if condition sal_True.
@@ -397,10 +348,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Field that expands to an empty line (without height).
- --------------------------------------------------------------------*/
-
+// Field that expands to an empty line (without height).
 class SwHiddenParaFieldType : public SwFieldType
 {
 public:
@@ -409,10 +357,6 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Hidded paragraph.
- --------------------------------------------------------------------*/
-
 class SwHiddenParaField : public SwField
 {
     OUString           aCond;
@@ -434,10 +378,6 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Run Macro.
- --------------------------------------------------------------------*/
-
 class SwMacroFieldType : public SwFieldType
 {
     SwDoc* pDoc;
@@ -448,10 +388,6 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    MacroField.
- --------------------------------------------------------------------*/
-
 class SW_DLLPUBLIC SwMacroField : public SwField
 {
     OUString aMacro;
@@ -490,10 +426,6 @@ public:
     static bool isScriptURL( const OUString& str );
 };
 
-/*--------------------------------------------------------------------
-    PostIts
- --------------------------------------------------------------------*/
-
 class SwPostItFieldType : public SwFieldType
 {
 private:
@@ -509,10 +441,6 @@ public:
     };
 };
 
-/*--------------------------------------------------------------------
-    PostItField
- --------------------------------------------------------------------*/
-
 class SW_DLLPUBLIC SwPostItField : public SwField
 {
     OUString sTxt;
@@ -561,10 +489,6 @@ public:
     virtual OUString    GetDescription() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    DocumentInfo
- --------------------------------------------------------------------*/
-
 class SwDocInfoFieldType : public SwValueFieldType
 {
 public:
@@ -598,10 +522,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Extended User settings.
- --------------------------------------------------------------------*/
-
+// Extended User settings.
 class SwExtUserFieldType : public SwFieldType
 {
     OUString aData;
@@ -634,10 +555,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Relative page numbers - field.
- --------------------------------------------------------------------*/
-
+// Relative page numbers - field.
 class SwRefPageSetFieldType : public SwFieldType
 {
 public:
@@ -650,10 +568,7 @@ protected:
    virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Relative page numbering.
- --------------------------------------------------------------------*/
-
+// Relative page numbering.
 class SwRefPageSetField : public SwField
 {
     short   nOffset;
@@ -677,10 +592,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Relative page numbers - query field.
- --------------------------------------------------------------------*/
-
+// Relative page numbers - query field.
 class SwRefPageGetFieldType : public SwFieldType
 {
     SwDoc*          pDoc;
@@ -697,10 +609,7 @@ public:
     SwDoc*  GetDoc() const                  { return pDoc; }
 };
 
-/*--------------------------------------------------------------------
-    Query relative page numbering.
- --------------------------------------------------------------------*/
-
+// Query relative page numbering.
 class SwRefPageGetField : public SwField
 {
     OUString sTxt;
@@ -717,10 +626,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Field to jump to and edit.
- --------------------------------------------------------------------*/
-
+// Field to jump to and edit.
 class SwJumpEditFieldType : public SwFieldType
 {
     SwDoc* pDoc;
@@ -757,10 +663,6 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Script Fieldtype.
- --------------------------------------------------------------------*/
-
 class SwScriptFieldType : public SwFieldType
 {
     SwDoc* pDoc;
@@ -770,10 +672,6 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    ScriptField.
- --------------------------------------------------------------------*/
-
 class SwScriptField : public SwField
 {
     OUString sType;  ///< Type of Code (Java/VBScript/...)
@@ -804,10 +702,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Combined Character Fieldtype
- --------------------------------------------------------------------*/
-
+// Combined Character Fieldtype
 class SwCombinedCharFieldType : public SwFieldType
 {
 public:
@@ -816,10 +711,7 @@ public:
     virtual SwFieldType*    Copy() const SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    ScriptField
- --------------------------------------------------------------------*/
-
+// ScriptField
 #define MAX_COMBINED_CHARACTERS     6
 
 class SW_DLLPUBLIC SwCombinedCharField : public SwField
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 4a09b17..ee1aa0e 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -350,10 +350,7 @@ public:
     virtual bool        PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
 };
 
-/*--------------------------------------------------------------------
-    Description: Sorted list of input fields and DropDown fields
- --------------------------------------------------------------------*/
-
+// Sorted list of input fields and DropDown fields
 class SwInputFieldList
 {
 public:
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 357aafe..42c0f5a 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -27,8 +27,6 @@ class SwCharFmt;
 class SwTxtCharFmt;
 class IntlWrapper;
 
-// ATT_CHARFMT *********************************************
-
 class SW_DLLPUBLIC SwFmtCharFmt: public SfxPoolItem, public SwClient
 {
     friend class SwTxtCharFmt;
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index eada4b6..a40416e 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -23,8 +23,6 @@
 #include <format.hxx>
 #include <boost/shared_ptr.hpp>
 
-// ATT_AUTOFMT *********************************************
-
 class SwFmtAutoFmt: public SfxPoolItem
 {
     boost::shared_ptr<SfxItemSet> mpHandle;
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 95aa7bf..3258931 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -331,8 +331,6 @@ public:
     virtual FillAttributesPtr getFillAttributes() const;
 };
 
-// --------------- inline Implementations ------------------------
-
 //UUUUinline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich,
 //UUUU                                             bool bInParents ) const
 //UUUU{
diff --git a/sw/inc/istyleaccess.hxx b/sw/inc/istyleaccess.hxx
index add8a10..f961ea4 100644
--- a/sw/inc/istyleaccess.hxx
+++ b/sw/inc/istyleaccess.hxx
@@ -22,14 +22,10 @@
 #include <vector>
 #include <svl/stylepool.hxx>
 
-/*--------------------------------------------------------------------
-    Management of (automatic) styles
- --------------------------------------------------------------------*/
-
+// Management of (automatic) styles
 class IStyleAccess
 {
 public:
-
     enum SwAutoStyleFamily
     {
         AUTO_STYLE_CHAR,
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 294a79e..be64d45 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -524,8 +524,6 @@ private:
     SwTableNode & operator= ( const SwTableNode & rNode );
 };
 
-// SwSectionNode
-
 class SwSectionNode
     : public SwStartNode
     , private ::boost::noncopyable
@@ -572,8 +570,6 @@ public:
 
 };
 
-// SwDummySectionNode
-
 /** This class is internal. And quite frankly I don't know what ND_SECTIONDUMMY is for,
    the class has been merely created to replace "SwNode( ND_SECTIONDUMMY )", the only case
    of instantiating SwNode directly. Now SwNode can be an abstract base class. */
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 7a93657..c8756381 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -351,8 +351,6 @@ public:
 
 };
 
-// -------------- inlines ---------------------------------
-
 inline SwSection* SwSection::GetParent() const
 {
     SwSectionFmt* pFmt = GetFmt();
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index fc1d475..1acbf8d 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -395,9 +395,9 @@ public:
                                                 bool bFmt = false,
                                                 const OString& sDefPage = OString(),
                                                 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
+    /// @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
     virtual SfxAbstractApplyTabDialog*  CreateTemplateDialog(
                                                 Window*             pParent,
                                                 SfxStyleSheetBase&  rBase,
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index 5c0d966..f66e723 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.hxx
@@ -45,8 +45,6 @@ protected:
     virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
 };
 
-// ----------- Inlines -----------------------------
-
 inline const SwDDEFieldType* SwDDETable::GetDDEFldType() const
 {
     return ((SwDDETable*)this)->GetDDEFldType();
diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h
index 88238ed..aff4847 100644
--- a/sw/inc/swerror.h
+++ b/sw/inc/swerror.h
@@ -66,8 +66,6 @@
 #define ERR_TBLINSCOL_ERROR             (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 57 )
 #define ERR_TBLDDECHG_ERROR             (ERROR_SW_BASE|ERRCODE_CLASS_NONE| 58 )
 
-// ----- Warnings ---------------------------
-
 // Import - Warnings
 #define WARN_SWG_NO_DRAWINGS            (WARN_SW_READ_BASE | 70 )
 #define WARN_WW6_FASTSAVE_ERR           (WARN_SW_READ_BASE | 71 )
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 23975d5..8c96aba 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -18,15 +18,15 @@
  */
 #ifndef INCLUDED_SW_INC_TBLAFMT_HXX
 #define INCLUDED_SW_INC_TBLAFMT_HXX
-/*************************************************************************
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-    The structure of table auto formatting should not be changed. It is used
-    by different code of Writer and Calc. If a change is necessary, the
-    source code of both applications must be changed!
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-**************************************************************************/
+/*
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ *
+ *     The structure of table auto formatting should not be changed. It is used
+ *     by different code of Writer and Calc. If a change is necessary, the
+ *     source code of both applications must be changed!
+ *
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ */
 
 #include <boost/scoped_ptr.hpp>
 
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 701cf8b..86565af 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -42,10 +42,7 @@ class SwDoc;
 
 class SwTOXMarks : public std::vector<SwTOXMark*> {};
 
-/*--------------------------------------------------------------------
-     Description:  Entry of content index, alphabetical index or user defined index
- --------------------------------------------------------------------*/
-
+// Entry of content index, alphabetical index or user defined index
 class SW_DLLPUBLIC SwTOXMark
     : public SfxPoolItem
     , public SwModify
@@ -148,10 +145,7 @@ public:
     static void InsertTOXMarks( SwTOXMarks& aMarks, const SwTOXType& rType );
 };
 
-/*--------------------------------------------------------------------
-     Description:  index types
- --------------------------------------------------------------------*/
-
+// index types
 class SwTOXType : public SwModify
 {
 public:
@@ -171,10 +165,7 @@ private:
     SwTOXType & operator= (const SwTOXType &);
 };
 
-/*--------------------------------------------------------------------
-     Description:  Structure of the index lines
- --------------------------------------------------------------------*/
-
+// Structure of the index lines
 #define FORM_TITLE              0
 #define FORM_ALPHA_DELIMITTER   1
 #define FORM_PRIMARY_KEY        2
@@ -341,10 +332,7 @@ public:
     static OUString GetFormAuth();
 };
 
-/*--------------------------------------------------------------------
-     Description: Content to create indexes of
- --------------------------------------------------------------------*/
-
+// Content to create indexes of
 typedef sal_uInt16 SwTOXElement;
 namespace nsSwTOXElement
 {
@@ -396,10 +384,7 @@ namespace nsSwTOOElements
 
 #define TOX_STYLE_DELIMITER ((sal_Unicode)0x01)
 
-/*--------------------------------------------------------------------
-     Description:  Class for all indexes
- --------------------------------------------------------------------*/
-
+// Class for all indexes
 class SW_DLLPUBLIC SwTOXBase : public SwClient
 {
     SwForm      aForm;              // description of the lines
@@ -545,10 +530,6 @@ public:
     void RegisterToTOXType( SwTOXType& rMark );
 };
 
-/*--------------------------------------------------------------------
-     Description:  Inlines
- --------------------------------------------------------------------*/
-
 //SwTOXMark
 
 inline OUString SwTOXMark::GetAlternativeText() const
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index fe4fad2..c849a7b 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -132,8 +132,6 @@ public:
     virtual sal_Int32* GetEnd() SAL_OVERRIDE;
 };
 
-// --------------- Inline Implementations ------------------------
-
 inline const sal_Int32* SwTxtAttr::End() const
 {
     return const_cast<SwTxtAttr * >(this)->GetEnd();
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index b727106..b8720b0 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -29,8 +29,6 @@ namespace sw {
     class MetaFieldManager;
 }
 
-// ATT_CHARFMT *********************************************
-
 class SwTxtCharFmt : public SwTxtAttrEnd
 {
     SwTxtNode * m_pTxtNode;
@@ -51,7 +49,6 @@ public:
     sal_uInt16 GetSortNumber() const { return m_nSortNumber; }
 };
 
-// ******************************
 
 class SwTxtAttrNesting : public SwTxtAttrEnd
 {
@@ -80,7 +77,6 @@ public:
     void ChgTxtNode(SwTxtNode * const pNode);
 };
 
-// ******************************
 
 class SW_DLLPUBLIC SwTxtRuby : public SwTxtAttrNesting, public SwClient
 {
diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx
index cd1f73d..b3e2b6c 100644
--- a/sw/inc/txtflcnt.hxx
+++ b/sw/inc/txtflcnt.hxx
@@ -26,13 +26,10 @@ class SwFrm;
 class SwTxtNode;
 class SwDoc;
 
-// SWTXT_FLYCNT ********************************
 // Attribute for line-bound frames (without end index).
-
 class SwTxtFlyCnt : public SwTxtAttr
 {
     SwFlyInCntFrm  *_GetFlyFrm( const SwFrm *pCurrFrm );
-
 public:
     SwTxtFlyCnt( SwFmtFlyCnt& rAttr, sal_Int32 nStart );
 
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 7ce306e..3f4d41f 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -24,8 +24,6 @@
 
 class SwTxtNode;
 
-// ATT_FLD ***********************************
-
 class SwTxtFld : public SwTxtAttr
 {
     mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTxtFld()>
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index 7ad6dc4..94b2712 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -29,8 +29,6 @@ class SwNodes;
 class SwDoc;
 class SwFrm;
 
-// ATT_FTN **********************************************************
-
 class SW_DLLPUBLIC SwTxtFtn : public SwTxtAttr
 {
     SwNodeIndex * m_pStartNode;
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index f1159c5..341762d 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -26,8 +26,6 @@
 class SwTxtNode;
 class SwCharFmt;
 
-// ATT_INETFMT *********************************************
-
 class SW_DLLPUBLIC SwTxtINetFmt : public SwTxtAttrNesting, public SwClient
 {
     SwTxtNode * m_pTxtNode;
diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx
index 78fac97..eee21e2 100644
--- a/sw/inc/txtrfmrk.hxx
+++ b/sw/inc/txtrfmrk.hxx
@@ -23,9 +23,7 @@
 
 class SwTxtNode;
 
-// SWTXT_REFMARK *************************************
 // Attribute for content-/position references in text.
-
 class SwTxtRefMark : public SwTxtAttrEnd
 {
     SwTxtNode * m_pTxtNode;
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index e767bd7..6436b85 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -24,9 +24,7 @@
 class SwTxtNode;
 class SwDoc;
 
-// SWTXT_TOXMARK *******************************
 // Attribute for indices/tables of contents.
-
 class SwTxtTOXMark : public SwTxtAttrEnd
 {
     SwTxtNode * m_pTxtNode;
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 1f3d632..e43ea2b 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -583,17 +583,15 @@ public:
     virtual void onChange() SAL_OVERRIDE;
 };
 
-/*  The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of
-    the current SwViewShell so that fields are not printed as commands and
-    hidden characters are always invisible. Hidden text and place holders
-    should be printed according to the current print options.
-    After printing the view options are restored
-  -----------------------------------------------------------------------*/
+// The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of
+// the current SwViewShell so that fields are not printed as commands and
+// hidden characters are always invisible. Hidden text and place holders
+// should be printed according to the current print options.
+// After printing the view options are restored
 class SwViewOptionAdjust_Impl
 {
     SwViewShell *     m_pShell;
     SwViewOption    m_aOldViewOptions;
-
 public:
     SwViewOptionAdjust_Impl( SwViewShell& rSh, const SwViewOption &rViewOptions );
     ~SwViewOptionAdjust_Impl();
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index f6816be..98e875e 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -189,10 +189,7 @@ public:
     inline sal_uInt32   GetCoreOptions() const {return nCoreOptions;}
     inline void     SetUIOptions( const SwViewOption& );
 
-/*---------------------------------------------------------------------------
-    Options from nCoreOptions
-----------------------------------------------------------------------------*/
-
+    // Options from nCoreOptions
     inline bool IsIdle() const
         { return bIdle; }
 
@@ -330,9 +327,7 @@ public:
     inline void SetCrossHair( bool b )
         { b ? (nCoreOptions |= VIEWOPT_1_CROSSHAIR ) : ( nCoreOptions &= ~VIEWOPT_1_CROSSHAIR); }
 
-/*---------------------------------------------------------------------------
-    Options from nCore2Options
-----------------------------------------------------------------------------*/
+    // Options from nCore2Options
     inline bool IsBlackFont() const
         {return nCore2Options & VIEWOPT_CORE2_BLACKFONT ? sal_True : sal_False;}
 
@@ -436,10 +431,7 @@ public:
     inline bool operator == ( const SwViewOption &rOpt ) const;
     inline bool operator != ( const SwViewOption &rOpt ) const  { return !(*this == rOpt); }
 
-/*---------------------------------------------------------------------------
-    Options from nUIOptions
-----------------------------------------------------------------------------*/
-
+    // Options from nUIOptions
     bool    IsViewVScrollBar() const
         {
 #if HAVE_FEATURE_DESKTOP
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index ff7d1a6..8b0f1b3 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -30,8 +30,6 @@ using ::com::sun::star::lang::IndexOutOfBoundsException;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Sequence;
 
-// SwAccessiblePreview
-
 SwAccessiblePreview::SwAccessiblePreview( SwAccessibleMap *pMp ) :
     SwAccessibleDocumentBase( pMp )
 {
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 2cad1a6..be678fe 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -27,8 +27,6 @@ static SwClientIter* pClientIters = 0;
 
 TYPEINIT0( SwClient );
 
-// SwClient
-
 SwClient::SwClient( SwModify* pToRegisterIn )
     : pLeft( 0 ), pRight( 0 ), pRegisteredIn( 0 ), mbIsAllowedToBeRemovedInModifyCall( false )
 {
@@ -82,8 +80,6 @@ bool SwClient::GetInfo( SfxPoolItem& ) const
     return true;
 }
 
-// SwModify
-
 SwModify::SwModify()
     : SwClient(0), pRoot(0)
 {
@@ -355,8 +351,6 @@ void SwModify::ModifyBroadcast( const SfxPoolItem* pOldValue, const SfxPoolItem*
     }
 }
 
-// SwDepend
-
 SwDepend::SwDepend( SwClient* pTellHim, SwModify* pDepend )
     : SwClient( pDepend )
 {
@@ -382,8 +376,6 @@ bool SwDepend::GetInfo( SfxPoolItem& rInfo ) const
     return pToTell ? pToTell->GetInfo( rInfo ) : true;
 }
 
-// SwClientIter
-
 SwClientIter::SwClientIter( const SwModify& rModify )
     : rRoot(rModify)
     , pNxtIter(NULL)
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index b8957c1..e9bfb33 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -31,8 +31,6 @@
 #include <switerator.hxx>
 #include <swtable.hxx>
 
-// SwTblBoxNumFormat
-
 SwTblBoxNumFormat::SwTblBoxNumFormat( sal_uInt32 nFormat, bool bFlag )
     : SfxUInt32Item( RES_BOXATR_FORMAT, nFormat ), bAuto( bFlag )
 {
@@ -50,8 +48,6 @@ SfxPoolItem* SwTblBoxNumFormat::Clone( SfxItemPool* ) const
     return new SwTblBoxNumFormat( GetValue(), bAuto );
 }
 
-// SwTblBoxFormula
-
 SwTblBoxFormula::SwTblBoxFormula( const OUString& rFormula )
     : SfxPoolItem( RES_BOXATR_FORMULA ),
     SwTableFormula( rFormula ),
@@ -192,8 +188,6 @@ void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue )
     }
 }
 
-// SwTblBoxValue
-
 SwTblBoxValue::SwTblBoxValue()
     : SfxPoolItem( RES_BOXATR_VALUE ), nValue( 0 )
 {
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 984db36..073abb7 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -41,8 +41,6 @@
 #include <svx/sxenditm.hxx>
 #include <svx/sdsxyitm.hxx>
 
-// SwAttrPool
-
 SwAttrPool::SwAttrPool( SwDoc* pD )
     : SfxItemPool( OUString("SWG"),
                     POOLATTR_BEGIN, POOLATTR_END-1,
@@ -145,8 +143,6 @@ void SwAttrPool::removeAndDeleteSecondaryPools()
     SfxItemPool::Free(pEEgPool);
 }
 
-// SwAttrSet
-
 SwAttrSet::SwAttrSet( SwAttrPool& rPool, sal_uInt16 nWh1, sal_uInt16 nWh2 )
     : SfxItemSet( rPool, nWh1, nWh2 ), pOldSet( 0 ), pNewSet( 0 )
 {
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 81da0bb..f180ce0 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -24,8 +24,6 @@
 
 TYPEINIT0(SwIndexReg);
 
-// SwIndex
-
 SwIndex::SwIndex(SwIndexReg *const pReg, sal_Int32 const nIdx)
     : m_nIndex( nIdx )
     , m_pIndexReg( pReg )
@@ -209,8 +207,6 @@ SwIndex& SwIndex::Assign( SwIndexReg* pArr, sal_Int32 nIdx )
     return *this;
 }
 
-// SwIndexReg
-
 SwIndexReg::SwIndexReg()
     : m_pFirst( 0 ), m_pLast( 0 )
 {
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 6a05a8c..62d87e4 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -63,8 +63,7 @@ long SwSelPaintRects::nPixPtX = 0;
 long SwSelPaintRects::nPixPtY = 0;
 MapMode* SwSelPaintRects::pMapMode = 0;
 
-// -----  Starting from here: classes / methods for the non-text-cursor -----
-
+// Starting from here: classes / methods for the non-text-cursor
 SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell )
     : m_pCrsrShell( pCShell )
 {
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 1c419fe..f703847 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1618,14 +1618,15 @@ static bool lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void*  )
     return true;
 }
 
-/** Re-trigger spelling in the idle handler.
+/**
+ * Re-trigger spelling in the idle handler.
  *
  * @param bInvalid if <true>, the WrongLists in all nodes are invalidated
  *                 and the SpellInvalid flag is set on all pages.
  * @param bOnlyWrong controls whether only the areas with wrong words are
  *                   checked or the whole area.
  * @param bSmartTags ???
- ************************************************************************/
+ */
 void SwDoc::SpellItAgainSam( bool bInvalid, bool bOnlyWrong, bool bSmartTags )
 {
     std::set<SwRootFrm*> aAllLayouts = GetAllLayouts();
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 5aa68f1..0ef7fb7 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1303,8 +1303,6 @@ IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess()
 const IDocumentMarkAccess* SwDoc::getIDocumentMarkAccess() const
     { return static_cast< IDocumentMarkAccess* >(mpMarkManager.get()); }
 
-// SaveBookmark methods
-
 SaveBookmark::SaveBookmark(
     bool bSavePos,
     bool bSaveOtherPos,
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 58cff5c..f679b93 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -965,12 +965,12 @@ SwDrawFrmFmt* SwDoc::InsertDrawObj(
     return pFmt;
 }
 
-/* ---------------------------------------------------------------------------
-    paragraph frames - o.k. if the PaM includes the paragraph from the beginning
-                       to the beginning of the next paragraph at least
-    frames at character - o.k. if the PaM starts at least at the same position
-                         as the frame
- ---------------------------------------------------------------------------*/
+/*
+ * paragraph frames - o.k. if the PaM includes the paragraph from the beginning
+ *                    to the beginning of the next paragraph at least
+ * frames at character - o.k. if the PaM starts at least at the same position
+ *                      as the frame
+ */
 static bool lcl_TstFlyRange( const SwPaM* pPam, const SwPosition* pFlyPos,
                         RndStdIds nAnchorId )
 {
@@ -1763,8 +1763,7 @@ SwFlyFrmFmt* SwDoc::InsertDrawLabel(
     return pNewFmt;
 }
 
-// IDocumentTimerAccess methods ------------------------------------------
-
+// IDocumentTimerAccess methods
 void SwDoc::StartIdling()
 {
     mbStartIdleTimer = true;
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index 83d2b8a..1a4994c 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -202,8 +202,8 @@ bool SwDoc::_SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rEntry, sal_uInt
         rPam.DeleteMark();
     }
 
-    // ----- search the start
-    // --- look where a ruby attribute starts
+    // search the start
+    // look where a ruby attribute starts
     sal_uInt16 nHtIdx = USHRT_MAX;
     const SwpHints* pHts = pTNd->GetpSwpHints();
     const SwTxtAttr* pAttr = 0;
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index c16f576..2a04550 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -709,8 +709,7 @@ static const SwTxtNode* lcl_FindChapterNode( const SwNode& rNd, sal_uInt8 nLvl =
     return pNd ? pNd->FindOutlineNodeOfLevel( nLvl ) : 0;
 }
 
-// Table of contents class ------------------------------------------
-
+// Table of contents class
 SwTOXBaseSection::SwTOXBaseSection(SwTOXBase const& rBase, SwSectionFmt & rFmt)
     : SwTOXBase( rBase )
     , SwSection( TOX_CONTENT_SECTION, OUString(), rFmt )
diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx
index 71c7cee..4ccaf42 100644
--- a/sw/source/core/doc/list.cxx
+++ b/sw/source/core/doc/list.cxx
@@ -219,7 +219,6 @@ void SwListImpl::NotifyItemsOnListLevel( const int nLevel )
     }
 }
 
-// SwList ---------------------------------------------------------------------
 SwList::SwList( const OUString& sListId,
                 SwNumRule& rDefaultListStyle,
                 const SwNodes& rNodes )
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 71e0569..7584054 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -1291,19 +1291,19 @@ bool SwTable::SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt )
 }
 
 /*
-    ----------------------- >> MERGE << ------------------------
-     Algorithm:
-        If we only have one Line in the _FndBox, take this Line and test
-        the Box count:
-        - If we have more than one Box, we merge on Box level, meaning
-          the new Box will be as wide as the old ones.
-            - All Lines that are above/under the Area, are inserted into
-            the Box as Line + Box.
-            - All Lines that come before/after the Area, are inserted into
-              the Boxes Left/Right.
-
-    ----------------------- >> MERGE << ------------------------
-*/
+ * >> MERGE <<
+ * Algorithm:
+ *    If we only have one Line in the _FndBox, take this Line and test
+ *    the Box count:
+ * If we have more than one Box, we merge on Box level, meaning
+ *      the new Box will be as wide as the old ones.
+ * All Lines that are above/under the Area, are inserted into
+ *        the Box as Line + Box.
+ * All Lines that come before/after the Area, are inserted into
+ *          the Boxes Left/Right.
+ *
+ * >> MERGE <<
+ */
 static void lcl_CpyLines( sal_uInt16 nStt, sal_uInt16 nEnd,
                                 SwTableLines& rLines,
                                 SwTableBox* pInsBox,
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index c10acd5..a1473d2 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2303,10 +2303,6 @@ sal_uInt16 SwDoc::MergeTbl( SwPaM& rPam )
     return nRet;
 }
 
-/**
- * SwTableNode
- *
- */
 SwTableNode::SwTableNode( const SwNodeIndex& rIdx )
     : SwStartNode( rIdx, ND_TABLENODE )
 {
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 1cda015..a99dafd 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -896,8 +896,6 @@ SwEndNode::SwEndNode( SwNodes& rNds, sal_uLong nPos, SwStartNode& rSttNd )
     pStartOfSection->pEndOfSection = this;
 }
 
-// SwCntntNode
-
 SwCntntNode::SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
                             SwFmtColl *pColl )
     : SwModify( pColl ),     // CrsrsShell, FrameFmt,
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 4fea5d7..50ea9f6 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -189,8 +189,6 @@ OUString SwSectionData::CollapseWhiteSpaces(const OUString& sName)
     return aBuf.makeStringAndClear();
 }
 
-// SwSection ===========================================================
-
 SwSection::SwSection(
         SectionType const eType, OUString const& rName, SwSectionFmt & rFormat)
     : SwClient(& rFormat)
@@ -624,8 +622,6 @@ const SwTOXBase* SwSection::GetTOXBase() const
     return pRet;
 }
 
-// SwSectionFmt ========================================================
-
 SwSectionFmt::SwSectionFmt( SwSectionFmt* pDrvdFrm, SwDoc *pDoc )
     : SwFrmFmt( pDoc->GetAttrPool(), OUString(), pDrvdFrm )
 {
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 7abc1f8..16b5e87 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -164,8 +164,6 @@ bool IsMarqueeTextObj( const SdrObject& rObj )
          || SDRTEXTANI_ALTERNATE == eTKind || SDRTEXTANI_SLIDE == eTKind );
 }
 
-// SwContact
-
 SwContact::SwContact( SwFrmFmt *pToRegisterIn ) :
     SwClient( pToRegisterIn ),
     mbInDTOR( false )
@@ -391,8 +389,6 @@ sal_uInt32 SwContact::GetMaxOrdNum() const
     return nMaxOrdNum;
 }
 
-// SwFlyDrawContact
-
 SwFlyDrawContact::SwFlyDrawContact( SwFlyFrmFmt *pToRegisterIn, SdrModel * ) :
     SwContact( pToRegisterIn )
 {
@@ -2142,8 +2138,6 @@ sdr::contact::ViewContact* SwDrawVirtObj::CreateObjectSpecificViewContact()
     return new sdr::contact::VCOfDrawVirtObj(*this);
 }
 
-// SwDrawVirtObj
-
 SwDrawVirtObj::SwDrawVirtObj( SdrObject&        _rNewObj,
                               SwDrawContact&    _rDrawContact )
     : SdrVirtObj( _rNewObj ),
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 09b8acf..75307c1 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -89,8 +89,6 @@ static const SwFrm *lcl_FindAnchor( const SdrObject *pObj, bool bAll )
     return 0;
 }
 
-// SwDrawView
-
 SwDrawView::SwDrawView( SwViewImp &rI, SdrModel *pMd, OutputDevice *pOutDev) :
     FmFormView( (FmFormModel*)pMd, pOutDev ),
     rImp( rI )
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index bd5b88b..c39acfc 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -135,7 +135,6 @@ class SwAutoFormat
     bool m_bEmptyLine : 1;
     bool m_bMoreLines : 1;
 
-    // ------------- private methods -----------------------------
     CharClass& GetCharClass( LanguageType eLang ) const
     {
         if( !m_pCharClass || eLang != m_eCharClassLang )
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index 4dc1816..d1552ab 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -51,8 +51,6 @@ OUString removeControlChars(const OUString& sIn)
 
 }
 
-// SwChapterFieldType
-
 SwChapterFieldType::SwChapterFieldType()
     : SwFieldType( RES_CHAPTERFLD )
 {
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index 76d514e..0a1d8a6 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -632,8 +632,6 @@ SwFieldType* SwDBNumSetFieldType::Copy() const
     return pTmp;
 }
 
-// SwDBNumSetField
-
 SwDBNumSetField::SwDBNumSetField(SwDBNumSetFieldType* pTyp,
                                  const OUString& rCond,
                                  const OUString& rDBNum,
@@ -732,8 +730,6 @@ bool    SwDBNumSetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return bRet;
 }
 
-// SwDBNameFieldType
-
 SwDBNameFieldType::SwDBNameFieldType(SwDoc* pDocument)
     : SwFieldType( RES_DBNAMEFLD )
 {
@@ -784,8 +780,6 @@ bool SwDBNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return SwDBNameInfField::PutValue(rAny, nWhichId );
 }
 
-// SwDBSetNumberFieldType
-
 SwDBSetNumberFieldType::SwDBSetNumberFieldType()
     : SwFieldType( RES_DBSETNUMBERFLD )
 {
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 2ba6e71..7ae5179 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -101,8 +101,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace nsSwDocInfoSubType;
 
-// SwPageNumberFieldType
-
 SwPageNumberFieldType::SwPageNumberFieldType()
     : SwFieldType( RES_PAGENUMBERFLD ),
     nNumberingType( SVX_NUM_ARABIC ),
@@ -170,8 +168,6 @@ void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc,
     }
 }
 
-// SwPageNumberField
-
 SwPageNumberField::SwPageNumberField(SwPageNumberFieldType* pTyp,
           sal_uInt16 nSub, sal_uInt32 nFmt, short nOff,
           sal_uInt16 const nPageNumber, sal_uInt16 const nMaxPage)
@@ -314,7 +310,6 @@ bool SwPageNumberField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     }
     return bRet;
 }
-// SwAuthorFieldType
 
 SwAuthorFieldType::SwAuthorFieldType()
     : SwFieldType( RES_AUTHORFLD )
@@ -335,8 +330,6 @@ SwFieldType* SwAuthorFieldType::Copy() const
     return new SwAuthorFieldType;
 }
 
-// SwAuthorField
-
 SwAuthorField::SwAuthorField(SwAuthorFieldType* pTyp, sal_uInt32 nFmt)
     : SwField(pTyp, nFmt)
 {
@@ -410,8 +403,6 @@ bool SwAuthorField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return true;
 }
 
-// SwFileNameFieldType
-
 SwFileNameFieldType::SwFileNameFieldType(SwDoc *pDocument)
     : SwFieldType( RES_FILENAMEFLD )
 {
@@ -476,8 +467,6 @@ SwFieldType* SwFileNameFieldType::Copy() const
     return pTmp;
 }
 
-// SwFileNameField
-
 SwFileNameField::SwFileNameField(SwFileNameFieldType* pTyp, sal_uInt32 nFmt)
     : SwField(pTyp, nFmt)
 {
@@ -589,8 +578,6 @@ bool SwFileNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return true;
 }
 
-// SwTemplNameFieldType
-
 SwTemplNameFieldType::SwTemplNameFieldType(SwDoc *pDocument)
     : SwFieldType( RES_TEMPLNAMEFLD )
 {
@@ -653,7 +640,6 @@ SwFieldType* SwTemplNameFieldType::Copy() const
     SwFieldType *pTmp = new SwTemplNameFieldType(pDoc);
     return pTmp;
 }
-// SwTemplNameField
 
 SwTemplNameField::SwTemplNameField(SwTemplNameFieldType* pTyp, sal_uInt32 nFmt)
     : SwField(pTyp, nFmt)
@@ -735,8 +721,6 @@ bool SwTemplNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return true;
 }
 
-// SwDocStatFieldType
-
 SwDocStatFieldType::SwDocStatFieldType(SwDoc* pDocument)
     : SwFieldType( RES_DOCSTATFLD ), nNumberingType( SVX_NUM_ARABIC )
 {
@@ -1281,8 +1265,6 @@ bool SwDocInfoField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
     return true;
 }
 
-// SwHiddenTxtFieldType
-
 SwHiddenTxtFieldType::SwHiddenTxtFieldType( bool bSetHidden )
     : SwFieldType( RES_HIDDENTXTFLD ), bHidden( bSetHidden )
 {
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index c0ec660..2d94ddf 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -2283,9 +2283,6 @@ static bool lcl_IsLineOfTblFrm( const SwTabFrm& rTable, const SwFrm& rChk )
     return &rTable == pTblFrm;
 }
 
-/*
- * lcl_UpdateRepeatedHeadlines
- */
 static void lcl_UpdateRepeatedHeadlines( SwTabFrm& rTabFrm, bool bCalcLowers )
 {
     OSL_ENSURE( rTabFrm.IsFollow(), "lcl_UpdateRepeatedHeadlines called for non-follow tab" );
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index 310aea7..771b1b1 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -43,8 +43,6 @@ using namespace ::com::sun::star;
 TYPEINIT1_AUTOFACTORY(SwCropGrf, SfxPoolItem)
 TYPEINIT1_AUTOFACTORY(SwGammaGrf, SfxPoolItem)
 
-// SwMirrorGrf
-
 SfxPoolItem* SwMirrorGrf::Clone( SfxItemPool* ) const
 {
     return new SwMirrorGrf( *this );
@@ -149,8 +147,6 @@ bool SwMirrorGrf::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-// SwCropGrf
-
 SwCropGrf::SwCropGrf()
     : SvxGrfCrop( RES_GRFATR_CROPGRF )
 {}
@@ -164,8 +160,6 @@ SfxPoolItem* SwCropGrf::Clone( SfxItemPool* ) const
     return new SwCropGrf( *this );
 }
 
-// SwRotationGrf
-
 SfxPoolItem* SwRotationGrf::Clone( SfxItemPool * ) const
 {
     return new SwRotationGrf( GetValue(), aUnrotatedSize );
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index 39082b1..fcf5c11 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -31,7 +31,7 @@ class SdrObjGroup;
 class SdrUndoAction;
 class SwDrawFrmFmt;
 
-// ----------- Undo for Draw Objects ---------------------------------
+// Undo for Draw Objects
 class SwSdrUndo : public SwUndo
 {
     SdrUndoAction* pSdrUndo;
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index b794164..d6a6737 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -21,7 +21,7 @@
 
 #include <tools/solar.h>
 
-/* --------------------------------------------------
+/*
  * Die Klasse SwNode2Layout stellt die Verbindung von Nodes zum Layout her.
  * Sie liefert einen intelligenten Iterator ueber die zum Node oder Nodebereich
  * gehoerenden Frames. Je nach Zweck der Iteration, z.B. um vor oder hinter
@@ -41,7 +41,7 @@
  *    die Frames gehaengt werden koennen.
  * 2. Die Lieferung der Frames hinter/vor die die neuen Frames eines Nodes
  *    gehaengt werden muessen, ebenfalls von MakeFrms gerufen.
- * --------------------------------------------------*/
+ */
 
 class SwNode2LayImpl;
 class SwFrm;
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index 59ee171..32a4719 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -49,8 +49,7 @@ bool GoPrevious(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode );
 SW_DLLPUBLIC SwCntntNode* GoNextNds( SwNodeIndex * pIdx, bool );
 SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, bool );
 
-// --------- Funktionsdefinitionen fuer die SwCrsrShell --------------
-
+// Funktionsdefinitionen fuer die SwCrsrShell
 bool GoPrevPara( SwPaM&, SwPosPara);
 bool GoCurrPara( SwPaM&, SwPosPara);
 bool GoNextPara( SwPaM&, SwPosPara);
@@ -58,8 +57,7 @@ bool GoPrevSection( SwPaM&, SwPosSection);
 bool GoCurrSection( SwPaM&, SwPosSection);
 bool GoNextSection( SwPaM&, SwPosSection);
 
-// ------------ Typedefiniton fuer Funktionen ----------------------
-
+// Typedefiniton fuer Funktionen
 typedef bool (*GoNd)( SwNode*, SwIndex*, sal_uInt16 );
 typedef SwCntntNode* (*GoNds)( SwNodeIndex*, bool );
 typedef void (*GoDoc)( SwPosition* );
@@ -82,7 +80,7 @@ struct SwMoveFnCollection
     MvSection fnSection;
 };
 
-// --------- Funktionsdefinitionen fuers Suchen --------------
+// Funktionsdefinitionen fuers Suchen
 SwCntntNode* GetNode( SwPaM&, bool&, SwMoveFn, bool bInReadOnly = false );
 
 #endif
diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
index 7b72f99..4146d8f 100644
--- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
@@ -53,7 +53,6 @@ namespace objectpositioning
             // the needed type
             SwTxtFrm&       GetAnchorTxtFrm() const;
 
-        // *********************************************************************
             /** determine frame for horizontal position
 
                 if the given proposed frame is a content frame, the proposed
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index 31f396c..53dda8b 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -115,10 +115,7 @@ public:
     inline bool IsNumeric( const OUString& rStr ) const;
 };
 
-/*--------------------------------------------------------------------
-     Beschreibung: Klassen fuer die Sortierung der Verzeichnisse
- --------------------------------------------------------------------*/
-
+// Beschreibung: Klassen fuer die Sortierung der Verzeichnisse
 struct SwTOXSortTabBase
 {
     SwTOXSources aTOXSources;
@@ -175,10 +172,7 @@ inline const ::com::sun::star::lang::Locale& SwTOXSortTabBase::GetLocale() const
     return aLocale;
 }
 
-/*--------------------------------------------------------------------
-     Beschreibung: fuer Sortierung nach Text
- --------------------------------------------------------------------*/
-
+// Beschreibung: fuer Sortierung nach Text
 struct SwTOXIndex : public SwTOXSortTabBase
 {
     SwTOXIndex( const SwTxtNode&, const SwTxtTOXMark*, sal_uInt16 nOptions, sal_uInt8 nKeyLevel,
@@ -215,10 +209,7 @@ private:
     sal_uInt16  nLev;
 };
 
-/*--------------------------------------------------------------------
-     Beschreibung: fuer Sortierung nach Position
- --------------------------------------------------------------------*/
-
+// Beschreibung: fuer Sortierung nach Position
 struct SwTOXContent : public SwTOXSortTabBase
 {
     SwTOXContent( const SwTxtNode&, const SwTxtTOXMark*,
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index a6fab3f..cb42214 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -186,8 +186,6 @@ bool SwObjPosOscillationControl::OscillationDetected()
     return bOscillationDetected;
 }
 
-// class <SwAnchoredDrawObject>
-
 TYPEINIT1(SwAnchoredDrawObject,SwAnchoredObject);
 
 SwAnchoredDrawObject::SwAnchoredDrawObject() :
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index b4a0cd8..7ab974c 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -62,8 +62,6 @@ SwObjPositioningInProgress::~SwObjPositioningInProgress()
     }
 }
 
-// SwAnchoredObject
-
 TYPEINIT0(SwAnchoredObject);
 
 SwAnchoredObject::SwAnchoredObject() :
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 583ccc7..aa40d45 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -171,9 +171,7 @@ void DelHFFormat( SwClient *pToRemove, SwFrmFmt *pFmt )
     }
 }
 
-//  class SwFmtFrmSize
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 SwFmtFrmSize::SwFmtFrmSize( SwFrmSize eSize, SwTwips nWidth, SwTwips nHeight )
     : SfxPoolItem( RES_FRM_SIZE ),
     m_aSize( nWidth, nHeight ),
@@ -419,13 +417,10 @@ bool SwFmtFrmSize::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-//  class SwFmtFillOrder
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 SwFmtFillOrder::SwFmtFillOrder( SwFillOrder nFO )
     : SfxEnumItem( RES_FILL_ORDER, sal_uInt16(nFO) )
 {}
-
 SfxPoolItem*  SwFmtFillOrder::Clone( SfxItemPool* ) const
 {
     return new SwFmtFillOrder( GetFillOrder() );
@@ -436,9 +431,7 @@ sal_uInt16  SwFmtFillOrder::GetValueCount() const
     return SW_FILL_ORDER_END - SW_FILL_ORDER_BEGIN;
 }
 
-//  class SwFmtHeader
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 SwFmtHeader::SwFmtHeader( SwFrmFmt *pHeaderFmt )
     : SfxPoolItem( RES_HEADER ),
     SwClient( pHeaderFmt ),
@@ -483,9 +476,7 @@ void SwFmtHeader::RegisterToFormat( SwFmt& rFmt )
     rFmt.Add(this);
 }
 
-//  class SwFmtFooter
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 SwFmtFooter::SwFmtFooter( SwFrmFmt *pFooterFmt )
     : SfxPoolItem( RES_FOOTER ),
     SwClient( pFooterFmt ),
@@ -530,9 +521,7 @@ SfxPoolItem*  SwFmtFooter::Clone( SfxItemPool* ) const
     return new SwFmtFooter( *this );
 }
 
-//  class SwFmtCntnt
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 SwFmtCntnt::SwFmtCntnt( const SwFmtCntnt &rCpy )
     : SfxPoolItem( RES_CNTNT )
 {
@@ -572,9 +561,7 @@ SfxPoolItem*  SwFmtCntnt::Clone( SfxItemPool* ) const
     return new SwFmtCntnt( *this );
 }
 
-//  class SwFmtPageDesc
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 SwFmtPageDesc::SwFmtPageDesc( const SwFmtPageDesc &rCpy )
     : SfxPoolItem( RES_PAGEDESC ),
     SwClient( (SwPageDesc*)rCpy.GetPageDesc() ),
@@ -1105,9 +1092,7 @@ bool SwFmtCol::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-//  class SwFmtSurround
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 SwFmtSurround::SwFmtSurround( SwSurround eFly ) :
     SfxEnumItem( RES_SURROUND, sal_uInt16( eFly ) )
 {
@@ -1241,9 +1226,7 @@ SfxPoolItem* SwFmtVertOrient::Create(SvStream &rStream, sal_uInt16 /*itemVersion
     return new SwFmtVertOrient(yPos, orient, relation);
 }
 
-//  class SwFmtVertOrient
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, sal_Int16 eVert,
                                   sal_Int16 eRel )
     : SfxPoolItem( RES_VERT_ORIENT ),
@@ -1325,9 +1308,7 @@ bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-//  class SwFmtHoriOrient
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori,
                               sal_Int16 eRel, bool bPos )
     : SfxPoolItem( RES_HORI_ORIENT ),
@@ -1421,9 +1402,7 @@ bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-//  class SwFmtAnchor
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 SwFmtAnchor::SwFmtAnchor( RndStdIds nRnd, sal_uInt16 nPage )
     : SfxPoolItem( RES_ANCHOR ),
     nAnchorId( nRnd ),
@@ -1628,9 +1607,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-//  class SwFmtURL
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 SwFmtURL::SwFmtURL() :
     SfxPoolItem( RES_URL ),
     pMap( 0 ),
@@ -1788,29 +1765,21 @@ bool SwFmtURL::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-// class SwFmtEditInReadonly
-
 SfxPoolItem* SwFmtEditInReadonly::Clone( SfxItemPool* ) const
 {
     return new SwFmtEditInReadonly( Which(), GetValue() );
 }
 
-// class SwFmtLayoutSplit
-
 SfxPoolItem* SwFmtLayoutSplit::Clone( SfxItemPool* ) const
 {
     return new SwFmtLayoutSplit( GetValue() );
 }
 
-// class SwFmtRowSplit
-
 SfxPoolItem* SwFmtRowSplit::Clone( SfxItemPool* ) const
 {
     return new SwFmtRowSplit( GetValue() );
 }
 
-// class SwFmtNoBalancedColumns
-
 SfxPoolItem* SwFmtNoBalancedColumns::Clone( SfxItemPool* ) const
 {
     return new SwFmtNoBalancedColumns( GetValue() );
@@ -2032,8 +2001,6 @@ bool SwFmtChain::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return bRet;
 }
 
-//class SwFmtLineNumber
-
 SwFmtLineNumber::SwFmtLineNumber() :
     SfxPoolItem( RES_LINENUMBER )
 {
@@ -2107,8 +2074,6 @@ bool SwFmtLineNumber::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-// class SwTextGridItem
-
 SwTextGridItem::SwTextGridItem()
     : SfxPoolItem( RES_TEXTGRID ), m_aColor( COL_LIGHTGRAY ), m_nLines( 20 )
     , m_nBaseHeight( 400 ), m_nRubyHeight( 200 ), m_eGridType( GRID_NONE )
@@ -2398,16 +2363,12 @@ void SwTextGridItem::Init()
     }
 }
 
-// class SwHeaderAndFooterEatSpacingItem
-
 SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const
 {
     return new SwHeaderAndFooterEatSpacingItem( Which(), GetValue() );
 }
 
-//  class SwFrmFmt
-//  Partially implemented inline in hxx
-
+// Partially implemented inline in hxx
 TYPEINIT1( SwFrmFmt, SwFmt );
 IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrmFmt )
 
diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx
index 348789a..5400d14 100644
--- a/sw/source/core/layout/calcmove.cxx
+++ b/sw/source/core/layout/calcmove.cxx
@@ -1564,7 +1564,7 @@ void SwCntntFrm::MakeAll()
                     bFitPromise = true;
                     continue;
                 }
-                /* --------------------------------------------------
+                /*
                  * In earlier days, we never tried to fit TextFrms in
                  * frames and sections using bMoveOrFit by ignoring
                  * its attributes (Widows, Keep).
@@ -1572,7 +1572,7 @@ void SwCntntFrm::MakeAll()
                  * as it must be tried anyway with linked frames and sections.
                  * Exception: If we sit in FormatWidthCols, we must not ignore
                  * the attributes.
-                 * --------------------------------------------------*/
+                 */
                 else if ( !bFtn && bMoveable &&
                       ( !bFly || !FindFlyFrm()->IsColLocked() ) &&
                       ( !bSct || !FindSctFrm()->IsColLocked() ) )
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 5c56308..64b70f6 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -25,7 +25,7 @@
  * The PROTOCOL macros allow you to log events in frame methods. In places where
  * logging is useful either one of the PROTOCOL(...) or PROTOCOL_ENTER(...) can
  * be used. PROTOCOL_ENTER(...) additionally logs the leaving of a method.
-
+ *
  * The PROTOCOL macros accept the following parameters:
  * 1.   A pointer to an SwFrm (usually "this" or "rThis")
  * 2.   The function group i.e. PROT_MAKEALL. This is used to decide (inline)
@@ -82,7 +82,6 @@
  *      listed; default is 0 which means that none are logged. It's also
  *      possible to remove functions using '!'.
  *      An example INI file:
- *      ------------------------------------------
  *           #Functions: all, except PRTARE
  *           [record] 0xFFFFFFFE !0x200
  *           [frmid]
@@ -90,7 +89,6 @@
  *           1 2 12 13 14 15
  *           #no layout frames, except ColumnFrms
  *           [frmtype] !0x3FFF 0x4
- *      ------------------------------------------
  *
  * As soon as the logging is in process, one can manipulate many things in
  * SwImplProtocol::_Record(...) using a debugger, especially concerning
@@ -100,7 +98,6 @@
 #include "dbg_lay.hxx"
 
 #include <stdio.h>
-
 #include "flyfrm.hxx"
 #include "txtfrm.hxx"
 #include <fntcache.hxx>
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index 72896f3..a1c29b5 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -38,9 +38,6 @@
 using namespace ::com::sun::star;
 using namespace objectpositioning;
 
-// **************************************************************************
-// constructor, destructor, initialization
-// **************************************************************************
 SwAnchoredObjectPosition::SwAnchoredObjectPosition( SdrObject& _rDrawObj )
     : mrDrawObj( _rDrawObj ),
       mbIsObjFly( false ),
@@ -838,10 +835,8 @@ SwTwips SwAnchoredObjectPosition::_CalcRelPosX(
     return nRelPosX;
 }
 
-// **************************************************************************
 // method incl. helper methods for adjusting proposed horizontal position,
 // if object has to draw aside another object.
-// **************************************************************************
 /** adjust calculated horizontal position in order to draw object
     aside other objects with same positioning
 */
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 81528f2..99d77d0 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -135,8 +135,6 @@ void SAL_CALL SwOLEListener_Impl::disposing( const lang::EventObject& ) throw (u
         pOLELRU_Cache->RemoveObj( *mpObj );
 }
 
-// SwEmbedObjectLink
-
 // TODO/LATER: actually SwEmbedObjectLink should be used here, but because different objects are used to control
 //             embedded object different link objects with the same functionality had to be implemented
 
@@ -205,8 +203,6 @@ void SwEmbedObjectLink::Closed()
     SvBaseLink::Closed();
 }
 
-// SwOLENode
-
 SwOLENode::SwOLENode( const SwNodeIndex &rWhere,
                     const svt::EmbeddedObjectRef& xObj,
                     SwGrfFmtColl *pGrfColl,
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index 88ec540..028d3e8 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -206,18 +206,11 @@ bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-/**
- * SwRegisterItem
- */
-
 SfxPoolItem* SwRegisterItem::Clone( SfxItemPool * ) const
 {
     return new SwRegisterItem( *this );
 }
 
-/**
- * SwNumRuleItem
- */
 SfxPoolItem* SwNumRuleItem::Clone( SfxItemPool * ) const
 {
     return new SwNumRuleItem( *this );
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index e3afa6c..c3a7ce4 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -99,8 +99,6 @@ public:
     void setDummyFlag( bool bDummy ) { mbDummyFlag = bDummy; }
 };
 
-// ----------- Inlines -----------------------------
-
 inline const Color* SwTableBox::GetSaveUserColor() const
 {
     return pImpl ? pImpl->GetSaveUserColor() : 0;
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index ac3afd1..12e3e528 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -230,9 +230,7 @@ SwLinePortion *SwTxtFormatter::Underflow( SwTxtFormatInfo &rInf )
 //        }
 //    }
 
-    /*--------------------------------------------------
-     * Snapshot
-     * --------------------------------------------------*/
+    // Snapshot
     if ( pPor==rInf.GetLast() )
     {
         // We end up here, if the portion triggering the under-flow
@@ -242,9 +240,7 @@ SwLinePortion *SwTxtFormatter::Underflow( SwTxtFormatInfo &rInf )
         pPor->Truncate();
         return pPor; // Is that enough?
     }
-    /*---------------------------------------------------
-     * End the snapshot
-     * --------------------------------------------------*/
+    // End the snapshot
 
     // X + Width == 0 with SoftHyph > Line?!
     if( !pPor || !(rInf.X() + pPor->Width()) )
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 5c946a7..0a068f6 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -1046,9 +1046,7 @@ void SwTxtFrm::StopAnimation( OutputDevice* pOut )
     }
 }
 
-// SwCombinedPortion::SwCombinedPortion(..)
 // initializes the script array and clears the width array
-
 SwCombinedPortion::SwCombinedPortion( const OUString &rTxt )
     : SwFldPortion( rTxt )
     , nUpPos(0)
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index abcfc80..b683ada 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -130,10 +130,6 @@ static SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId)
 
 TYPEINIT2( SwTOXMark, SfxPoolItem, SwClient );    // fuers rtti
 
-/*--------------------------------------------------------------------
-     TOX dtor and ctor
- --------------------------------------------------------------------*/
-
 /// pool default constructor
 SwTOXMark::SwTOXMark()
     : SfxPoolItem( RES_TXTATR_TOXMARK )
@@ -239,10 +235,7 @@ void SwTOXMark::InsertTOXMarks( SwTOXMarks& aMarks, const SwTOXType& rType )
     }
 }
 
-/*--------------------------------------------------------------------
-  Manage types of TOX
- --------------------------------------------------------------------*/
-
+// Manage types of TOX
 SwTOXType::SwTOXType( TOXTypes eTyp, const OUString& rName )
     : SwModify(0),
     aName(rName),
@@ -257,10 +250,7 @@ SwTOXType::SwTOXType(const SwTOXType& rCopy)
 {
 }
 
-/*--------------------------------------------------------------------
-    Edit forms
-  --------------------------------------------------------------------*/
-
+// Edit forms
 SwForm::SwForm( TOXTypes eTyp ) // #i21237#
     : eType( eTyp ), nFormMaxLevel( SwForm::GetFormMaxLevel( eTyp )),
 //  nFirstTabPos( lNumIndent ),
@@ -466,10 +456,6 @@ OUString SwForm::GetFormChapterMark() {return OUString("<C>");}
 OUString SwForm::GetFormText()        {return OUString("<X>");}
 OUString SwForm::GetFormAuth()        {return OUString("<A>");}
 
-/*--------------------------------------------------------------------
-  Ctor TOXBase
- --------------------------------------------------------------------*/
-
 SwTOXBase::SwTOXBase(const SwTOXType* pTyp, const SwForm& rForm,
                      sal_uInt16 nCreaType, const OUString& rTitle )
     : SwClient((SwModify*)pTyp)
@@ -557,10 +543,7 @@ SwTOXBase& SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource )
     return *this;
 }
 
-/*--------------------------------------------------------------------
-  TOX specific functions
- --------------------------------------------------------------------*/
-
+// TOX specific functions
 SwTOXBase::~SwTOXBase()
 {
 //    if( GetTOXType()->GetType() == TOX_USER  )
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index a26f4bb..8073668 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -47,10 +47,8 @@ extern bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-/*--------------------------------------------------------------------
-  Initialize strings
- --------------------------------------------------------------------*/
 
+// Initialize strings
 sal_uInt16 SwTOXSortTabBase::nOpt = 0;
 
 SwTOXInternational::SwTOXInternational( LanguageType nLang, sal_uInt16 nOpt,
@@ -129,10 +127,7 @@ OUString SwTOXInternational::GetFollowingText( bool bMorePages ) const
     return pIndexWrapper->GetFollowingText( bMorePages );
 }
 
-/*--------------------------------------------------------------------
-  SortElement for TOX entries
- --------------------------------------------------------------------*/
-
+// SortElement for TOX entries
 SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd,
                                     const SwTxtTOXMark* pMark,
                                     const SwTOXInternational* pInter,
@@ -268,10 +263,7 @@ bool SwTOXSortTabBase::operator<( const SwTOXSortTabBase& rCmp )
     return false;
 }
 
-/*--------------------------------------------------------------------
-   Sorted keyword entry
- --------------------------------------------------------------------*/
-
+// Sorted keyword entry
 SwTOXIndex::SwTOXIndex( const SwTxtNode& rNd,
                         const SwTxtTOXMark* pMark, sal_uInt16 nOptions,
                         sal_uInt8 nKyLevel,
@@ -408,10 +400,7 @@ sal_uInt16 SwTOXIndex::GetLevel() const
     return nForm;
 }
 
-/*--------------------------------------------------------------------
-  Key and separator
- --------------------------------------------------------------------*/
-
+// Key and separator
 SwTOXCustom::SwTOXCustom(const TextAndReading& rKey,
                          sal_uInt16 nLevel,
                          const SwTOXInternational& rIntl,
@@ -445,10 +434,7 @@ TextAndReading SwTOXCustom::GetText_Impl() const
     return m_aKey;
 }
 
-/*--------------------------------------------------------------------
-   Sorts the TOX entries
- --------------------------------------------------------------------*/
-
+// Sorts the TOX entries
 SwTOXContent::SwTOXContent( const SwTxtNode& rNd, const SwTxtTOXMark* pMark,
                         const SwTOXInternational& rIntl)
     : SwTOXSortTabBase( TOX_SORT_CONTENT, &rNd, pMark, &rIntl )
@@ -492,12 +478,9 @@ sal_uInt16 SwTOXContent::GetLevel() const
     return pTxtMark->GetTOXMark().GetLevel();
 }
 
-/*--------------------------------------------------------------------
-   TOX assembled from paragraphs
-   Watch out for OLE/graphics when sorting!
-   The position must not come from the document, but from the "anchor"!
- --------------------------------------------------------------------*/
-
+// TOX assembled from paragraphs
+// Watch out for OLE/graphics when sorting!
+// The position must not come from the document, but from the "anchor"!
 SwTOXPara::SwTOXPara( const SwCntntNode& rNd, SwTOXElement eT, sal_uInt16 nLevel, const OUString& sSeqName )
     : SwTOXSortTabBase( TOX_SORT_PARA, &rNd, 0, 0 ),
     eType( eT ),
@@ -628,10 +611,7 @@ OUString SwTOXPara::GetURL() const
     return aTxt;
 }
 
-/*--------------------------------------------------------------------
-  Table
- --------------------------------------------------------------------*/
-
+// Table
 SwTOXTable::SwTOXTable( const SwCntntNode& rNd )
     : SwTOXSortTabBase( TOX_SORT_TABLE, &rNd, 0, 0 ),
     nLevel(FORM_ALPHA_DELIMITTER)
diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx
index f56b196..5379f79 100644
--- a/sw/source/core/txtnode/SwGrammarContact.cxx
+++ b/sw/source/core/txtnode/SwGrammarContact.cxx
@@ -27,18 +27,17 @@
 #include <rootfrm.hxx>
 #include <viewsh.hxx>
 
-/* SwGrammarContact
-    This class is responsible for the delayed display of grammar checks when a paragraph is edited
-    It's a client of the paragraph the cursor points to.
-    If the cursor position changes, updateCursorPosition has to be called
-    If the grammar checker wants to set a grammar marker at a paragraph, he has to request
-    the grammar list from this class. If the requested paragraph is not edited, it returns
-    the normal grammar list. But if the paragraph is the active one, a proxy list will be returned and
-    all changes are set in this proxy list. If the cursor leaves the paragraph the proxy list
-    will replace the old list. If the grammar checker has completed the paragraph ('setChecked')
-    then a timer is setup which replaces the old list as well.
-*/
-
+/*
+ * This class is responsible for the delayed display of grammar checks when a paragraph is edited
+ * It's a client of the paragraph the cursor points to.
+ * If the cursor position changes, updateCursorPosition has to be called
+ * If the grammar checker wants to set a grammar marker at a paragraph, he has to request
+ * the grammar list from this class. If the requested paragraph is not edited, it returns
+ * the normal grammar list. But if the paragraph is the active one, a proxy list will be returned and
+ * all changes are set in this proxy list. If the cursor leaves the paragraph the proxy list
+ * will replace the old list. If the grammar checker has completed the paragraph ('setChecked')
+ * then a timer is setup which replaces the old list as well.
+ */
 class SwGrammarContact : public IGrammarContact, public SwClient
 {
     Timer aTimer;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index cf0e1c9..2ae4530 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -185,8 +185,6 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
     } while( true );
 }
 
-// SwTxtNode
-
 SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere,
                       SwTxtFmtColl *pTxtColl,
                       const SfxItemSet* pAutoAttr )
diff --git a/sw/source/core/uibase/app/docshini.cxx b/sw/source/core/uibase/app/docshini.cxx
index 9f06c23..39c10b8 100644
--- a/sw/source/core/uibase/app/docshini.cxx
+++ b/sw/source/core/uibase/app/docshini.cxx
@@ -392,7 +392,6 @@ void  SwDocShell::Init_Impl()
     SetMapUnit( MAP_TWIP );
 }
 
-// AddLink
 void SwDocShell::AddLink()
 {
     if( !pDoc )
@@ -431,7 +430,6 @@ void SwDocShell::UpdateFontList()
     }
 }
 
-// RemoveLink
 void SwDocShell::RemoveLink()
 {
     // disconnect Uno-Object
diff --git a/sw/source/core/uibase/app/docst.cxx b/sw/source/core/uibase/app/docst.cxx
index 75e38c6..36e29fc 100644
--- a/sw/source/core/uibase/app/docst.cxx
+++ b/sw/source/core/uibase/app/docst.cxx
@@ -829,7 +829,6 @@ sal_uInt16 SwDocShell::Edit(
     return nRet;
 }
 
-// Delete
 sal_uInt16 SwDocShell::Delete(const OUString &rName, sal_uInt16 nFamily)
 {
     SfxStyleSheetBase *pStyle = mxBasePool->Find(rName, (SfxStyleFamily)nFamily);
@@ -1217,13 +1216,12 @@ void  SwDocShell::LoadStyles( SfxObjectShell& rSource )
 {
     _LoadStyles(rSource, false);
 }
-/* --------------------------------------------------
-    bPreserveCurrentDocument determines whether SetFixFields() is called
-    This call modifies the source document. This mustn't happen when the source
-    is a document the user is working on.
-    Calls of ::LoadStyles() normally use files especially loaded for the purpose
-    of importing styles.
- --------------------------------------------------*/
+
+// bPreserveCurrentDocument determines whether SetFixFields() is called
+// This call modifies the source document. This mustn't happen when the source
+// is a document the user is working on.
+// Calls of ::LoadStyles() normally use files especially loaded for the purpose
+// of importing styles.
 void SwDocShell::_LoadStyles( SfxObjectShell& rSource, bool bPreserveCurrentDocument )
 {
 /*  [Description]
diff --git a/sw/source/core/uibase/app/docstyle.cxx b/sw/source/core/uibase/app/docstyle.cxx
index 848649c..4a6d686 100644
--- a/sw/source/core/uibase/app/docstyle.cxx
+++ b/sw/source/core/uibase/app/docstyle.cxx
@@ -403,7 +403,6 @@ SwDocStyleSheet::SwDocStyleSheet( const SwDocStyleSheet& rOrg) :
 {
 }
 
-// Reset
 void  SwDocStyleSheet::Reset()
 {
     aName = "";
diff --git a/sw/source/core/uibase/config/cfgitems.cxx b/sw/source/core/uibase/config/cfgitems.cxx
index a834edb..c9a64b1 100644
--- a/sw/source/core/uibase/config/cfgitems.cxx
+++ b/sw/source/core/uibase/config/cfgitems.cxx
@@ -50,9 +50,7 @@ SwDocDisplayItem::SwDocDisplayItem( sal_uInt16 _nWhich ) :
 
 };
 
-/*-------------------------------------------------------------------
-    Item for the Settings dialog, page document view
---------------------------------------------------------------------*/
+// Item for the Settings dialog, page document view
 SwDocDisplayItem::SwDocDisplayItem( const SwDocDisplayItem& rDocDisplayItem ):
             SfxPoolItem(rDocDisplayItem)
 {
@@ -225,26 +223,20 @@ void SwElemItem::FillViewOptions( SwViewOption& rVOpt) const
     rVOpt.SetPostIts    (bNotes             );
 }
 
-/*--------------------------------------------------------------------
-    Description: CopyCTOR
- --------------------------------------------------------------------*/
+// CopyCTOR
 SwAddPrinterItem::SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem ):
             SfxPoolItem(rAddPrinterItem),
             SwPrintData( rAddPrinterItem )
 {
 }
 
-/*--------------------------------------------------------------------
-    Description: CTOR for empty Item
- --------------------------------------------------------------------*/
+// CTOR for empty Item
 SwAddPrinterItem::SwAddPrinterItem( sal_uInt16 _nWhich):
                 SfxPoolItem(_nWhich)
 {
 }
 
-/*--------------------------------------------------------------------
-    Description: CTOR from SwPrintOptions
- --------------------------------------------------------------------*/
+// CTOR from SwPrintOptions
 SwAddPrinterItem::SwAddPrinterItem( sal_uInt16 _nWhich, const SwPrintData& rPrtData ) :
     SfxPoolItem(_nWhich)
 {
@@ -265,9 +257,7 @@ bool SwAddPrinterItem::operator==( const SfxPoolItem& rAttr ) const
     return  SwPrintData::operator==(rItem);
 }
 
-/*--------------------------------------------------
- Item for Settings dialog, ShadowCursorPage
---------------------------------------------------*/
+// Item for Settings dialog, ShadowCursorPage
 SwShadowCursorItem::SwShadowCursorItem( sal_uInt16 _nWhich )
     : SfxPoolItem( _nWhich ),
     eMode( FILL_TAB )
diff --git a/sw/source/core/uibase/config/dbconfig.cxx b/sw/source/core/uibase/config/dbconfig.cxx
index 19f802d..cad668f 100644
--- a/sw/source/core/uibase/config/dbconfig.cxx
+++ b/sw/source/core/uibase/config/dbconfig.cxx
@@ -28,10 +28,6 @@
 using namespace utl;
 using namespace com::sun::star::uno;
 
-/*--------------------------------------------------------------------
-     Description: Ctor
- --------------------------------------------------------------------*/
-
 const Sequence<OUString>& SwDBConfig::GetPropertyNames()
 {
     static Sequence<OUString> aNames;
diff --git a/sw/source/core/uibase/config/prtopt.cxx b/sw/source/core/uibase/config/prtopt.cxx
index eb969bd..2b2a648 100644
--- a/sw/source/core/uibase/config/prtopt.cxx
+++ b/sw/source/core/uibase/config/prtopt.cxx
@@ -28,10 +28,7 @@
 using namespace utl;
 using namespace com::sun::star::uno;
 
-/*--------------------------------------------------------------------
-     Description: Ctor
- --------------------------------------------------------------------*/
-
+// Ctor
 Sequence<OUString> SwPrintOptions::GetPropertyNames()
 {
     static const char* aPropNames[] =
diff --git a/sw/source/core/uibase/config/uinums.cxx b/sw/source/core/uibase/config/uinums.cxx
index ba78c55..f6ea5cf 100644
--- a/sw/source/core/uibase/config/uinums.cxx
+++ b/sw/source/core/uibase/config/uinums.cxx
@@ -47,14 +47,12 @@ using namespace ::com::sun::star;
 
 #define CHAPTER_FILENAME "chapter.cfg"
 
-// SwNumRulesWithName ----------------------------------------------------
-// PUBLIC METHODES -------------------------------------------------------
-/*------------------------------------------------------------------------
+/*
  Description:   Saving a rule
  Parameter:     rCopy -- the rule to save
                     nIdx -- position, where the rule is to be saved.
                         An old rule at that position will be overwritten.
-------------------------------------------------------------------------*/
+*/
 
 SwBaseNumRules::SwBaseNumRules( const OUString& rFileName )
     :

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list