diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/ctrltool.hxx | 8 | ||||
| -rw-r--r-- | include/tools/fontenum.hxx | 1 | ||||
| -rw-r--r-- | include/tools/fract.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/gradient.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/hatch.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/lineinfo.hxx | 6 |
6 files changed, 12 insertions, 16 deletions
diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index cd06bce505a8..0c830f3c121a 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -26,11 +26,12 @@ #include <rtl/ustring.hxx> #include <sal/types.h> #include <vcl/metric.hxx> +#include <tools/solar.h> class ImplFontListNameInfo; class OutputDevice; -/************************************************************************* +/* Beschreibung ============ @@ -130,10 +131,7 @@ Point. Der letzte Wert des Array ist 0. Das Array, was zurueckgegeben wird, wird von der FontList wieder zerstoert. Nach dem Aufruf der naechsten Methode von der FontList, sollte deshalb das Array nicht mehr referenziert werden. -*************************************************************************/ - - -// - FontList - +*/ #define FONTLIST_FONTINFO_NOTFOUND ((sal_uInt16)0xFFFF) diff --git a/include/tools/fontenum.hxx b/include/tools/fontenum.hxx index 0d5bddb3289b..f72c331544f4 100644 --- a/include/tools/fontenum.hxx +++ b/include/tools/fontenum.hxx @@ -20,7 +20,6 @@ #define INCLUDED_TOOLS_FONTENUM_HXX #include <sal/types.h> -#include <tools/solar.h> #ifndef ENUM_FONTFAMILY_DECLARED #define ENUM_FONTFAMILY_DECLARED diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx index 41820e71c377..10e810ecb4ca 100644 --- a/include/tools/fract.hxx +++ b/include/tools/fract.hxx @@ -20,7 +20,6 @@ #define INCLUDED_TOOLS_FRACT_HXX #include <tools/toolsdllapi.h> -#include <tools/solar.h> class SvStream; diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx index c01e7b65b46c..adbe28f10cbb 100644 --- a/include/vcl/gradient.hxx +++ b/include/vcl/gradient.hxx @@ -37,10 +37,10 @@ class SvStream; class Impl_Gradient { public: - sal_uLong mnRefCount; - GradientStyle meStyle; - Color maStartColor; - Color maEndColor; + sal_uInt32 mnRefCount; + GradientStyle meStyle; + Color maStartColor; + Color maEndColor; sal_uInt16 mnAngle; sal_uInt16 mnBorder; sal_uInt16 mnOfsX; diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx index 8be2fadeedb4..70515d43afc8 100644 --- a/include/vcl/hatch.hxx +++ b/include/vcl/hatch.hxx @@ -33,11 +33,11 @@ class SvStream; struct ImplHatch { - sal_uLong mnRefCount; + sal_uInt32 mnRefCount; Color maColor; HatchStyle meStyle; long mnDistance; - sal_uInt16 mnAngle; + sal_uInt16 mnAngle; ImplHatch(); ImplHatch( const ImplHatch& rImplHatch ); diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index 96418479c00a..991abd513588 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -35,12 +35,12 @@ namespace basegfx { class B2DPolyPolygon; } struct ImplLineInfo { - sal_uLong mnRefCount; + sal_uInt32 mnRefCount; LineStyle meStyle; long mnWidth; - sal_uInt16 mnDashCount; + sal_uInt16 mnDashCount; long mnDashLen; - sal_uInt16 mnDotCount; + sal_uInt16 mnDotCount; long mnDotLen; long mnDistance; |