Formatting changes across all modules

+ Removed comment cruft
+ Tab formatting in number of files
+ Some commented out code removed
+ Tab characters replaced with spaces
+ Newline cleanup in quite a few files
+ Tweak header guard #endifs

Change-Id: I3208ff2f047da890edcc49b73389aca22442f5fc
Reviewed-on: https://gerrit.libreoffice.org/22221
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

39 files changed, 73 insertions, 150 deletions

diff --git a/include/vcl/bitmapaccess.hxx b/include/vcl/bitmapaccess.hxx
index 4e9c44f81578..051beb8a2b13 100644
--- a/include/vcl/bitmapaccess.hxx
+++ b/include/vcl/bitmapaccess.hxx
@@ -25,11 +25,10 @@
 #include <vcl/salbtype.hxx>
 #include <vcl/bitmap.hxx>
 
-// - Access functions -
 typedef BitmapColor (*FncGetPixel)(ConstScanline pScanline, long nX, const ColorMask& rMask);
 typedef void (*FncSetPixel)(Scanline pScanline, long nX, const BitmapColor& rBitmapColor, const ColorMask& rMask);
 
-// - BitmapInfoAccess -
+
 class VCL_DLLPUBLIC BitmapInfoAccess
 {
     friend class BitmapReadAccess;
@@ -86,7 +85,7 @@ protected:
     BitmapInfoAccess(Bitmap& rBitmap, BitmapAccessMode nMode);
 };
 
-// - BitmapReadAccess -
+
 class VCL_DLLPUBLIC BitmapReadAccess : public BitmapInfoAccess
 {
     friend class BitmapWriteAccess;
@@ -181,7 +180,7 @@ protected:
     BitmapReadAccess(Bitmap& rBitmap, BitmapAccessMode nMode);
 };
 
-// - BitmapWriteAccess -
+
 class VCL_DLLPUBLIC BitmapWriteAccess : public BitmapReadAccess
 {
 public:
@@ -233,22 +232,25 @@ private:
     }
 };
 
-// - Inlines -
+
 inline bool BitmapInfoAccess::operator!() const
 {
     return mpBuffer == nullptr;
 }
 
+
 inline long BitmapInfoAccess::Width() const
 {
     return mpBuffer ? mpBuffer->mnWidth : 0L;
 }
 
+
 inline long BitmapInfoAccess::Height() const
 {
     return mpBuffer ? mpBuffer->mnHeight : 0L;
 }
 
+
 inline bool BitmapInfoAccess::IsTopDown() const
 {
     assert(mpBuffer && "Access is not valid!");
@@ -256,11 +258,13 @@ inline bool BitmapInfoAccess::IsTopDown() const
     return mpBuffer && (BMP_SCANLINE_ADJUSTMENT(mpBuffer->mnFormat) == BMP_FORMAT_TOP_DOWN);
 }
 
+
 inline bool BitmapInfoAccess::IsBottomUp() const
 {
     return !IsTopDown();
 }
 
+
 inline sal_uLong BitmapInfoAccess::GetScanlineFormat() const
 {
     assert(mpBuffer && "Access is not valid!");
@@ -268,6 +272,7 @@ inline sal_uLong BitmapInfoAccess::GetScanlineFormat() const
     return mpBuffer ? BMP_SCANLINE_FORMAT(mpBuffer->mnFormat) : 0UL;
 }
 
+
 inline sal_uLong BitmapInfoAccess::GetScanlineSize() const
 {
     assert(mpBuffer && "Access is not valid!");
@@ -275,6 +280,7 @@ inline sal_uLong BitmapInfoAccess::GetScanlineSize() const
     return mpBuffer ? mpBuffer->mnScanlineSize : 0UL;
 }
 
+
 inline sal_uInt16  BitmapInfoAccess::GetBitCount() const
 {
     assert(mpBuffer && "Access is not valid!");
@@ -282,6 +288,7 @@ inline sal_uInt16  BitmapInfoAccess::GetBitCount() const
     return mpBuffer ? mpBuffer->mnBitCount : 0;
 }
 
