Bin more pointless comments and ASCII graphics

Suggested Easy Hack: Replace all instances of // -------- comments
including surrounding newlines with a single newline.

Another Easy Hack, slightly harder to automate: Remove all the
pointless comments that just tell the class name right before the
declaration of that class.

Change-Id: Ia890ed613b53c5d719988697e20a983d62334123

8 files changed, 1 insertions, 375 deletions

diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index 2a0b139df92e..7753083ace72 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.hxx
@@ -27,15 +27,10 @@
 #include <vcl/region.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
 
-// -----------
-// - Defines -
-// -----------
-
 #define BMP_MIRROR_NONE             0x00000000UL
 #define BMP_MIRROR_HORZ             0x00000001UL
 #define BMP_MIRROR_VERT             0x00000002UL
 
-// -----------------------------------------------------------------------------
 
 #define BMP_SCALE_NONE              0x00000000UL
 #define BMP_SCALE_FAST              0x00000001UL
@@ -50,29 +45,19 @@
 #define BMP_SCALE_BEST              BMP_SCALE_LANCZOS
 #define BMP_SCALE_DEFAULT           BMP_SCALE_BOX
 
-// -----------------------------------------------------------------------------
-
 #define BMP_DITHER_NONE             0x00000000UL
 #define BMP_DITHER_MATRIX           0x00000001UL
 #define BMP_DITHER_FLOYD            0x00000002UL
 #define BMP_DITHER_FLOYD_16         0x00000004UL
 
-// -----------------------------------------------------------------------------
-
 #define BMP_VECTORIZE_NONE          BMP_VECTORIZE_OUTER
 #define BMP_VECTORIZE_INNER         0x00000001UL
 #define BMP_VECTORIZE_OUTER         0x00000002UL
 #define BMP_VECTORIZE_BOUND_ONLY    0x00000004UL
 #define BMP_VECTORIZE_REDUCE_EDGES  0x00000008UL
 
-// -----------------------------------------------------------------------------
-
 #define BMP_COL_TRANS                   Color( 252, 3, 251 )
 
-// ---------
-// - Enums -
-// ---------
-
 enum BmpConversion
 {
     BMP_CONVERSION_NONE = 0,
@@ -88,8 +73,6 @@ enum BmpConversion
     BMP_CONVERSION_GHOSTED = 10
 };
 
-// ------------------------------------------------------------------------
-
 enum BmpCombine
 {
     BMP_COMBINE_COPY = 0,
@@ -102,8 +85,6 @@ enum BmpCombine
     BMP_COMBINE_NXOR = 7
 };
 
-// ------------------------------------------------------------------------
-
 enum BmpReduce
 {
     BMP_REDUCE_SIMPLE = 0,
@@ -111,8 +92,6 @@ enum BmpReduce
     BMP_REDUCE_MEDIAN = 2
 };
 
-// ------------------------------------------------------------------------
-
 enum BmpEmboss
 {
     BMP_EMBOSS_TOPLEFT = 0,
@@ -126,8 +105,6 @@ enum BmpEmboss
     BMP_EMBOSS_BOTTOMRIGHT = 8
 };
 
-// ------------------------------------------------------------------------
-
 enum BmpFilter
 {
     BMP_FILTER_SMOOTH = 0,
@@ -143,12 +120,6 @@ enum BmpFilter
     BMP_FILTER_UNKNOWN = 65535
 };
 
-// ------------------------------------------------------------------------
-
-// --------------------
-// - FilterParameters -
-// --------------------
-
 class VCL_DLLPUBLIC BmpFilterParam
 {
     friend class Bitmap;
@@ -217,7 +188,7 @@ public:
 };
 
 // --------------------
-// Resample Kernels
+// Resample kernels
 // --------------------
 
 class Kernel
@@ -299,10 +270,6 @@ class BoxKernel : public Kernel {
     }
 };
 
-// ----------
-// - Bitmap -
-// ----------
-
 class   BitmapReadAccess;
 class   BitmapWriteAccess;
 class   BitmapPalette;
