[Libreoffice-commits] core.git: include/vcl
Alexandre Vicenzi
vicenzi.alexandre at gmail.com
Thu Jan 30 03:24:13 PST 2014
include/vcl/abstdlg.hxx | 3 ---
include/vcl/accel.hxx | 7 +------
include/vcl/apptypes.hxx | 5 -----
include/vcl/btndlg.hxx | 10 ----------
include/vcl/cursor.hxx | 1 -
include/vcl/decoview.hxx | 9 ---------
include/vcl/dockingarea.hxx | 4 ----
include/vcl/fntstyle.hxx | 9 ---------
include/vcl/graph.h | 9 ---------
include/vcl/introwin.hxx | 7 +------
include/vcl/jobset.hxx | 6 ------
include/vcl/keycod.hxx | 6 ------
include/vcl/keycodes.hxx | 9 ---------
include/vcl/menubtn.hxx | 11 +----------
include/vcl/msgbox.hxx | 22 +---------------------
include/vcl/pointr.hxx | 5 -----
include/vcl/ptrstyle.hxx | 6 ------
include/vcl/region.hxx | 5 -----
include/vcl/salgtype.hxx | 21 ---------------------
include/vcl/slider.hxx | 5 -----
include/vcl/spin.h | 2 --
include/vcl/split.hxx | 5 -----
include/vcl/splitwin.hxx | 17 -----------------
include/vcl/stdtext.hxx | 9 ---------
include/vcl/syschild.hxx | 5 -----
include/vcl/tabctrl.hxx | 9 ---------
include/vcl/tabdlg.hxx | 5 -----
include/vcl/toolbox.hxx | 16 +---------------
include/vcl/unowrap.hxx | 3 +--
include/vcl/vclenum.hxx | 19 +------------------
include/vcl/virdev.hxx | 7 +------
include/vcl/waitobj.hxx | 5 -----
include/vcl/wall.hxx | 11 +----------
33 files changed, 9 insertions(+), 264 deletions(-)
New commits:
commit 1984bb05de38a6f4b23b422f1d4156670d493ba1
Author: Alexandre Vicenzi <vicenzi.alexandre at gmail.com>
Date: Wed Jan 29 21:54:21 2014 -0200
fdo#63154 Removed unused solar.h ref. in vcl
Change-Id: I038c941559a275c43c2be7d5453ca4c37390f343
Reviewed-on: https://gerrit.libreoffice.org/7733
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 89ec5d3..fa69831 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_VCL_ABSTDLG_HXX
#include <rtl/ustring.hxx>
-#include <tools/solar.h>
#include <vcl/dllapi.h>
class Window;
@@ -64,8 +63,6 @@ public:
virtual bool IsRecommendToOpenReadonly() const = 0;
};
-//-------------------------------------------------------------
-
class VCL_DLLPUBLIC VclAbstractDialogFactory
{
public:
diff --git a/include/vcl/accel.hxx b/include/vcl/accel.hxx
index c206e35..44f5041 100644
--- a/include/vcl/accel.hxx
+++ b/include/vcl/accel.hxx
@@ -20,20 +20,15 @@
#ifndef INCLUDED_VCL_ACCEL_HXX
#define INCLUDED_VCL_ACCEL_HXX
-#include <tools/solar.h>
-#include <vcl/dllapi.h>
#include <tools/link.hxx>
#include <tools/resid.hxx>
#include <tools/rc.hxx>
#include <vcl/keycod.hxx>
+#include <vcl/dllapi.h>
class ImplAccelData;
class ImplAccelEntry;
-// ---------------
-// - Accelerator -
-// ---------------
-
class VCL_DLLPUBLIC Accelerator : public Resource
{
friend class ImplAccelManager;
diff --git a/include/vcl/apptypes.hxx b/include/vcl/apptypes.hxx
index d2de42b..5a22c1c 100644
--- a/include/vcl/apptypes.hxx
+++ b/include/vcl/apptypes.hxx
@@ -20,14 +20,9 @@
#ifndef INCLUDED_VCL_APPTYPES_HXX
#define INCLUDED_VCL_APPTYPES_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <tools/rtti.hxx>
-// ---------------------
-// - Application-Types -
-// ---------------------
-
#define EXC_RSCNOTLOADED ((sal_uInt16)0x0100)
#define EXC_SYSOBJNOTCREATED ((sal_uInt16)0x0200)
#define EXC_SYSTEM ((sal_uInt16)0x0300)
diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index 4d631df..0239157 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -21,18 +21,12 @@
#define INCLUDED_VCL_BTNDLG_HXX
#include <boost/ptr_container/ptr_vector.hpp>
-
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/dialog.hxx>
struct ImplBtnDlgItem;
class PushButton;
-// ----------------------
-// - ButtonDialog-Types -
-// ----------------------
-
#define BUTTONDIALOG_BUTTON_NOTFOUND ((sal_uInt16)0xFFFF)
#define BUTTONDIALOG_DEFBUTTON ((sal_uInt16)0x0001)
@@ -41,10 +35,6 @@ class PushButton;
#define BUTTONDIALOG_HELPBUTTON ((sal_uInt16)0x0008)
#define BUTTONDIALOG_FOCUSBUTTON ((sal_uInt16)0x0010)
-// ----------------
-// - ButtonDialog -
-// ----------------
-
class VCL_DLLPUBLIC ButtonDialog : public Dialog
{
private:
diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx
index fb82f05..42d741b 100644
--- a/include/vcl/cursor.hxx
+++ b/include/vcl/cursor.hxx
@@ -22,7 +22,6 @@
#include <tools/gen.hxx>
#include <tools/link.hxx>
-#include <tools/solar.h>
#include <vcl/dllapi.h>
struct ImplCursorData;
diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx
index 0f8234a7..8cff366 100644
--- a/include/vcl/decoview.hxx
+++ b/include/vcl/decoview.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_DECOVIEW_HXX
#define INCLUDED_VCL_DECOVIEW_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <rsc/rsc-vcl-shared-types.hxx>
@@ -29,10 +28,6 @@ class Point;
class Color;
class OutputDevice;
-// ------------------------
-// - DecorationView-Types -
-// ------------------------
-
// Flags for DrawSymbol()
#define SYMBOL_DRAW_MONO ((sal_uInt16)0x0001)
#define SYMBOL_DRAW_DISABLE ((sal_uInt16)0x0002)
@@ -72,10 +67,6 @@ class OutputDevice;
#define BUTTON_DRAW_NOTEXT ((sal_uInt16)0x2000)
#define BUTTON_DRAW_NOIMAGE ((sal_uInt16)0x4000)
-// ------------------
-// - DecorationView -
-// ------------------
-
class VCL_DLLPUBLIC DecorationView
{
private:
diff --git a/include/vcl/dockingarea.hxx b/include/vcl/dockingarea.hxx
index 01a8cff..3ba3f80 100644
--- a/include/vcl/dockingarea.hxx
+++ b/include/vcl/dockingarea.hxx
@@ -20,14 +20,10 @@
#ifndef INCLUDED_VCL_DOCKINGAREA_HXX
#define INCLUDED_VCL_DOCKINGAREA_HXX
-#include <tools/solar.h>
#include <vcl/window.hxx>
-// ------------------------------------------
// A simple container for docked toolbars
// - its main purpose is theming support
-// ------------------------------------------
-
class VCL_DLLPUBLIC DockingAreaWindow : public Window
{
class ImplData;
diff --git a/include/vcl/fntstyle.hxx b/include/vcl/fntstyle.hxx
index d0cc557..643d5d2 100644
--- a/include/vcl/fntstyle.hxx
+++ b/include/vcl/fntstyle.hxx
@@ -20,13 +20,8 @@
#ifndef INCLUDED_VCL_FNTSTYLE_HXX
#define INCLUDED_VCL_FNTSTYLE_HXX
-#include <tools/solar.h>
#include <sal/types.h>
-// --------------
-// - Font enums -
-// --------------
-
#ifndef ENUM_FONTRELIEF_DECLARED
#define ENUM_FONTRELIEF_DECLARED
@@ -34,10 +29,6 @@ enum FontRelief { RELIEF_NONE, RELIEF_EMBOSSED, RELIEF_ENGRAVED, FontRelief_FORC
#endif
-// --------------
-// - Font types -
-// --------------
-
typedef sal_uInt8 FontKerning;
#define KERNING_FONTSPECIFIC ((FontKerning)0x01)
#define KERNING_ASIAN ((FontKerning)0x02)
diff --git a/include/vcl/graph.h b/include/vcl/graph.h
index 509ea46..abc7aa5 100644
--- a/include/vcl/graph.h
+++ b/include/vcl/graph.h
@@ -21,13 +21,8 @@
#define INCLUDED_VCL_GRAPH_H
#include <rtl/ustring.hxx>
-#include <tools/solar.h>
#include <vcl/dllapi.h>
-// ---------------
-// - GraphicType -
-// ---------------
-
enum GraphicType
{
GRAPHIC_NONE,
@@ -36,10 +31,6 @@ enum GraphicType
GRAPHIC_DEFAULT
};
-// -----------------
-// - GraphicReader -
-// -----------------
-
class ReaderData;
class VCL_DLLPUBLIC GraphicReader
diff --git a/include/vcl/introwin.hxx b/include/vcl/introwin.hxx
index 59be750..dcc2478 100644
--- a/include/vcl/introwin.hxx
+++ b/include/vcl/introwin.hxx
@@ -20,14 +20,9 @@
#ifndef INCLUDED_VCL_INTROWIN_HXX
#define INCLUDED_VCL_INTROWIN_HXX
-#include <tools/solar.h>
+#include <vcl/bitmapex.hxx>
#include <vcl/dllapi.h>
#include <vcl/wrkwin.hxx>
-#include <vcl/bitmapex.hxx>
-
-// --------------
-// - IntroWindow -
-// --------------
class VCL_DLLPUBLIC IntroWindow : public WorkWindow
{
diff --git a/include/vcl/jobset.hxx b/include/vcl/jobset.hxx
index 1732ae9..fb0f8ba 100644
--- a/include/vcl/jobset.hxx
+++ b/include/vcl/jobset.hxx
@@ -20,18 +20,12 @@
#ifndef INCLUDED_VCL_JOBSET_HXX
#define INCLUDED_VCL_JOBSET_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/prntypes.hxx>
-
class SvStream;
struct ImplJobSetup;
-// ------------
-// - JobSetup -
-// ------------
-
class VCL_DLLPUBLIC JobSetup
{
friend class Printer;
diff --git a/include/vcl/keycod.hxx b/include/vcl/keycod.hxx
index 5334995..7b547ae 100644
--- a/include/vcl/keycod.hxx
+++ b/include/vcl/keycod.hxx
@@ -21,19 +21,13 @@
#define INCLUDED_VCL_KEYCOD_HXX
#include <rtl/ustring.hxx>
-#include <tools/solar.h>
#include <tools/resid.hxx>
#include <vcl/dllapi.h>
#include <vcl/keycodes.hxx>
-
#include <vcl/vclenum.hxx>
class Window;
-// -----------
-// - KeyCode -
-// -----------
-
class VCL_DLLPUBLIC KeyCode
{
private:
diff --git a/include/vcl/keycodes.hxx b/include/vcl/keycodes.hxx
index b6a1b4a..9644561 100644
--- a/include/vcl/keycodes.hxx
+++ b/include/vcl/keycodes.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_KEYCODES_HXX
#define INCLUDED_VCL_KEYCODES_HXX
-#include <tools/solar.h>
#include <rsc/rsc-vcl-shared-types.hxx>
#undef DELETE
#include <com/sun/star/awt/Key.hpp>
@@ -165,18 +164,10 @@
#define MODKEY_MOD2 (MODKEY_LMOD2|MODKEY_RMOD2)
#define MODKEY_MOD3 (MODKEY_LMOD3|MODKEY_RMOD3)
-// ---------------
-// - Mouse-Types -
-// ---------------
-
#define MOUSE_LEFT ((sal_uInt16)0x0001)
#define MOUSE_MIDDLE ((sal_uInt16)0x0002)
#define MOUSE_RIGHT ((sal_uInt16)0x0004)
-// -------------------
-// - Indicator-Types -
-// -------------------
-
#define INDICATOR_CAPSLOCK 0x0001
#define INDICATOR_NUMLOCK 0x0002
#define INDICATOR_SCROLLLOCK 0x0004
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index 3855948..bce98e9 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -20,25 +20,16 @@
#ifndef INCLUDED_VCL_MENUBTN_HXX
#define INCLUDED_VCL_MENUBTN_HXX
-#include <tools/solar.h>
-#include <vcl/dllapi.h>
#include <vcl/button.hxx>
+#include <vcl/dllapi.h>
class Timer;
class PopupMenu;
class VclBuilder;
class VclSimpleEvent;
-// --------------------
-// - MenuButton-Types -
-// --------------------
-
#define MENUBUTTON_MENUMODE_TIMED ((sal_uInt16)0x0001)
-// --------------
-// - MenuButton -
-// --------------
-
class VCL_DLLPUBLIC MenuButton : public PushButton
{
private:
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx
index b1387f0..081141b 100644
--- a/include/vcl/msgbox.hxx
+++ b/include/vcl/msgbox.hxx
@@ -20,19 +20,15 @@
#ifndef INCLUDED_VCL_MSGBOX_HXX
#define INCLUDED_VCL_MSGBOX_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/btndlg.hxx>
#include <vcl/image.hxx>
#include <vcl/bitmap.hxx>
+
class VclMultiLineEdit;
class FixedImage;
class CheckBox;
-// -----------
-// - MessBox -
-// -----------
-
class VCL_DLLPUBLIC MessBox : public ButtonDialog
{
protected:
@@ -74,10 +70,6 @@ public:
virtual Size GetOptimalSize() const;
};
-// -----------
-// - InfoBox -
-// -----------
-
class VCL_DLLPUBLIC InfoBox : public MessBox
{
private:
@@ -92,10 +84,6 @@ public:
static Image GetStandardImage();
};
-// --------------
-// - WarningBox -
-// --------------
-
class VCL_DLLPUBLIC WarningBox : public MessBox
{
private:
@@ -111,10 +99,6 @@ public:
static Image GetStandardImage();
};
-// ------------
-// - ErrorBox -
-// ------------
-
class VCL_DLLPUBLIC ErrorBox : public MessBox
{
private:
@@ -128,10 +112,6 @@ public:
static Image GetStandardImage();
};
-// ------------
-// - QueryBox -
-// ------------
-
class VCL_DLLPUBLIC QueryBox : public MessBox
{
private:
diff --git a/include/vcl/pointr.hxx b/include/vcl/pointr.hxx
index 2af80e6..44f7430 100644
--- a/include/vcl/pointr.hxx
+++ b/include/vcl/pointr.hxx
@@ -20,16 +20,11 @@
#ifndef INCLUDED_VCL_POINTR_HXX
#define INCLUDED_VCL_POINTR_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/ptrstyle.hxx>
class Point;
-// -----------
-// - Pointer -
-// -----------
-
class VCL_DLLPUBLIC Pointer
{
PointerStyle meStyle;
diff --git a/include/vcl/ptrstyle.hxx b/include/vcl/ptrstyle.hxx
index 4b3c22c..ece5af2 100644
--- a/include/vcl/ptrstyle.hxx
+++ b/include/vcl/ptrstyle.hxx
@@ -20,12 +20,6 @@
#ifndef INCLUDED_VCL_PTRSTYLE_HXX
#define INCLUDED_VCL_PTRSTYLE_HXX
-#include <tools/solar.h>
-
-// -----------------
-// - Pointer-Types -
-// -----------------
-
typedef sal_uInt16 PointerStyle;
#define POINTER_ARROW ((PointerStyle)0)
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index 7daa349..d3eec64 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_VCL_REGION_HXX
#include <tools/gen.hxx>
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -32,15 +31,11 @@ class RegionBand;
class Polygon;
class PolyPolygon;
-//////////////////////////////////////////////////////////////////////////////
-
typedef boost::shared_ptr< RegionBand > RegionBandPtr;
typedef boost::shared_ptr< PolyPolygon > PolyPolygonPtr;
typedef boost::shared_ptr< basegfx::B2DPolyPolygon > B2DPolyPolygonPtr;
typedef std::vector< Rectangle > RectangleVector;
-//////////////////////////////////////////////////////////////////////////////
-
class VCL_DLLPUBLIC Region
{
private:
diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx
index 95a1f8b..dc21904 100644
--- a/include/vcl/salgtype.hxx
+++ b/include/vcl/salgtype.hxx
@@ -20,21 +20,12 @@
#ifndef INCLUDED_VCL_SALGTYPE_HXX
#define INCLUDED_VCL_SALGTYPE_HXX
-#include <tools/solar.h>
-
-// ------------
-// - SalColor -
-// ------------
-
typedef sal_uInt32 SalColor;
#define MAKE_SALCOLOR( r, g, b ) ((SalColor)(((sal_uInt32)((sal_uInt8)(b))))|(((sal_uInt32)((sal_uInt8)(g)))<<8)|(((sal_uInt32)((sal_uInt8)(r)))<<16))
#define SALCOLOR_RED( n ) ((sal_uInt8)((n)>>16))
#define SALCOLOR_GREEN( n ) ((sal_uInt8)(((sal_uInt16)(n)) >> 8))
#define SALCOLOR_BLUE( n ) ((sal_uInt8)(n))
#define SALCOLOR_NONE (~(SalColor)0)
-// ------------
-// - SalPoint -
-// ------------
// must equal to class Point
struct SalPoint
@@ -45,10 +36,6 @@ struct SalPoint
typedef const SalPoint* PCONSTSALPOINT;
-// --------------
-// - SalTwoRect -
-// --------------
-
struct SalTwoRect
{
long mnSrcX;
@@ -61,19 +48,11 @@ struct SalTwoRect
long mnDestHeight;
};
-// ---------------
-// - SalROPColor -
-// ---------------
-
typedef sal_uInt16 SalROPColor;
#define SAL_ROP_0 ((SalROPColor)0)
#define SAL_ROP_1 ((SalROPColor)1)
#define SAL_ROP_INVERT ((SalROPColor)2)
-// -------------
-// - SalInvert -
-// -------------
-
typedef sal_uInt16 SalInvert;
#define SAL_INVERT_HIGHLIGHT ((SalInvert)0x0001)
#define SAL_INVERT_50 ((SalInvert)0x0002)
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 8a9804c..ef24221 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -20,16 +20,11 @@
#ifndef INCLUDED_VCL_SLIDER_HXX
#define INCLUDED_VCL_SLIDER_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
// for enum ScrollType
#include <vcl/scrbar.hxx>
-// ----------
-// - Slider -
-// ----------
-
class VCL_DLLPUBLIC Slider : public Control
{
private:
diff --git a/include/vcl/spin.h b/include/vcl/spin.h
index be6d11a..a53e04b 100644
--- a/include/vcl/spin.h
+++ b/include/vcl/spin.h
@@ -20,8 +20,6 @@
#ifndef INCLUDED_VCL_SPIN_H
#define INCLUDED_VCL_SPIN_H
-#include <tools/solar.h>
-
class Rectangle;
class OutputDevice;
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index c5b97a7..3e86882 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -20,16 +20,11 @@
#ifndef INCLUDED_VCL_SPLIT_HXX
#define INCLUDED_VCL_SPLIT_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/window.hxx>
#define SPLITTER_DEFAULTSTEPSIZE 0xFFFF
-// ------------
-// - Splitter -
-// ------------
-
class VCL_DLLPUBLIC Splitter : public Window
{
private:
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 65fe65b..07f3407 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -20,40 +20,23 @@
#ifndef INCLUDED_VCL_SPLITWIN_HXX
#define INCLUDED_VCL_SPLITWIN_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/dockwin.hxx>
class Wallpaper;
struct ImplSplitSet;
-// -----------------------
-// - SplitWindowItemBits -
-// -----------------------
-
typedef sal_uInt16 SplitWindowItemBits;
-// -------------------------------
-// - Bits fuer SplitWindow-Items -
-// -------------------------------
-
#define SWIB_FIXED ((SplitWindowItemBits)0x0001)
#define SWIB_RELATIVESIZE ((SplitWindowItemBits)0x0002)
#define SWIB_PERCENTSIZE ((SplitWindowItemBits)0x0004)
#define SWIB_COLSET ((SplitWindowItemBits)0x0008)
#define SWIB_INVISIBLE ((SplitWindowItemBits)0x0010)
-// ---------------------
-// - SplitWindow-Types -
-// ---------------------
-
#define SPLITWINDOW_APPEND ((sal_uInt16)0xFFFF)
#define SPLITWINDOW_ITEM_NOTFOUND ((sal_uInt16)0xFFFF)
-// ---------------
-// - SplitWindow -
-// ---------------
-
class VCL_DLLPUBLIC SplitWindow : public DockingWindow
{
private:
diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx
index 76a5e74..cfd865c 100644
--- a/include/vcl/stdtext.hxx
+++ b/include/vcl/stdtext.hxx
@@ -21,25 +21,16 @@
#define INCLUDED_VCL_STDTEXT_HXX
#include <rtl/ustring.hxx>
-#include <tools/solar.h>
#include <vcl/dllapi.h>
class Window;
-// ------------------
-// - Standard-Texte -
-// ------------------
-
#define STANDARD_TEXT_FIRST STANDARD_TEXT_SERVICE_NOT_AVAILABLE
#define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((sal_uInt16)0)
#define STANDARD_TEXT_LAST STANDARD_TEXT_SERVICE_NOT_AVAILABLE
OUString VCL_DLLPUBLIC GetStandardText(sal_uInt16 nStdText);
-// -------------------------------------
-// - Hilfsmethoden fuer Standard-Texte -
-// -------------------------------------
-
void VCL_DLLPUBLIC ShowServiceNotAvailableError(Window* pParent, const OUString& rServiceName, bool bError);
#endif // INCLUDED_VCL_STDTEXT_HXX
diff --git a/include/vcl/syschild.hxx b/include/vcl/syschild.hxx
index 6c57f31..0238da2 100644
--- a/include/vcl/syschild.hxx
+++ b/include/vcl/syschild.hxx
@@ -20,17 +20,12 @@
#ifndef INCLUDED_VCL_SYSCHILD_HXX
#define INCLUDED_VCL_SYSCHILD_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/window.hxx>
struct SystemEnvData;
struct SystemWindowData;
-// ---------------------
-// - SystemChildWindow -
-// ---------------------
-
class VCL_DLLPUBLIC SystemChildWindow : public Window
{
private:
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 263e648..f084cde 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_TABCTRL_HXX
#define INCLUDED_VCL_TABCTRL_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
@@ -30,19 +29,11 @@ class TabPage;
class PushButton;
class ListBox;
-// --------------------
-// - TabControl-Types -
-// --------------------
-
#ifndef TAB_APPEND
#define TAB_APPEND ((sal_uInt16)0xFFFF)
#define TAB_PAGE_NOTFOUND ((sal_uInt16)0xFFFF)
#endif /* !TAB_APPEND */
-// --------------
-// - TabControl -
-// --------------
-
class VCL_DLLPUBLIC TabControl : public Control
{
private:
diff --git a/include/vcl/tabdlg.hxx b/include/vcl/tabdlg.hxx
index ebf8a6c..27651d8 100644
--- a/include/vcl/tabdlg.hxx
+++ b/include/vcl/tabdlg.hxx
@@ -20,17 +20,12 @@
#ifndef INCLUDED_VCL_TABDLG_HXX
#define INCLUDED_VCL_TABDLG_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/dialog.hxx>
class FixedLine;
class TabControl;
-// ----------------------
-// - TabDialog -
-// ----------------------
-
class VCL_DLLPUBLIC TabDialog : public Dialog
{
private:
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index e7668b8..ff42380 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_TOOLBOX_HXX
#define INCLUDED_VCL_TOOLBOX_HXX
-#include <tools/solar.h>
+#include <com/sun/star/frame/XFrame.hpp>
#include <rsc/rsc-vcl-shared-types.hxx>
#include <vcl/dllapi.h>
#include <vcl/dockwin.hxx>
@@ -28,8 +28,6 @@
#include <vcl/timer.hxx>
#include <vector>
-#include <com/sun/star/frame/XFrame.hpp>
-
class UserDrawEvent;
struct ImplToolItem;
@@ -43,10 +41,6 @@ namespace vcl
class IImageListProvider;
}
-// -------------------------
-// - ToolBoxCustomizeEvent -
-// -------------------------
-
#define TOOLBOX_CUSTOMIZE_RESIZE ((sal_uInt16)0xFFFE)
class VCL_DLLPUBLIC ToolBoxCustomizeEvent
@@ -96,10 +90,6 @@ inline sal_Bool ToolBoxCustomizeEvent::IsResized() const
return sal_False;
}
-// -----------------
-// - ToolBox-Types -
-// -----------------
-
#define TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004)
#define TOOLBOX_APPEND ((sal_uInt16)0xFFFF)
@@ -130,10 +120,6 @@ struct ImplToolSize
sal_uInt16 mnLines;
};
-// -----------
-// - ToolBox -
-// -----------
-
class VCL_DLLPUBLIC ToolBox : public DockingWindow
{
friend class FloatingWindow;
diff --git a/include/vcl/unowrap.hxx b/include/vcl/unowrap.hxx
index 86b3f8e..fd0e979 100644
--- a/include/vcl/unowrap.hxx
+++ b/include/vcl/unowrap.hxx
@@ -20,9 +20,8 @@
#ifndef INCLUDED_VCL_UNOWRAP_HXX
#define INCLUDED_VCL_UNOWRAP_HXX
-#include <tools/solar.h>
-#include <vcl/dllapi.h>
#include <com/sun/star/uno/Reference.h>
+#include <vcl/dllapi.h>
class XWindowPeer;
class XToolkit;
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 74e28c6..e5d3fbd 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -20,27 +20,20 @@
#ifndef INCLUDED_VCL_VCLENUM_HXX
#define INCLUDED_VCL_VCLENUM_HXX
+#include <rsc/rsc-vcl-shared-types.hxx>
#include <sal/types.h>
-#include <tools/solar.h>
#include <tools/fontenum.hxx>
-#include <rsc/rsc-vcl-shared-types.hxx>
-
-// ------------------------------------------------------------
enum ExtTimeFieldFormat { EXTTIMEF_24H_SHORT, EXTTIMEF_24H_LONG,
EXTTIMEF_12H_SHORT, EXTTIMEF_12H_LONG,
EXTTIMEF_DURATION_SHORT, EXTTIMEF_DURATION_LONG };
-// ------------------------------------------------------------
-
enum ExtDateFieldFormat { XTDATEF_SYSTEM_SHORT, XTDATEF_SYSTEM_SHORT_YY, XTDATEF_SYSTEM_SHORT_YYYY,
XTDATEF_SYSTEM_LONG,
XTDATEF_SHORT_DDMMYY, XTDATEF_SHORT_MMDDYY, XTDATEF_SHORT_YYMMDD,
XTDATEF_SHORT_DDMMYYYY, XTDATEF_SHORT_MMDDYYYY, XTDATEF_SHORT_YYYYMMDD,
XTDATEF_SHORT_YYMMDD_DIN5008, XTDATEF_SHORT_YYYYMMDD_DIN5008, ExtDateFieldFormat_FORCE_EQUAL_SIZE=SAL_MAX_ENUM };
-// ------------------------------------------------------------
-
enum GradientStyle
{
GradientStyle_LINEAR = 0,
@@ -52,8 +45,6 @@ enum GradientStyle
GradientStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
};
-// ------------------------------------------------------------
-
// to avoid conflicts with enum's declared otherwise
#define HATCH_SINGLE HatchStyle_SINGLE
#define HATCH_DOUBLE HatchStyle_DOUBLE
@@ -68,8 +59,6 @@ enum HatchStyle
HatchStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
};
-// ------------------------------------------------------------
-
// to avoid conflicts with enum's declared otherwise
#define LINE_NONE LineStyle_NONE
#define LINE_SOLID LineStyle_SOLID
@@ -84,20 +73,14 @@ enum LineStyle
LineStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
};
-// ------------------------------------------------------------
-
enum RasterOp { ROP_OVERPAINT, ROP_XOR, ROP_0, ROP_1, ROP_INVERT };
-// ------------------------------------------------------------
-
enum FontAutoHint { AUTOHINT_DONTKNOW, AUTOHINT_FALSE, AUTOHINT_TRUE };
enum FontHinting { HINTING_DONTKNOW, HINTING_FALSE, HINTING_TRUE };
enum FontHintStyle { HINT_NONE, HINT_SLIGHT, HINT_MEDIUM, HINT_FULL };
-// ------------------------------------------------------------
-
typedef sal_uInt32 sal_UCS4; // TODO: this should be moved to rtl
enum OutDevSupportType { OutDevSupport_TransparentRect, OutDevSupport_B2DClip, OutDevSupport_B2DDraw };
diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx
index 3509dc3..a15e057 100644
--- a/include/vcl/virdev.hxx
+++ b/include/vcl/virdev.hxx
@@ -20,14 +20,9 @@
#ifndef INCLUDED_VCL_VIRDEV_HXX
#define INCLUDED_VCL_VIRDEV_HXX
-#include <tools/solar.h>
+#include <basebmp/bitmapdevice.hxx>
#include <vcl/dllapi.h>
#include <vcl/outdev.hxx>
-#include <basebmp/bitmapdevice.hxx>
-
-// -----------------
-// - VirtualDevice -
-// -----------------
class SalVirtualDevice;
struct SystemGraphicsData;
diff --git a/include/vcl/waitobj.hxx b/include/vcl/waitobj.hxx
index 0cabd62..2ef2f69 100644
--- a/include/vcl/waitobj.hxx
+++ b/include/vcl/waitobj.hxx
@@ -20,14 +20,9 @@
#ifndef INCLUDED_VCL_WAITOBJ_HXX
#define INCLUDED_VCL_WAITOBJ_HXX
-#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/window.hxx>
-// --------------
-// - WaitObject -
-// --------------
-
class VCL_DLLPUBLIC WaitObject
{
private:
diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx
index 46cfbb7..f7a4608 100644
--- a/include/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
@@ -20,19 +20,14 @@
#ifndef INCLUDED_VCL_WALL_HXX
#define INCLUDED_VCL_WALL_HXX
-#include <tools/solar.h>
-#include <vcl/dllapi.h>
#include <tools/color.hxx>
#include <tools/gen.hxx>
+#include <vcl/dllapi.h>
class Gradient;
class BitmapEx;
class ImplWallpaper;
-// -------------------
-// - Wallpaper-Types -
-// -------------------
-
#define WALLPAPER_NULL WallpaperStyle_NULL
#define WALLPAPER_TILE WallpaperStyle_TILE
#define WALLPAPER_CENTER WallpaperStyle_CENTER
@@ -72,10 +67,6 @@ enum WallpaperStyle
#endif
-// -------------
-// - Wallpaper -
-// -------------
-
class VCL_DLLPUBLIC Wallpaper
{
private:
More information about the Libreoffice-commits
mailing list