+
 inline BitmapColor BitmapInfoAccess::GetBestMatchingColor(const BitmapColor& rBitmapColor)
 {
     if (HasPalette())
@@ -290,6 +297,7 @@ inline BitmapColor BitmapInfoAccess::GetBestMatchingColor(const BitmapColor& rBi
         return rBitmapColor;
 }
 
+
 inline bool BitmapInfoAccess::HasPalette() const
 {
     assert(mpBuffer && "Access is not valid!");
@@ -297,6 +305,7 @@ inline bool BitmapInfoAccess::HasPalette() const
     return mpBuffer && !!mpBuffer->maPalette;
 }
 
+
 inline const BitmapPalette& BitmapInfoAccess::GetPalette() const
 {
     assert(mpBuffer && "Access is not valid!");
@@ -304,6 +313,7 @@ inline const BitmapPalette& BitmapInfoAccess::GetPalette() const
     return mpBuffer->maPalette;
 }
 
+
 inline sal_uInt16 BitmapInfoAccess::GetPaletteEntryCount() const
 {
     assert(HasPalette() && "Bitmap has no palette!");
@@ -311,6 +321,7 @@ inline sal_uInt16 BitmapInfoAccess::GetPaletteEntryCount() const
     return HasPalette() ? mpBuffer->maPalette.GetEntryCount() : 0;
 }
 
+
 inline const BitmapColor& BitmapInfoAccess::GetPaletteColor( sal_uInt16 nColor ) const
 {
     assert(mpBuffer && "Access is not valid!");
@@ -319,13 +330,13 @@ inline const BitmapColor& BitmapInfoAccess::GetPaletteColor( sal_uInt16 nColor )
     return mpBuffer->maPalette[nColor];
 }
 
+
 inline const BitmapColor& BitmapInfoAccess::GetBestPaletteColor(const BitmapColor& rBitmapColor) const
 {
     return GetPaletteColor(GetBestPaletteIndex(rBitmapColor));
 }
 
 
-
 inline ColorMask& BitmapInfoAccess::GetColorMask() const
 {
     assert(mpBuffer && "Access is not valid!");
@@ -333,6 +344,7 @@ inline ColorMask& BitmapInfoAccess::GetColorMask() const
     return mpBuffer->maColorMask;
 }
 
+
 inline Scanline BitmapReadAccess::GetBuffer() const
 {
     assert(mpBuffer && "Access is not valid!");
@@ -340,6 +352,7 @@ inline Scanline BitmapReadAccess::GetBuffer() const
     return mpBuffer ? mpBuffer->mpBits : nullptr;
 }
 
+
 inline Scanline BitmapReadAccess::GetScanline(long nY) const
 {
     assert(mpBuffer && mpScanBuf && "Access is not valid!");
@@ -348,6 +361,7 @@ inline Scanline BitmapReadAccess::GetScanline(long nY) const
     return mpScanBuf[nY];
 }
 
+
 inline BitmapColor BitmapReadAccess::GetPixel(long nY, long nX) const
 {
     assert(mpBuffer && mpScanBuf && "Access is not valid!");
@@ -357,11 +371,13 @@ inline BitmapColor BitmapReadAccess::GetPixel(long nY, long nX) const
     return mFncGetPixel(mpScanBuf[nY], nX, maColorMask );
 }
 
+
 inline sal_uInt8 BitmapReadAccess::GetPixelIndex(long nY, long nX) const
 {
     return GetPixel(nY, nX).GetBlueOrIndex();
 }
 
+
 inline BitmapColor BitmapReadAccess::GetPixelFromData(const sal_uInt8* pData, long nX) const
 {
     assert(pData && "Access is not valid!");
@@ -369,6 +385,7 @@ inline BitmapColor BitmapReadAccess::GetPixelFromData(const sal_uInt8* pData, lo
     return mFncGetPixel( pData, nX, maColorMask );
 }
 
+
 inline void BitmapReadAccess::SetPixelOnData(sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor)
 {
     assert(pData && "Access is not valid!");
@@ -376,6 +393,7 @@ inline void BitmapReadAccess::SetPixelOnData(sal_uInt8* pData, long nX, const Bi
     mFncSetPixel(pData, nX, rBitmapColor, maColorMask);
 }
 
+
 inline BitmapColor BitmapReadAccess::GetColor(long nY, long nX) const
 {
     if (HasPalette())
@@ -384,11 +402,13 @@ inline BitmapColor BitmapReadAccess::GetColor(long nY, long nX) const
         return GetPixel(nY, nX);
 }
 
+
 inline sal_uInt8 BitmapReadAccess::GetLuminance(long nY, long nX) const
 {
     return GetColor(nY, nX).GetLuminance();
 }
 
+
 inline void BitmapWriteAccess::SetPalette(const BitmapPalette& rPalette)
 {
     assert(mpBuffer && "Access is not valid!");
@@ -396,6 +416,7 @@ inline void BitmapWriteAccess::SetPalette(const BitmapPalette& rPalette)
     mpBuffer->maPalette = rPalette;
 }
 
+
 inline void BitmapWriteAccess::SetPaletteEntryCount(sal_uInt16 nCount)
 {
     assert(mpBuffer && "Access is not valid!");
@@ -403,6 +424,7 @@ inline void BitmapWriteAccess::SetPaletteEntryCount(sal_uInt16 nCount)
     mpBuffer->maPalette.SetEntryCount(nCount);
 }
 
+
 inline void BitmapWriteAccess::SetPaletteColor(sal_uInt16 nColor, const BitmapColor& rBitmapColor)
 {
     assert(mpBuffer && "Access is not valid!");
@@ -411,6 +433,7 @@ inline void BitmapWriteAccess::SetPaletteColor(sal_uInt16 nColor, const BitmapCo
     mpBuffer->maPalette[nColor] = rBitmapColor;
 }
 
+
 inline void BitmapWriteAccess::SetPixel(long nY, long nX, const BitmapColor& rBitmapColor)
 {
     assert(mpBuffer && "Access is not valid!");
@@ -420,6 +443,7 @@ inline void BitmapWriteAccess::SetPixel(long nY, long nX, const BitmapColor& rBi
     mFncSetPixel(mpScanBuf[nY], nX, rBitmapColor, maColorMask);
 }
 
+
 inline void BitmapWriteAccess::SetPixelIndex(long nY, long nX, sal_uInt8 cIndex)
 {
     SetPixel(nY, nX, BitmapColor(cIndex));
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index 9665dfd10ea1..2cea4564235c 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -37,6 +37,7 @@ class UserDrawEvent;
 class ImplCommonButtonData;
 enum class DrawButtonFlags;
 
+
 class VCL_DLLPUBLIC Button : public Control
 {
 private:
@@ -103,9 +104,6 @@ protected:
 };
 
 
-// - PushButton-Types -
-
-
 enum class PushButtonDropdownStyle
 {
     NONE            = 0x0000,
@@ -114,9 +112,6 @@ enum class PushButtonDropdownStyle
 };
 
 
-// - PushButton -
-
-
 class VCL_DLLPUBLIC PushButton : public Button
 {
 protected:
@@ -207,16 +202,19 @@ public:
     virtual void    ShowFocus(const Rectangle& rRect) override;
 };
 
+
 inline void PushButton::Check( bool bCheck )
 {
     SetState( (bCheck) ? TRISTATE_TRUE : TRISTATE_FALSE );
 }
 
+
 inline bool PushButton::IsChecked() const
 {
     return (GetState() == TRISTATE_TRUE);
 }
 
+
 class VCL_DLLPUBLIC OKButton : public PushButton
 {
 protected:
@@ -233,6 +231,7 @@ public:
     virtual void    Click() override;
 };
 
+
 class VCL_DLLPUBLIC CancelButton : public PushButton
 {
 protected:
@@ -249,6 +248,7 @@ public:
     virtual void    Click() override;
 };
 
+
 class VCL_DLLPUBLIC CloseButton : public CancelButton
 {
 public:
@@ -256,10 +256,6 @@ public:
 };
 
 
-
-// - HelpButton -
-
-
 class VCL_DLLPUBLIC HelpButton : public PushButton
 {
 protected:
@@ -277,7 +273,6 @@ public:
 };
 
 
-// - RadioButton -
 class VCL_DLLPUBLIC RadioButton : public Button
 {
 private:
@@ -404,9 +399,6 @@ public:
 };
 
 
-// - CheckBox -
-
-
 class VCL_DLLPUBLIC CheckBox : public Button
 {
 private:
@@ -495,24 +487,24 @@ public:
     virtual void ShowFocus(const Rectangle& rRect) override;
 };
 
+
 inline void CheckBox::Check( bool bCheck )
 {
     SetState( (bCheck) ? TRISTATE_TRUE : TRISTATE_FALSE );
 }
 
+
 inline bool CheckBox::IsChecked() const
 {
     return (GetState() == TRISTATE_TRUE);
 }
 
 
-// - Control-Layer fuer alten Code -
-
-
 class VCL_DLLPUBLIC ImageButton : public PushButton
 {
 protected:
     using PushButton::ImplInitStyle;
+
 private:
     SAL_DLLPRIVATE void     ImplInitStyle();
 
@@ -524,6 +516,7 @@ public:
                  ImageButton( vcl::Window* pParent, const ResId& rResId );
 };
 
+
 class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
 {
                     ImageRadioButton( const ImageRadioButton & ) = delete;
@@ -533,6 +526,7 @@ public:
     explicit        ImageRadioButton( vcl::Window* pParent, WinBits nStyle = 0 );
 };
 
+
 class VCL_DLLPUBLIC TriStateBox : public CheckBox
 {
                     TriStateBox( const TriStateBox & ) = delete;
@@ -542,10 +536,12 @@ public:
     explicit        TriStateBox( vcl::Window* pParent, WinBits nStyle = 0 );
 };
 
+
 class VCL_DLLPUBLIC DisclosureButton : public CheckBox
 {
 protected:
     SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) override;
+
 public:
     explicit DisclosureButton( vcl::Window* pParent, WinBits nStyle = 0 );
 
diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx
index bba39cc97ddd..d3ec4ffc9435 100644
--- a/include/vcl/commandevent.hxx
+++ b/include/vcl/commandevent.hxx
@@ -26,10 +26,6 @@
 #include <vcl/keycod.hxx>
 #include <vcl/font.hxx>
 
-
-// - CommandExtTextInputData -
-
-
 #define EXTTEXTINPUT_ATTR_GRAYWAVELINE          ((sal_uInt16)0x0100)
 #define EXTTEXTINPUT_ATTR_UNDERLINE             ((sal_uInt16)0x0200)
 #define EXTTEXTINPUT_ATTR_BOLDUNDERLINE         ((sal_uInt16)0x0400)
@@ -42,6 +38,7 @@
 #define EXTTEXTINPUT_CURSOR_INVISIBLE           ((sal_uInt16)0x0001)
 #define EXTTEXTINPUT_CURSOR_OVERWRITE           ((sal_uInt16)0x0002)
 
+
 class VCL_DLLPUBLIC CommandExtTextInputData
 {
 private:
@@ -70,9 +67,6 @@ public:
 };
 
 
-// - CommandInputContextData -
-
-
 class VCL_DLLPUBLIC CommandInputContextData
 {
 private:
@@ -83,20 +77,19 @@ public:
                     CommandInputContextData( LanguageType eLang );
 };
 
+
 inline CommandInputContextData::CommandInputContextData()
 {
     meLanguage = LANGUAGE_DONTKNOW;
 }
 
+
 inline CommandInputContextData::CommandInputContextData( LanguageType eLang )
 {
     meLanguage = eLang;
 }
 
 
-// - CommandWheelData -
-
-
 enum class CommandWheelMode
 {
     NONE              = 0,
@@ -106,6 +99,7 @@ enum class CommandWheelMode
     DATAZOOM          = 4
 };
 
+
 // Magic value used in mnLines field in CommandWheelData
 #define COMMAND_WHEEL_PAGESCROLL        ((sal_uLong)0xFFFFFFFF)
 
@@ -145,6 +139,7 @@ public:
                         { return ((mnCode & KEY_MOD2) != 0); }
 };
 
+
 inline CommandWheelData::CommandWheelData()
 {
     mnDelta         = 0;
@@ -156,6 +151,7 @@ inline CommandWheelData::CommandWheelData()
     mbDeltaIsPixel  = false;
 }
 
+
 inline CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDelta,
                                            sal_uLong nScrollLines,
                                            CommandWheelMode nWheelMode, sal_uInt16 nKeyModifier,
@@ -171,9 +167,6 @@ inline CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDel
 }
 
 
-// - CommandScrollData -
-
-
 class VCL_DLLPUBLIC CommandScrollData
 {
 private:
@@ -188,12 +181,14 @@ public:
     long            GetDeltaY() const { return mnDeltaY; }
 };
 
+
 inline CommandScrollData::CommandScrollData()
 {
     mnDeltaX    = 0;
     mnDeltaY    = 0;
 }
 
+
 inline CommandScrollData::CommandScrollData( long nDeltaX, long nDeltaY )
 {
     mnDeltaX    = nDeltaX;
@@ -201,9 +196,6 @@ inline CommandScrollData::CommandScrollData( long nDeltaX, long nDeltaY )
 }
 
 
-// - CommandModKeyData -
-
-
 class VCL_DLLPUBLIC CommandModKeyData
 {
 private:
@@ -219,26 +211,26 @@ public:
     bool            IsRightShift() const { return (mnCode & MODKEY_RSHIFT) != 0; }
 };
 
+
 inline CommandModKeyData::CommandModKeyData()
 {
     mnCode = 0L;
 }
 
+
 inline CommandModKeyData::CommandModKeyData( sal_uInt16 nCode )
 {
     mnCode = nCode;
 }
 
 
-// - CommandDialogData -
-
-
 enum class ShowDialogId
 {
     Preferences       = 1,
     About             = 2,
 };
 
+
 class VCL_DLLPUBLIC CommandDialogData
 {
     ShowDialogId   m_nDialogId;
@@ -250,6 +242,7 @@ public:
     ShowDialogId GetDialogId() const { return m_nDialogId; }
 };
 
+
 // Media Commands
 enum class MediaCommand
 {
@@ -277,6 +270,7 @@ enum class MediaCommand
     PreviousTrackHold     = 22,// Button Left holding pressed.
 };
 
+
 class VCL_DLLPUBLIC CommandMediaData
 {
     MediaCommand m_nMediaId;
@@ -292,7 +286,7 @@ public:
     bool GetPassThroughToOS() const { return m_bPassThroughToOS; }
 };
 
-// - CommandSelectionChangeData -
+
 class VCL_DLLPUBLIC CommandSelectionChangeData
 {
 private:
@@ -307,11 +301,13 @@ public:
     sal_uLong          GetEnd() const { return mnEnd; }
 };
 
+
 inline CommandSelectionChangeData::CommandSelectionChangeData()
 {
     mnStart = mnEnd = 0;
 }
 
+
 inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart,
                                    sal_uLong nEnd )
 {
@@ -319,6 +315,7 @@ inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart,
     mnEnd = nEnd;
 }
 
+
 class VCL_DLLPUBLIC CommandSwipeData
 {
     double mnVelocityX;
@@ -334,6 +331,7 @@ public:
     double getVelocityX() const { return mnVelocityX; }
 };
 
+
 class VCL_DLLPUBLIC CommandLongPressData
 {
     double mnX;
@@ -354,7 +352,6 @@ public:
 };
 
 
-// - CommandEvent -
 enum class CommandEventId
 {
     NONE                    = 0,
@@ -381,6 +378,7 @@ enum class CommandEventId
     LongPress               = 22,
 };
 
+
 class VCL_DLLPUBLIC CommandEvent
 {
 private:
@@ -410,6 +408,7 @@ public:
     const CommandLongPressData*         GetLongPressData() const;
 };
 
+
 inline CommandEvent::CommandEvent()
 {
     mpData          = nullptr;
@@ -417,6 +416,7 @@ inline CommandEvent::CommandEvent()
     mbMouseEvent    = false;
 }
 
+
 inline CommandEvent::CommandEvent( const Point& rMousePos,
                                    CommandEventId nCmd, bool bMEvt, const void* pCmdData ) :
             maPos( rMousePos )
@@ -426,6 +426,7 @@ inline CommandEvent::CommandEvent( const Point& rMousePos,
     mbMouseEvent    = bMEvt;
 }
 
+
 inline const CommandExtTextInputData* CommandEvent::GetExtTextInputData() const
 {
     if ( mnCommand == CommandEventId::ExtTextInput )
@@ -434,6 +435,7 @@ inline const CommandExtTextInputData* CommandEvent::GetExtTextInputData() const
         return nullptr;
 }
 
+
 inline const CommandWheelData* CommandEvent::GetWheelData() const
 {
     if ( mnCommand == CommandEventId::Wheel )
@@ -442,6 +444,7 @@ inline const CommandWheelData* CommandEvent::GetWheelData() const
         return nullptr;
 }
 
+
 inline const CommandScrollData* CommandEvent::GetAutoScrollData() const
 {
     if ( mnCommand == CommandEventId::AutoScroll )
@@ -450,6 +453,7 @@ inline const CommandScrollData* CommandEvent::GetAutoScrollData() const
         return nullptr;
 }
 
+
 inline const CommandModKeyData* CommandEvent::GetModKeyData() const
 {
     if( mnCommand == CommandEventId::ModKeyChange )
@@ -458,6 +462,7 @@ inline const CommandModKeyData* CommandEvent::GetModKeyData() const
         return nullptr;
 }
 
+
 inline const CommandDialogData* CommandEvent::GetDialogData() const
 {
     if( mnCommand == CommandEventId::ShowDialog )
@@ -466,6 +471,7 @@ inline const CommandDialogData* CommandEvent::GetDialogData() const
         return nullptr;
 }
 
+
 inline CommandMediaData* CommandEvent::GetMediaData() const
 {
     if( mnCommand == CommandEventId::Media )
@@ -474,6 +480,7 @@ inline CommandMediaData* CommandEvent::GetMediaData() const
         return nullptr;
 }
 
+
 inline const CommandSelectionChangeData* CommandEvent::GetSelectionChangeData() const
 {
     if( mnCommand == CommandEventId::SelectionChange )
@@ -482,6 +489,7 @@ inline const CommandSelectionChangeData* CommandEvent::GetSelectionChangeData()
     return nullptr;
 }
 
+
 inline const CommandSwipeData* CommandEvent::GetSwipeData() const
 {
     if( mnCommand == CommandEventId::Swipe )
@@ -490,6 +498,7 @@ inline const CommandSwipeData* CommandEvent::GetSwipeData() const
         return nullptr;
 }
 
+
 inline const CommandLongPressData* CommandEvent::GetLongPressData() const
 {
     if( mnCommand == CommandEventId::LongPress )
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 3ede0ebb4271..803f2f5e0ef7 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -31,7 +31,6 @@ namespace vcl { struct ImplControlData; struct ControlLayoutData; }
 class StyleSettings;
 
 
-// - Control -
 
 
 class VCL_DLLPUBLIC Control : public vcl::Window
diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx
index f9f427684f8b..e11cdeb22fad 100644
--- a/include/vcl/cvtgrf.hxx
+++ b/include/vcl/cvtgrf.hxx
@@ -25,7 +25,6 @@
 #include <vcl/salctype.hxx>
 
 
-// - GraphicConverter -
 
 
 struct  ConvertData;
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 1c0b92f291cc..3aa38f543802 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -25,7 +25,6 @@
 #include <vcl/syswin.hxx>
 #include <vcl/vclptr.hxx>
 
-// - Dialog -
 
 struct DialogImpl;
 class VclBox;
@@ -123,7 +122,6 @@ public:
     void            GrabFocusToFirstControl();
 };
 
-// - ModelessDialog -
 class VCL_DLLPUBLIC ModelessDialog : public Dialog
 {
                     ModelessDialog (const ModelessDialog &) = delete;
@@ -133,7 +131,6 @@ public:
     explicit        ModelessDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, Dialog::InitFlag eFlag = Dialog::InitFlag::Default );
 };
 
-// - ModalDialog -
 class VCL_DLLPUBLIC ModalDialog : public Dialog
 {
 public:
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 65b70c7028df..3f8f2f6acdf7 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -209,7 +209,6 @@ public:
 };
 
 
-// - DockingWindow -
 
 
 class VCL_DLLPUBLIC DockingWindow
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 3e6fbb77c5da..ec947b672db0 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -47,7 +47,6 @@ struct DDInfo;
 struct Impl_IMEInfos;
 
 
-// - Edit-Types -
 #define EDIT_NOLIMIT                SAL_MAX_INT32
 #define EDIT_UPDATEDATA_TIMEOUT     350
 
@@ -70,7 +69,6 @@ enum AutocompleteAction{ AUTOCOMPLETE_KEYINPUT, AUTOCOMPLETE_TABFORWARD, AUTOCOM
 
 class Timer;
 
-// - Edit -
 class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropClient
 {
 private:
diff --git a/include/vcl/event.hxx b/include/vcl/event.hxx
index 6db6d3adfaf5..119027cf0fdc 100644
--- a/include/vcl/event.hxx
+++ b/include/vcl/event.hxx
@@ -81,7 +81,6 @@ inline KeyEvent::KeyEvent( sal_Unicode nChar, const vcl::KeyCode& rKeyCode,
 }
 
 
-// - MouseEvent-Types -
 
 
 enum class MouseEventModifiers
@@ -112,7 +111,6 @@ namespace o3tl
 #define MOUSE_RIGHT             ((sal_uInt16)0x0004)
 
 
-// - MouseEvent -
 
 
 class VCL_DLLPUBLIC MouseEvent
@@ -244,7 +242,6 @@ public:
 };
 
 
-// - HelpEvent -
 
 enum class HelpEventMode
 {
@@ -341,7 +338,6 @@ inline UserDrawEvent::UserDrawEvent(vcl::Window* pWindow, vcl::RenderContext* pR
 }
 
 
-// - TrackingEvent -
 
 
 class VCL_DLLPUBLIC TrackingEvent
@@ -378,7 +374,6 @@ inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt,
 }
 
 
-// - NotifyEvent -
 
 enum class MouseNotifyEvent
 {
@@ -445,7 +440,6 @@ inline const CommandEvent* NotifyEvent::GetCommandEvent() const
 }
 
 
-// - DataChangedEvent -
 
 
 enum class DataChangedEventType {
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 0f855a35b00f..0741efdf2d37 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -35,7 +35,6 @@ class LocaleDataWrapper;
 class LanguageTag;
 
 
-// - FormatterBase -
 
 
 class VCL_DLLPUBLIC FormatterBase
@@ -91,7 +90,6 @@ public:
 
 
 
-// - PatternFormatter -
 
 
 #define PATTERN_FORMAT_EMPTYLITERALS    ((sal_uInt16)0x0001)
@@ -130,7 +128,6 @@ public:
 };
 
 
-// - NumericFormatter -
 
 
 class VCL_DLLPUBLIC NumericFormatter : public FormatterBase
@@ -209,7 +206,6 @@ public:
 };
 
 
-// - MetricFormatter -
 
 
 class VCL_DLLPUBLIC MetricFormatter : public NumericFormatter
@@ -267,7 +263,6 @@ public:
 
 
 
-// - CurrencyFormatter -
 
 
 class VCL_DLLPUBLIC CurrencyFormatter : public NumericFormatter
@@ -293,7 +288,6 @@ public:
 
 
 
-// - DateFormatter -
 
 
 class VCL_DLLPUBLIC DateFormatter : public FormatterBase
@@ -387,7 +381,6 @@ public:
 
 
 
-// - TimeFormatter -
 
 
 class VCL_DLLPUBLIC TimeFormatter : public FormatterBase
@@ -465,7 +458,6 @@ public:
 
 
 
-// - PatternField -
 
 
 class VCL_DLLPUBLIC PatternField : public SpinField, public PatternFormatter
@@ -481,7 +473,6 @@ public:
 
 
 
-// - NumericField -
 
 
 class VCL_DLLPUBLIC NumericField : public SpinField, public NumericFormatter
@@ -511,7 +502,6 @@ public:
 
 
 
-// - MetricField  -
 
 
 class VCL_DLLPUBLIC MetricField : public SpinField, public MetricFormatter
@@ -582,7 +572,6 @@ public:
 
 
 
-// - CurrencyField -
 
 
 class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter
@@ -605,7 +594,6 @@ public:
 
 
 
-// - DateField -
 
 
 class VCL_DLLPUBLIC DateField : public SpinField, public DateFormatter
@@ -639,7 +627,6 @@ public:
 };
 
 
-// - TimeField -
 
 
 class VCL_DLLPUBLIC TimeField : public SpinField, public TimeFormatter
@@ -676,7 +663,6 @@ public:
 
 
 
-// - PatternBox -
 
 
 class VCL_DLLPUBLIC PatternBox : public ComboBox, public PatternFormatter
@@ -695,7 +681,6 @@ public:
 
 
 
-// - NumericBox -
 
 
 class VCL_DLLPUBLIC NumericBox : public ComboBox, public NumericFormatter
@@ -719,7 +704,6 @@ public:
 
 
 
-// - MetricBox -
 
 
 class VCL_DLLPUBLIC MetricBox : public ComboBox, public MetricFormatter
@@ -753,7 +737,6 @@ public:
 
 
 
-// - CurrencyBox -
 
 
 class VCL_DLLPUBLIC CurrencyBox : public ComboBox, public CurrencyFormatter
@@ -774,7 +757,6 @@ public:
 };
 
 
