fdo#63154 Removed unused solar.h ref. in vcl

Change-Id: Ibbc80b09a288494baae4e5ebee4428a6a80a904a
Reviewed-on: https://gerrit.libreoffice.org/7738
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

24 files changed, 19 insertions, 381 deletions

diff --git a/vcl/inc/accel.h b/vcl/inc/accel.h
index b2bef1ac8a6e..d1ccb875baa0 100644
--- a/vcl/inc/accel.h
+++ b/vcl/inc/accel.h
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_INC_ACCEL_H
 #define INCLUDED_VCL_INC_ACCEL_H
 
-#include <tools/solar.h>
 #include <vcl/keycod.hxx>
 
 class Accelerator;
diff --git a/vcl/inc/accmgr.hxx b/vcl/inc/accmgr.hxx
index e4c59b74555f..98dd74f9c6ed 100644
--- a/vcl/inc/accmgr.hxx
+++ b/vcl/inc/accmgr.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_INC_ACCMGR_HXX
 #define INCLUDED_VCL_INC_ACCMGR_HXX
 
-#include <tools/solar.h>
 #include <vector>
 
 class Accelerator;
@@ -28,10 +27,6 @@ class KeyCode;
 
 typedef ::std::vector< Accelerator* > ImplAccelList;
 
-// --------------------
-// - ImplAccelManager -
-// --------------------
-
 class ImplAccelManager
 {
 private:
diff --git a/vcl/inc/brdwin.hxx b/vcl/inc/brdwin.hxx
index 71b67b66ee40..051200458349 100644
--- a/vcl/inc/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
@@ -20,15 +20,10 @@
 #ifndef INCLUDED_VCL_INC_BRDWIN_HXX
 #define INCLUDED_VCL_INC_BRDWIN_HXX
 
-#include <tools/solar.h>
 #include <vcl/window.hxx>
 
 class ImplBorderWindowView;
 
-// --------------------------
-// - ImplBorderWindow-Types -
-// --------------------------
-
 #define BORDERWINDOW_STYLE_OVERLAP          ((sal_uInt16)0x0001)
 #define BORDERWINDOW_STYLE_BORDER           ((sal_uInt16)0x0002)
 #define BORDERWINDOW_STYLE_FLOAT            ((sal_uInt16)0x0004)
@@ -79,10 +74,6 @@ class ImplBorderWindowView;
 #define BORDERWINDOW_TITLE_POPUP            ((sal_uInt16)0x0008)
 #define BORDERWINDOW_TITLE_NONE             ((sal_uInt16)0x0010)
 
-// --------------------
-// - ImplBorderWindow -
-// --------------------
-
 class ImplBorderWindow : public Window
 {
     friend class Window;
@@ -181,12 +172,6 @@ public:
     virtual Size            GetOptimalSize() const;
 };
 
-// =======================================================================
-
-// -----------------------
-// - ImplBorderFrameData -
-// -----------------------
-
 struct ImplBorderFrameData
 {
     ImplBorderWindow*       mpBorderWindow;
@@ -228,12 +213,6 @@ struct ImplBorderFrameData
     sal_Bool                    mbTitleClipped;
 };
 
-// =======================================================================
-
-// ------------------------
-// - ImplBorderWindowView -
-// ------------------------
-
 class ImplBorderWindowView
 {
 public:
@@ -260,12 +239,6 @@ public:
     long                    ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const;
 };
 
-// =======================================================================
-
-// --------------------------
-// - ImplNoBorderWindowView -
-// --------------------------
-
 class ImplNoBorderWindowView : public ImplBorderWindowView
 {
 public:
@@ -278,13 +251,6 @@ public:
     virtual void            DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
 };
 
-
-// =======================================================================
-
-// -----------------------------
-// - ImplSmallBorderWindowView -
-// -----------------------------
-
 class ImplSmallBorderWindowView : public ImplBorderWindowView
 {
     ImplBorderWindow*       mpBorderWindow;
@@ -307,14 +273,6 @@ public:
     virtual void            DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
 };
 
-
-// =======================================================================
-
-// ---------------------------
-// - ImplStdBorderWindowView -
-// ---------------------------
-
-
 class ImplStdBorderWindowView : public ImplBorderWindowView
 {
     ImplBorderFrameData     maFrameData;
@@ -338,7 +296,6 @@ public:
     virtual void            DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
 };
 
-
 #endif // INCLUDED_VCL_INC_BRDWIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/dbggui.hxx b/vcl/inc/dbggui.hxx
index 9ee6dc2d0e29..b701aaa570fb 100644
--- a/vcl/inc/dbggui.hxx
+++ b/vcl/inc/dbggui.hxx
@@ -20,12 +20,6 @@
 #ifndef INCLUDED_VCL_INC_DBGGUI_HXX
 #define INCLUDED_VCL_INC_DBGGUI_HXX
 
-#include <tools/solar.h>
-
-// ------------
-// - DBG_UITL -
-// ------------
-
 #ifdef DBG_UTIL
 
 class Window;
diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx
index 527d76f0a01c..432748f4a682 100644
--- a/vcl/inc/idlemgr.hxx
+++ b/vcl/inc/idlemgr.hxx
@@ -20,17 +20,12 @@
 #ifndef INCLUDED_VCL_INC_IDLEMGR_HXX
 #define INCLUDED_VCL_INC_IDLEMGR_HXX
 
-#include <tools/solar.h>
 #include <vcl/timer.hxx>
 #include <vector>
 
 struct ImplIdleData;
 typedef ::std::vector< ImplIdleData* > ImplIdleList;
 
-// ---------------
-// - ImplIdleMgr -
-// ---------------
-
 class ImplIdleMgr
 {
 private:
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index af7910cddd9f..58d6f9ccdbfd 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_VCL_INC_ILSTBOX_HXX
 
 #include <boost/ptr_container/ptr_vector.hpp>
-
-#include <tools/solar.h>
 #include <vcl/image.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/button.hxx>
@@ -35,10 +33,6 @@
 class ScrollBar;
 class ScrollBarBox;
 
-// -----------------
-// - ListBox-Types -
-// -----------------
-
 #define HORZ_SCROLL         4
 #define IMG_TXT_DISTANCE    6
 
@@ -51,10 +45,6 @@ enum LB_EVENT_TYPE
     LET_KEYSPACE
 };
 
-// -----------------
-// - ImplEntryType -
-// -----------------
-
 struct ImplEntryType
 {
     OUString    maStr;
@@ -93,10 +83,6 @@ struct ImplEntryType
     }
 };
 
