svx: remove comment cruft

Change-Id: I8f55407d75bba49b3ebeab80dd7a49d6224959d6
Reviewed-on: https://gerrit.libreoffice.org/53899
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

29 files changed, 45 insertions, 166 deletions

diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx
index 162f5bb47404..058cca339fa2 100644
--- a/include/svx/SmartTagItem.hxx
+++ b/include/svx/SmartTagItem.hxx
@@ -37,8 +37,6 @@ namespace com { namespace sun { namespace star { namespace frame {
     class XController;
 } } } }
 
-// class SvxSmartTagItem -----------------------------------------------------
-
 class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem
 {
     const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > > maActionComponentsSequence;
diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx
index 98e955b353df..b9eb98e36071 100644
--- a/include/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
@@ -16,6 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef INCLUDED_SVX_CHECKLBX_HXX
 #define INCLUDED_SVX_CHECKLBX_HXX
 
@@ -34,8 +35,6 @@ class Image;
 class SvLBoxButtonData;
 class SvTreeListEntry;
 
-// class SvxCheckListBox -------------------------------------------------
-
 class SVX_DLLPUBLIC SvxCheckListBox : public SvTreeListBox
 {
     using Window::GetText;
diff --git a/include/svx/dlgutil.hxx b/include/svx/dlgutil.hxx
index 59136e6fe487..76b2a600c718 100644
--- a/include/svx/dlgutil.hxx
+++ b/include/svx/dlgutil.hxx
@@ -16,17 +16,13 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef INCLUDED_SVX_DLGUTIL_HXX
 #define INCLUDED_SVX_DLGUTIL_HXX
 
 #include <svtools/unitconv.hxx>
 #include <svx/svxdllapi.h>
 
-// macro -----------------------------------------------------------------
-
-// typedef ---------------------------------------------------------------
-
-// Functions -------------------------------------------------------------
 class SfxItemSet;
 
 SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& );
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index e16762dfc2c2..405edcce644f 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -30,8 +30,6 @@
 #include <svx/svxdllapi.h>
 #include <svx/xtextit0.hxx>
 
-// forward ---------------------------------------------------------------
-
 class SdrView;
 class SdrPageView;
 class SdrObject;
@@ -48,11 +46,9 @@ class XFormTextShadowColorItem;
 class XFormTextShadowXValItem;
 class XFormTextShadowYValItem;
 
-/*************************************************************************
-|*
-|* ControllerItem for Fontwork
-|*
-\************************************************************************/
+/** ControllerItem for Fontwork
+ */
+
 
 class SvxFontWorkDialog;
 
@@ -68,11 +64,8 @@ public:
     SvxFontWorkControllerItem(sal_uInt16 nId, SvxFontWorkDialog&, SfxBindings&);
 };
 
-/*************************************************************************
-|*
-|* Derived from SfxChildWindow as "container" for fontwork dialog
-|*
-\************************************************************************/
+/** Derived from SfxChildWindow as "container" for fontwork dialog
+ */
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow
 {
@@ -81,11 +74,8 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWind
     SFX_DECL_CHILDWINDOW_WITHID(SvxFontWorkChildWindow);
 };
 
