Bin some pointless comments and ASCII graphics

Change-Id: Ib7b176eb1889ebd94d4b628899011de9ebbb3dbd

29 files changed, 1 insertions, 261 deletions

diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/aqua/saldata.hxx
index 91d706eca8ee..b7f3ad745a38 100644
--- a/vcl/inc/aqua/saldata.hxx
+++ b/vcl/inc/aqua/saldata.hxx
@@ -48,19 +48,11 @@ class SalVirtualDevice;
 class SalPrinter;
 class SystemFontList;
 
-// ------------------
-// - Some constants -
-// ------------------
-
 #define SAL_CLIPRECT_COUNT 16
 
 #define VER_TIGER   0x1040
 #define VER_LEOPARD 0x1050
 
-// -----------
-// - SalData -
-// -----------
-
 class AquaSalFrame;
 struct FrameHash : public boost::hash<sal_IntPtr>
 {
@@ -121,8 +113,6 @@ public:
 inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; }
 inline SalData *GetSalData() { return ImplGetSVData()->mpSalData; }
 
-// --- Prototypes ---
-
 sal_Bool ImplSalYieldMutexTryToAcquire();
 void ImplSalYieldMutexAcquire();
 void ImplSalYieldMutexRelease();
diff --git a/vcl/inc/aqua/salinst.h b/vcl/inc/aqua/salinst.h
index c8d22665f7bc..a295e066df2b 100644
--- a/vcl/inc/aqua/salinst.h
+++ b/vcl/inc/aqua/salinst.h
@@ -35,10 +35,6 @@ class AquaSalFrame;
 class ApplicationEvent;
 class Image;
 
-// -----------------
-// - SalYieldMutex -
-// -----------------
-
 class SalYieldMutex : public vcl::SolarMutexObject
 {
     sal_uLong                                       mnCount;
@@ -56,19 +52,6 @@ public:
 #define YIELD_GUARD osl::SolarGuard aGuard( GetSalData()->mpFirstInstance->GetYieldMutex() )
 
 
-// -------------------
-// - SalInstanceData -
-// -------------------
-
-//struct SalInstanceData
-//{
-//public:
-//};
-
-// ------------------
-// - AquaSalInstance -
-// ------------------
-
 class AquaSalInstance : public SalInstance
 {
     struct SalUserEvent
@@ -184,7 +167,6 @@ class YieldMutexReleaser
     ~YieldMutexReleaser();
 };
 
-// helper class
 rtl::OUString GetOUString( CFStringRef );
 rtl::OUString GetOUString( NSString* );
 CFStringRef CreateCFString( const rtl::OUString& );
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 894f1941f296..5f4a6e69a8d9 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -37,9 +37,6 @@
 #define VIRTUAL_DESKTOP_WIDTH 1024
 #define VIRTUAL_DESKTOP_HEIGHT 768
 
-// ---------------
-// - SalTimer -
-// ---------------
 class SvpSalInstance;
 class SvpSalTimer : public SalTimer
 {
@@ -53,9 +50,6 @@ public:
     virtual void Stop();
 };
 
-// ---------------
-// - SalInstance -
-// ---------------
 class SvpSalFrame;
 class GenPspGraphics;
 class SvpSalInstance : public SalGenericInstance
diff --git a/vcl/inc/ios/saldata.hxx b/vcl/inc/ios/saldata.hxx
index 9ab5e4bab2e5..d461899802be 100644
--- a/vcl/inc/ios/saldata.hxx
+++ b/vcl/inc/ios/saldata.hxx
@@ -46,16 +46,8 @@ class SalVirtualDevice;
 class SalPrinter;
 class SystemFontList;
 
-// ------------------
-// - Some constants -
-// ------------------
-
 #define SAL_CLIPRECT_COUNT 16
 
-// -----------
-// - SalData -
-// -----------
-
 class IosSalFrame;
 struct FrameHash : public boost::hash<sal_IntPtr>
 {
@@ -100,8 +92,6 @@ public:
 inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; }
 inline SalData *GetSalData() { return ImplGetSVData()->mpSalData; }
 
-// --- Prototypes ---
-
 sal_Bool ImplSalYieldMutexTryToAcquire();
 void ImplSalYieldMutexAcquire();
 void ImplSalYieldMutexRelease();
diff --git a/vcl/inc/ios/salinst.h b/vcl/inc/ios/salinst.h
index cb4d996a491e..f7ff822ebeb5 100644
--- a/vcl/inc/ios/salinst.h
+++ b/vcl/inc/ios/salinst.h
@@ -35,10 +35,6 @@ class IosSalFrame;
 class ApplicationEvent;
 class Image;
 
-// -----------------
-// - SalYieldMutex -
-// -----------------
-
 class SalYieldMutex : public vcl::SolarMutexObject
 {
     sal_uLong                                   mnCount;
@@ -56,19 +52,6 @@ public:
 #define YIELD_GUARD osl::SolarGuard aGuard( GetSalData()->mpFirstInstance->GetYieldMutex() )
 
 
-// -------------------
-// - SalInstanceData -
-// -------------------
-
-//struct SalInstanceData
-//{
-//public:
-//};
-
-// ------------------
-// - IosSalInstance -
-// ------------------
-
 class IosSalInstance : public SalInstance
 {
     struct SalUserEvent
@@ -176,7 +159,6 @@ class YieldMutexReleaser
     ~YieldMutexReleaser();
 };
 
-// helper class
 rtl::OUString GetOUString( CFStringRef );
 rtl::OUString GetOUString( NSString* );
 CFStringRef CreateCFString( const rtl::OUString& );
diff --git a/vcl/inc/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index f97c03ff6d2b..e4ef22c03d35 100644
--- a/vcl/inc/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -42,7 +42,6 @@ public:
     virtual ~SalData();
 };
 
-// -=-= inlines =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 inline void SetSalData( SalData* pData )
 { ImplGetSVData()->mpSalData = pData; }
 
diff --git a/vcl/inc/salframe.hxx b/vcl/inc/salframe.hxx
index 2ae1121675a7..d85375b6e3f7 100644
--- a/vcl/inc/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -115,10 +115,6 @@ typedef sal_uInt64 SalExtStyle;
 using ::rtl::OUString;
 using ::rtl::OString;
 
-// ------------
-// - SalFrame -
-// ------------
-
 struct SystemParentData;
 
 class VCL_PLUGIN_PUBLIC SalFrame : public vcl::DeletionNotifier
@@ -263,8 +259,6 @@ public:
     { return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; }
 };
 