-// -----------------
-// - ImplEntryList -
-// -----------------
-
 class ImplEntryList
 {
 private:
@@ -189,10 +175,6 @@ public:
     sal_uInt16          FindFirstSelectable( sal_uInt16 nPos, bool bForward = true );
 };
 
-// ---------------------
-// - ImplListBoxWindow -
-// ---------------------
-
 class ImplListBoxWindow : public Control, public ::vcl::ISearchableStringList
 {
 private:
@@ -397,10 +379,6 @@ protected:
     virtual void                            SelectEntry( ::vcl::StringEntryIdentifier _entry );
 };
 
-// ---------------
-// - ImplListBox -
-// ---------------
-
 class ImplListBox : public Control
 {
 private:
@@ -529,10 +507,6 @@ public:
     inline void     SetDropTraget(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; }
 };
 
-// -----------------------------
-// - ImplListBoxFloatingWindow -
-// -----------------------------
-
 class ImplListBoxFloatingWindow : public FloatingWindow
 {
 private:
@@ -572,10 +546,6 @@ public:
     virtual void    Resize();
 };
 
-// -----------
-// - ImplWin -
-// -----------
-
 class ImplWin : public Control
 {
 private:
@@ -638,10 +608,6 @@ public:
     void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; }
 };
 
-// -----------
-// - ImplBtn -
-// -----------
-
 class ImplBtn : public PushButton
 {
 private:
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index 99143124b7a5..486312157075 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -20,14 +20,9 @@
 #ifndef INCLUDED_VCL_INC_JOBSET_H
 #define INCLUDED_VCL_INC_JOBSET_H
 
-#include <tools/solar.h>
-#include <vcl/prntypes.hxx>
 #include <boost/unordered_map.hpp>
 #include <rtl/ustring.hxx>
-
-// ------------------
-// - JobSetup-Types -
-// ------------------
+#include <vcl/prntypes.hxx>
 
 // see com.sun.star.portal.client.JobSetupSystem.idl:
 #define JOBSETUP_SYSTEM_DONTKNOW    0
@@ -37,10 +32,6 @@
 #define JOBSETUP_SYSTEM_MAC         4
 #define JOBSETUP_SYSTEM_JAVA        5
 
-// ----------------
-// - ImplJobSetup -
-// ----------------
-
 struct ImplJobSetup
 {
     sal_uInt16          mnRefCount;         // RefCount (only independ data)
diff --git a/vcl/inc/outdata.hxx b/vcl/inc/outdata.hxx
index fde89eff64da..8b5243df627a 100644
--- a/vcl/inc/outdata.hxx
+++ b/vcl/inc/outdata.hxx
@@ -20,14 +20,9 @@
 #ifndef INCLUDED_VCL_INC_OUTDATA_HXX
 #define INCLUDED_VCL_INC_OUTDATA_HXX
 
-#include <tools/solar.h>
 #include <tools/color.hxx>
 #include <vcl/salgtype.hxx>
 
-// -----------------
-// - Hilfemethoden -
-// -----------------
-
 inline SalColor ImplColorToSal( Color aColor )
 {
     return MAKE_SALCOLOR( aColor.GetRed(), aColor.GetGreen(), aColor.GetBlue() );
diff --git a/vcl/inc/outdev.h b/vcl/inc/outdev.h
index 4b3ec17a4697..299e80323c9c 100644
--- a/vcl/inc/outdev.h
+++ b/vcl/inc/outdev.h
@@ -20,12 +20,10 @@
 #ifndef INCLUDED_VCL_INC_OUTDEV_H
 #define INCLUDED_VCL_INC_OUTDEV_H
 
-#include <tools/solar.h>
-#include <outfont.hxx>
-
-#include <vector>
 #include <list>
+#include <outfont.hxx>
 #include <set>
+#include <vector>
 
 class Size;
 class Font;
@@ -33,10 +31,6 @@ class VirtualDevice;
 class ImplGetDevFontList;
 class GetDevSizeList;
 
-// -----------------------
-// - ImplDevFontListData -
-// -----------------------
-
 // flags for mnMatchType member
 #define IMPL_DEVFONT_SCALABLE       ((sal_uIntPtr)0x00000001)
 #define IMPL_DEVFONT_SYMBOL         ((sal_uIntPtr)0x00000002)
@@ -86,11 +80,6 @@ friend class ImplDevFontList; // TODO: remove soon
     int                 mnMinQuality;       // quality of the worst font face
 };
 
-
-// ----------------------
-// - ImplGetDevFontList -
-// ----------------------
-
 // an ImplGetDevFontList is created by an ImplDevFontList
 // it becomes invalid when original ImplDevFontList is modified
 class ImplGetDevFontList
@@ -105,10 +94,6 @@ public:
     int                 Count() const               { return maDevFontVector.size(); }
 };
 
-// ----------------------
-// - ImplGetDevSizeList -
-// ----------------------
-
 class ImplGetDevSizeList
 {
 private:
@@ -124,9 +109,6 @@ public:
     const OUString&     GetFontName() const     { return maFontName; }
 };
 
-// ------------------------
-// - ImplFontSubstitution -
-// ------------------------
 // nowadays these substitutions are needed for backward compatibility and tight platform integration:
 // - substitutions from configuration entries (Tools->Options->FontReplacement and/or fontconfig)
 // - device specific substitutions (e.g. for PS printer builtin fonts)
@@ -192,9 +174,6 @@ public:
     virtual bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingCodes ) const = 0;
 };
 
