fdo#63154 Remove old solar.h references

Remove some unused references in tools.
Change sal_uLong to sal_uInt32 in filter and vcl.

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

8 files changed, 15 insertions, 19 deletions

diff --git a/filter/source/graphicfilter/idxf/dxfvec.cxx b/filter/source/graphicfilter/idxf/dxfvec.cxx
index e18d88f2b330..415bbc46148e 100644
--- a/filter/source/graphicfilter/idxf/dxfvec.cxx
+++ b/filter/source/graphicfilter/idxf/dxfvec.cxx
@@ -221,7 +221,7 @@ LineInfo DXFTransform::Transform(const DXFLineInfo& aDXFLineInfo) const
     return aLineInfo;
 }
 
-sal_uLong DXFTransform::TransLineWidth(double fW) const
+sal_uInt32 DXFTransform::TransLineWidth(double fW) const
 {
     double fex,fey;
 
@@ -229,7 +229,7 @@ sal_uLong DXFTransform::TransLineWidth(double fW) const
     fey=sqrt(aMY.fx*aMY.fx + aMY.fy*aMY.fy);
     // ###
     // printf("fex=%f fey=%f\n", fex, fey);
-    return (sal_uLong)(fabs(fW)*(fex+fey)/2.0+0.5);
+    return (sal_uInt32)(fabs(fW)*(fex+fey)/2.0+0.5);
 }
 
 
diff --git a/filter/source/graphicfilter/idxf/dxfvec.hxx b/filter/source/graphicfilter/idxf/dxfvec.hxx
index a82cf28a56a2..8e936f0bc08f 100644
--- a/filter/source/graphicfilter/idxf/dxfvec.hxx
+++ b/filter/source/graphicfilter/idxf/dxfvec.hxx
@@ -148,7 +148,7 @@ public:
         // arbitrary position would be created, sal_False is returned.
         // (The center point will not be transformed, use Transform(..))
 
-    sal_uLong TransLineWidth(double fW) const;
+    sal_uInt32 TransLineWidth(double fW) const;
         // Transforms the thickness of a line (as good as possible)
 
     double CalcRotAngle() const;
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;