diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 17:41:47 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-10-23 18:34:39 +0200 |
commit | 31af61ea091cc895b893c849f2130aa35792b7db (patch) | |
tree | 6c7b63c5b538034bd5d356c5a8667b7e95d59b9c /vcl/source/gdi | |
parent | e92c0d6f9b7a6251e00dc55219a203a7e53c96e2 (diff) |
Fraction: Revert "fdo#81356: convert Fraction to boost::rational<long> - wip"
This reverts commit 47a2d7642d249d70b5da0c330a73f3a0032e4bba.
Conflicts:
cui/source/tabpages/transfrm.cxx
svx/source/svdraw/svdedtv1.cxx
svx/source/svdraw/svdibrow.cxx
sw/source/filter/ww1/w1filter.cxx
tools/source/generic/rational.cxx
Change-Id: I4849916f5f277a4afef0e279b0135c76b36b9d15
Diffstat (limited to 'vcl/source/gdi')
-rw-r--r-- | vcl/source/gdi/cvtsvm.cxx | 10 | ||||
-rw-r--r-- | vcl/source/gdi/dibtools.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 12 | ||||
-rw-r--r-- | vcl/source/gdi/impgraph.cxx | 12 | ||||
-rw-r--r-- | vcl/source/gdi/mapmod.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl2.cxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/textlayout.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/virdev.cxx | 2 |
9 files changed, 29 insertions, 29 deletions
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 3d95cc97d59d..9e560776da1c 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -139,17 +139,17 @@ void ImplReadMapMode( SvStream& rIStm, MapMode& rMapMode ) rIStm.ReadInt16( nUnit ); ReadPair( rIStm, aOrg ); rIStm.ReadInt32( nXNum ).ReadInt32( nXDenom ).ReadInt32( nYNum ).ReadInt32( nYDenom ); - rMapMode = MapMode( (MapUnit) nUnit, aOrg, boost::rational<long>( nXNum, nXDenom ), boost::rational<long>( nYNum, nYDenom ) ); + rMapMode = MapMode( (MapUnit) nUnit, aOrg, Fraction( nXNum, nXDenom ), Fraction( nYNum, nYDenom ) ); } void ImplWriteMapMode( SvStream& rOStm, const MapMode& rMapMode ) { rOStm.WriteInt16( rMapMode.GetMapUnit() ); WritePair( rOStm, rMapMode.GetOrigin() ); - rOStm.WriteInt32( rMapMode.GetScaleX().numerator() ); - rOStm.WriteInt32( rMapMode.GetScaleX().denominator() ); - rOStm.WriteInt32( rMapMode.GetScaleY().numerator() ); - rOStm.WriteInt32( rMapMode.GetScaleY().denominator() ); + rOStm.WriteInt32( rMapMode.GetScaleX().GetNumerator() ); + rOStm.WriteInt32( rMapMode.GetScaleX().GetDenominator() ); + rOStm.WriteInt32( rMapMode.GetScaleY().GetNumerator() ); + rOStm.WriteInt32( rMapMode.GetScaleY().GetDenominator() ); } void ImplWritePushAction( SvStream& rOStm ) diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 2e503ed7dc6b..a37d5c21e3a0 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -766,8 +766,8 @@ bool ImplReadDIBBody( SvStream& rIStm, Bitmap& rBmp, Bitmap* pBmpAlpha, sal_uLon MapMode aMapMode( MAP_MM, Point(), - boost::rational<long>(1000, aHeader.nXPelsPerMeter), - boost::rational<long>(1000, aHeader.nYPelsPerMeter)); + Fraction(1000, aHeader.nXPelsPerMeter), + Fraction(1000, aHeader.nYPelsPerMeter)); aNewBmp.SetPrefMapMode(aMapMode); aNewBmp.SetPrefSize(Size(aHeader.nWidth, aHeader.nHeight)); diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 9144800e627c..a767f8553e71 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -550,8 +550,8 @@ void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos, if( !aTmpPrefSize.Height() ) aTmpPrefSize.Height() = aDestSize.Height(); - boost::rational<long> aScaleX( aDestSize.Width(), aTmpPrefSize.Width() ); - boost::rational<long> aScaleY( aDestSize.Height(), aTmpPrefSize.Height() ); + Fraction aScaleX( aDestSize.Width(), aTmpPrefSize.Width() ); + Fraction aScaleY( aDestSize.Height(), aTmpPrefSize.Height() ); aScaleX *= aDrawMap.GetScaleX(); aDrawMap.SetScaleX( aScaleX ); aScaleY *= aDrawMap.GetScaleY(); aDrawMap.SetScaleY( aScaleY ); @@ -784,8 +784,8 @@ void GDIMetaFile::Move( long nX, long nY, long nDPIX, long nDPIY ) { aOffset = aMapVDev.LogicToPixel( aBaseOffset, GetPrefMapMode() ); MapMode aMap( aMapVDev.GetMapMode() ); - aOffset.Width() = static_cast<long>(aOffset.Width() * boost::rational_cast<double>(aMap.GetScaleX())); - aOffset.Height() = static_cast<long>(aOffset.Height() * boost::rational_cast<double>(aMap.GetScaleY())); + aOffset.Width() = static_cast<long>(aOffset.Width() * (double)aMap.GetScaleX()); + aOffset.Height() = static_cast<long>(aOffset.Height() * (double)aMap.GetScaleY()); } else aOffset = OutputDevice::LogicToLogic( aBaseOffset, GetPrefMapMode(), aMapVDev.GetMapMode() ); @@ -816,9 +816,9 @@ void GDIMetaFile::Scale( double fScaleX, double fScaleY ) aPrefSize.Height() = FRound( aPrefSize.Height() * fScaleY ); } -void GDIMetaFile::Scale( const boost::rational<long>& rScaleX, const boost::rational<long>& rScaleY ) +void GDIMetaFile::Scale( const Fraction& rScaleX, const Fraction& rScaleY ) { - Scale( boost::rational_cast<double>(rScaleX), boost::rational_cast<double>(rScaleY) ); + Scale( (double) rScaleX, (double) rScaleY ); } void GDIMetaFile::Clip( const Rectangle& i_rClipRect ) diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 9ec9a2887728..d48432941f0c 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1039,8 +1039,8 @@ bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, bool bSwap ) aSize = Size( nWidth, nHeight ); aMapMode = MapMode( (MapUnit) nMapMode, Point( nOffsX, nOffsY ), - boost::rational<long>( nScaleNumX, nScaleDenomX ), - boost::rational<long>( nScaleNumY, nScaleDenomY ) ); + Fraction( nScaleNumX, nScaleDenomX ), + Fraction( nScaleNumY, nScaleDenomY ) ); } nHeaderLen = rIStm.Tell() - nStartPos; @@ -1246,10 +1246,10 @@ bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm ) rOStm.WriteInt32( aSize.Width() ); rOStm.WriteInt32( aSize.Height() ); rOStm.WriteInt32( aMapMode.GetMapUnit() ); - rOStm.WriteInt32( aMapMode.GetScaleX().numerator() ); - rOStm.WriteInt32( aMapMode.GetScaleX().denominator() ); - rOStm.WriteInt32( aMapMode.GetScaleY().numerator() ); - rOStm.WriteInt32( aMapMode.GetScaleY().denominator() ); + rOStm.WriteInt32( aMapMode.GetScaleX().GetNumerator() ); + rOStm.WriteInt32( aMapMode.GetScaleX().GetDenominator() ); + rOStm.WriteInt32( aMapMode.GetScaleY().GetNumerator() ); + rOStm.WriteInt32( aMapMode.GetScaleY().GetDenominator() ); rOStm.WriteInt32( aMapMode.GetOrigin().X() ); rOStm.WriteInt32( aMapMode.GetOrigin().Y() ); } diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index 2ac95ed54b11..992898e0164e 100644 --- a/vcl/source/gdi/mapmod.cxx +++ b/vcl/source/gdi/mapmod.cxx @@ -80,7 +80,7 @@ ImplMapMode* ImplMapMode::ImplGetStaticMapMode( MapUnit eUnit ) ImplMapMode* pImplMapMode = ((ImplMapMode*)aStaticImplMapModeAry)+eUnit; if ( !pImplMapMode->mbSimple ) { - boost::rational<long> aDefFraction( 1, 1 ); + Fraction aDefFraction( 1, 1 ); pImplMapMode->maScaleX = aDefFraction; pImplMapMode->maScaleY = aDefFraction; pImplMapMode->meUnit = eUnit; @@ -125,7 +125,7 @@ MapMode::MapMode( MapUnit eUnit ) } MapMode::MapMode( MapUnit eUnit, const Point& rLogicOrg, - const boost::rational<long>& rScaleX, const boost::rational<long>& rScaleY ) + const Fraction& rScaleX, const Fraction& rScaleY ) { mpImplMapMode = new ImplMapMode; @@ -163,14 +163,14 @@ void MapMode::SetOrigin( const Point& rLogicOrg ) mpImplMapMode->maOrigin = rLogicOrg; } -void MapMode::SetScaleX( const boost::rational<long>& rScaleX ) +void MapMode::SetScaleX( const Fraction& rScaleX ) { ImplMakeUnique(); mpImplMapMode->maScaleX = rScaleX; } -void MapMode::SetScaleY( const boost::rational<long>& rScaleY ) +void MapMode::SetScaleY( const Fraction& rScaleY ) { ImplMakeUnique(); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 450177671fc5..172eac9f97b3 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -1705,7 +1705,7 @@ void PDFWriterImpl::PDFPage::appendWaveLine( sal_Int32 nWidth, sal_Int32 nY, sal PDFWriter& i_rOuterFace) : m_pReferenceDevice( NULL ), - m_aMapMode( MAP_POINT, Point(), boost::rational<long>( 1L, pointToPixel(1) ), boost::rational<long>( 1L, pointToPixel(1) ) ), + m_aMapMode( MAP_POINT, Point(), Fraction( 1L, pointToPixel(1) ), Fraction( 1L, pointToPixel(1) ) ), m_nCurrentStructElement( 0 ), m_bEmitStructure( true ), m_bNewMCID( false ), @@ -7465,7 +7465,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool // if the mapmode is distorted we need to adjust for that also if( m_aCurrentPDFState.m_aMapMode.GetScaleX() != m_aCurrentPDFState.m_aMapMode.GetScaleY() ) { - fXScale *= boost::rational_cast<double>(m_aCurrentPDFState.m_aMapMode.GetScaleX()) / boost::rational_cast<double>(m_aCurrentPDFState.m_aMapMode.GetScaleY()); + fXScale *= double(m_aCurrentPDFState.m_aMapMode.GetScaleX()) / double(m_aCurrentPDFState.m_aMapMode.GetScaleY()); } int nAngle = m_aCurrentPDFState.m_aFont.GetOrientation(); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index a43e61245e52..3c0aaf7f76b5 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -497,8 +497,8 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa MapMode aMapMode( aSubstitute.GetPrefMapMode() ); Size aOutSize( OutputDevice::LogicToLogic( pA->GetSize(), pDummyVDev->GetMapMode(), aMapMode ) ); - aMapMode.SetScaleX( boost::rational<long>( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) ); - aMapMode.SetScaleY( boost::rational<long>( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) ); + aMapMode.SetScaleX( Fraction( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) ); + aMapMode.SetScaleY( Fraction( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) ); aMapMode.SetOrigin( OutputDevice::LogicToLogic( pA->GetPoint(), pDummyVDev->GetMapMode(), aMapMode ) ); m_rOuterFace.SetMapMode( aMapMode ); diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx index 0d584eb1a8b3..59e36687f046 100644 --- a/vcl/source/gdi/textlayout.cxx +++ b/vcl/source/gdi/textlayout.cxx @@ -103,7 +103,7 @@ namespace vcl OutputDevice& m_rTargetDevice; OutputDevice& m_rReferenceDevice; Font m_aUnzoomedPointFont; - const boost::rational<long> m_aZoom; + const Fraction m_aZoom; const bool m_bRTLEnabled; Rectangle m_aCompleteTextRect; diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index a8ef0925bab1..b9a8b2bdb20f 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -451,7 +451,7 @@ bool VirtualDevice::SetOutputSizePixel( const Size& rNewSize, bool bErase ) } bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer( - const Size& rNewSize, const boost::rational<long>& rScale, const Point& rNewOffset, + const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer, const bool bTopDown ) { if (pBuffer) { |