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

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

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;

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:

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: */

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;

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:

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:

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)

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() );

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; }

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>

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 );
 

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:

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;
 

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
 

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;

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:

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
 {

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

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

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

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
 

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>

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
 {