-// - DateBox -
 
 
 class VCL_DLLPUBLIC DateBox : public ComboBox, public DateFormatter
@@ -794,7 +776,6 @@ public:
 
 
 
-// - TimeBox -
 
 
 class VCL_DLLPUBLIC TimeBox : public ComboBox, public TimeFormatter
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 3c9e3a35446b..85188d288821 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -30,7 +30,6 @@
 class UserDrawEvent;
 
 
-// - FixedText -
 
 
 class VCL_DLLPUBLIC FixedText : public Control
@@ -92,7 +91,6 @@ public:
 };
 
 
-// - FixedLine -
 
 
 class VCL_DLLPUBLIC FixedLine : public Control
@@ -126,7 +124,6 @@ public:
     virtual Size    GetOptimalSize() const override;
 };
 
-// - FixedBitmap -
 class VCL_DLLPUBLIC FixedBitmap : public Control
 {
 private:
@@ -155,7 +152,6 @@ public:
 };
 
 
-// - FixedImage -
 
 
 class VCL_DLLPUBLIC FixedImage : public Control
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 20b0688adc97..01672f0b7650 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -28,7 +28,6 @@
 class ToolBox;
 
 
-// - FloatingWindow-Types -
 
 
 enum class FloatWinPopupFlags
@@ -87,7 +86,6 @@ enum HitTest
     HITTEST_RECT
 };
 