@@ -868,80 +835,56 @@ public:
     friend VCL_DLLPUBLIC SvStream&        operator<<( SvStream& rOStm, const Bitmap& rBitmap );
 };
 
-// -----------
-// - Inlines -
-// -----------
-
 inline sal_Bool Bitmap::operator!() const
 {
     return( mpImpBmp == NULL );
 }
 
-// ------------------------------------------------------------------
-
 inline sal_Bool Bitmap::operator==( const Bitmap& rBitmap ) const
 {
     return( rBitmap.mpImpBmp == mpImpBmp );
 }
 
-// ------------------------------------------------------------------
-
 inline sal_Bool Bitmap::operator!=( const Bitmap& rBitmap ) const
 {
     return( rBitmap.mpImpBmp != mpImpBmp );
 }
 
-// ------------------------------------------------------------------
-
 inline sal_Bool Bitmap::IsSameInstance( const Bitmap& rBitmap ) const
 {
     return( rBitmap.mpImpBmp == mpImpBmp );
 }
 
-// ------------------------------------------------------------------
-
 inline sal_Bool Bitmap::IsEmpty() const
 {
     return( mpImpBmp == NULL );
 }
 
-// ------------------------------------------------------------------
-
 inline const MapMode& Bitmap::GetPrefMapMode() const
 {
     return maPrefMapMode;
 }
 
-// ------------------------------------------------------------------
-
 inline void Bitmap::SetPrefMapMode( const MapMode& rMapMode )
 {
     maPrefMapMode = rMapMode;
 }
 
-// ------------------------------------------------------------------
-
 inline const Size& Bitmap::GetPrefSize() const
 {
     return maPrefSize;
 }
 
-// ------------------------------------------------------------------
-
 inline void Bitmap::SetPrefSize( const Size& rSize )
 {
     maPrefSize = rSize;
 }
 
-// ------------------------------------------------------------------
-
 inline sal_uLong Bitmap::GetColorCount() const
 {
     return( 1UL << (sal_uLong) GetBitCount() );
 }
 