-/*************************************************************************
-|*
-|* Floating window for setting attributes of text effects
-|*
-\************************************************************************/
+/** Floating window for setting attributes of text effects
+  */
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
 {
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index b73531b06e47..a70491896ef9 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -68,7 +68,7 @@ public:
     /** Destructs the array. */
                         ~Array();
 
-    // array size and column/row indexes --------------------------------------
+    // array size and column/row indexes
 
     /** Reinitializes the array with the specified size. Clears all styles. */
     void                Initialize( size_t nWidth, size_t nHeight );
@@ -85,7 +85,7 @@ public:
     /** Returns the cell index from the cell address (nCol,nRow). */
     size_t              GetCellIndex( size_t nCol, size_t nRow, bool bRTL) const;
 
-    // cell border styles -----------------------------------------------------
+    // cell border styles
 
     /** Sets the left frame style of the cell (nCol,nRow). Ignores merged ranges. */
     void                SetCellStyleLeft( size_t nCol, size_t nRow, const Style& rStyle );
@@ -198,7 +198,7 @@ public:
             An invisible style for invalid cell addresses. */
     const Style&        GetCellStyleTR( size_t nCol, size_t nRow ) const;
 
-    // cell merging -----------------------------------------------------------
+    // cell merging
 
     /** Inserts a new merged cell range.
         @precond  The range must not intersect other merged ranges. */
@@ -234,7 +234,7 @@ public:
     void                GetMergedRange( size_t& rnFirstCol, size_t& rnFirstRow,
                             size_t& rnLastCol, size_t& rnLastRow, size_t nCol, size_t nRow ) const;
 
-    // clipping ---------------------------------------------------------------
+    // clipping
 
     /** Sets a clipping range.
         @descr
@@ -247,7 +247,7 @@ public:
             clipped too. This array can handle only one clip range at a time. */
     void                SetClipRange( size_t nFirstCol, size_t nFirstRow, size_t nLastCol, size_t nLastRow );
 
-    // cell coordinates -------------------------------------------------------
+    // cell coordinates
 
     /** Sets the X output coordinate of the left column. */
     void                SetXOffset( long nXOffset );
@@ -293,12 +293,12 @@ public:
         Returns total output range of merged ranges, if bExpandMerged is true. */
     basegfx::B2DRange GetCellRange( size_t nCol, size_t nRow, bool bExpandMerged ) const;
 
-    // mirroring --------------------------------------------------------------
+    // mirroring
 
     /** Mirrors the entire array horizontally. */
     void                MirrorSelfX();
 
-    // drawing ----------------------------------------------------------------
+    // drawing
 
     /** Draws the part of the specified range, that is inside the clipping range.
         @param pForceColor
diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx
index 8c35b2d29e29..db2699edd543 100644
--- a/include/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
@@ -88,7 +88,7 @@ public:
     /** Initializes the control, enables/disables frame borders according to flags. */
     void                Initialize( FrameSelFlags nFlags );
 
-    // enabled frame borders --------------------------------------------------
+    // enabled frame borders
 
     /** Returns true, if the specified frame border is enabled. */
     bool                IsBorderEnabled( FrameBorderType eBorder ) const;
@@ -99,7 +99,7 @@ public:
     /** Returns the index of a frame border (counts only enabled borders) from passed type. */
     sal_Int32           GetEnabledBorderIndex( FrameBorderType eBorder ) const;
 
-    // frame border state and style -------------------------------------------
+    // frame border state and style
 
     /** Returns true, if the control supports the "don't care" frame border state. */
     bool                SupportsDontCareState() const;
@@ -128,7 +128,7 @@ public:
         returns the color in the passed parameter. */
     bool                GetVisibleColor( Color& rColor ) const;
 
-    // frame border selection -------------------------------------------------
+    // frame border selection
 
     /** Returns the current selection handler. */
     const Link<LinkParamNone*,void>&  GetSelectHdl() const;
@@ -154,7 +154,7 @@ public:
     /** Sets the passed color to all selected frame borders. */
     void                SetColorToSelection( const Color& rColor );
 
-    // accessibility ----------------------------------------------------------
+    // accessibility
 
     virtual css::uno::Reference< css::accessibility::XAccessible >
                         CreateAccessible() override;
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index dbca1f993e38..0f6b422a5672 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -35,8 +35,6 @@ namespace svx
     SVX_DLLPUBLIC bool ShowBorderBackgroundDlg( vcl::Window* pParent, SfxItemSet* pBBSet );
 }
 