-// - FloatingWindow -
 
 class VCL_DLLPUBLIC FloatingWindow : public SystemWindow
 {
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 6875a5074ca4..15461dcc2031 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -40,7 +40,6 @@ namespace tools {
 class Gradient;
 
 
-// - GDIMetaFile-Types -
 
 
 #define GDI_METAFILE_END                ((size_t)0xFFFFFFFF)
@@ -54,7 +53,6 @@ enum MtfConversion
 };
 
 
-// - Color conversion routines -
 
 
 typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam );
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index b9e461761d2c..f31824dfb8cd 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -29,7 +29,6 @@
 class SvStream;
 
 
-// - ImpBuffer -
 
 
 struct ImpBuffer
@@ -49,7 +48,6 @@ struct ImpBuffer
 };
 
 
-// - ImpSwap -
 
 
 struct ImpSwap
@@ -69,7 +67,6 @@ struct ImpSwap
 };
 
 
-// - ImpGfxLink -
 
 
 struct ImpGfxLink
@@ -90,7 +87,6 @@ struct ImpGfxLink
 //#endif // __PRIVATE
 
 
-// - GfxLinkType -
 
 
 enum GfxLinkType
@@ -115,7 +111,6 @@ enum GfxLinkType
 #define GFX_LINK_LAST_NATIVE_ID     GFX_LINK_TYPE_NATIVE_BMP
 
 
