diff options
| -rw-r--r-- | include/vcl/lineinfo.hxx | 30 | ||||
| -rw-r--r-- | vcl/source/gdi/lineinfo.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 14 |
3 files changed, 27 insertions, 27 deletions
diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx index 73b5376abbf8..753cc5b54c4f 100644 --- a/include/vcl/lineinfo.hxx +++ b/include/vcl/lineinfo.hxx @@ -32,10 +32,10 @@ namespace basegfx { class B2DPolyPolygon; } struct ImplLineInfo { - long mnWidth; - long mnDashLen; - long mnDotLen; - long mnDistance; + sal_Int32 mnWidth; + sal_Int32 mnDashLen; + sal_Int32 mnDotLen; + sal_Int32 mnDistance; basegfx::B2DLineJoin meLineJoin; css::drawing::LineCap meLineCap; @@ -53,7 +53,7 @@ struct ImplLineInfo class VCL_DLLPUBLIC LineInfo { public: - LineInfo( LineStyle eLineStyle = LineStyle::Solid, long nWidth = 0 ); + LineInfo( LineStyle eLineStyle = LineStyle::Solid, sal_Int32 nWidth = 0 ); LineInfo( const LineInfo& rLineInfo ); LineInfo( LineInfo&& rLineInfo ); ~LineInfo(); @@ -66,23 +66,23 @@ public: void SetStyle( LineStyle eStyle ); LineStyle GetStyle() const { return mpImplLineInfo->meStyle; } - void SetWidth( long nWidth ); - long GetWidth() const { return mpImplLineInfo->mnWidth; } + void SetWidth( sal_Int32 nWidth ); + sal_Int32 GetWidth() const { return mpImplLineInfo->mnWidth; } void SetDashCount( sal_uInt16 nDashCount ); - sal_uInt16 GetDashCount() const { return mpImplLineInfo->mnDashCount; } + sal_uInt16 GetDashCount() const { return mpImplLineInfo->mnDashCount; } - void SetDashLen( long nDashLen ); - long GetDashLen() const { return mpImplLineInfo->mnDashLen; } + void SetDashLen( sal_Int32 nDashLen ); + sal_Int32 GetDashLen() const { return mpImplLineInfo->mnDashLen; } void SetDotCount( sal_uInt16 nDotCount ); - sal_uInt16 GetDotCount() const { return mpImplLineInfo->mnDotCount; } + sal_uInt16 GetDotCount() const { return mpImplLineInfo->mnDotCount; } - void SetDotLen( long nDotLen ); - long GetDotLen() const { return mpImplLineInfo->mnDotLen; } + void SetDotLen( sal_Int32 nDotLen ); + sal_Int32 GetDotLen() const { return mpImplLineInfo->mnDotLen; } - void SetDistance( long nDistance ); - long GetDistance() const { return mpImplLineInfo->mnDistance; } + void SetDistance( sal_Int32 nDistance ); + sal_Int32 GetDistance() const { return mpImplLineInfo->mnDistance; } void SetLineJoin(basegfx::B2DLineJoin eLineJoin); basegfx::B2DLineJoin GetLineJoin() const { return mpImplLineInfo->meLineJoin; } diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx index 85c54eefbf5a..dd460d77e4b5 100644 --- a/vcl/source/gdi/lineinfo.cxx +++ b/vcl/source/gdi/lineinfo.cxx @@ -53,7 +53,7 @@ inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const } -LineInfo::LineInfo( LineStyle eStyle, long nWidth ) : mpImplLineInfo() +LineInfo::LineInfo( LineStyle eStyle, sal_Int32 nWidth ) : mpImplLineInfo() { mpImplLineInfo->meStyle = eStyle; mpImplLineInfo->mnWidth = nWidth; @@ -79,7 +79,7 @@ void LineInfo::SetStyle( LineStyle eStyle ) mpImplLineInfo->meStyle = eStyle; } -void LineInfo::SetWidth( long nWidth ) +void LineInfo::SetWidth( sal_Int32 nWidth ) { mpImplLineInfo->mnWidth = nWidth; } @@ -89,7 +89,7 @@ void LineInfo::SetDashCount( sal_uInt16 nDashCount ) mpImplLineInfo->mnDashCount = nDashCount; } -void LineInfo::SetDashLen( long nDashLen ) +void LineInfo::SetDashLen( sal_Int32 nDashLen ) { mpImplLineInfo->mnDashLen = nDashLen; } @@ -99,12 +99,12 @@ void LineInfo::SetDotCount( sal_uInt16 nDotCount ) mpImplLineInfo->mnDotCount = nDotCount; } -void LineInfo::SetDotLen( long nDotLen ) +void LineInfo::SetDotLen( sal_Int32 nDotLen ) { mpImplLineInfo->mnDotLen = nDotLen; } -void LineInfo::SetDistance( long nDistance ) +void LineInfo::SetDistance( sal_Int32 nDistance ) { mpImplLineInfo->mnDistance = nDistance; } diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index ada2cd648646..b6e4629df93e 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1595,25 +1595,25 @@ bool PDFWriterImpl::PDFPage::appendLineInfo( const LineInfo& rInfo, OStringBuffe rBuffer.append( "[ " ); if( rInfo.GetDashLen() == rInfo.GetDotLen() ) // degraded case { - appendMappedLength( static_cast<sal_Int32>(rInfo.GetDashLen()), rBuffer ); + appendMappedLength( rInfo.GetDashLen(), rBuffer ); rBuffer.append( ' ' ); - appendMappedLength( static_cast<sal_Int32>(rInfo.GetDistance()), rBuffer ); + appendMappedLength( rInfo.GetDistance(), rBuffer ); rBuffer.append( ' ' ); } else { for( int n = 0; n < rInfo.GetDashCount(); n++ ) { - appendMappedLength( static_cast<sal_Int32>(rInfo.GetDashLen()), rBuffer ); + appendMappedLength( rInfo.GetDashLen(), rBuffer ); rBuffer.append( ' ' ); - appendMappedLength( static_cast<sal_Int32>(rInfo.GetDistance()), rBuffer ); + appendMappedLength( rInfo.GetDistance(), rBuffer ); rBuffer.append( ' ' ); } for( int m = 0; m < rInfo.GetDotCount(); m++ ) { - appendMappedLength( static_cast<sal_Int32>(rInfo.GetDotLen()), rBuffer ); + appendMappedLength( rInfo.GetDotLen(), rBuffer ); rBuffer.append( ' ' ); - appendMappedLength( static_cast<sal_Int32>(rInfo.GetDistance()), rBuffer ); + appendMappedLength( rInfo.GetDistance(), rBuffer ); rBuffer.append( ' ' ); } } @@ -1622,7 +1622,7 @@ bool PDFWriterImpl::PDFPage::appendLineInfo( const LineInfo& rInfo, OStringBuffe if( rInfo.GetWidth() > 1 ) { - appendMappedLength( static_cast<sal_Int32>(rInfo.GetWidth()), rBuffer ); + appendMappedLength( rInfo.GetWidth(), rBuffer ); rBuffer.append( " w\n" ); } else if( rInfo.GetWidth() == 0 ) |