-// -----------------
-// - ImplFontCache -
-// -----------------
 // TODO: closely couple with ImplDevFontList
 
 class ImplFontCache
@@ -222,10 +201,6 @@ public:
     void                Invalidate();
 };
 
-// ------------------
-// - ImplOutDevData -
-// ------------------
-
 namespace vcl { struct ControlLayoutData; }
 // #i75163#
 namespace basegfx { class B2DHomMatrix; }
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 88c1b0fb5943..87234bf1501e 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -368,7 +368,6 @@
 #include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/rtti.hxx>
-#include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <tools/tenccvt.hxx>
 #include <tools/time.hxx>
diff --git a/vcl/inc/print.h b/vcl/inc/print.h
index 4b56092f37c2..4453f3305363 100644
--- a/vcl/inc/print.h
+++ b/vcl/inc/print.h
@@ -20,11 +20,8 @@
 #ifndef INCLUDED_VCL_INC_PRINT_H
 #define INCLUDED_VCL_INC_PRINT_H
 
-#include "tools/solar.h"
-#include "vcl/dllapi.h"
-
 #include "rtl/ustring.hxx"
-
+#include "vcl/dllapi.h"
 #include <vector>
 #include <boost/unordered_map.hpp>
 
@@ -35,20 +32,12 @@ class JobSetup;
 namespace vcl
 { class PrinterListener; }
 
-// --------------------
-// - ImplPrnQueueData -
-// --------------------
-
 struct ImplPrnQueueData
 {
     QueueInfo*              mpQueueInfo;
     SalPrinterQueueInfo*    mpSalQueueInfo;
 };
 
-// --------------------
-// - ImplPrnQueueList -
-// --------------------
-
 class VCL_PLUGIN_PUBLIC ImplPrnQueueList
 {
 public:
@@ -64,10 +53,6 @@ public:
     ImplPrnQueueData*       Get( const OUString& rPrinter );
 };
 
-// --------------
-// - Prototypes -
-// --------------
-
 void ImplDeletePrnQueueList();
 void SAL_DLLPRIVATE ImplUpdateJobSetupPaper( JobSetup& rJobSetup );
 
diff --git a/vcl/inc/regband.hxx b/vcl/inc/regband.hxx
index 11b847b20213..dc760e47b359 100644
--- a/vcl/inc/regband.hxx
+++ b/vcl/inc/regband.hxx
@@ -20,10 +20,9 @@
 #ifndef INCLUDED_VCL_INC_REGBAND_HXX
 #define INCLUDED_VCL_INC_REGBAND_HXX
 
-#include <tools/solar.h>
 #include <tools/poly.hxx>
 
-/* =======================================================================
+/*
 
 class ImplRegionBand
 
@@ -37,11 +36,7 @@ Intersection - the Class will process the clipping for the actual band.
 The actual separations may be checked by functions like IsInside or
 IsOver.
 
-======================================================================= */
-
-// ------------------------
-// - ImplRegionBand-Types -
-// ------------------------
+*/
 
 // element for the list with x-separations
 struct ImplRegionBandSep
@@ -64,10 +59,6 @@ struct ImplRegionBandPoint
     LineType                    meLineType;
 };
 