-// - GfxLink -
 
 
 struct ImpBuffer;
diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx
index 3f2404b5ba0a..5c44fc5486d6 100644
--- a/include/vcl/gradient.hxx
+++ b/include/vcl/gradient.hxx
@@ -28,7 +28,6 @@
 #include <o3tl/cow_wrapper.hxx>
 
 
-// - Impl_Gradient -
 
 
 class Rectangle;
@@ -60,7 +59,6 @@ public:
 };
 
 
-// - Gradient -
 
 
 class VCL_DLLPUBLIC Gradient
diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx
index a1d987f7fbe5..bd83af4bb493 100644
--- a/include/vcl/graphicfilter.hxx
+++ b/include/vcl/graphicfilter.hxx
@@ -129,7 +129,6 @@ enum class GraphicFileFormat
     XXX = 0xffff
 };
 
-// - GraphicDescriptor -
 
 
 class VCL_DLLPUBLIC GraphicDescriptor
diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx
index a781cf96d6d2..0ba7e3ad77bd 100644
--- a/include/vcl/group.hxx
+++ b/include/vcl/group.hxx
@@ -25,7 +25,6 @@
 #include <vcl/ctrl.hxx>
 
 
-// - GroupBox -
 
 
 class VCL_DLLPUBLIC GroupBox : public Control
diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx
index 935ea9ac6e06..0dd3e8c3601d 100644
--- a/include/vcl/hatch.hxx
+++ b/include/vcl/hatch.hxx
@@ -26,7 +26,6 @@
 #include <vcl/vclenum.hxx>
 
 
-// - Impl_Hatch -
 
 
 class SvStream;
@@ -47,7 +46,6 @@ struct ImplHatch
 };
 
 
-// - Hatch -
 
 
 class VCL_DLLPUBLIC Hatch
diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx
index 4d226a8122f8..1970c21dd99a 100644
--- a/include/vcl/help.hxx
+++ b/include/vcl/help.hxx
@@ -30,7 +30,6 @@ class Rectangle;
 namespace vcl { class Window; }
 
 
-// - Help-Types -
 
 enum class QuickHelpFlags
 {
@@ -59,7 +58,6 @@ namespace o3tl
 
 #define OOO_HELP_INDEX          ".help:index"
 
-// - Help -
 
 class VCL_DLLPUBLIC Help
 {
diff --git a/include/vcl/imgctrl.hxx b/include/vcl/imgctrl.hxx
index cdfd9498916f..582b73274fdb 100644
--- a/include/vcl/imgctrl.hxx
+++ b/include/vcl/imgctrl.hxx
@@ -26,7 +26,6 @@
 #include <vcl/bitmapex.hxx>
 
 
-// - ImageControl -
 
 
 class VCL_DLLPUBLIC ImageControl : public FixedImage
diff --git a/include/vcl/inputctx.hxx b/include/vcl/inputctx.hxx
index d1f3f9ff3f5b..ced1d2903bc3 100644
--- a/include/vcl/inputctx.hxx
+++ b/include/vcl/inputctx.hxx
@@ -26,7 +26,6 @@
 #include <o3tl/typed_flags_set.hxx>
 
 
-// - InputContext-Flags -
 
 
 enum class InputContextFlags
@@ -43,7 +42,6 @@ namespace o3tl
 }
 
 
-// - InputContext -
 
 
 class VCL_DLLPUBLIC InputContext
diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx
index 2faf4a0c93c3..3495bb28dd33 100644
--- a/include/vcl/lineinfo.hxx
+++ b/include/vcl/lineinfo.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/drawing/LineCap.hpp>
 
 
-// - ImplLineInfo -
 
 
 class SvStream;
@@ -57,7 +56,6 @@ struct ImplLineInfo
 };
 
 