-// ------------------------------------------------------------------
-
 inline sal_uLong Bitmap::GetSizeBytes() const
 {
     const Size aSizePix( GetSizePixel() );
diff --git a/vcl/inc/vcl/cvtsvm.hxx b/vcl/inc/vcl/cvtsvm.hxx
index 5ca9dbd1c5eb..2dc9435cdfa9 100644
--- a/vcl/inc/vcl/cvtsvm.hxx
+++ b/vcl/inc/vcl/cvtsvm.hxx
@@ -25,10 +25,6 @@
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
 
-// -----------
-// - Defines -
-// -----------
-
 #define CONVERT_TO_SVM1                 0x00000001UL
 #define CONVERT_FROM_SVM1               0x00000002UL
 
@@ -81,10 +77,6 @@
 
 #define GDI_LINECAP_ACTION              1036
 
-// ----------------
-// - SVMConverter -
-// ----------------
-
 class VCL_PLUGIN_PUBLIC SVMConverter
 {
 private:
diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index 4e7f38e1f952..51cff9fc4cb9 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -51,18 +51,10 @@ class Gradient;
 #define METAFILE_LABEL_NOTFOUND         GDI_METAFILE_LABEL_NOTFOUND
 #endif
 
-// -----------
-// - Defines -
-// -----------
-
 #define MTF_MIRROR_NONE             0x00000000UL
 #define MTF_MIRROR_HORZ             0x00000001UL
 #define MTF_MIRROR_VERT             0x00000002UL
 
-// ---------
-// - Enums -
-// ---------
-
 enum MtfConversion
 {
     MTF_CONVERSION_NONE = 0,
@@ -77,11 +69,6 @@ enum MtfConversion
 typedef Color (*ColorExchangeFnc)( const Color& rColor, const void* pColParam );
 typedef BitmapEx (*BmpExchangeFnc)( const BitmapEx& rBmpEx, const void* pBmpParam );
 
-
-// ---------------
-// - GDIMetaFile -
-// ---------------
-
 class VCL_DLLPUBLIC GDIMetaFile
 {
 private:
diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx
index 78445bfd8a67..6c7ba0a70347 100644
--- a/vcl/inc/vcl/image.hxx
+++ b/vcl/inc/vcl/image.hxx
@@ -33,17 +33,9 @@ struct ImplImage;
 struct ImplImageList;
 namespace com { namespace sun { namespace star { namespace graphic { class XGraphic;} } } }
 
-// -----------
-// - Defines -
-// -----------
-
 #define IMAGE_STDBTN_COLOR          Color( 0xC0, 0xC0, 0xC0 )
 #define IMAGELIST_IMAGE_NOTFOUND    ((sal_uInt16)0xFFFF)
 
-// -----------------------
-// - ImageColorTransform -
-// -----------------------
-
 enum ImageColorTransform
 {
     IMAGECOLORTRANSFORM_NONE = 0,
@@ -52,10 +44,6 @@ enum ImageColorTransform
     IMAGECOLORTRANSFORM_MONOCHROME_WHITE = 3
 };
 
-// ---------
-// - Image -
-// ---------
-
 class VCL_DLLPUBLIC Image
 {
     friend class ImageList;
@@ -91,10 +79,6 @@ private:
     SAL_DLLPRIVATE void    ImplInit( const BitmapEx& rBmpEx );
 };
 
-// -------------
-// - ImageList -
-// -------------
-
 class VCL_DLLPUBLIC ImageList
 {
 public:
diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx
index e52d18457036..4cad0a3fb8bf 100644
--- a/vcl/inc/vcl/metaact.hxx
+++ b/vcl/inc/vcl/metaact.hxx
@@ -37,10 +37,6 @@
 
 class SvStream;
 
-// -----------
-// - Defines -
-// -----------
-
 #define META_NULL_ACTION                    (0)
 #define META_PIXEL_ACTION                   (100)
 #define META_POINT_ACTION                   (101)
@@ -97,8 +93,6 @@ class SvStream;
 
 #define META_COMMENT_ACTION                 (512)
 
-// ------------------------------------------------------------------------
-
 struct ImplMetaReadData
 {
     rtl_TextEncoding        meActualCharSet;
@@ -109,8 +103,6 @@ struct ImplMetaReadData
                             }
 };
 
-// ------------------------------------------------------------------------
-
 struct ImplMetaWriteData
 {
     rtl_TextEncoding        meActualCharSet;
@@ -121,8 +113,6 @@ struct ImplMetaWriteData
                             }
 };
 
-// ------------------------------------------------------------------------
-
 #define DECL_META_ACTION( Name, nType )                                     \
                         Meta##Name##Action();                               \
 protected:                                                                  \
@@ -138,10 +128,6 @@ Meta##Name##Action::Meta##Name##Action() :                              \
     MetaAction( nType ) {}                                              \
 Meta##Name##Action::~Meta##Name##Action() {}
 
-// --------------
-// - MetaAction -
-// --------------
-
 class VCL_DLLPUBLIC MetaAction
 {
 private:
@@ -177,10 +163,6 @@ public:
     static MetaAction*  ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData );
 };
 
-// -------------------
-// - MetaPixelAction -
-// -------------------
-
 class VCL_DLLPUBLIC MetaPixelAction : public MetaAction
 {
 private:
@@ -201,10 +183,6 @@ public:
     const Color&        GetColor() const { return maColor; }
 };
 
-// -------------------
-// - MetaPointAction -
-// -------------------
-
 class VCL_DLLPUBLIC MetaPointAction : public MetaAction
 {
 private:
@@ -223,10 +201,6 @@ public:
     const Point&        GetPoint() const { return maPt; }
 };
 
-// ------------------
-// - MetaLineAction -
-// ------------------
-
 class VCL_DLLPUBLIC MetaLineAction : public MetaAction
 {
 private:
@@ -252,10 +226,6 @@ public:
     const LineInfo&     GetLineInfo() const { return maLineInfo; }
 };
 
-// ------------------
-// - MetaRectAction -
-// ------------------
-
 class VCL_DLLPUBLIC MetaRectAction : public MetaAction
 {
 private:
@@ -274,10 +244,6 @@ public:
     const Rectangle&    GetRect() const { return maRect; }
 };
 
-// -----------------------
-// - MetaRoundRectAction -
-// -----------------------
-
 class VCL_DLLPUBLIC MetaRoundRectAction : public MetaAction
 {
 private:
@@ -302,10 +268,6 @@ public:
     sal_uInt32          GetVertRound() const { return mnVertRound; }
 };
 
-// ---------------------
-// - MetaEllipseAction -
-// ---------------------
-
 class VCL_DLLPUBLIC MetaEllipseAction : public MetaAction
 {
 private:
@@ -325,10 +287,6 @@ public:
     const Rectangle&    GetRect() const { return maRect; }
 };
 
-// -----------------
-// - MetaArcAction -
-// -----------------
-
 class VCL_DLLPUBLIC MetaArcAction : public MetaAction
 {
 private:
@@ -353,10 +311,6 @@ public:
     const Point&        GetEndPoint() const { return maEndPt; }
 };
 
-// -----------------
-// - MetaPieAction -
-// -----------------
-
 class VCL_DLLPUBLIC MetaPieAction : public MetaAction
 {
 private:
@@ -381,10 +335,6 @@ public:
     const Point&        GetEndPoint() const { return maEndPt; }
 };
 
-// -------------------
-// - MetaChordAction -
-// -------------------
-
 class VCL_DLLPUBLIC MetaChordAction : public MetaAction
 {
 private:
@@ -409,10 +359,6 @@ public:
     const Point&        GetEndPoint() const { return maEndPt; }
 };
 
-// ----------------------
-// - MetaPolyLineAction -
-// ----------------------
-
 class VCL_DLLPUBLIC MetaPolyLineAction : public MetaAction
 {
 private:
@@ -435,10 +381,6 @@ public:
     const LineInfo&     GetLineInfo() const { return maLineInfo; }
 };
 
-// ---------------------
-// - MetaPolygonAction -
-// ---------------------
-
 class VCL_DLLPUBLIC MetaPolygonAction : public MetaAction
 {
 private:
@@ -458,10 +400,6 @@ public:
     const Polygon&      GetPolygon() const { return maPoly; }
 };
 
-// -------------------------
-// - MetaPolyPolygonAction -
-// -------------------------
-
 class VCL_DLLPUBLIC MetaPolyPolygonAction : public MetaAction
 {
 private:
@@ -481,10 +419,6 @@ public:
     const PolyPolygon&  GetPolyPolygon() const { return maPolyPoly; }
 };
 
-// ------------------
-// - MetaTextAction -
-// ------------------
-
 class VCL_DLLPUBLIC MetaTextAction : public MetaAction
 {
 private:
@@ -511,10 +445,6 @@ public:
     sal_uInt16              GetLen() const { return mnLen; }
 };
 
-// -----------------------
-// - MetaTextArrayAction -
-// -----------------------
-
 class VCL_DLLPUBLIC MetaTextArrayAction : public MetaAction
 {
 private:
@@ -554,10 +484,6 @@ public:
     sal_Int32*          GetDXArray() const { return mpDXAry; }
 };
 
-// -------------------------
-// - MetaStretchTextAction -
-// -------------------------
-
 class VCL_DLLPUBLIC MetaStretchTextAction : public MetaAction
 {
 private:
@@ -587,10 +513,6 @@ public:
     sal_uInt16              GetLen() const { return mnLen; }
 };
 
-// ----------------------
-// - MetaTextRectAction -
-// ----------------------
-
 class VCL_DLLPUBLIC MetaTextRectAction : public MetaAction
 {
 private:
@@ -615,10 +537,6 @@ public:
     sal_uInt16              GetStyle() const { return mnStyle; }
 };
 
-// ----------------------
-// - MetaTextLineAction -
-// ----------------------
-
 class VCL_DLLPUBLIC MetaTextLineAction : public MetaAction
 {
 private:
@@ -648,10 +566,6 @@ public:
     FontUnderline       GetOverline()  const { return meOverline; }
 };
 
-// -----------------
-// - MetaBmpAction -
-// -----------------
-
 class VCL_DLLPUBLIC MetaBmpAction : public MetaAction
 {
 private:
@@ -673,10 +587,6 @@ public:
     const Point&        GetPoint() const { return maPt; }
 };
 
-// ----------------------
-// - MetaBmpScaleAction -
-// ----------------------
-
 class VCL_DLLPUBLIC MetaBmpScaleAction : public MetaAction
 {
 private:
@@ -701,10 +611,6 @@ public:
     const Size&         GetSize() const { return maSz; }
 };
 
-// --------------------------
-// - MetaBmpScalePartAction -
-// --------------------------
-
 class VCL_DLLPUBLIC MetaBmpScalePartAction : public MetaAction
 {
 private:
@@ -734,10 +640,6 @@ public:
     const Size&         GetSrcSize() const { return maSrcSz; }
 };
 
-// -----------------
-// - MetaBmpExAction -
-// -----------------
-
 class VCL_DLLPUBLIC MetaBmpExAction : public MetaAction
 {
 private:
@@ -759,10 +661,6 @@ public:
     const Point&        GetPoint() const { return maPt; }
 };
 
-// ----------------------
-// - MetaBmpExScaleAction -
-// ----------------------
-
 class VCL_DLLPUBLIC MetaBmpExScaleAction : public MetaAction
 {
 private:
@@ -787,10 +685,6 @@ public:
     const Size&         GetSize() const { return maSz; }
 };
 
-// ----------------------------
-// - MetaBmpExScalePartAction -
-// ----------------------------
-
 class VCL_DLLPUBLIC MetaBmpExScalePartAction : public MetaAction
 {
 private:
@@ -820,10 +714,6 @@ public:
     const Size&         GetSrcSize() const { return maSrcSz; }
 };
 
-// ------------------
-// - MetaMaskAction -
-// ------------------
-
 class VCL_DLLPUBLIC MetaMaskAction : public MetaAction
 {
 private:
@@ -849,10 +739,6 @@ public:
     const Point&        GetPoint() const { return maPt; }
 };
 
-// -----------------------
-// - MetaMaskScaleAction -
-// -----------------------
-
 class VCL_DLLPUBLIC MetaMaskScaleAction : public MetaAction
 {
 private:
@@ -880,10 +766,6 @@ public:
     const Size&         GetSize() const { return maSz; }
 };
 
-// ---------------------------
-// - MetaMaskScalePartAction -
-// ---------------------------
-
 class VCL_DLLPUBLIC MetaMaskScalePartAction : public MetaAction
 {
 private:
@@ -916,10 +798,6 @@ public:
     const Size&         GetSrcSize() const { return maSrcSz; }
 };
 
-// ----------------------
-// - MetaGradientAction -
-// ----------------------
-
 class VCL_DLLPUBLIC MetaGradientAction : public MetaAction
 {
 private:
@@ -941,10 +819,6 @@ public:
     const Gradient&     GetGradient() const { return maGradient; }
 };
 
-// ------------------------
-// - MetaGradientExAction -
-// ------------------------
-
 class VCL_DLLPUBLIC MetaGradientExAction : public MetaAction
 {
 private:
@@ -966,10 +840,6 @@ public:
     const Gradient&     GetGradient() const { return maGradient; }
 };
 
-// -------------------
-// - MetaHatchAction -
-// -------------------
-
 class VCL_DLLPUBLIC MetaHatchAction : public MetaAction
 {
 private:
@@ -991,10 +861,6 @@ public:
     const Hatch&        GetHatch() const { return maHatch; }
 };
 
-// -----------------------
-// - MetaWallpaperAction -
-// -----------------------
-
 class VCL_DLLPUBLIC MetaWallpaperAction : public MetaAction
 {
 private:
@@ -1017,10 +883,6 @@ public:
     const Wallpaper&    GetWallpaper() const { return maWallpaper; }
 };
 
-// ------------------------
-// - MetaClipRegionAction -
-// ------------------------
-
 class VCL_DLLPUBLIC MetaClipRegionAction : public MetaAction
 {
 private:
@@ -1042,10 +904,6 @@ public:
     sal_Bool                IsClipping() const { return mbClip; }
 };
 
-// ---------------------------------
-// - MetaISectRectClipRegionAction -
-// ---------------------------------
-
 class VCL_DLLPUBLIC MetaISectRectClipRegionAction : public MetaAction
 {
 private:
@@ -1065,10 +923,6 @@ public:
     const Rectangle&    GetRect() const { return maRect; }
 };
 
-// -----------------------------------
-// - MetaISectRegionClipRegionAction -
-// -----------------------------------
-
 class VCL_DLLPUBLIC MetaISectRegionClipRegionAction : public MetaAction
 {
 private:
@@ -1088,10 +942,6 @@ public:
     const Region&       GetRegion() const { return maRegion; }
 };
 
-// ----------------------------
-// - MetaMoveClipRegionAction -
-// ----------------------------
-
 class VCL_DLLPUBLIC MetaMoveClipRegionAction : public MetaAction
 {
 private:
@@ -1112,10 +962,6 @@ public:
     long                GetVertMove() const { return mnVertMove; }
 };
 
-// -----------------------
-// - MetaLineColorAction -
-// -----------------------
-
 class VCL_DLLPUBLIC MetaLineColorAction : public MetaAction
 {
 private:
@@ -1134,10 +980,6 @@ public:
     sal_Bool                IsSetting() const { return mbSet; }
 };
 
-// -----------------------
-// - MetaFillColorAction -
-// -----------------------
-
 class VCL_DLLPUBLIC MetaFillColorAction : public MetaAction
 {
 private:
@@ -1156,10 +998,6 @@ public:
     sal_Bool                IsSetting() const { return mbSet; }
 };
 
-// -----------------------
-// - MetaTextColorAction -
-// -----------------------
-
 class VCL_DLLPUBLIC MetaTextColorAction : public MetaAction
 {
 private:
@@ -1176,10 +1014,6 @@ public:
     const Color&        GetColor() const { return maColor; }
 };
 
-// ---------------------------
-// - MetaTextFillColorAction -
-// ---------------------------
-
 class VCL_DLLPUBLIC MetaTextFillColorAction : public MetaAction
 {
 private:
@@ -1198,10 +1032,6 @@ public:
     sal_Bool                IsSetting() const { return mbSet; }
 };
 
-// ---------------------------
-// - MetaTextLineColorAction -
-// ---------------------------
-
 class VCL_DLLPUBLIC MetaTextLineColorAction : public MetaAction
 {
 private:
@@ -1220,10 +1050,6 @@ public:
     sal_Bool                IsSetting() const { return mbSet; }
 };
 
-// ---------------------------
-// - MetaOverlineColorAction -
-// ---------------------------
-
 class VCL_DLLPUBLIC MetaOverlineColorAction : public MetaAction
 {
 private:
@@ -1242,10 +1068,6 @@ public:
     sal_Bool                IsSetting() const { return mbSet; }
 };
 
-// -----------------------
-// - MetaTextAlignAction -
-// -----------------------
-
 class VCL_DLLPUBLIC MetaTextAlignAction : public MetaAction
 {
 private:
@@ -1262,10 +1084,6 @@ public:
     TextAlign           GetTextAlign() const { return maAlign; }
 };
 
-// ---------------------
-// - MetaMapModeAction -
-// ---------------------
-
 class VCL_DLLPUBLIC MetaMapModeAction : public MetaAction
 {
 private:
@@ -1284,10 +1102,6 @@ public:
     const MapMode&      GetMapMode() const { return maMapMode; }
 };
 
-// ---------------------
-// - MetaFontAction -
-// ---------------------
-
 class VCL_DLLPUBLIC MetaFontAction : public MetaAction
 {
 private:
@@ -1306,10 +1120,6 @@ public:
     const Font&         GetFont() const { return maFont; }
 };
 
-// ------------------
-// - MetaPushAction -
-// ------------------
-
 class VCL_DLLPUBLIC MetaPushAction : public MetaAction
 {
 private:
@@ -1326,10 +1136,6 @@ public:
     sal_uInt16              GetFlags() const { return mnFlags; }
 };
 
-// -----------------
-// - MetaPopAction -
-// -----------------
-
 class VCL_DLLPUBLIC MetaPopAction : public MetaAction
 {
 public:
@@ -1337,10 +1143,6 @@ public:
         DECL_META_ACTION( Pop, META_POP_ACTION )
 };
 
-// ----------------------
-// - MetaRasterOpAction -
-// ----------------------
-
 class VCL_DLLPUBLIC MetaRasterOpAction : public MetaAction
 {
 private:
@@ -1357,10 +1159,6 @@ public:
     RasterOp            GetRasterOp() const { return meRasterOp; }
 };
 
-// -------------------------
-// - MetaTransparentAction -
-// -------------------------
-
 class VCL_DLLPUBLIC MetaTransparentAction : public MetaAction
 {
 private:
@@ -1382,10 +1180,6 @@ public:
     sal_uInt16              GetTransparence() const { return mnTransPercent; }
 };
 
-// ------------------------------
-// - MetaFloatTransparentAction -
-// ------------------------------
-
 class VCL_DLLPUBLIC MetaFloatTransparentAction : public MetaAction
 {
 private:
@@ -1412,10 +1206,6 @@ public:
     const Gradient&     GetGradient() const { return maGradient; }
 };
 
-// ---------------------
-// - MetaDrawEPSAction -
-// ---------------------
-
 class VCL_DLLPUBLIC MetaEPSAction : public MetaAction
 {
 private:
@@ -1442,10 +1232,6 @@ public:
     const Size&         GetSize() const { return maSize; }
 };
 
-// ----------------------
-// - MetaRefPointAction -
-// ----------------------
-
 class VCL_DLLPUBLIC MetaRefPointAction : public MetaAction
 {
 private:
@@ -1464,10 +1250,6 @@ public:
     sal_Bool                IsSetting() const { return mbSet; }
 };
 
-// ---------------------
-// - MetaCommentAction -
-// ---------------------
-
 class VCL_DLLPUBLIC MetaCommentAction : public MetaAction
 {
 private:
@@ -1502,10 +1284,6 @@ public:
     const sal_uInt8*        GetData() const { return mpData; }
 };
 
-// ------------------------
-// - MetaLayoutModeAction -
-// ------------------------
-
 class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction
 {
 private:
@@ -1521,10 +1299,6 @@ public:
     sal_uInt32          GetLayoutMode() const { return mnLayoutMode; }
 };
 
-// ------------------------
-// - MetaTextLanguageAction -
-// ------------------------
-
 class VCL_DLLPUBLIC MetaTextLanguageAction : public MetaAction
 {
 private:
diff --git a/vcl/inc/vcl/octree.hxx b/vcl/inc/vcl/octree.hxx
index 86b191757744..7d1054db8156 100644
--- a/vcl/inc/vcl/octree.hxx
+++ b/vcl/inc/vcl/octree.hxx
@@ -23,17 +23,9 @@
 #include <vcl/salbtype.hxx>
 #include <vcl/dllapi.h>
 
-// -----------
-// - Defines -
-// -----------
-
 #define OCTREE_BITS     5
 #define OCTREE_BITS_1   10
 
-// --------------
-// - OctreeNode -
-// --------------
-
 typedef struct OctreeNode
 {
     sal_uLong       nCount;
@@ -50,10 +42,6 @@ typedef struct OctreeNode
 typedef NODE*       PNODE;
 typedef PNODE*      PPNODE;
 
-// ----------
-// - Octree -
-// ----------
-
 class ImpNodeCache;
 class BitmapReadAccess;
 
@@ -91,8 +79,6 @@ public:
     inline sal_uInt16               GetBestPaletteIndex( const BitmapColor& rColor );
 };
 
-// ------------------------------------------------------------------------
-
 inline const BitmapPalette& Octree::GetPalette()
 {
     aPal.SetEntryCount( (sal_uInt16) nLeafCount );
@@ -101,8 +87,6 @@ inline const BitmapPalette& Octree::GetPalette()
     return aPal;
 }
 
-// ------------------------------------------------------------------------
-
 inline sal_uInt16 Octree::GetBestPaletteIndex( const BitmapColor& rColor )
 {
     pColor = &(BitmapColor&) rColor;
@@ -112,10 +96,6 @@ inline sal_uInt16 Octree::GetBestPaletteIndex( const BitmapColor& rColor )
     return nPalIndex;
 }
 
-// -------------------
-// - InverseColorMap -
-// -------------------
-
 class VCL_PLUGIN_PUBLIC InverseColorMap
 {
 private:
@@ -135,8 +115,6 @@ public:
     inline sal_uInt16       GetBestPaletteIndex( const BitmapColor& rColor );
 };
 
-// ------------------------------------------------------------------------
-
 inline sal_uInt16 InverseColorMap::GetBestPaletteIndex( const BitmapColor& rColor )
 {
     return pMap[ ( ( (sal_uLong) rColor.GetRed() >> nBits ) << OCTREE_BITS_1 ) |
diff --git a/vcl/inc/vcl/salctype.hxx b/vcl/inc/vcl/salctype.hxx
index 0c7db7b0d4ab..4fbb65d2a49a 100644
--- a/vcl/inc/vcl/salctype.hxx
+++ b/vcl/inc/vcl/salctype.hxx
@@ -25,10 +25,6 @@
 
 #include <vcl/graph.hxx>
 
-// -----------
-// - Defines -
-// -----------
-
 #define CVT_UNKNOWN (0x00000000UL)
 #define CVT_BMP     (0x00000001UL)
 #define CVT_GIF     (0x00000002UL)
@@ -42,10 +38,6 @@
 #define CVT_EMF     (0x0000000aUL)
 #define CVT_SVG     (0x0000000bUL)
 
-// ---------------
-// - ConvertData -
-// ---------------
-
 class SvStream;
 
 struct ConvertData
@@ -65,18 +57,10 @@ public:
                         ~ConvertData() {}
 };
 
-// ------------
-// - Callback -
-// ------------
-
 typedef sal_uLong (*SALGRFCVTPROC)( void* pInst,
                                 sal_uLong nInFormat, void* pInBuffer, sal_uLong nInBufSize,
                                 sal_uLong nOutFormat, void** ppOutBuffer );
 
-// -------------------
-// - BitmapConverter -
-// -------------------
-
 namespace vcl
 {
 com::sun::star::uno::Reference< com::sun::star::script::XInvocation > createBmpConverter();
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index b6839f5309ef..a60b6f6d9c92 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -38,10 +38,6 @@ class FontSelectPattern;
 class ImplWinFontEntry;
 class ImplFontAttrCache;
 
-// -----------
-// - Defines -
-// -----------
-
 #define RGB_TO_PALRGB(nRGB)         ((nRGB)|0x02000000)
 #define PALRGB_TO_RGB(nPalRGB)      ((nPalRGB)&0x00ffffff)
 
@@ -142,10 +138,6 @@ public:
     bool                    IsGSUBstituted( sal_UCS4 ) const;
 };
 
-// ------------------
-// - WinSalGraphics -
-// ------------------
-
 class WinSalGraphics : public SalGraphics
 {
 public:
@@ -383,16 +375,8 @@ int     ImplIsSysColorEntry( SalColor nSalColor );
 void    ImplGetLogFontFromFontSelect( HDC, const FontSelectPattern*,
             LOGFONTW&, bool bTestVerticalAvail );
 
-// -----------
-// - Defines -
-// -----------
-
 #define MAX_64KSALPOINTS    ((((sal_uInt16)0xFFFF)-8)/sizeof(POINTS))
 
-// -----------
-// - Inlines -
-// -----------
-
 // #102411# Win's GCP mishandles kerning => we need to do it ourselves
 // SalGraphicsData::mpFontKernPairs is sorted by
 inline bool ImplCmpKernData( const KERNINGPAIR& a, const KERNINGPAIR& b )