From 2298b055cab8cf8d0268ee1375a5c6e416bf1332 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 6 Jan 2021 10:10:39 +0200 Subject: move the bigint based Scale() implementations to one central place Picking the best looking one in the process. Change-Id: I77f9236fcd21f883a23fe2f43f20336f17b44cc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108831 Tested-by: Noel Grandin Reviewed-by: Noel Grandin --- editeng/source/items/borderline.cxx | 11 ++++++----- editeng/source/items/frmitems.cxx | 29 +++++++++++++++-------------- editeng/source/items/textitem.cxx | 5 +++-- 3 files changed, 24 insertions(+), 21 deletions(-) (limited to 'editeng/source/items') diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 6a33b4bbcfc5..08261ed7165f 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -28,6 +28,7 @@ #include #include #include +#include using namespace ::com::sun::star::table::BorderLineStyle; @@ -496,23 +497,23 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderLineStyle nStyle, sal_uInt16 nOut sal_uInt16 SvxBorderLine::GetOutWidth() const { - sal_uInt16 nOut = static_cast(Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv )); + sal_uInt16 nOut = static_cast(BigInt::Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv )); if ( m_bMirrorWidths ) - nOut = static_cast(Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv )); + nOut = static_cast(BigInt::Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv )); return nOut; } sal_uInt16 SvxBorderLine::GetInWidth() const { - sal_uInt16 nIn = static_cast(Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv )); + sal_uInt16 nIn = static_cast(BigInt::Scale( m_aWidthImpl.GetLine2( m_nWidth ), m_nMult, m_nDiv )); if ( m_bMirrorWidths ) - nIn = static_cast(Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv )); + nIn = static_cast(BigInt::Scale( m_aWidthImpl.GetLine1( m_nWidth ), m_nMult, m_nDiv )); return nIn; } sal_uInt16 SvxBorderLine::GetDistance() const { - return static_cast(Scale( m_aWidthImpl.GetGap( m_nWidth ), m_nMult, m_nDiv )); + return static_cast(BigInt::Scale( m_aWidthImpl.GetGap( m_nWidth ), m_nMult, m_nDiv )); } diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 4f365da2b7de..43a9be8e4635 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -270,8 +271,8 @@ bool SvxSizeItem::GetPresentation void SvxSizeItem::ScaleMetrics( tools::Long nMult, tools::Long nDiv ) { - m_aSize.setWidth( Scale( m_aSize.Width(), nMult, nDiv ) ); - m_aSize.setHeight( Scale( m_aSize.Height(), nMult, nDiv ) ); + m_aSize.setWidth( BigInt::Scale( m_aSize.Width(), nMult, nDiv ) ); + m_aSize.setHeight( BigInt::Scale( m_aSize.Height(), nMult, nDiv ) ); } @@ -572,10 +573,10 @@ bool SvxLRSpaceItem::GetPresentation void SvxLRSpaceItem::ScaleMetrics( tools::Long nMult, tools::Long nDiv ) { - nFirstLineOffset = static_cast(Scale( nFirstLineOffset, nMult, nDiv )); - nTxtLeft = Scale( nTxtLeft, nMult, nDiv ); - nLeftMargin = Scale( nLeftMargin, nMult, nDiv ); - nRightMargin = Scale( nRightMargin, nMult, nDiv ); + nFirstLineOffset = static_cast(BigInt::Scale( nFirstLineOffset, nMult, nDiv )); + nTxtLeft = BigInt::Scale( nTxtLeft, nMult, nDiv ); + nLeftMargin = BigInt::Scale( nLeftMargin, nMult, nDiv ); + nRightMargin = BigInt::Scale( nRightMargin, nMult, nDiv ); } @@ -824,8 +825,8 @@ bool SvxULSpaceItem::GetPresentation void SvxULSpaceItem::ScaleMetrics( tools::Long nMult, tools::Long nDiv ) { - nUpper = static_cast(Scale( nUpper, nMult, nDiv )); - nLower = static_cast(Scale( nLower, nMult, nDiv )); + nUpper = static_cast(BigInt::Scale( nUpper, nMult, nDiv )); + nLower = static_cast(BigInt::Scale( nLower, nMult, nDiv )); } @@ -1222,7 +1223,7 @@ bool SvxShadowItem::GetPresentation void SvxShadowItem::ScaleMetrics( tools::Long nMult, tools::Long nDiv ) { - nWidth = static_cast(Scale( nWidth, nMult, nDiv )); + nWidth = static_cast(BigInt::Scale( nWidth, nMult, nDiv )); } @@ -1862,10 +1863,10 @@ void SvxBoxItem::ScaleMetrics( tools::Long nMult, tools::Long nDiv ) if ( pBottom ) pBottom->ScaleMetrics( nMult, nDiv ); if ( pLeft ) pLeft->ScaleMetrics( nMult, nDiv ); if ( pRight ) pRight->ScaleMetrics( nMult, nDiv ); - nTopDist = static_cast(Scale( nTopDist, nMult, nDiv )); - nBottomDist = static_cast(Scale( nBottomDist, nMult, nDiv )); - nLeftDist = static_cast(Scale( nLeftDist, nMult, nDiv )); - nRightDist = static_cast(Scale( nRightDist, nMult, nDiv )); + nTopDist = static_cast(BigInt::Scale( nTopDist, nMult, nDiv )); + nBottomDist = static_cast(BigInt::Scale( nBottomDist, nMult, nDiv )); + nLeftDist = static_cast(BigInt::Scale( nLeftDist, nMult, nDiv )); + nRightDist = static_cast(BigInt::Scale( nRightDist, nMult, nDiv )); } @@ -2162,7 +2163,7 @@ void SvxBoxInfoItem::ScaleMetrics( tools::Long nMult, tools::Long nDiv ) { if ( pHori ) pHori->ScaleMetrics( nMult, nDiv ); if ( pVert ) pVert->ScaleMetrics( nMult, nDiv ); - nDefDist = static_cast(Scale( nDefDist, nMult, nDiv )); + nDefDist = static_cast(BigInt::Scale( nDefDist, nMult, nDiv )); } diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 84cc8e743dec..dd2205b670ab 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -33,6 +33,7 @@ #include #include +#include #include #include @@ -835,7 +836,7 @@ bool SvxFontHeightItem::GetPresentation void SvxFontHeightItem::ScaleMetrics( tools::Long nMult, tools::Long nDiv ) { - nHeight = static_cast(Scale( nHeight, nMult, nDiv )); + nHeight = static_cast(BigInt::Scale( nHeight, nMult, nDiv )); } @@ -1496,7 +1497,7 @@ SvxKerningItem* SvxKerningItem::Clone( SfxItemPool * ) const void SvxKerningItem::ScaleMetrics( tools::Long nMult, tools::Long nDiv ) { - SetValue( static_cast(Scale( GetValue(), nMult, nDiv )) ); + SetValue( static_cast(BigInt::Scale( GetValue(), nMult, nDiv )) ); } -- cgit v1.2.3