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

XDash: salu_uIntPtr to sal_uInt32

Browse Source 
Unsigned integer was used tp be consistent with previous integral type,
but both unsigned and signed integers are used by callers.

Change-Id: I3f902e00fbff690a72a7ca0f1c818976d3d2bebe
This commit is contained in:
Matteo Casalin
2015-11-08 19:41:42 +01:00
parent b905d3e9f2
commit a847127fc3
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/svx/xdash.hxx
View File

@@ -35,31 +35,31 @@ class SVX_DLLPUBLIC XDash
protected: protected:
css::drawing::DashStyle eDash; css::drawing::DashStyle eDash;
sal_uInt16 nDots; sal_uInt16 nDots;
sal_uIntPtr nDotLen; sal_uInt32 nDotLen;
sal_uInt16 nDashes; sal_uInt16 nDashes;
sal_uIntPtr nDashLen; sal_uInt32 nDashLen;
sal_uIntPtr nDistance; sal_uInt32 nDistance;
public: public:
XDash(css::drawing::DashStyle eDash = css::drawing::DashStyle_RECT, XDash(css::drawing::DashStyle eDash = css::drawing::DashStyle_RECT,
sal_uInt16 nDots = 1, sal_uIntPtr nDotLen = 20, sal_uInt16 nDots = 1, sal_uInt32 nDotLen = 20,
sal_uInt16 nDashes = 1, sal_uIntPtr nDashLen = 20, sal_uIntPtr nDistance = 20); sal_uInt16 nDashes = 1, sal_uInt32 nDashLen = 20, sal_uInt32 nDistance = 20);
bool operator==(const XDash& rDash) const; bool operator==(const XDash& rDash) const;
void SetDashStyle(css::drawing::DashStyle eNewStyle) { eDash = eNewStyle; } void SetDashStyle(css::drawing::DashStyle eNewStyle) { eDash = eNewStyle; }
void SetDots(sal_uInt16 nNewDots) { nDots = nNewDots; } void SetDots(sal_uInt16 nNewDots) { nDots = nNewDots; }
void SetDotLen(sal_uIntPtr nNewDotLen) { nDotLen = nNewDotLen; } void SetDotLen(sal_uInt32 nNewDotLen) { nDotLen = nNewDotLen; }
void SetDashes(sal_uInt16 nNewDashes) { nDashes = nNewDashes; } void SetDashes(sal_uInt16 nNewDashes) { nDashes = nNewDashes; }
void SetDashLen(sal_uIntPtr nNewDashLen) { nDashLen = nNewDashLen; } void SetDashLen(sal_uInt32 nNewDashLen) { nDashLen = nNewDashLen; }
void SetDistance(sal_uIntPtr nNewDistance) { nDistance = nNewDistance; } void SetDistance(sal_uInt32 nNewDistance) { nDistance = nNewDistance; }
css::drawing::DashStyle GetDashStyle() const { return eDash; } css::drawing::DashStyle GetDashStyle() const { return eDash; }
sal_uInt16 GetDots() const { return nDots; } sal_uInt16 GetDots() const { return nDots; }
sal_uIntPtr GetDotLen() const { return nDotLen; } sal_uInt32 GetDotLen() const { return nDotLen; }
sal_uInt16 GetDashes() const { return nDashes; } sal_uInt16 GetDashes() const { return nDashes; }
sal_uIntPtr GetDashLen() const { return nDashLen; } sal_uInt32 GetDashLen() const { return nDashLen; }
sal_uIntPtr GetDistance() const { return nDistance; } sal_uInt32 GetDistance() const { return nDistance; }
// XDash is translated into an array of doubles which describe the lengths of the // XDash is translated into an array of doubles which describe the lengths of the
// dashes, dots and empty passages. It returns the complete length of the full DashDot // dashes, dots and empty passages. It returns the complete length of the full DashDot

6
svx/source/xoutdev/xattr.cxx
View File

@@ -434,8 +434,8 @@ sal_uInt16 XLineStyleItem::GetValueCount() const
return 3; return 3;
} }
XDash::XDash(css::drawing::DashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen, XDash::XDash(css::drawing::DashStyle eTheDash, sal_uInt16 nTheDots, sal_uInt32 nTheDotLen,
sal_uInt16 nTheDashes, sal_uIntPtr nTheDashLen, sal_uIntPtr nTheDistance) : sal_uInt16 nTheDashes, sal_uInt32 nTheDashLen, sal_uInt32 nTheDistance) :
eDash(eTheDash), eDash(eTheDash),
nDots(nTheDots), nDots(nTheDots),
nDotLen(nTheDotLen), nDotLen(nTheDotLen),
@@ -968,7 +968,7 @@ bool XLineDashItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId )
case MID_LINEDASH_DASHLEN: case MID_LINEDASH_DASHLEN:
case MID_LINEDASH_DISTANCE: case MID_LINEDASH_DISTANCE:
{ {
sal_Int32 nVal = 0; sal_uInt32 nVal = 0;
if(!(rVal >>= nVal)) if(!(rVal >>= nVal))
return false; return false;