-// ------------------
-// - ImplRegionBand -
-// ------------------
-
 class ImplRegionBand
 {
 public:
diff --git a/vcl/inc/salvd.hxx b/vcl/inc/salvd.hxx
index 55a0372d0f35..2720e34f99bc 100644
--- a/vcl/inc/salvd.hxx
+++ b/vcl/inc/salvd.hxx
@@ -20,9 +20,8 @@
 #ifndef INCLUDED_VCL_INC_SALVD_HXX
 #define INCLUDED_VCL_INC_SALVD_HXX
 
-#include <tools/solar.h>
-#include <vcl/dllapi.h>
 #include <basebmp/bitmapdevice.hxx>
+#include <vcl/dllapi.h>
 
 class SalGraphics;
 
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index 14662c390ed1..dee69c690161 100644
--- a/vcl/inc/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
@@ -20,21 +20,14 @@
 #ifndef INCLUDED_VCL_INC_TEXTLAYOUT_HXX
 #define INCLUDED_VCL_INC_TEXTLAYOUT_HXX
 
+#include <memory>
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
 #include <vcl/outdev.hxx>
-#include <memory>
 
 class Control;
 
-//........................................................................
 namespace vcl
 {
-//........................................................................
-
-    //====================================================================
-    //= ITextLayout
-    //====================================================================
     class SAL_NO_VTABLE ITextLayout
     {
     public:
@@ -49,9 +42,6 @@ namespace vcl
         ~ITextLayout() {}
     };
 
-    //====================================================================
-    //= DefaultTextLayout
-    //====================================================================
     /** is an implementation of the ITextLayout interface which simply delegates its calls to the respective
         methods of an OutputDevice instance, without any inbetween magic.
     */
@@ -96,9 +86,6 @@ namespace vcl
         OutputDevice&   m_rTargetDevice;
     };
 
-    //====================================================================
-    //= ControlTextRenderer
-    //====================================================================
     class ReferenceDeviceTextLayout;
     /** a class which allows rendering text of a Control onto a device, by taking into account the metrics of
         a reference device.
@@ -122,9 +109,7 @@ namespace vcl
         ::std::auto_ptr< ReferenceDeviceTextLayout >   m_pImpl;
     };
 
-//........................................................................
 } // namespace vcl
-//........................................................................
 
 #endif // INCLUDED_VCL_INC_TEXTLAYOUT_HXX
 
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 029d3ec48181..d2c2d1774eb3 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -22,7 +22,6 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <tools/solar.h>
 #include <vcl/image.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/controllayout.hxx>
@@ -44,10 +43,6 @@
 
 class Window;
 
-// ----------------
-// - ImplToolItem -
-// ----------------
-
 struct ImplToolItem
 {
     Window*             mpWindow;
diff --git a/vcl/inc/unx/salmenu.h b/vcl/inc/unx/salmenu.h
index 7722a8f279ae..3b545bff969f 100644
--- a/vcl/inc/unx/salmenu.h
+++ b/vcl/inc/unx/salmenu.h
@@ -20,11 +20,9 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALMENU_H
 #define INCLUDED_VCL_INC_UNX_SALMENU_H
 
-#include <tools/solar.h>
 #include <vcl/bitmap.hxx>
 #include <salmenu.hxx>
 
-
 class X11SalMenu : public SalMenu
 {
 public:
diff --git a/vcl/inc/unx/salobj.h b/vcl/inc/unx/salobj.h
index 5014dd327422..dc65ba5185d9 100644
--- a/vcl/inc/unx/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -20,11 +20,9 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALOBJ_H
 #define INCLUDED_VCL_INC_UNX_SALOBJ_H
 
-#include <tools/solar.h>
+#include <salobj.hxx>
 #include <vcl/sysdata.hxx>
-
 #include <vclpluginapi.h>
-#include <salobj.hxx>
 
 class SalClipRegion
 {
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index 60128a9adc0d..bdcc61e49012 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -20,10 +20,9 @@
 #ifndef INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
 #define INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
 
-#include <tools/solar.h>
+#include <generic/gensys.h>
 #include <osl/mutex.hxx>
 #include <osl/thread.hxx>
-#include <generic/gensys.h>
 #include <vclpluginapi.h>
 
 class VCLPLUG_GEN_PUBLIC X11SalSystem : public SalGenericSystem
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index d72ff768146c..05b5abb8cc16 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -20,20 +20,17 @@
 #ifndef INCLUDED_VCL_INC_WINDOW_H
 #define INCLUDED_VCL_INC_WINDOW_H
 
-#include <vector>
-#include <tools/solar.h>
-#include <vcl/outdev.hxx>
-#include <vcl/timer.hxx>
-#include <vcl/inputctx.hxx>
-#include <vcl/pointr.hxx>
-#include <tools/wintypes.hxx>
-#include <vcl/vclevent.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/weakref.hxx>
-
-#include <vcl/salnativewidgets.hxx>
-
 #include <list>
+#include <tools/wintypes.hxx>
+#include <vcl/inputctx.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/pointr.hxx>
+#include <vcl/salnativewidgets.hxx>
+#include <vcl/timer.hxx>
+#include <vcl/vclevent.hxx>
+#include <vector>
 
 struct SalPaintEvent;
 struct ImplDelData;
@@ -92,21 +89,11 @@ namespace vcl {
     struct ControlLayoutData;
 }
 
-
-// --------------
-// - Prototypes -
-// --------------
-
 bool ImplWindowFrameProc( Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent );
 
-// -----------
-// - HitTest -
-// -----------
-
 #define WINDOW_HITTEST_INSIDE           ((sal_uInt16)0x0001)
 #define WINDOW_HITTEST_TRANSPARENT      ((sal_uInt16)0x0002)
 
-
 struct ImplWinData
 {
     OUString*           mpExtOldText;
@@ -126,7 +113,6 @@ struct ImplWinData
                         maTopWindowChildren;
 };
 
-
 struct ImplOverlapData
 {
     VirtualDevice*      mpSaveBackDev;      // saved background bitmap
@@ -137,7 +123,6 @@ struct ImplOverlapData
     sal_uInt8           mnTopLevel;         // Level for Overlap-Window
 };
 
-
 struct ImplFrameData
 {
     Timer               maPaintTimer;       // paint timer
@@ -193,7 +178,6 @@ struct ImplFrameData
     sal_Bool                mbInternalDragGestureRecognizer;
 };
 
-
 struct ImplAccessibleInfos
 {
     sal_uInt16 nAccessibleRole;
@@ -207,7 +191,6 @@ struct ImplAccessibleInfos
     ~ImplAccessibleInfos();
 };
 
-
 enum AlwaysInputMode { AlwaysInputNone = 0, AlwaysInputEnabled = 1, AlwaysInputDisabled =2 };
 
 class WindowImpl
diff --git a/vcl/source/filter/jpeg/JpegTransform.hxx b/vcl/source/filter/jpeg/JpegTransform.hxx
index c3d55539a8f5..fe8ed376c8a0 100644
--- a/vcl/source/filter/jpeg/JpegTransform.hxx
+++ b/vcl/source/filter/jpeg/JpegTransform.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
 #define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
 
-#include <tools/solar.h>
 #include <vcl/graph.hxx>
 
 class JpegTransform
diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx
index 3a027a2f7ebe..5f8abedad293 100644
--- a/vcl/source/filter/jpeg/JpegWriter.cxx
+++ b/vcl/source/filter/jpeg/JpegWriter.cxx
@@ -25,11 +25,10 @@ extern "C"
     #include <jerror.h>
 }
 
-#include <tools/solar.h>
+#include "JpegWriter.hxx"
 #include <vcl/bmpacc.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
-#include "JpegWriter.hxx"
 
 #define BUFFER_SIZE  4096
 
diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx
index 87cde317df0c..e8310666f481 100644
--- a/vcl/source/filter/jpeg/jpeg.cxx
+++ b/vcl/source/filter/jpeg/jpeg.cxx
@@ -20,7 +20,6 @@
 #include "JpegReader.hxx"
 #include "JpegWriter.hxx"
 
-#include <tools/solar.h>
 #include <vcl/bmpacc.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/vcl/source/filter/sgfbram.hxx b/vcl/source/filter/sgfbram.hxx
index 0bc8614e1d79..1af6f56ef815 100644
--- a/vcl/source/filter/sgfbram.hxx
+++ b/vcl/source/filter/sgfbram.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_VCL_SOURCE_FILTER_SGFBRAM_HXX
 #define INCLUDED_VCL_SOURCE_FILTER_SGFBRAM_HXX
 
-#include <tools/solar.h>
-
 #define SgfBitImag0   1 /* Bitmap                  */
 #define SgfBitImag1   4 /* Bitmap                  */
 #define SgfBitImag2   5 /* Bitmap                  */
@@ -96,10 +94,6 @@ extern long SgfVectXdiv;
 extern long SgfVectYdiv;
 extern bool SgfVectScal;
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Windows BMP /////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 #define BmpFileHeaderSize 14
 class BmpFileHeader
 {
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 4c6d457595e4..122daaa1ce81 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -37,8 +37,6 @@
 #include <svdata.hxx>
 #include <svids.hrc>
 
-// =======================================================================
-
 // Attention: Must not contain non-PODs because array is enlarged/copied
 // with the use of memmove/memcpy.
 struct ImplSplitItem
@@ -80,8 +78,6 @@ struct ImplSplitSet
     bool                mbCalcPix;
 };
 
-
-
 /** Check whether the given size is inside the valid range defined by
     [rItem.mnMinSize,rItem.mnMaxSize].  When it is not inside it then return
     the upper or lower bound, respectively. Otherwise return the given size
@@ -113,8 +109,6 @@ namespace {
 #define SPLIT_WINDOW            ((sal_uInt16)0x0004)
 #define SPLIT_NOSPLIT           ((sal_uInt16)0x8000)
 
-// =======================================================================
-
 static void ImplCalcBorder( WindowAlign eAlign, sal_Bool bNoAlign,
                             long& rLeft, long& rTop,
                             long& rRight, long& rBottom )
@@ -158,8 +152,6 @@ static void ImplCalcBorder( WindowAlign eAlign, sal_Bool bNoAlign,
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplDrawBorder( SplitWindow* pWin )
 {
     const StyleSettings&    rStyleSettings = pWin->GetSettings().GetStyleSettings();
@@ -225,8 +217,6 @@ void SplitWindow::ImplDrawBorder( SplitWindow* pWin )
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplDrawBorderLine( SplitWindow* pWin )
 {
     if ( pWin->mbFadeOut || pWin->mbAutoHide )
@@ -265,8 +255,6 @@ void SplitWindow::ImplDrawBorderLine( SplitWindow* pWin )
     }
 }
 
-// -----------------------------------------------------------------------
-
 static ImplSplitSet* ImplFindSet( ImplSplitSet* pSet, sal_uInt16 nId )
 {
     if ( pSet->mnId == nId )
@@ -295,8 +283,6 @@ static ImplSplitSet* ImplFindSet( ImplSplitSet* pSet, sal_uInt16 nId )
     return NULL;
 }
 
-// -----------------------------------------------------------------------
-
 static ImplSplitSet* ImplFindItem( ImplSplitSet* pSet, sal_uInt16 nId, sal_uInt16& rPos )
 {
     sal_uInt16          i;
@@ -325,8 +311,6 @@ static ImplSplitSet* ImplFindItem( ImplSplitSet* pSet, sal_uInt16 nId, sal_uInt1
     return NULL;
 }
 
-// -----------------------------------------------------------------------
-
 static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, Window* pWindow )
 {
     sal_uInt16          i;
@@ -351,8 +335,6 @@ static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, Window* pWindow )
     return 0;
 }
 
-// -----------------------------------------------------------------------
-
 static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, const Point& rPos,
                             sal_Bool bRows, sal_Bool bDown = sal_True )
 {
@@ -398,8 +380,6 @@ static sal_uInt16 ImplFindItem( ImplSplitSet* pSet, const Point& rPos,
     return 0;
 }
 
-// -----------------------------------------------------------------------
-
 static void ImplDeleteSet( ImplSplitSet* pSet )
 {
     sal_uInt16          i;
@@ -422,8 +402,6 @@ static void ImplDeleteSet( ImplSplitSet* pSet )
     delete pSet;
 }
 
-// -----------------------------------------------------------------------
-
 static void ImplCalcSet( ImplSplitSet* pSet,
                          long nSetLeft, long nSetTop,
                          long nSetWidth, long nSetHeight,
@@ -801,8 +779,6 @@ static void ImplCalcSet( ImplSplitSet* pSet,
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, sal_Bool bHide,
                                 sal_Bool bRows, sal_Bool /*bDown*/ )
 {
@@ -904,8 +880,6 @@ void SplitWindow::ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, sal_Bo
     }
 }
 
-// -----------------------------------------------------------------------
-
 static void ImplCalcLogSize( ImplSplitItem* pItems, sal_uInt16 nItems )
 {
     // Original-Groessen updaten
@@ -941,8 +915,6 @@ static void ImplCalcLogSize( ImplSplitItem* pItems, sal_uInt16 nItems )
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplDrawBack( SplitWindow* pWindow, const Rectangle& rRect,
                                 const Wallpaper* pWall, const Bitmap* pBitmap )
 {
@@ -970,8 +942,6 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, const Rectangle& rRect,
         pWindow->DrawWallpaper( rRect, *pWall );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet )
 {
     sal_uInt16          i;
@@ -1013,8 +983,6 @@ void SplitWindow::ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet )
     }
 }
 
-// -----------------------------------------------------------------------
-
 static void ImplDrawSplit( SplitWindow* pWindow, ImplSplitSet* pSet,
                            sal_Bool bRows, sal_Bool bDown = sal_True )
 {
@@ -1108,8 +1076,6 @@ static void ImplDrawSplit( SplitWindow* pWindow, ImplSplitSet* pSet,
     }
 }
 
-// -----------------------------------------------------------------------
-
 sal_uInt16 SplitWindow::ImplTestSplit( ImplSplitSet* pSet, const Point& rPos,
                                    long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos,
                                    sal_Bool bRows, sal_Bool /*bDown*/ )