-// - LineInfo -
 
 
 class VCL_DLLPUBLIC LineInfo
diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx
index ad92f1a7c2be..d159d9255b67 100644
--- a/include/vcl/longcurr.hxx
+++ b/include/vcl/longcurr.hxx
@@ -27,7 +27,6 @@
 class LocaleDataWrapper;
 
 
-// - LongCurrencyFormatter -
 
 
 class VCL_DLLPUBLIC LongCurrencyFormatter : public FormatterBase
@@ -73,7 +72,6 @@ public:
 };
 
 
-// - LongCurrencyField -
 
 
 class VCL_DLLPUBLIC LongCurrencyField : public SpinField, public LongCurrencyFormatter
@@ -106,7 +104,6 @@ public:
 };
 
 
-// - LongCurrencyBox -
 
 
 class VCL_DLLPUBLIC LongCurrencyBox : public ComboBox, public LongCurrencyFormatter
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index 2edd16f09923..1fef4f749864 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -29,7 +29,6 @@ class SvStream;
 class OutputDevice;
 
 
-// - MapMode -
 
 
 class VCL_DLLPUBLIC MapMode
diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx
index be86fa9e3603..3e47a87df4fd 100644
--- a/include/vcl/mnemonic.hxx
+++ b/include/vcl/mnemonic.hxx
@@ -26,7 +26,6 @@
 #include <vcl/dllapi.h>
 
 
-// - ImplMnemonicTypes -
 
 
 // Mnemonic Chars, which we want support
@@ -52,7 +51,6 @@
 #define MNEMONIC_INDEX_NOTFOUND     ((sal_uInt16)0xFFFF)
 
 
-// - MnemonicGenerator -
 
 
 class VCL_DLLPUBLIC MnemonicGenerator
diff --git a/include/vcl/morebtn.hxx b/include/vcl/morebtn.hxx
index bc627a4c559a..5e96c3a9eb5a 100644
--- a/include/vcl/morebtn.hxx
+++ b/include/vcl/morebtn.hxx
@@ -28,7 +28,6 @@
 struct ImplMoreButtonData;
 
 
-// - MoreButton -
 
 
 class VCL_DLLPUBLIC MoreButton : public PushButton
diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx
index 13eac89d1686..884e8076edc7 100644
--- a/include/vcl/prgsbar.hxx
+++ b/include/vcl/prgsbar.hxx
@@ -46,13 +46,11 @@
  ************************************************************************/
 
 
-// - WinBits -
 
 
 #define WB_STDPROGRESSBAR       WB_BORDER
 
 
-// - ProgressBar -
 
 
 class VCL_DLLPUBLIC ProgressBar : public vcl::Window
diff --git a/include/vcl/prntypes.hxx b/include/vcl/prntypes.hxx
index 3dfa9ca6b864..2d5d9b969e10 100644
--- a/include/vcl/prntypes.hxx
+++ b/include/vcl/prntypes.hxx
@@ -25,19 +25,16 @@
 #include <o3tl/typed_flags_set.hxx>
 
 
-// - Duplex Mode -
 
 
 enum DuplexMode { DUPLEX_UNKNOWN, DUPLEX_OFF, DUPLEX_LONGEDGE, DUPLEX_SHORTEDGE };
 
 
-// - Orientation -
 
 
 enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE };
 
 
-// - QueueInfo-Types -
 
 enum class PrintQueueFlags
 {
@@ -76,7 +73,6 @@ namespace o3tl
 #define QUEUE_JOBS_DONTKNOW             ((sal_uLong)0xFFFFFFFF)
 
 
-// - Printer-Types -
 
 enum class PrinterCapType
 {
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx
index 6037bdcfb1dc..63664484a413 100644
--- a/include/vcl/salbtype.hxx
+++ b/include/vcl/salbtype.hxx
@@ -29,13 +29,11 @@
 #include <vcl/dllapi.h>
 
 
-// - Memory -
 
 typedef sal_uInt8*        Scanline;
 typedef const sal_uInt8*  ConstScanline;
 
 
-// - Bitmap formats -
 
 #define BMP_FORMAT_BOTTOM_UP                        0x00000000UL
 #define BMP_FORMAT_TOP_DOWN                         0x80000000UL
@@ -86,7 +84,6 @@ d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & maR.mnOr ) >> maR.mnO
     ( (sal_uInt32) (d_rCol).GetBlue() << d_BS ) ) & d_BM ) | \
     d_ALPHA )
 
-// - BitmapColor -
 
 class Color;
 
@@ -139,7 +136,6 @@ public:
     inline sal_uInt16   GetColorError( const BitmapColor& rBitmapColor ) const;
 };
 
-// - BitmapPalette -
 class Palette;
 
 class VCL_DLLPUBLIC BitmapPalette
@@ -223,7 +219,6 @@ struct VCL_DLLPUBLIC ColorMaskElement
     }
 };
 
-// - ColorMask -
 class VCL_DLLPUBLIC ColorMask
 {
     ColorMaskElement        maR;
@@ -264,7 +259,6 @@ public:
     inline void         SetColorFor32Bit( const BitmapColor& rColor, sal_uInt8* pPixel ) const;
 };
 
-// - BitmapBuffer -
 struct VCL_DLLPUBLIC BitmapBuffer
 {
     sal_uLong       mnFormat;
@@ -277,7 +271,6 @@ struct VCL_DLLPUBLIC BitmapBuffer
     sal_uInt8*      mpBits;
 };
 
-// - Access modes -
 typedef enum
 {
     BITMAP_INFO_ACCESS,
@@ -286,7 +279,6 @@ typedef enum
 }
 BitmapAccessMode;
 
-// - StretchAndConvert -
 VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert(
     const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect,
     sal_uLong nDstBitmapFormat, const BitmapPalette* pDstPal = nullptr, const ColorMask* pDstMask = nullptr );
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index 99b547baf1d8..e9864609280c 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -27,14 +27,12 @@
 class AutoTimer;
 
 
-// - ScrollBar-Types -
 
 
 enum ScrollType { SCROLL_DONTKNOW, SCROLL_LINEUP, SCROLL_LINEDOWN,
                   SCROLL_PAGEUP, SCROLL_PAGEDOWN, SCROLL_DRAG, SCROLL_SET };
 
 