-
-
 #endif // __cplusplus
 
 #endif // _SV_SALFRAME_HXX
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 9936c8651f05..7da7860edc68 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -79,10 +79,6 @@ typedef std::map< sal_Ucs, sal_uInt32 >   Ucs2UIntMap;
 typedef std::map< sal_Ucs, rtl::OString > Ucs2OStrMap;
 typedef std::vector< sal_Int32 > Int32Vector;
 
-// ---------------
-// - SalGraphics -
-// ---------------
-
 // note: if you add any new methods to class SalGraphics using coordinates
 //       make sure they have a corresponding protected pure virtual method
 //       which has to be implemented by the platform dependent part.
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 19b5ec605c8f..fa74ae7c15c5 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -60,10 +60,6 @@ struct SystemGraphicsData;
 struct SystemWindowData;
 class Menu;
 
-// ---------------
-// - SalInstance -
-// ---------------
-
 class VCL_PLUGIN_PUBLIC SalInstance
 {
 private:
@@ -183,28 +179,15 @@ public:
 SalInstance* CreateSalInstance();
 void DestroySalInstance( SalInstance* pInst );
 
-// -------------------------
-// - SalInstance-Functions -
-// -------------------------
-
 void SalAbort( const OUString& rErrorText, bool bDumpCore );
 
 VCL_PLUGIN_PUBLIC const OUString& SalGetDesktopEnvironment();
 
-// -----------
-// - SalData -
-// -----------
-
 void InitSalData();                         // called from Application-Ctor
 void DeInitSalData();                       // called from Application-Dtor
 
 void InitSalMain();
 
-// ----------
-// - SVMain -
-// ----------
-
-// Callbacks (indepen in \sv\source\app\svmain.cxx)
 VCL_DLLPUBLIC int SVMain();
 
 #endif // _SV_SALINST_HXX
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index e0c13d65a165..afbaa5c629be 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -56,8 +56,6 @@ class PhysicalFontFace;
 #define SAL_LAYOUT_DISABLE_GLYPH_PROCESSING 0x1000
 #define SAL_LAYOUT_FOR_FALLBACK             0x2000
 
-// -----------------
-
 // used for managing runs e.g. for BiDi, glyph and script fallback
 class VCL_PLUGIN_PUBLIC ImplLayoutRuns
 {
@@ -81,7 +79,6 @@ public:
     bool    PosIsInAnyRun( int nCharPos ) const;
 };
 
-// -----------------
 
 class ImplLayoutArgs
 {
@@ -134,10 +131,6 @@ bool IsDiacritic( sal_UCS4 );
 int GetVerticalFlags( sal_UCS4 );
 sal_UCS4 GetVerticalChar( sal_UCS4 );
 
-// -------------
-// - SalLayout -
-// -------------
-
 typedef sal_uInt32 sal_GlyphId;
 
 // Glyph Flags
@@ -237,10 +230,6 @@ protected:
     Point           maDrawBase;
 };
 
-// ------------------
-// - MultiSalLayout -
-// ------------------
-
 class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout
 {
 public:
@@ -286,10 +275,6 @@ private:
     bool            mbInComplete;
 };
 
-// --------------------
-// - GenericSalLayout -
-// --------------------
-
 struct GlyphItem
 {
     int     mnFlags;
@@ -316,13 +301,9 @@ public:
     bool    IsDiacritic() const     { return ((mnFlags & IS_DIACRITIC) != 0); }
 };
 
-// ---------------
-
 typedef std::list<GlyphItem> GlyphList;
 typedef std::vector<GlyphItem> GlyphVector;
 
-// ---------------
-
 class VCL_PLUGIN_PUBLIC GenericSalLayout : public SalLayout
 {
 public:
diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx
index 6753e10e009c..4e8f6b1af2f8 100644
--- a/vcl/inc/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -35,10 +35,6 @@ struct SystemEnvData;
 #define SAL_OBJECT_CLIP_EXCLUDERECTS            ((sal_uInt16)0x0002)
 #define SAL_OBJECT_CLIP_ABSOLUTE                ((sal_uInt16)0x0004)
 
-// -------------
-// - SalObject -
-// -------------
-
 class VCL_PLUGIN_PUBLIC SalObject
 {
     void*               m_pInst;
diff --git a/vcl/inc/salprn.hxx b/vcl/inc/salprn.hxx
index 2597e529e4bc..63fbbc494c9c 100644
--- a/vcl/inc/salprn.hxx
+++ b/vcl/inc/salprn.hxx
@@ -33,10 +33,6 @@ class SalFrame;
 struct ImplJobSetup;
 namespace vcl { class PrinterController; }
 
-// -----------------------
-// - SalPrinterQueueInfo -
-// -----------------------
-
 struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo
 {
     rtl::OUString               maPrinterName;
@@ -51,10 +47,6 @@ struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo
                             ~SalPrinterQueueInfo();
 };
 
-// ------------------
-// - SalInfoPrinter -
-// ------------------
-
 class VCL_PLUGIN_PUBLIC SalInfoPrinter
 {
 public:
@@ -93,10 +85,6 @@ public:
     virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData ) = 0;
 };
 
-// --------------
-// - SalPrinter -
-// --------------
-
 class VCL_PLUGIN_PUBLIC SalPrinter
 {
 public:                     // public for Sal Implementation
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx
index 308c65e927f4..598b5513d9fb 100644
--- a/vcl/inc/salsys.hxx
+++ b/vcl/inc/salsys.hxx
@@ -44,9 +44,6 @@ const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_YES    = 6;
 const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO     = 7;
 
 
-// -------------
-// - SalSystem -
-// -------------
 class VCL_PLUGIN_PUBLIC SalSystem
 {
 public:
diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx
index 0565604d7c8a..5bca38b330e6 100644
--- a/vcl/inc/saltimer.hxx
+++ b/vcl/inc/saltimer.hxx
@@ -24,10 +24,6 @@
 #include <vcl/dllapi.h>
 #include <salwtype.hxx>
 
-// ------------
-// - SalTimer -
-// ------------
-
 /*
  * note: there will be only a single instance of SalTimer
  * SalTimer originally had only static methods, but
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index cf736ac1cb9a..35084c746f4a 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -26,10 +26,6 @@
 
 class SalGraphics;
 
-// --------------------
-// - SalVirtualDevice -
-// --------------------
-
 class VCL_PLUGIN_PUBLIC SalVirtualDevice
 {
 public:                     // public for Sal Implementation
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx
index 5902a9882442..7196326a2367 100644
--- a/vcl/inc/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
@@ -329,10 +329,6 @@ struct SalInputContext
 
 #endif // __cplusplus
 
-// ------------------
-// - SalTimer-Types -
-// ------------------
-
 typedef void (*SALTIMERPROC)();
 
 #endif // _SV_SALWTYPE_HXX
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index ba3791770828..484205d223e9 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -96,9 +96,6 @@ class SalData;
 namespace vcl { class DisplayConnection; class SettingsConfigItem; class DeleteOnDeinitBase; }
 namespace utl { class DefaultFontConfiguration; class FontSubstConfiguration; }
 
-// -----------------
-// - ImplSVAppData -
-// -----------------
 class LocaleConfigurationListener : public utl::ConfigurationListener
 {
 public:
@@ -159,10 +156,6 @@ struct ImplSVAppData
 };
 
 
-// -----------------
-// - ImplSVGDIData -
-// -----------------
-
 struct ImplSVGDIData
 {
     OutputDevice*           mpFirstWinGraphics; // First OutputDevice with a Frame Graphics
@@ -191,10 +184,6 @@ struct ImplSVGDIData
 };
 
 
-// -----------------
-// - ImplSVWinData -
-// -----------------
-
 struct ImplSVWinData
 {
     Window*                 mpFirstFrame;       // First FrameWindow
@@ -220,10 +209,6 @@ struct ImplSVWinData
 };
 
 
-// ------------------
-// - ImplSVCtrlData -
-// ------------------
-
 typedef std::vector< std::pair< OUString, FieldUnit > > FieldUnitStringList;
 
 struct ImplSVCtrlData
@@ -252,10 +237,6 @@ struct ImplSVCtrlData
 };
 
 
-// ------------------
-// - ImplSVHelpData -
-// ------------------
-
 struct ImplSVHelpData
 {
     sal_Bool                    mbContextHelp       : 1;    // is ContextHelp enabled
@@ -304,10 +285,6 @@ struct ImplSVNWFData
 };
 
 
-// --------------
-// - ImplSVData -
-// --------------
-
 struct ImplSVData
 {
     SalData*                mpSalData;
@@ -375,22 +352,9 @@ FieldUnitStringList* ImplGetFieldUnits();
 FieldUnitStringList* ImplGetCleanedFieldUnits();
 
 
-// -----------------------------------------------------------------------
-
-// -----------------
-// - ImplSVEmpyStr -
-// -----------------
-
-// Empty-SV-String
-
 inline const String& ImplGetSVEmptyStr()
     { return String::EmptyString(); }
 
-// -----------------------------------------------------------------------
-
-// ----------------------
-// - struct ImplDelData -
-// ----------------------
 // ImplDelData is used as a "dog tag" by a window when it
 // does something that could indirectly destroy the window
 // TODO: wild destruction of a window should not be possible
@@ -417,10 +381,6 @@ private:
     void            AttachToWindow( const Window* );
 };
 
-// ---------------
-// - ImplSVEvent -
-// ---------------
-
 struct ImplSVEvent
 {
     sal_uLong               mnEvent;
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index c84ae020584f..c148b63ba36b 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -29,13 +29,10 @@
 #include <osl/module.h>
 #include <vclpluginapi.h>
 
-// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class SalXLib;
 class SalDisplay;
 class SalPrinter;
 
-// -=-= typedefs -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
 #if defined LINUX || defined NETBSD || defined AIX || \
     defined FREEBSD || defined OPENBSD || defined DRAGONFLY || \
     defined ANDROID
@@ -44,7 +41,6 @@ class SalPrinter;
 typedef unsigned int pthread_t;
 #endif
 
-// -=-= SalData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class VCLPLUG_GEN_PUBLIC X11SalData : public SalGenericData
 {
     static int XErrorHdl( Display*, XErrorEvent* );
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 2bfddda72523..b20684e5ac39 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -20,7 +20,6 @@
 #ifndef _SV_SALDISP_HXX
 #define _SV_SALDISP_HXX
 
-// -=-= exports =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class   SalDisplay;
 class   SalColormap;
 class   SalVisual;
@@ -41,14 +40,12 @@ class   SalXLib;
 
 #include <vclpluginapi.h>
 
-// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class   BitmapPalette;
 class   SalFrame;
 class   ColorMask;
 
 namespace vcl_sal { class WMAdaptor; }
 
-// -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #define PROPERTY_SUPPORT_WM_Parent_Pixmap_None  0x00000004
 #define PROPERTY_SUPPORT_WM_ClientPos           0x00000008
 #define PROPERTY_SUPPORT_3ButtonMouse           0x00000020
@@ -76,7 +73,6 @@ typedef enum  {
 
 extern "C" srv_vendor_t sal_GetServerVendor( Display *p_display );
 
-// -=-= SalRGB -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // MSB/Bigendian view (SalColor == RGB, r=0xFF0000, g=0xFF00, b=0xFF)
 
 enum SalRGB { RGB,  RBG,
@@ -87,7 +83,6 @@ enum SalRGB { RGB,  RBG,
               BGRA, BRGA,
               otherSalRGB };
 
-// -=-= SalVisual =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class SalVisual : public XVisualInfo
 {
     SalRGB          eRGBMode_;
@@ -112,7 +107,6 @@ public:
             SalColor        GetTCColor( Pixel nPixel ) const;
 };
 
-// -=-= SalColormap =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class SalColormap
 {
     const SalDisplay*       m_pDisplay;
@@ -157,7 +151,6 @@ public:
     SalColor        GetColor( Pixel nPixel ) const;
 };
 
-// -=-= SalXLib =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 typedef int(*YieldFunc)(int fd, void* data);
 
 class VCLPLUG_GEN_PUBLIC SalXLib
@@ -192,8 +185,6 @@ public:
     bool            CheckTimeout( bool bExecuteTimers = true );
 };
 
-// -=-= SalDisplay -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
 class SalI18N_InputMethod;
 class SalI18N_KeyboardExtension;
 class AttributeProvider;
@@ -390,8 +381,6 @@ public:
     virtual void    PostUserEvent() = 0;
 };
 
-// -=-= inlines =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
 inline GC SalDisplay::GetGC( sal_uInt16 nDepth, SalX11Screen nXScreen ) const
 { return 1 == nDepth
          ? GetMonoGC( nXScreen )
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index c6a8cc30d100..a88686478376 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -34,14 +34,13 @@
 
 #include <list>
 
-// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class   SalDisplay;
 class   X11SalGraphics;
 class   SalI18N_InputContext;
 
 namespace vcl_sal { class WMAdaptor; class NetWMAdaptor; class GnomeWMAdaptor; }
 
-// -=-= X11SalFrame =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+// X11SalFrame
 #define SHOWSTATE_UNKNOWN       -1
 #define SHOWSTATE_MINIMIZED     0
 #define SHOWSTATE_NORMAL        1
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 3684dd0c2a32..503872f973ad 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -32,7 +32,6 @@
 
 #include <deque>
 
-// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class ImplFontMetricData;
 class FontSelectPattern;
 class SalBitmap;
@@ -51,8 +50,6 @@ namespace basegfx {
     class B2DTrapezoid;
 }
 
-// -=-= SalGraphicsData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
 typedef struct FT_FaceRec_* FT_Face;
 
 class CairoFontsCache
@@ -370,8 +367,6 @@ inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const
 { return GetColormap().GetPixel( nSalColor ); }
 
 
-// -=-= Shortcuts =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
 #ifdef DBG_UTIL
 #define stderr0( s )            fprintf( stderr, s )
 #else
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 83ba4b87fa3f..ea41c55ccb5e 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -28,7 +28,6 @@
 #include "generic/geninst.h"
 
 
-// -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class SalXLib;
 class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalGenericInstance
 {
diff --git a/vcl/inc/unx/salstd.hxx b/vcl/inc/unx/salstd.hxx
index 73a2868836ce..dd37938c6834 100644
--- a/vcl/inc/unx/salstd.hxx
+++ b/vcl/inc/unx/salstd.hxx
@@ -22,7 +22,6 @@
 
 #include <tools/solar.h>
 
-// -=-= X-Lib forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #ifndef _SVUNX_H
 typedef unsigned long       Pixel;
 typedef unsigned long       XID;
diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h
index 36de29b7014f..5061ad919e16 100644
--- a/vcl/inc/unx/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -24,7 +24,6 @@
 #include <unx/svunx.h>
 #include <unx/salstd.hxx>
 
-// -=-= inlines =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 inline long Divide( long nDividend, long nDivisor )
 { return (nDividend + nDivisor/2) / nDivisor; }
 
diff --git a/vcl/inc/unx/salunxtime.h b/vcl/inc/unx/salunxtime.h
index d2d49165e791..a10033b3ee06 100644
--- a/vcl/inc/unx/salunxtime.h
+++ b/vcl/inc/unx/salunxtime.h
@@ -30,7 +30,6 @@
 #endif
 #include <sal/types.h>
 
-// -=-= timeval =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 inline int operator >= ( const timeval &t1, const timeval &t2 )
 {
     if( t1.tv_sec == t2.tv_sec )
diff --git a/vcl/inc/unx/salvd.h b/vcl/inc/unx/salvd.h
index edebd52ebcd6..50e2cd4700f6 100644
--- a/vcl/inc/unx/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -24,11 +24,9 @@
 #include <unx/saltype.h>
 #include <salvd.hxx>
 
-// -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class SalDisplay;
 class X11SalGraphics;
 
-// -=-= SalVirDevData -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 class X11SalVirtualDevice : public SalVirtualDevice
 {
     SalDisplay      *pDisplay_;
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index b2c52ec41c1c..e605f57e993c 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -78,25 +78,11 @@ namespace awt {
 VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 );
 VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4, LanguageType );
 
-// --------------------
-// - SystemWindowMode -
-// --------------------
-
 #define SYSTEMWINDOW_MODE_NOAUTOMODE    ((sal_uInt16)0x0001)
 #define SYSTEMWINDOW_MODE_DIALOG        ((sal_uInt16)0x0002)
 
-// -------------
-// - EventHook -
-// -------------
-
 typedef long (*VCLEventHookProc)( NotifyEvent& rEvt, void* pData );
 
-// --------------------
-// - ApplicationEvent -
-// --------------------
-
-// Build in again, in order to make AppEvents work on MACs
-
 // ATTENTION: ENUM duplicate in daemon.cxx under Unix!
 
 #ifdef UNX
@@ -128,9 +114,6 @@ private:
     rtl::OUString aData;
 };
 
-// ---------------
-// - Application -
-// ---------------
 
 class VCL_DLLPUBLIC Application
 {
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index d6f60e459b00..b35e3be60044 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -42,18 +42,10 @@ struct TempFontItem;
 
 typedef HRESULT (WINAPI  *DwmIsCompositionEnabled_ptr)(BOOL*);
 
-// --------------------
-// - Standard-Defines -
-// --------------------
-
 #define MAX_STOCKPEN            4
 #define MAX_STOCKBRUSH          4
 #define SAL_CLIPRECT_COUNT      16
 
-// --------------------
-// - Icon cache       -
-// --------------------
-
 struct SalIcon
 {
     int     nId;
@@ -62,10 +54,6 @@ struct SalIcon
     SalIcon *pNext;
 };
 
-// -----------
-// - SalData -
-// -----------
-
 class SalData
 {
 public:
@@ -141,10 +129,6 @@ public:
 inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = pData; }
 inline SalData* GetSalData() { return ImplGetSVData()->mpSalData; }
 
-// --------------
-// - SalShlData -
-// --------------
-
 struct SalShlData
 {
     HINSTANCE               mhInst;                 // Instance of SAL-DLL
@@ -157,10 +141,6 @@ struct SalShlData
 
 extern SalShlData aSalShlData;
 
-// ------------
-// - GDICache -
-// ------------
-
 #define CACHESIZE_HDC       3
 #define CACHED_HDC_1        0
 #define CACHED_HDC_2        1
@@ -219,10 +199,6 @@ rtl_TextEncoding ImplSalGetSystemEncoding();
 OUString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen = STRING_LEN );
 int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
 
-// -----------
-// - Defines -
-// -----------
-
 #define SAL_FRAME_WNDEXTRA          sizeof( DWORD )
 #define SAL_FRAME_THIS              0
 #define SAL_FRAME_CLASSNAMEA        "SALFRAME"
@@ -309,10 +285,6 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
 #define SALOBJ_MSG_POSTFOCUS        (WM_USER+161)
 
 
-// -----------------
-// - Helpfunctions -
-// -----------------
-
 // A/W-Wrapper
 BOOL    ImplPostMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam );
 BOOL    ImplSendMessage( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam );
diff --git a/vcl/inc/win/salinst.h b/vcl/inc/win/salinst.h
index 8055103c2946..e73070020b8c 100644
--- a/vcl/inc/win/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -22,10 +22,6 @@
 
 #include <salinst.hxx>
 
-// -------------------
-// - SalInstanceData -
-// -------------------
-
 class SalYieldMutex;
 
 class WinSalInstance : public SalInstance
@@ -81,10 +77,6 @@ public:
     static int WorkaroundExceptionHandlingInUSER32Lib(int nExcept, LPEXCEPTION_POINTERS pExceptionInfo);
 };
 
-// --------------
-// - Prototypen -
-// --------------
-
 SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND hWndParent, sal_uIntPtr nSalFrameStyle );
 SalObject* ImplSalCreateObject( WinSalInstance* pInst, WinSalFrame* pParent );
 HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, sal_Bool bAsChild );