Remove ASCII art and useless comments from sw module

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

34 files changed, 82 insertions, 370 deletions

diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx
index 496f03b9c211..4c76292bc3cb 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 50cbdcbd46da..dac4b6549eb3 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 86e70a05da7e..ee67ba04ec8a 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 e7f63e7461d9..e2b006be4449 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 8f4967585d0d..a7674e1377ed 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 53548f4cc704..8677265eda08 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 d2b2eb783c1f..c4c6ad11b0f8 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 b4f5b3d9b7a6..4417c0e069e2 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 b76fb541c766..d0787959cebf 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 78ea8a1004e6..9760272e43ea 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 fe2f411eb24b..c93984daedee 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 ad3ea83a11a3..246971fc22fc 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 4a09b171f851..ee1aa0e364d5 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 357aafe67fd5..42c0f5afcbc2 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 eada4b6ac8c9..a40416ec507a 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 95aa7bf81ea0..325893105c0f 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 add8a10e3100..f961ea468f55 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 294a79e38bf5..be64d454d690 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 7a9365718b96..c87563812418 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 fc1d475c7530..1acbf8dd8375 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 5c0d96666d52..f66e723d312d 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 88238edc2291..aff48474e0ff 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 23975d5990e4..8c96abafcc87 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 701cf8b2f811..86565aff003c 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 fe4fad242796..c849a7b70e8d 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 b727106b41f5..b8720b09ec6f 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 cd1f73dd8fc5..b3e2b6cfb103 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 7ce306e1b5c3..3f4d41f13de7 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 7ad6dc498e7c..94b2712c2f0a 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 f1159c598a75..341762d4f8b5 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 78fac9723424..eee21e2f9f32 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 e767bd759d28..6436b859f342 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 1f3d632de10e..e43ea2be83aa 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 f6816be6bd13..98e875e72eda 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