-// - ScrollBar -
 
 struct ImplScrollBarData;
 
@@ -141,7 +139,6 @@ public:
 };
 
 
-// - ScrollBarBox -
 
 
 class VCL_DLLPUBLIC ScrollBarBox : public vcl::Window
diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx
index aa0c256d20b6..7576c61dfba5 100644
--- a/include/vcl/seleng.hxx
+++ b/include/vcl/seleng.hxx
@@ -37,7 +37,6 @@ class CommandEvent;
 enum SelectionMode { NO_SELECTION, SINGLE_SELECTION, RANGE_SELECTION, MULTIPLE_SELECTION };
 
 
-// - FunctionSet -
 
 
 class VCL_DLLPUBLIC FunctionSet
@@ -62,7 +61,6 @@ public:
 };
 
 
-// - SelectionEngine -
 
 enum class SelectionEngineFlags {
     DRG_ENAB     = 0x0001,
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 46de94d538f9..aa6f4d51e77f 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -53,7 +53,6 @@ namespace vcl {
     class IconThemeInfo;
 }
 
-// - MouseSettings -
 
 enum class MouseSettingsOptions
 {
@@ -177,7 +176,6 @@ struct FrameStyle
 
 
 
-// - StyleSettings -
 
 
 enum class StyleSettingsOptions
@@ -626,7 +624,6 @@ public:
 };
 
 
-// - MiscSettings -
 
 
 class VCL_DLLPUBLIC MiscSettings
@@ -654,7 +651,6 @@ public:
 };
 
 
-// - HelpSettings -
 
 class VCL_DLLPUBLIC HelpSettings
 {
@@ -675,7 +671,6 @@ public:
 };
 
 
-// - AllSettings -
 
 enum class AllSettingsFlags {
     NONE     = 0x0000,
diff --git a/include/vcl/sound.hxx b/include/vcl/sound.hxx
index 7f4bc6f04517..d99b4ff9a431 100644
--- a/include/vcl/sound.hxx
+++ b/include/vcl/sound.hxx
@@ -25,7 +25,6 @@
 namespace vcl { class Window; }
 
 
-// - Sound -
 
 
 class VCL_DLLPUBLIC Sound
diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx
index 6f55421e7c00..68392f0f15fb 100644
--- a/include/vcl/spin.hxx
+++ b/include/vcl/spin.hxx
@@ -26,7 +26,6 @@
 #include <vcl/timer.hxx>
 
 
-// - SpinButton -
 
 
 class VCL_DLLPUBLIC SpinButton : public Control
diff --git a/include/vcl/status.hxx b/include/vcl/status.hxx
index 571e8d05b50c..23339b164dc6 100644
--- a/include/vcl/status.hxx
+++ b/include/vcl/status.hxx
@@ -29,7 +29,6 @@ struct ImplStatusItem;
 typedef ::std::vector< ImplStatusItem* > ImplStatusItemList;
 
 
-// - Progress-Ausgabe -
 
 void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos,
                                 long nOffset, long nPrgsWidth, long nPrgsHeight,
@@ -37,13 +36,11 @@ void VCL_DLLPUBLIC DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRende
                                 const Rectangle& rFramePosSize);
 
 
-// - StatusBarItemBits -
 
 
 typedef sal_uInt16 StatusBarItemBits;
 
 
-// - Bits fuer StatusBarItems -
 
 
 #define SIB_LEFT                    ((StatusBarItemBits)0x0001)
@@ -56,7 +53,6 @@ typedef sal_uInt16 StatusBarItemBits;
 #define SIB_USERDRAW                ((StatusBarItemBits)0x0080)
 
 
-// - StatusBar-Types -
 
 
 #define STATUSBAR_APPEND            ((sal_uInt16)0xFFFF)
@@ -64,7 +60,6 @@ typedef sal_uInt16 StatusBarItemBits;
 #define STATUSBAR_OFFSET            ((long)5)
 
 
-// - StatusBar -
 
 
 class VCL_DLLPUBLIC StatusBar : public vcl::Window
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index e95cbf93f7bb..58771f29da92 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -32,7 +32,6 @@ class NotebookBarWindow;
 class TaskPaneList;
 class VclContainer;
 
-// - Icon-Types -
 #define ICON_LO_DEFAULT                 1
 #define ICON_TEXT_DOCUMENT              2
 #define ICON_SPREADSHEET_DOCUMENT       4
@@ -44,7 +43,6 @@ class VclContainer;
 #define ICON_MACROLIBRARY               1
 
 
-// - WindowStateData -
 
 
 #define WINDOWSTATE_MASK_X                  ((sal_uInt32)0x00000001)
@@ -121,7 +119,6 @@ public:
 };
 
 
-// - SystemWindow-Types -
 
 
 enum class MenuBarMode
@@ -136,7 +133,6 @@ enum class TitleButton
     Menu           = 4,
 };
 
-// - SystemWindow -
 class VCL_DLLPUBLIC SystemWindow
     : public vcl::Window
     , public VclBuilderContainer
diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index ff04ade6181c..734607a450b5 100644
--- a/include/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
@@ -26,7 +26,6 @@
 #include <vcl/window.hxx>
 
 
-// - TabPage -
 
 
 class VCL_DLLPUBLIC TabPage
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 5487745d36ab..060c068ead4e 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -121,7 +121,6 @@ namespace o3tl
 }
 
 
-// - WindowTypes -
 
 
 // Type fuer GetWindow()
@@ -430,7 +429,6 @@ enum class GetDlgWindowType
 };
 
 
-// - Window -
 
 
 #ifdef DBG_UTIL
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index 5f0523858596..507de99dddbe 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -29,7 +29,6 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; }}}}
 struct SystemParentData;
 
 
-// - WorkWindow - Types -
 
 
 // Presentation Flags
@@ -47,7 +46,6 @@ namespace o3tl
 }
 
 
-// - WorkWindow -
 
 
 class VCL_DLLPUBLIC WorkWindow : public SystemWindow