-// class  SvxHFPage ------------------------------------------------------
-
 class SVX_DLLPUBLIC SvxHFPage : public SfxTabPage
 {
     using TabPage::ActivatePage;
@@ -100,8 +98,6 @@ private:
     SVX_DLLPRIVATE void         ResetBackground_Impl( const SfxItemSet& rSet );
 };
 
-// class SvxHeaderPage ---------------------------------------------------
-
 class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
 {
 public:
@@ -111,8 +107,6 @@ public:
     SVX_DLLPRIVATE SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet );
 };
 
-// class SvxFooterPage ---------------------------------------------------
-
 class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
 {
 public:
diff --git a/include/svx/insctrl.hxx b/include/svx/insctrl.hxx
index 3ef32376de29..38384e345e6f 100644
--- a/include/svx/insctrl.hxx
+++ b/include/svx/insctrl.hxx
@@ -16,14 +16,13 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef INCLUDED_SVX_INSCTRL_HXX
 #define INCLUDED_SVX_INSCTRL_HXX
 
 #include <sfx2/stbitem.hxx>
 #include <svx/svxdllapi.h>
 
-// class SvxInsertToolBoxControl -----------------------------------------
-
 class SVX_DLLPUBLIC SvxInsertStatusBarControl : public SfxStatusBarControl
 {
 public:
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index e82c3ca944b9..51988da2e3cb 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -24,14 +24,10 @@
 #include <svx/dlgctrl.hxx>
 #include <svx/svxdllapi.h>
 
-// forward ---------------------------------------------------------------
-
 class XLineColorItem;
 class XLineWidthItem;
 class SfxObjectShell;
 
-// class SvxLineBox ------------------------------------------------------
-
 class SvxLineBox : public LineLB
 {
     sal_uInt16      nCurPos;
@@ -59,7 +55,6 @@ protected:
 
 };
 
-// class SvxMetricField --------------------------------------------------
 class SVX_DLLPUBLIC SvxMetricField : public MetricField
 {
     using Window::Update;
@@ -88,8 +83,6 @@ public:
     void            RefreshDlgUnit();
 };
 
-// class SvxFillTypeBox --------------------------------------------------
-
 class SVX_DLLPUBLIC SvxFillTypeBox : public FillTypeLB
 {
 public:
diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx
index ef3e32d1a361..ea5eb4000922 100644
--- a/include/svx/layctrl.hxx
+++ b/include/svx/layctrl.hxx
@@ -22,8 +22,6 @@
 #include <sfx2/tbxctrl.hxx>
 #include <svx/svxdllapi.h>
 
-// class SvxTableToolBoxControl ------------------------------------------
-
 class SVX_DLLPUBLIC SvxTableToolBoxControl : public SfxToolBoxControl
 {
 private:
@@ -41,8 +39,6 @@ public:
     virtual ~SvxTableToolBoxControl() override;
 };
 
-// class SvxColumnsToolBoxControl ----------------------------------------
-
 class SVX_DLLPUBLIC SvxColumnsToolBoxControl : public SfxToolBoxControl
 {
     bool    bEnabled;
@@ -59,7 +55,6 @@ public:
                                               const SfxPoolItem* pState ) override;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx
index 37bfc7af3f03..ab8c405426f5 100644
--- a/include/svx/modctrl.hxx
+++ b/include/svx/modctrl.hxx
@@ -25,11 +25,8 @@
 
 #include <memory>
 
-// Forward declarations
 class Timer;
 
-// class SvxModifyControl ------------------------------------------------
-
 class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl
 {
 public:
@@ -53,7 +50,6 @@ private:
     std::shared_ptr<ImplData> mxImpl;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx
index a94ee73e2ccd..5b87881cbce5 100644
--- a/include/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
@@ -24,12 +24,8 @@
 #include <svx/numfmtsh.hxx>
 #include <svx/svxdllapi.h>
 
-// class SvxNumberInfoItem -----------------------------------------------
-
-
-/*
-This item is used as a transport medium for a number formatter
-*/
+/** This item is used as a transport medium for a number formatter
+ */
 
 class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem
 {
@@ -78,7 +74,6 @@ private:
     sal_uInt32          nDelCount;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx
index 956588b6b5f8..f63b3a98e289 100644
--- a/include/svx/ofaitem.hxx
+++ b/include/svx/ofaitem.hxx
@@ -23,8 +23,6 @@
 #include <rtl/ref.hxx>
 #include <svx/svxdllapi.h>
 
-// class OfaPtrItem ------------------------------------------------------
-
 class SVX_DLLPUBLIC OfaPtrItem : public SfxPoolItem
 {
 private:
@@ -39,8 +37,6 @@ public:
     void*                    GetValue() const { return pPtr; }
 };
 
-// class OfaRefItem - for ref counting items
-
 template <class reference_type>
 class OfaRefItem : public SfxPoolItem
 {
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index bd59955cee05..fc20989f7134 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -28,8 +28,6 @@
 
 class SvxGridTabPage;
 
-// class SvxOptionsGrid --------------------------------------------------
-
 class SVX_DLLPUBLIC SvxOptionsGrid
 {
 protected:
@@ -70,8 +68,6 @@ public:
     bool        GetEqualGrid()    const {  return bEqualGrid;   }
 };
 
-// class SvxGridItem -----------------------------------------------------
-
 class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem
 {
     // #i9076#
@@ -90,8 +86,6 @@ public:
 
 };
 
-// class SvxGridTabPage --------------------------------------------------
-
 class SVX_DLLPUBLIC SvxGridTabPage : public SfxTabPage
 {
     using TabPage::ActivatePage;
diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx
index ef9bfca867fd..9f726b0d747c 100644
--- a/include/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
@@ -22,8 +22,6 @@
 #include <vcl/weld.hxx>
 #include <svx/svxdllapi.h>
 
-// class SvxPasswordDialog -----------------------------------------------
-
 class SVX_DLLPUBLIC SvxPasswordDialog : public weld::GenericDialogController
 {
 private:
diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx
index bcce77a4e5fb..65dee15106d5 100644
--- a/include/svx/postattr.hxx
+++ b/include/svx/postattr.hxx
@@ -23,12 +23,8 @@
 #include <svl/stritem.hxx>
 #include <svx/svxdllapi.h>
 
-// class SvxPostItAuthorItem ---------------------------------------------
-
-
-/*
-The author shorthand symbol of a note
-*/
+/** The author shorthand symbol of a note
+ */
 
 class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem
 {
@@ -53,12 +49,8 @@ public:
 };
 
 
-// class SvxPostItDateItem -----------------------------------------------
-
-
-/*
-The date of a note
-*/
+/** The date of a note
+ */
 
 class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem
 {
@@ -82,13 +74,8 @@ public:
     }
 };
 
-
-// class SvxPostItTextItem -----------------------------------------------
-
-
-/*
-The text of a note
-*/
+/** The text of a note
+ */
 
 class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem
 {
@@ -113,12 +100,9 @@ public:
     }
 };
 
-// class SvxPostItIdItem -----------------------------------------------
 
-
-/*
-The internal id of a note
-*/
+/** The internal id of a note
+ */
 
 class SVX_DLLPUBLIC SvxPostItIdItem: public SfxStringItem
 {
@@ -136,7 +120,6 @@ public:
     }
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx
index 40dbfcc48ff1..d7c57be179fc 100644
--- a/include/svx/pszctrl.hxx
+++ b/include/svx/pszctrl.hxx
@@ -23,13 +23,9 @@
 #include <sfx2/stbitem.hxx>
 #include <svx/svxdllapi.h>
 
-// forward ---------------------------------------------------------------
-
 class  SvxSizeItem;
 struct SvxPosSizeStatusBarControl_Impl;
 
-// class SvxPosSizeToolBoxControl ----------------------------------------
-
 class SVX_DLLPUBLIC SvxPosSizeStatusBarControl : public SfxStatusBarControl
 {
 private:
@@ -46,7 +42,6 @@ public:
     virtual void    Command( const CommandEvent& rCEvt ) override;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index 1964c716de64..867c975e7005 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -23,9 +23,6 @@
 #include <vcl/field.hxx>
 #include <svx/svxdllapi.h>
 
-
-// class SvxRelativeField ------------------------------------------------
-
 class SVX_DLLPUBLIC SvxRelativeField : public MetricField
 {
 private:
@@ -47,7 +44,6 @@ public:
     void            EnableNegativeMode() {bNegativeEnabled = true;}
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index fd5fde10b17f..0dc39a552f6e 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -197,8 +197,6 @@ public:
     bool        IsConsistent() const;
 };
 
-// class SvxObjectItem ---------------------------------------------------
-
 class SVX_DLLPUBLIC SvxObjectItem : public SfxPoolItem
 {
 private:
@@ -239,7 +237,6 @@ public:
     void SetEndY(long lValue);
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 748ced9bdb58..8da9ca5eb535 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -50,8 +50,6 @@ struct SearchAttrItem
     SfxPoolItem*    pItem;
 };
 
-// class SearchAttrItemList ----------------------------------------------
-
 typedef std::vector<SearchAttrItem> SrchAttrItemList;
 
 class SVX_DLLPUBLIC SearchAttrItemList : private SrchAttrItemList
@@ -77,9 +75,6 @@ public:
     void Remove(size_t nPos);
 };
 
-
-// class SvxSearchDialogWrapper ------------------------------------------
-
 enum class SearchLabel
 {
     Empty,
@@ -108,16 +103,12 @@ public:
     SFX_DECL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper);
 };
 
-// class SvxSearchDialog -------------------------------------------------
-/*
-    [Description]
+/**
     In this modeless dialog the attributes for a search are configured
     and a search is started from it. Several search types
     (search, search all, replace, replace all) are possible.
 
-    [Items]
-    <SvxSearchItem><SID_ATTR_SEARCH>
-*/
+ */
 
 class SvxSearchDialog : public SfxModelessDialog
 {
diff --git a/include/svx/stddlg.hxx b/include/svx/stddlg.hxx
index 973994f88f6d..a783bd8c0061 100644
--- a/include/svx/stddlg.hxx
+++ b/include/svx/stddlg.hxx
@@ -22,8 +22,6 @@
 #include <sfx2/basedlgs.hxx>
 #include <svx/svxdllapi.h>
 
-// class SvxStandardDialog -----------------------------------------------
-
 class SVX_DLLPUBLIC SvxStandardDialog: public SfxModalDialog
 {
 public:
@@ -32,10 +30,9 @@ public:
     short           Execute() override;
 
 protected:
-    virtual void    Apply() = 0;    // pure virtual!!!
+    virtual void    Apply() = 0;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 475a09d9c590..ae05a2d3c28c 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -60,9 +60,6 @@
 //     V3:  1000..1126, 1127..1140
 //     V4:  1000..1126, 1172..1185
 
-
-
-
 class SdrAllPositionXItem;
 class SdrAllPositionYItem;
 class SdrAllSizeHeightItem;
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 00a4a9567546..ffde6d09468c 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -24,10 +24,6 @@
 #include <svx/svxdllapi.h>
 #include <editeng/measfld.hxx>
 
-
-//  Initial Declarations
-
-
 class SdrOutliner;
 struct ImpMeasureRec;
 struct ImpMeasurePoly;
@@ -36,10 +32,6 @@ namespace sdr { namespace properties {
     class MeasureProperties;
 }}
 
-
-//   Auxiliary Class SdrMeasureObjGeoData
-
-
 class SdrMeasureObjGeoData : public SdrTextObjGeoData
 {
 public:
@@ -51,10 +43,6 @@ public:
     virtual ~SdrMeasureObjGeoData() override;
 };
 
-
-//   SdrMeasureObj
-
-
 class SVX_DLLPUBLIC SdrMeasureObj : public SdrTextObj
 {
 private:
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index 559ea220bc4b..7c2d2c753e7a 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -79,7 +79,7 @@ namespace o3tl
     template<> struct typed_flags<SdrSnap> : is_typed_flags<SdrSnap, 3> {};
 }
 
-// SdrCrookMode::Stretch is not implemented yet!
+// TODO SdrCrookMode::Stretch is not implemented yet!
 enum class SdrCrookMode {
     Rotate,
     Slant,
diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index 0453c252c637..92b0e63add06 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -26,19 +26,17 @@
 #include <svx/swframetypes.hxx>
 #include <com/sun/star/text/WrapTextMode.hpp>
 
-// class SwFrmPagePreview -------------------------------------------------------
-
 class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window
 {
-    Color       m_aTransColor;      // transparency
-    Color       m_aBgCol;           // background
-    Color       m_aFrameColor;      // graphic frame
-    Color       m_aAlignColor;      // align anchor
-    Color       m_aBorderCol;       // frame of doc
-    Color       m_aPrintAreaCol;    // frame of printable area of doc
-    Color       m_aTxtCol;          // symbolised text
-    Color       m_aBlankCol;        // area of symbol for blank
-    Color       m_aBlankFrameCol;   // frame of symbol for blank
+    Color       m_aTransColor;      ///< transparency
+    Color       m_aBgCol;           ///< background
+    Color       m_aFrameColor;      ///< graphic frame
+    Color       m_aAlignColor;      ///< align anchor
+    Color       m_aBorderCol;       ///< frame of doc
+    Color       m_aPrintAreaCol;    ///< frame of printable area of doc
+    Color       m_aTxtCol;          ///< symbolised text
+    Color       m_aBlankCol;        ///< area of symbol for blank
+    Color       m_aBlankFrameCol;   ///< frame of symbol for blank
 
     tools::Rectangle   aPage;
     tools::Rectangle   aPagePrtArea;
diff --git a/include/svx/sxmlhitm.hxx b/include/svx/sxmlhitm.hxx
index 141c37febcb1..b2d45fa50a26 100644
--- a/include/svx/sxmlhitm.hxx
+++ b/include/svx/sxmlhitm.hxx
@@ -22,9 +22,7 @@
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
 
-/*************************************************************************/
-/* Measure                                                               */
-/*************************************************************************/
+// Measure
 //                             ___
 //    |        100,00km       | 2mm = SdrMeasureHelplineOverhangItem
 //    |<--------------------->|---
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index 121b790d47eb..25a370a5de89 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -28,7 +28,6 @@
 
 class FontCharMap;
 
-// classes Subset & SubsetMap --------------------------------------------
 // TODO: should be moved into Font Attributes territory,
 // we let them mature here though because this is currently the only use
 
diff --git a/include/svx/xmlsecctrl.hxx b/include/svx/xmlsecctrl.hxx
index 0f7d44b86ff0..40d55ce116bd 100644
--- a/include/svx/xmlsecctrl.hxx
+++ b/include/svx/xmlsecctrl.hxx
@@ -26,8 +26,6 @@
 
 class  SvxSizeItem;
 
-// class SvxPosSizeToolBoxControl ----------------------------------------
-
 class SVX_DLLPUBLIC XmlSecStatusBarControl : public SfxStatusBarControl
 {
 private:
diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx
index aea330b44fb5..6e6b36d47ec9 100644
--- a/include/svx/zoomsliderctrl.hxx
+++ b/include/svx/zoomsliderctrl.hxx
@@ -24,7 +24,6 @@
 #include <svx/svxdllapi.h>
 #include <memory>
 
-// class SvxZoomSliderControl ----------------------------------------
 class SVX_DLLPUBLIC SvxZoomSliderControl : public SfxStatusBarControl
 {
 private: