mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#63154 Remove old solar.h references

Browse Source 
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>
This commit is contained in:
Alexandre Vicenzi
2014-03-07 01:57:34 -03:00
committed by Caolán McNamara
parent c95abf20eb
commit 17c8678595
8 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
filter/source/graphicfilter/idxf/dxfvec.cxx
View File

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

2
filter/source/graphicfilter/idxf/dxfvec.hxx
View File

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

8
include/svtools/ctrltool.hxx
View File

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

1
include/tools/fontenum.hxx
View File

@@ -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

1
include/tools/fract.hxx
View File

@@ -20,7 +20,6 @@
#define INCLUDED_TOOLS_FRACT_HXX
#include <tools/toolsdllapi.h>
#include <tools/solar.h>
class SvStream;

8
include/vcl/gradient.hxx
View File

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

4
include/vcl/hatch.hxx
View File

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

6
include/vcl/lineinfo.hxx
View File

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