@@ -1188,8 +1154,6 @@ sal_uInt16 SplitWindow::ImplTestSplit( ImplSplitSet* pSet, const Point& rPos,
     return 0;
 }
 
-// -----------------------------------------------------------------------
-
 sal_uInt16 SplitWindow::ImplTestSplit( SplitWindow* pWindow, const Point& rPos,
                                    long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos )
 {
@@ -1252,8 +1216,6 @@ sal_uInt16 SplitWindow::ImplTestSplit( SplitWindow* pWindow, const Point& rPos,
                          pWindow->mbHorz, !pWindow->mbBottomRight );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplDrawSplitTracking( SplitWindow* pThis, const Point& rPos )
 {
     Rectangle aRect;
@@ -1291,8 +1253,6 @@ void SplitWindow::ImplDrawSplitTracking( SplitWindow* pThis, const Point& rPos )
     pThis->ShowTracking( aRect, SHOWTRACK_SPLIT );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplInit( Window* pParent, WinBits nStyle )
 {
     ImplSplitSet* pNewSet   = new ImplSplitSet;
@@ -1367,8 +1327,6 @@ void SplitWindow::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings();
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplInitSettings()
 {
     // Wenn fuer das MainSet eine Bitmap gesetzt wird, dann
@@ -1394,16 +1352,12 @@ void SplitWindow::ImplInitSettings()
     }
 }
 
-// =======================================================================
-
 SplitWindow::SplitWindow( Window* pParent, WinBits nStyle ) :
     DockingWindow( WINDOW_SPLITWINDOW )
 {
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
-
 SplitWindow::~SplitWindow()
 {
     // Sets loeschen
@@ -1411,8 +1365,6 @@ SplitWindow::~SplitWindow()
     mpMainSet = NULL; //NULL for base-class callbacks during dtoring
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplSetWindowSize( long nDelta )
 {
     if ( !nDelta )
@@ -1453,8 +1405,6 @@ void SplitWindow::ImplSetWindowSize( long nDelta )
     SplitResize();
 }
 
-// -----------------------------------------------------------------------
-
 Size SplitWindow::CalcLayoutSizePixel( const Size& aNewSize )
 {
     Size aSize( aNewSize );
@@ -1520,8 +1470,6 @@ Size SplitWindow::CalcLayoutSizePixel( const Size& aNewSize )
     return aSize;
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplCalcLayout()
 {
     if ( !mbCalc || !mbRecalc || !mpMainSet->mpItems )
@@ -1604,8 +1552,6 @@ void SplitWindow::ImplCalcLayout()
     mbCalc = sal_False;
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplUpdate()
 {
     mbCalc = sal_True;
@@ -1619,8 +1565,6 @@ void SplitWindow::ImplUpdate()
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplSplitMousePos( Point& rMousePos )
 {
     if ( mnSplitTest & SPLIT_HORZ )
@@ -1644,8 +1588,6 @@ void SplitWindow::ImplSplitMousePos( Point& rMousePos )
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, sal_Bool bTest ) const
 {
     long nSplitSize = mpMainSet->mnSplitSize-2;
@@ -1716,8 +1658,6 @@ void SplitWindow::ImplGetButtonRect( Rectangle& rRect, long nEx, sal_Bool bTest
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplGetAutoHideRect( Rectangle& rRect, sal_Bool bTest ) const
 {
     Rectangle aRect;
@@ -1733,8 +1673,6 @@ void SplitWindow::ImplGetAutoHideRect( Rectangle& rRect, sal_Bool bTest ) const
     rRect = aRect;
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplGetFadeInRect( Rectangle& rRect, sal_Bool bTest ) const
 {
     Rectangle aRect;
@@ -1745,8 +1683,6 @@ void SplitWindow::ImplGetFadeInRect( Rectangle& rRect, sal_Bool bTest ) const
     rRect = aRect;
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplGetFadeOutRect( Rectangle& rRect, sal_Bool ) const
 {
     Rectangle aRect;
@@ -1757,8 +1693,6 @@ void SplitWindow::ImplGetFadeOutRect( Rectangle& rRect, sal_Bool ) const
     rRect = aRect;
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplDrawButtonRect( const Rectangle& rRect, long nSize )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -1825,8 +1759,6 @@ void SplitWindow::ImplDrawButtonRect( const Rectangle& rRect, long nSize )
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplDrawAutoHide( sal_Bool bInPaint )
 {
     if ( mbAutoHide )
@@ -1902,8 +1834,6 @@ void SplitWindow::ImplDrawAutoHide( sal_Bool bInPaint )
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplDrawFadeArrow( const Point& rPt, sal_Bool bHorz, sal_Bool bLeft )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -2046,8 +1976,6 @@ void SplitWindow::ImplDrawFadeIn( sal_Bool bInPaint )
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplDrawFadeOut( sal_Bool bInPaint )
 {
     if ( mbFadeOut )
@@ -2076,7 +2004,6 @@ void SplitWindow::ImplDrawFadeOut( sal_Bool bInPaint )
     }
 }
 
-// -----------------------------------------------------------------------
 void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt )
 {
     Point aMousePosPixel = rMEvt.GetPosPixel();
@@ -2267,50 +2194,36 @@ void SplitWindow::ImplStartSplit( const MouseEvent& rMEvt )
 }
 
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::StartSplit()
 {
     maStartSplitHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::Split()
 {
     maSplitHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::SplitResize()
 {
     maSplitResizeHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::AutoHide()
 {
     maAutoHideHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::FadeIn()
 {
     maFadeInHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::FadeOut()
 {
     maFadeOutHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( !rMEvt.IsLeft() || rMEvt.IsMod2() )
@@ -2363,8 +2276,6 @@ void SplitWindow::MouseButtonDown( const MouseEvent& rMEvt )
         ImplStartSplit( rMEvt );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::MouseMove( const MouseEvent& rMEvt )
 {
     if ( !IsTracking() )
@@ -2400,8 +2311,6 @@ void SplitWindow::MouseMove( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::Tracking( const TrackingEvent& rTEvt )
 {
     Point aMousePosPixel = rTEvt.GetMouseEvent().GetPosPixel();
@@ -2583,8 +2492,6 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
     }
 }
 
-// -----------------------------------------------------------------------
-
 bool SplitWindow::PreNotify( NotifyEvent& rNEvt )
 {
     const MouseEvent* pMouseEvt = NULL;
@@ -2614,8 +2521,6 @@ bool SplitWindow::PreNotify( NotifyEvent& rNEvt )
     return Window::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::Paint( const Rectangle& )
 {
     if ( mnWinStyle & WB_BORDER )
@@ -2634,15 +2539,11 @@ void SplitWindow::Paint( const Rectangle& )
         ImplDrawSplit( this, mpMainSet, mbHorz, !mbBottomRight );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::Move()
 {
     DockingWindow::Move();
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::Resize()
 {
     Size aSize = GetOutputSizePixel();
@@ -2653,8 +2554,6 @@ void SplitWindow::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::RequestHelp( const HelpEvent& rHEvt )
 {
     // no keyboard help for splitwin
@@ -2711,8 +2610,6 @@ void SplitWindow::RequestHelp( const HelpEvent& rHEvt )
     DockingWindow::RequestHelp( rHEvt );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::StateChanged( StateChangedType nType )
 {
     switch ( nType )
@@ -2734,8 +2631,6 @@ void SplitWindow::StateChanged( StateChangedType nType )
     DockingWindow::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -2748,8 +2643,6 @@ void SplitWindow::DataChanged( const DataChangedEvent& rDCEvt )
         DockingWindow::DataChanged( rDCEvt );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::InsertItem( sal_uInt16 nId, Window* pWindow, long nSize,
                               sal_uInt16 nPos, sal_uInt16 nSetId,
                               SplitWindowItemBits nBits )
@@ -2817,8 +2710,6 @@ void SplitWindow::InsertItem( sal_uInt16 nId, Window* pWindow, long nSize,
     ImplUpdate();
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::InsertItem( sal_uInt16 nId, long nSize,
                               sal_uInt16 nPos, sal_uInt16 nSetId,
                               SplitWindowItemBits nBits )
@@ -2826,8 +2717,6 @@ void SplitWindow::InsertItem( sal_uInt16 nId, long nSize,
     InsertItem( nId, NULL, nSize, nPos, nSetId, nBits );
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::RemoveItem( sal_uInt16 nId, sal_Bool bHide )
 {
 #ifdef DBG_UTIL
@@ -2874,8 +2763,6 @@ void SplitWindow::RemoveItem( sal_uInt16 nId, sal_Bool bHide )
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::Clear()
 {
     // Alle Sets loeschen
@@ -2899,8 +2786,6 @@ void SplitWindow::Clear()
     ImplUpdate();
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::SplitItem( sal_uInt16 nId, long nNewSize,
                              sal_Bool bPropSmall, sal_Bool bPropGreat )
 {
@@ -3134,8 +3019,6 @@ void SplitWindow::SplitItem( sal_uInt16 nId, long nNewSize,
     ImplUpdate();
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::SetItemSize( sal_uInt16 nId, long nNewSize )
 {
     sal_uInt16          nPos;
@@ -3156,8 +3039,6 @@ void SplitWindow::SetItemSize( sal_uInt16 nId, long nNewSize )
     }
 }
 
-// -----------------------------------------------------------------------
-
 long SplitWindow::GetItemSize( sal_uInt16 nId ) const
 {
     sal_uInt16          nPos;
@@ -3169,8 +3050,6 @@ long SplitWindow::GetItemSize( sal_uInt16 nId ) const
         return 0;
 }
 
-// -----------------------------------------------------------------------
-
 long SplitWindow::GetItemSize( sal_uInt16 nId, SplitWindowItemBits nBits ) const
 {
     sal_uInt16          nPos;
@@ -3226,9 +3105,6 @@ long SplitWindow::GetItemSize( sal_uInt16 nId, SplitWindowItemBits nBits ) const
         return 0;
 }
 
-
-
-
 void SplitWindow::SetItemSizeRange (sal_uInt16 nId, const Range aRange)
 {
     sal_uInt16 nPos;
@@ -3241,8 +3117,6 @@ void SplitWindow::SetItemSizeRange (sal_uInt16 nId, const Range aRange)
     }
 }
 
-// -----------------------------------------------------------------------
-
 sal_uInt16 SplitWindow::GetSet( sal_uInt16 nId ) const
 {
     sal_uInt16          nPos;
@@ -3254,8 +3128,6 @@ sal_uInt16 SplitWindow::GetSet( sal_uInt16 nId ) const
         return 0;
 }
 
-// -----------------------------------------------------------------------
-
 sal_Bool SplitWindow::IsItemValid( sal_uInt16 nId ) const
 {
     sal_uInt16          nPos;
@@ -3267,22 +3139,16 @@ sal_Bool SplitWindow::IsItemValid( sal_uInt16 nId ) const
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
-
 sal_uInt16 SplitWindow::GetItemId( Window* pWindow ) const
 {
     return ImplFindItem( mpBaseSet, pWindow );
 }
 
-// -----------------------------------------------------------------------
-
 sal_uInt16 SplitWindow::GetItemId( const Point& rPos ) const
 {
     return ImplFindItem( mpBaseSet, rPos, mbHorz, !mbBottomRight );
 }
 
-// -----------------------------------------------------------------------
-
 sal_uInt16 SplitWindow::GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId ) const
 {
     ImplSplitSet*   pSet = ImplFindSet( mpBaseSet, nSetId );
@@ -3303,8 +3169,6 @@ sal_uInt16 SplitWindow::GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId ) const
     return nPos;
 }
 
-// -----------------------------------------------------------------------
-
 sal_uInt16 SplitWindow::GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId ) const
 {
     ImplSplitSet* pSet = ImplFindSet( mpBaseSet, nSetId );
@@ -3314,8 +3178,6 @@ sal_uInt16 SplitWindow::GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId ) const
         return 0;
 }
 
-// -----------------------------------------------------------------------
-
 sal_uInt16 SplitWindow::GetItemCount( sal_uInt16 nSetId ) const
 {
     ImplSplitSet* pSet = ImplFindSet( mpBaseSet, nSetId );
@@ -3325,8 +3187,6 @@ sal_uInt16 SplitWindow::GetItemCount( sal_uInt16 nSetId ) const
         return 0;
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ImplNewAlign()
 {
     if ( mbNoAlign )
@@ -3368,8 +3228,6 @@ void SplitWindow::ImplNewAlign()
     ImplUpdate();
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::SetAlign( WindowAlign eNewAlign )
 {
     if ( meAlign != eNewAlign )
@@ -3379,32 +3237,24 @@ void SplitWindow::SetAlign( WindowAlign eNewAlign )
     }
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ShowAutoHideButton( sal_Bool bShow )
 {
     mbAutoHide = bShow;
     ImplUpdate();
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ShowFadeInHideButton( sal_Bool bShow )
 {
     mbFadeIn = bShow;
     ImplUpdate();
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::ShowFadeOutButton( sal_Bool bShow )
 {
     mbFadeOut = bShow;
     ImplUpdate();
 }
 
-// -----------------------------------------------------------------------
-
 void SplitWindow::SetAutoHideState( sal_Bool bAutoHide )
 {
     mbAutoHideIn = bAutoHide;
@@ -3416,8 +3266,6 @@ void SplitWindow::SetAutoHideState( sal_Bool bAutoHide )
     }
 }
 
-// -----------------------------------------------------------------------
-
 long SplitWindow::GetFadeInSize() const
 {
     long n = 0;