diff options
Diffstat (limited to 'vcl/source/gdi/lineinfo.cxx')
| -rw-r--r-- | vcl/source/gdi/lineinfo.cxx | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 8b97c2ecdbff..542c3103eb27 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -71,6 +71,20 @@ ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) : { } +// ----------------------------------------------------------------------- + +inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const +{ + return(meStyle == rB.meStyle + && mnWidth == rB.mnWidth + && mnDashCount == rB.mnDashCount + && mnDashLen == rB.mnDashLen + && mnDotCount == rB.mnDotCount + && mnDotLen == rB.mnDotLen + && mnDistance == rB.mnDistance + && meLineJoin == rB.meLineJoin); +} + // ------------ // - LineInfo - // ------------ @@ -120,19 +134,13 @@ LineInfo& LineInfo::operator=( const LineInfo& rLineInfo ) // ----------------------------------------------------------------------- -BOOL LineInfo::operator==( const LineInfo& rLineInfo ) const +sal_Bool LineInfo::operator==( const LineInfo& rLineInfo ) const { DBG_CHKTHIS( LineInfo, NULL ); DBG_CHKOBJ( &rLineInfo, LineInfo, NULL ); return( mpImplLineInfo == rLineInfo.mpImplLineInfo || - ( mpImplLineInfo->meStyle == rLineInfo.mpImplLineInfo->meStyle && - mpImplLineInfo->mnWidth == rLineInfo.mpImplLineInfo->mnWidth && - mpImplLineInfo->mnDashCount == rLineInfo.mpImplLineInfo->mnDashCount && - mpImplLineInfo->mnDashLen == rLineInfo.mpImplLineInfo->mnDashLen && - mpImplLineInfo->mnDotCount == rLineInfo.mpImplLineInfo->mnDotCount && - mpImplLineInfo->mnDotLen == rLineInfo.mpImplLineInfo->mnDotLen && - mpImplLineInfo->mnDistance == rLineInfo.mpImplLineInfo->mnDistance ) ); + *mpImplLineInfo == *rLineInfo.mpImplLineInfo ); } // ----------------------------------------------------------------------- @@ -168,7 +176,7 @@ void LineInfo::SetWidth( long nWidth ) // ----------------------------------------------------------------------- -void LineInfo::SetDashCount( USHORT nDashCount ) +void LineInfo::SetDashCount( sal_uInt16 nDashCount ) { DBG_CHKTHIS( LineInfo, NULL ); ImplMakeUnique(); @@ -186,7 +194,7 @@ void LineInfo::SetDashLen( long nDashLen ) // ----------------------------------------------------------------------- -void LineInfo::SetDotCount( USHORT nDotCount ) +void LineInfo::SetDotCount( sal_uInt16 nDotCount ) { DBG_CHKTHIS( LineInfo, NULL ); ImplMakeUnique(); @@ -229,7 +237,7 @@ void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin) SvStream& operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo ) { VersionCompat aCompat( rIStm, STREAM_READ ); - UINT16 nTmp16; + sal_uInt16 nTmp16; rIStm >> nTmp16; rImplLineInfo.meStyle = (LineStyle) nTmp16; rIStm >> rImplLineInfo.mnWidth; @@ -258,7 +266,7 @@ SvStream& operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ) VersionCompat aCompat( rOStm, STREAM_WRITE, 3 ); // version 1 - rOStm << (UINT16) rImplLineInfo.meStyle << rImplLineInfo.mnWidth; + rOStm << (sal_uInt16) rImplLineInfo.meStyle << rImplLineInfo.mnWidth; // since version2 rOStm << rImplLineInfo.mnDashCount << rImplLineInfo.mnDashLen; @@ -266,7 +274,7 @@ SvStream& operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ) rOStm << rImplLineInfo.mnDistance; // since version3 - rOStm << (UINT16) rImplLineInfo.meLineJoin; + rOStm << (sal_uInt16) rImplLineInfo.meLineJoin; return rOStm; } |