Skip to content

C
core
Kaydet (Commit) 17394c18 authored tarafından Alexandre Vicenzi's avatar Alexandre Vicenzi Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

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

Change-Id: Ibbc80b09a288494baae4e5ebee4428a6a80a904a
Reviewed-on: https://gerrit.libreoffice.org/7738Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 8d1ca883
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 229 deletions
vcl/inc/accel.h
Dosyayı görüntüle @ 17394c18
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_INC_ACCEL_H #ifndef INCLUDED_VCL_INC_ACCEL_H
#define INCLUDED_VCL_INC_ACCEL_H #define INCLUDED_VCL_INC_ACCEL_H
#include <tools/solar.h>
#include <vcl/keycod.hxx> #include <vcl/keycod.hxx>
class Accelerator; class Accelerator;
......
vcl/inc/accmgr.hxx
Dosyayı görüntüle @ 17394c18
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_INC_ACCMGR_HXX #ifndef INCLUDED_VCL_INC_ACCMGR_HXX
#define INCLUDED_VCL_INC_ACCMGR_HXX #define INCLUDED_VCL_INC_ACCMGR_HXX
#include <tools/solar.h>
#include <vector> #include <vector>
class Accelerator; class Accelerator;
...@@ -28,10 +27,6 @@ class KeyCode; ...@@ -28,10 +27,6 @@ class KeyCode;
typedef ::std::vector< Accelerator* > ImplAccelList; typedef ::std::vector< Accelerator* > ImplAccelList;
// --------------------
// - ImplAccelManager -
// --------------------
class ImplAccelManager class ImplAccelManager
{ {
private: private:
......
vcl/inc/brdwin.hxx
Dosyayı görüntüle @ 17394c18
...@@ -20,15 +20,10 @@ ...@@ -20,15 +20,10 @@
#ifndef INCLUDED_VCL_INC_BRDWIN_HXX #ifndef INCLUDED_VCL_INC_BRDWIN_HXX
#define INCLUDED_VCL_INC_BRDWIN_HXX #define INCLUDED_VCL_INC_BRDWIN_HXX
#include <tools/solar.h>
#include <vcl/window.hxx> #include <vcl/window.hxx>
class ImplBorderWindowView; class ImplBorderWindowView;
// --------------------------
// - ImplBorderWindow-Types -
// --------------------------
#define BORDERWINDOW_STYLE_OVERLAP ((sal_uInt16)0x0001) #define BORDERWINDOW_STYLE_OVERLAP ((sal_uInt16)0x0001)
#define BORDERWINDOW_STYLE_BORDER ((sal_uInt16)0x0002) #define BORDERWINDOW_STYLE_BORDER ((sal_uInt16)0x0002)
#define BORDERWINDOW_STYLE_FLOAT ((sal_uInt16)0x0004) #define BORDERWINDOW_STYLE_FLOAT ((sal_uInt16)0x0004)
...@@ -79,10 +74,6 @@ class ImplBorderWindowView; ...@@ -79,10 +74,6 @@ class ImplBorderWindowView;
#define BORDERWINDOW_TITLE_POPUP ((sal_uInt16)0x0008) #define BORDERWINDOW_TITLE_POPUP ((sal_uInt16)0x0008)
#define BORDERWINDOW_TITLE_NONE ((sal_uInt16)0x0010) #define BORDERWINDOW_TITLE_NONE ((sal_uInt16)0x0010)
// --------------------
// - ImplBorderWindow -
// --------------------
class ImplBorderWindow : public Window class ImplBorderWindow : public Window
{ {
friend class Window; friend class Window;
...@@ -181,12 +172,6 @@ public: ...@@ -181,12 +172,6 @@ public:
virtual Size GetOptimalSize() const; virtual Size GetOptimalSize() const;
}; };
// =======================================================================
// -----------------------
// - ImplBorderFrameData -
// -----------------------
struct ImplBorderFrameData struct ImplBorderFrameData
{ {
ImplBorderWindow* mpBorderWindow; ImplBorderWindow* mpBorderWindow;
...@@ -228,12 +213,6 @@ struct ImplBorderFrameData ...@@ -228,12 +213,6 @@ struct ImplBorderFrameData
sal_Bool mbTitleClipped; sal_Bool mbTitleClipped;
}; };
// =======================================================================
// ------------------------
// - ImplBorderWindowView -
// ------------------------
class ImplBorderWindowView class ImplBorderWindowView
{ {
public: public:
...@@ -260,12 +239,6 @@ public: ...@@ -260,12 +239,6 @@ public:
long ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const; long ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const;
}; };
// =======================================================================
// --------------------------
// - ImplNoBorderWindowView -
// --------------------------
class ImplNoBorderWindowView : public ImplBorderWindowView class ImplNoBorderWindowView : public ImplBorderWindowView
{ {
public: public:
...@@ -278,13 +251,6 @@ public: ...@@ -278,13 +251,6 @@ public:
virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
}; };
// =======================================================================
// -----------------------------
// - ImplSmallBorderWindowView -
// -----------------------------
class ImplSmallBorderWindowView : public ImplBorderWindowView class ImplSmallBorderWindowView : public ImplBorderWindowView
{ {
ImplBorderWindow* mpBorderWindow; ImplBorderWindow* mpBorderWindow;
...@@ -307,14 +273,6 @@ public: ...@@ -307,14 +273,6 @@ public:
virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
}; };
// =======================================================================
// ---------------------------
// - ImplStdBorderWindowView -
// ---------------------------
class ImplStdBorderWindowView : public ImplBorderWindowView class ImplStdBorderWindowView : public ImplBorderWindowView
{ {
ImplBorderFrameData maFrameData; ImplBorderFrameData maFrameData;
...@@ -338,7 +296,6 @@ public: ...@@ -338,7 +296,6 @@ public:
virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset );
}; };
#endif // INCLUDED_VCL_INC_BRDWIN_HXX #endif // INCLUDED_VCL_INC_BRDWIN_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
vcl/inc/dbggui.hxx
Dosyayı görüntüle @ 17394c18
...@@ -20,12 +20,6 @@ ...@@ -20,12 +20,6 @@
#ifndef INCLUDED_VCL_INC_DBGGUI_HXX #ifndef INCLUDED_VCL_INC_DBGGUI_HXX
#define INCLUDED_VCL_INC_DBGGUI_HXX #define INCLUDED_VCL_INC_DBGGUI_HXX
#include <tools/solar.h>
// ------------
// - DBG_UITL -
// ------------
#ifdef DBG_UTIL #ifdef DBG_UTIL
class Window; class Window;
......
vcl/inc/idlemgr.hxx
Dosyayı görüntüle @ 17394c18
...@@ -20,17 +20,12 @@ ...@@ -20,17 +20,12 @@
#ifndef INCLUDED_VCL_INC_IDLEMGR_HXX #ifndef INCLUDED_VCL_INC_IDLEMGR_HXX
#define INCLUDED_VCL_INC_IDLEMGR_HXX #define INCLUDED_VCL_INC_IDLEMGR_HXX
#include <tools/solar.h>
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
#include <vector> #include <vector>
struct ImplIdleData; struct ImplIdleData;
typedef ::std::vector< ImplIdleData* > ImplIdleList; typedef ::std::vector< ImplIdleData* > ImplIdleList;
// ---------------
// - ImplIdleMgr -
// ---------------
class ImplIdleMgr class ImplIdleMgr
{ {
private: private:
......
vcl/inc/ilstbox.hxx
Dosyayı görüntüle @ 17394c18
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
#define INCLUDED_VCL_INC_ILSTBOX_HXX #define INCLUDED_VCL_INC_ILSTBOX_HXX
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
#include <tools/solar.h>
#include <vcl/image.hxx> #include <vcl/image.hxx>
#include <vcl/ctrl.hxx> #include <vcl/ctrl.hxx>
#include <vcl/button.hxx> #include <vcl/button.hxx>
...@@ -35,10 +33,6 @@ ...@@ -35,10 +33,6 @@
class ScrollBar; class ScrollBar;
class ScrollBarBox; class ScrollBarBox;
// -----------------
// - ListBox-Types -
// -----------------
#define HORZ_SCROLL 4 #define HORZ_SCROLL 4
#define IMG_TXT_DISTANCE 6 #define IMG_TXT_DISTANCE 6
...@@ -51,10 +45,6 @@ enum LB_EVENT_TYPE ...@@ -51,10 +45,6 @@ enum LB_EVENT_TYPE
LET_KEYSPACE LET_KEYSPACE
}; };
// -----------------
// - ImplEntryType -
// -----------------
struct ImplEntryType struct ImplEntryType
{ {
OUString maStr; OUString maStr;
...@@ -93,10 +83,6 @@ struct ImplEntryType ...@@ -93,10 +83,6 @@ struct ImplEntryType
} }
}; };
// -----------------
// - ImplEntryList -
// -----------------
class ImplEntryList class ImplEntryList
{ {
private: private:
...@@ -189,10 +175,6 @@ public: ...@@ -189,10 +175,6 @@ public:
sal_uInt16 FindFirstSelectable( sal_uInt16 nPos, bool bForward = true ); sal_uInt16 FindFirstSelectable( sal_uInt16 nPos, bool bForward = true );
}; };
// ---------------------
// - ImplListBoxWindow -
// ---------------------
class ImplListBoxWindow : public Control, public ::vcl::ISearchableStringList class ImplListBoxWindow : public Control, public ::vcl::ISearchableStringList
{ {
private: private:
...@@ -397,10 +379,6 @@ protected: ...@@ -397,10 +379,6 @@ protected:
virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ); virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry );
}; };
// ---------------
// - ImplListBox -
// ---------------
class ImplListBox : public Control class ImplListBox : public Control
{ {
private: private:
...@@ -529,10 +507,6 @@ public: ...@@ -529,10 +507,6 @@ public:
inline void SetDropTraget(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; } inline void SetDropTraget(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; }
}; };
// -----------------------------
// - ImplListBoxFloatingWindow -
// -----------------------------
class ImplListBoxFloatingWindow : public FloatingWindow class ImplListBoxFloatingWindow : public FloatingWindow
{ {
private: private:
...@@ -572,10 +546,6 @@ public: ...@@ -572,10 +546,6 @@ public:
virtual void Resize(); virtual void Resize();
}; };
// -----------
// - ImplWin -
// -----------
class ImplWin : public Control class ImplWin : public Control
{ {
private: private:
...@@ -638,10 +608,6 @@ public: ...@@ -638,10 +608,6 @@ public:
void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; } void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; }
}; };
// -----------
// - ImplBtn -
// -----------
class ImplBtn : public PushButton class ImplBtn : public PushButton
{ {
private: private:
......
vcl/inc/jobset.h
Dosyayı görüntüle @ 17394c18
...@@ -20,14 +20,9 @@ ...@@ -20,14 +20,9 @@
#ifndef INCLUDED_VCL_INC_JOBSET_H #ifndef INCLUDED_VCL_INC_JOBSET_H
#define 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 <boost/unordered_map.hpp>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <vcl/prntypes.hxx>
// ------------------
// - JobSetup-Types -
// ------------------
// see com.sun.star.portal.client.JobSetupSystem.idl: // see com.sun.star.portal.client.JobSetupSystem.idl:
#define JOBSETUP_SYSTEM_DONTKNOW 0 #define JOBSETUP_SYSTEM_DONTKNOW 0
...@@ -37,10 +32,6 @@ ...@@ -37,10 +32,6 @@
#define JOBSETUP_SYSTEM_MAC 4 #define JOBSETUP_SYSTEM_MAC 4
#define JOBSETUP_SYSTEM_JAVA 5 #define JOBSETUP_SYSTEM_JAVA 5
// ----------------
// - ImplJobSetup -
// ----------------
struct ImplJobSetup struct ImplJobSetup
{ {
sal_uInt16 mnRefCount; // RefCount (only independ data) sal_uInt16 mnRefCount; // RefCount (only independ data)
......
vcl/inc/outdata.hxx
Dosyayı görüntüle @ 17394c18
...@@ -20,14 +20,9 @@ ...@@ -20,14 +20,9 @@
#ifndef INCLUDED_VCL_INC_OUTDATA_HXX #ifndef INCLUDED_VCL_INC_OUTDATA_HXX
#define INCLUDED_VCL_INC_OUTDATA_HXX #define INCLUDED_VCL_INC_OUTDATA_HXX
#include <tools/solar.h>
#include <tools/color.hxx> #include <tools/color.hxx>
#include <vcl/salgtype.hxx> #include <vcl/salgtype.hxx>
// -----------------
// - Hilfemethoden -
// -----------------
inline SalColor ImplColorToSal( Color aColor ) inline SalColor ImplColorToSal( Color aColor )
{ {
return MAKE_SALCOLOR( aColor.GetRed(), aColor.GetGreen(), aColor.GetBlue() ); return MAKE_SALCOLOR( aColor.GetRed(), aColor.GetGreen(), aColor.GetBlue() );
......
vcl/inc/outdev.h
Dosyayı görüntüle @ 17394c18
...@@ -20,12 +20,10 @@ ...@@ -20,12 +20,10 @@
#ifndef INCLUDED_VCL_INC_OUTDEV_H #ifndef INCLUDED_VCL_INC_OUTDEV_H
#define INCLUDED_VCL_INC_OUTDEV_H #define INCLUDED_VCL_INC_OUTDEV_H
#include <tools/solar.h>
#include <outfont.hxx>
#include <vector>
#include <list> #include <list>
#include <outfont.hxx>
#include <set> #include <set>
#include <vector>
class Size; class Size;
class Font; class Font;
...@@ -33,10 +31,6 @@ class VirtualDevice; ...@@ -33,10 +31,6 @@ class VirtualDevice;
class ImplGetDevFontList; class ImplGetDevFontList;
class GetDevSizeList; class GetDevSizeList;
// -----------------------
// - ImplDevFontListData -
// -----------------------
// flags for mnMatchType member // flags for mnMatchType member
#define IMPL_DEVFONT_SCALABLE ((sal_uIntPtr)0x00000001) #define IMPL_DEVFONT_SCALABLE ((sal_uIntPtr)0x00000001)
#define IMPL_DEVFONT_SYMBOL ((sal_uIntPtr)0x00000002) #define IMPL_DEVFONT_SYMBOL ((sal_uIntPtr)0x00000002)
...@@ -86,11 +80,6 @@ friend class ImplDevFontList; // TODO: remove soon ...@@ -86,11 +80,6 @@ friend class ImplDevFontList; // TODO: remove soon
int mnMinQuality; // quality of the worst font face int mnMinQuality; // quality of the worst font face
}; };
// ----------------------
// - ImplGetDevFontList -
// ----------------------
// an ImplGetDevFontList is created by an ImplDevFontList // an ImplGetDevFontList is created by an ImplDevFontList
// it becomes invalid when original ImplDevFontList is modified // it becomes invalid when original ImplDevFontList is modified
class ImplGetDevFontList class ImplGetDevFontList
...@@ -105,10 +94,6 @@ public: ...@@ -105,10 +94,6 @@ public:
int Count() const { return maDevFontVector.size(); } int Count() const { return maDevFontVector.size(); }
}; };
// ----------------------
// - ImplGetDevSizeList -
// ----------------------
class ImplGetDevSizeList class ImplGetDevSizeList
{ {
private: private:
...@@ -124,9 +109,6 @@ public: ...@@ -124,9 +109,6 @@ public:
const OUString& GetFontName() const { return maFontName; } const OUString& GetFontName() const { return maFontName; }
}; };
// ------------------------
// - ImplFontSubstitution -
// ------------------------
// nowadays these substitutions are needed for backward compatibility and tight platform integration: // nowadays these substitutions are needed for backward compatibility and tight platform integration:
// - substitutions from configuration entries (Tools->Options->FontReplacement and/or fontconfig) // - substitutions from configuration entries (Tools->Options->FontReplacement and/or fontconfig)
// - device specific substitutions (e.g. for PS printer builtin fonts) // - device specific substitutions (e.g. for PS printer builtin fonts)
...@@ -192,9 +174,6 @@ public: ...@@ -192,9 +174,6 @@ public:
virtual bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingCodes ) const = 0; virtual bool FindFontSubstitute( FontSelectPattern&, OUString& rMissingCodes ) const = 0;
}; };
// -----------------
// - ImplFontCache -
// -----------------
// TODO: closely couple with ImplDevFontList // TODO: closely couple with ImplDevFontList
class ImplFontCache class ImplFontCache
...@@ -222,10 +201,6 @@ public: ...@@ -222,10 +201,6 @@ public:
void Invalidate(); void Invalidate();
}; };
// ------------------
// - ImplOutDevData -
// ------------------
namespace vcl { struct ControlLayoutData; } namespace vcl { struct ControlLayoutData; }
// #i75163# // #i75163#
namespace basegfx { class B2DHomMatrix; } namespace basegfx { class B2DHomMatrix; }
......
vcl/inc/pch/precompiled_vcl.hxx
Dosyayı görüntüle @ 17394c18
...@@ -368,7 +368,6 @@ ...@@ -368,7 +368,6 @@
#include <tools/resid.hxx> #include <tools/resid.hxx>
#include <tools/resmgr.hxx> #include <tools/resmgr.hxx>
#include <tools/rtti.hxx> #include <tools/rtti.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <tools/tenccvt.hxx> #include <tools/tenccvt.hxx>
#include <tools/time.hxx> #include <tools/time.hxx>
......
vcl/inc/print.h
Dosyayı görüntüle @ 17394c18
...@@ -20,11 +20,8 @@ ...@@ -20,11 +20,8 @@
#ifndef INCLUDED_VCL_INC_PRINT_H #ifndef INCLUDED_VCL_INC_PRINT_H
#define INCLUDED_VCL_INC_PRINT_H #define INCLUDED_VCL_INC_PRINT_H
#include "tools/solar.h"
#include "vcl/dllapi.h"
#include "rtl/ustring.hxx" #include "rtl/ustring.hxx"
#include "vcl/dllapi.h"
#include <vector> #include <vector>
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
...@@ -35,20 +32,12 @@ class JobSetup; ...@@ -35,20 +32,12 @@ class JobSetup;
namespace vcl namespace vcl
{ class PrinterListener; } { class PrinterListener; }
// --------------------
// - ImplPrnQueueData -
// --------------------
struct ImplPrnQueueData struct ImplPrnQueueData
{ {
QueueInfo* mpQueueInfo; QueueInfo* mpQueueInfo;
SalPrinterQueueInfo* mpSalQueueInfo; SalPrinterQueueInfo* mpSalQueueInfo;
}; };
// --------------------
// - ImplPrnQueueList -
// --------------------
class VCL_PLUGIN_PUBLIC ImplPrnQueueList class VCL_PLUGIN_PUBLIC ImplPrnQueueList
{ {
public: public:
...@@ -64,10 +53,6 @@ public: ...@@ -64,10 +53,6 @@ public:
ImplPrnQueueData* Get( const OUString& rPrinter ); ImplPrnQueueData* Get( const OUString& rPrinter );
}; };
// --------------
// - Prototypes -
// --------------
void ImplDeletePrnQueueList(); void ImplDeletePrnQueueList();
void SAL_DLLPRIVATE ImplUpdateJobSetupPaper( JobSetup& rJobSetup ); void SAL_DLLPRIVATE ImplUpdateJobSetupPaper( JobSetup& rJobSetup );
......
vcl/inc/regband.hxx
Dosyayı görüntüle @ 17394c18
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#ifndef INCLUDED_VCL_INC_REGBAND_HXX #ifndef INCLUDED_VCL_INC_REGBAND_HXX
#define INCLUDED_VCL_INC_REGBAND_HXX #define INCLUDED_VCL_INC_REGBAND_HXX
#include <tools/solar.h>
#include <tools/poly.hxx> #include <tools/poly.hxx>
/* ======================================================================= /*
class ImplRegionBand class ImplRegionBand
...@@ -37,11 +36,7 @@ Intersection - the Class will process the clipping for the actual band. ...@@ -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 The actual separations may be checked by functions like IsInside or
IsOver. IsOver.
======================================================================= */ */
// ------------------------
// - ImplRegionBand-Types -
// ------------------------
// element for the list with x-separations // element for the list with x-separations
struct ImplRegionBandSep struct ImplRegionBandSep
...@@ -64,10 +59,6 @@ struct ImplRegionBandPoint ...@@ -64,10 +59,6 @@ struct ImplRegionBandPoint
LineType meLineType; LineType meLineType;
}; };
// ------------------
// - ImplRegionBand -
// ------------------
class ImplRegionBand class ImplRegionBand
{ {
public: public:
......
vcl/inc/salvd.hxx
Dosyayı görüntüle @ 17394c18
...@@ -20,9 +20,8 @@ ...@@ -20,9 +20,8 @@
#ifndef INCLUDED_VCL_INC_SALVD_HXX #ifndef INCLUDED_VCL_INC_SALVD_HXX
#define INCLUDED_VCL_INC_SALVD_HXX #define INCLUDED_VCL_INC_SALVD_HXX
#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <basebmp/bitmapdevice.hxx> #include <basebmp/bitmapdevice.hxx>
#include <vcl/dllapi.h>
class SalGraphics; class SalGraphics;
......
vcl/inc/textlayout.hxx
Dosyayı görüntüle @ 17394c18
...@@ -20,21 +20,14 @@ ...@@ -20,21 +20,14 @@
#ifndef INCLUDED_VCL_INC_TEXTLAYOUT_HXX #ifndef INCLUDED_VCL_INC_TEXTLAYOUT_HXX
#define INCLUDED_VCL_INC_TEXTLAYOUT_HXX #define INCLUDED_VCL_INC_TEXTLAYOUT_HXX
#include <memory>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/solar.h>
#include <vcl/outdev.hxx> #include <vcl/outdev.hxx>
#include <memory>
class Control; class Control;
//........................................................................
namespace vcl namespace vcl
{ {
//........................................................................
//====================================================================
//= ITextLayout
//====================================================================
class SAL_NO_VTABLE ITextLayout class SAL_NO_VTABLE ITextLayout
{ {
public: public:
...@@ -49,9 +42,6 @@ namespace vcl ...@@ -49,9 +42,6 @@ namespace vcl
~ITextLayout() {} ~ITextLayout() {}
}; };
//====================================================================
//= DefaultTextLayout
//====================================================================
/** is an implementation of the ITextLayout interface which simply delegates its calls to the respective /** is an implementation of the ITextLayout interface which simply delegates its calls to the respective
methods of an OutputDevice instance, without any inbetween magic. methods of an OutputDevice instance, without any inbetween magic.
*/ */
...@@ -96,9 +86,6 @@ namespace vcl ...@@ -96,9 +86,6 @@ namespace vcl
OutputDevice& m_rTargetDevice; OutputDevice& m_rTargetDevice;
}; };
//====================================================================
//= ControlTextRenderer
//====================================================================
class ReferenceDeviceTextLayout; class ReferenceDeviceTextLayout;
/** a class which allows rendering text of a Control onto a device, by taking into account the metrics of /** a class which allows rendering text of a Control onto a device, by taking into account the metrics of
a reference device. a reference device.
...@@ -122,9 +109,7 @@ namespace vcl ...@@ -122,9 +109,7 @@ namespace vcl
::std::auto_ptr< ReferenceDeviceTextLayout > m_pImpl; ::std::auto_ptr< ReferenceDeviceTextLayout > m_pImpl;
}; };
//........................................................................
} // namespace vcl } // namespace vcl
//........................................................................
#endif // INCLUDED_VCL_INC_TEXTLAYOUT_HXX #endif // INCLUDED_VCL_INC_TEXTLAYOUT_HXX
......
vcl/inc/toolbox.h
Dosyayı görüntüle @ 17394c18
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <tools/solar.h>
#include <vcl/image.hxx> #include <vcl/image.hxx>
#include <vcl/toolbox.hxx> #include <vcl/toolbox.hxx>
#include <vcl/controllayout.hxx> #include <vcl/controllayout.hxx>
...@@ -44,10 +43,6 @@ ...@@ -44,10 +43,6 @@
class Window; class Window;
// ----------------
// - ImplToolItem -
// ----------------
struct ImplToolItem struct ImplToolItem
{ {
Window* mpWindow; Window* mpWindow;
......
vcl/inc/unx/salmenu.h
Dosyayı görüntüle @ 17394c18
...@@ -20,11 +20,9 @@ ...@@ -20,11 +20,9 @@
#ifndef INCLUDED_VCL_INC_UNX_SALMENU_H #ifndef INCLUDED_VCL_INC_UNX_SALMENU_H
#define INCLUDED_VCL_INC_UNX_SALMENU_H #define INCLUDED_VCL_INC_UNX_SALMENU_H
#include <tools/solar.h>
#include <vcl/bitmap.hxx> #include <vcl/bitmap.hxx>
#include <salmenu.hxx> #include <salmenu.hxx>
class X11SalMenu : public SalMenu class X11SalMenu : public SalMenu
{ {
public: public:
......
vcl/inc/unx/salobj.h
Dosyayı görüntüle @ 17394c18
...@@ -20,11 +20,9 @@ ...@@ -20,11 +20,9 @@
#ifndef INCLUDED_VCL_INC_UNX_SALOBJ_H #ifndef INCLUDED_VCL_INC_UNX_SALOBJ_H
#define 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 <vcl/sysdata.hxx>
#include <vclpluginapi.h> #include <vclpluginapi.h>
#include <salobj.hxx>
class SalClipRegion class SalClipRegion
{ {
......
vcl/inc/unx/x11/x11sys.hxx
Dosyayı görüntüle @ 17394c18
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#ifndef INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX #ifndef INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
#define 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/mutex.hxx>
#include <osl/thread.hxx> #include <osl/thread.hxx>
#include <generic/gensys.h>
#include <vclpluginapi.h> #include <vclpluginapi.h>
class VCLPLUG_GEN_PUBLIC X11SalSystem : public SalGenericSystem class VCLPLUG_GEN_PUBLIC X11SalSystem : public SalGenericSystem
......
vcl/inc/window.h
Dosyayı görüntüle @ 17394c18
...@@ -20,20 +20,17 @@ ...@@ -20,20 +20,17 @@
#ifndef INCLUDED_VCL_INC_WINDOW_H #ifndef INCLUDED_VCL_INC_WINDOW_H
#define 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 <com/sun/star/uno/Reference.hxx>
#include <cppuhelper/weakref.hxx> #include <cppuhelper/weakref.hxx>
#include <vcl/salnativewidgets.hxx>
#include <list> #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 SalPaintEvent;
struct ImplDelData; struct ImplDelData;
...@@ -92,21 +89,11 @@ namespace vcl { ...@@ -92,21 +89,11 @@ namespace vcl {
struct ControlLayoutData; struct ControlLayoutData;
} }
// --------------
// - Prototypes -
// --------------
bool ImplWindowFrameProc( Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent ); bool ImplWindowFrameProc( Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent );
// -----------
// - HitTest -
// -----------
#define WINDOW_HITTEST_INSIDE ((sal_uInt16)0x0001) #define WINDOW_HITTEST_INSIDE ((sal_uInt16)0x0001)
#define WINDOW_HITTEST_TRANSPARENT ((sal_uInt16)0x0002) #define WINDOW_HITTEST_TRANSPARENT ((sal_uInt16)0x0002)
struct ImplWinData struct ImplWinData
{ {
OUString* mpExtOldText; OUString* mpExtOldText;
...@@ -126,7 +113,6 @@ struct ImplWinData ...@@ -126,7 +113,6 @@ struct ImplWinData
maTopWindowChildren; maTopWindowChildren;
}; };
struct ImplOverlapData struct ImplOverlapData
{ {
VirtualDevice* mpSaveBackDev; // saved background bitmap VirtualDevice* mpSaveBackDev; // saved background bitmap
...@@ -137,7 +123,6 @@ struct ImplOverlapData ...@@ -137,7 +123,6 @@ struct ImplOverlapData
sal_uInt8 mnTopLevel; // Level for Overlap-Window sal_uInt8 mnTopLevel; // Level for Overlap-Window
}; };
struct ImplFrameData struct ImplFrameData
{ {
Timer maPaintTimer; // paint timer Timer maPaintTimer; // paint timer
...@@ -193,7 +178,6 @@ struct ImplFrameData ...@@ -193,7 +178,6 @@ struct ImplFrameData
sal_Bool mbInternalDragGestureRecognizer; sal_Bool mbInternalDragGestureRecognizer;
}; };
struct ImplAccessibleInfos struct ImplAccessibleInfos
{ {
sal_uInt16 nAccessibleRole; sal_uInt16 nAccessibleRole;
...@@ -207,7 +191,6 @@ struct ImplAccessibleInfos ...@@ -207,7 +191,6 @@ struct ImplAccessibleInfos
~ImplAccessibleInfos(); ~ImplAccessibleInfos();
}; };
enum AlwaysInputMode { AlwaysInputNone = 0, AlwaysInputEnabled = 1, AlwaysInputDisabled =2 }; enum AlwaysInputMode { AlwaysInputNone = 0, AlwaysInputEnabled = 1, AlwaysInputDisabled =2 };
class WindowImpl class WindowImpl
......
vcl/source/filter/jpeg/JpegTransform.hxx
Dosyayı görüntüle @ 17394c18
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX #ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX #define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
#include <tools/solar.h>
#include <vcl/graph.hxx> #include <vcl/graph.hxx>
class JpegTransform class JpegTransform
......
vcl/source/filter/jpeg/JpegWriter.cxx
Dosyayı görüntüle @ 17394c18
...@@ -25,11 +25,10 @@ extern "C" ...@@ -25,11 +25,10 @@ extern "C"
#include <jerror.h> #include <jerror.h>
} }
#include <tools/solar.h> #include "JpegWriter.hxx"
#include <vcl/bmpacc.hxx> #include <vcl/bmpacc.hxx>
#include <vcl/FilterConfigItem.hxx> #include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx> #include <vcl/graphicfilter.hxx>
#include "JpegWriter.hxx"
#define BUFFER_SIZE 4096 #define BUFFER_SIZE 4096
......
vcl/source/filter/jpeg/jpeg.cxx
Dosyayı görüntüle @ 17394c18
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include "JpegReader.hxx" #include "JpegReader.hxx"
#include "JpegWriter.hxx" #include "JpegWriter.hxx"
#include <tools/solar.h>
#include <vcl/bmpacc.hxx> #include <vcl/bmpacc.hxx>
#include <vcl/FilterConfigItem.hxx> #include <vcl/FilterConfigItem.hxx>
#include <vcl/graphicfilter.hxx> #include <vcl/graphicfilter.hxx>
......
vcl/source/filter/sgfbram.hxx
Dosyayı görüntüle @ 17394c18
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#ifndef INCLUDED_VCL_SOURCE_FILTER_SGFBRAM_HXX #ifndef INCLUDED_VCL_SOURCE_FILTER_SGFBRAM_HXX
#define INCLUDED_VCL_SOURCE_FILTER_SGFBRAM_HXX #define INCLUDED_VCL_SOURCE_FILTER_SGFBRAM_HXX
#include <tools/solar.h>
#define SgfBitImag0 1 /* Bitmap */ #define SgfBitImag0 1 /* Bitmap */
#define SgfBitImag1 4 /* Bitmap */ #define SgfBitImag1 4 /* Bitmap */
#define SgfBitImag2 5 /* Bitmap */ #define SgfBitImag2 5 /* Bitmap */
...@@ -96,10 +94,6 @@ extern long SgfVectXdiv; ...@@ -96,10 +94,6 @@ extern long SgfVectXdiv;
extern long SgfVectYdiv; extern long SgfVectYdiv;
extern bool SgfVectScal; extern bool SgfVectScal;
////////////////////////////////////////////////////////////////////////////////////////////////////
// Windows BMP /////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
#define BmpFileHeaderSize 14 #define BmpFileHeaderSize 14
class BmpFileHeader class BmpFileHeader
{ {
......
vcl/source/window/splitwin.cxx
Dosyayı görüntüle @ 17394c18
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment