From 582ef22d3e8e30ffd58f092d37ffda30bd07bd9e Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 16 Oct 2014 15:30:32 +0200 Subject: fdo#84854 it seems long is not enough on 32 bit Fraction used BigInt internally for computations, rational does nothing like that. Change-Id: I3e9b25074f979bc291208f7c6362c3c40eb77ff5 --- vcl/inc/window.h | 2 +- vcl/source/filter/graphicfilter.cxx | 6 +++--- vcl/source/filter/graphicfilter2.cxx | 6 +++--- vcl/source/filter/jpeg/JpegReader.cxx | 4 ++-- vcl/source/filter/sgfbram.cxx | 2 +- vcl/source/filter/sgvmain.cxx | 2 +- vcl/source/filter/sgvtext.cxx | 2 +- vcl/source/filter/wmf/emfwr.cxx | 4 ++-- vcl/source/filter/wmf/winmtf.cxx | 4 ++-- vcl/source/filter/wmf/winwmf.cxx | 2 +- vcl/source/filter/wmf/wmfwr.cxx | 10 +++++----- vcl/source/gdi/cvtsvm.cxx | 2 +- vcl/source/gdi/dibtools.cxx | 4 ++-- vcl/source/gdi/gdimtf.cxx | 6 +++--- vcl/source/gdi/impgraph.cxx | 4 ++-- vcl/source/gdi/mapmod.cxx | 8 ++++---- vcl/source/gdi/pdfwriter_impl.cxx | 2 +- vcl/source/gdi/pdfwriter_impl2.cxx | 4 ++-- vcl/source/gdi/textlayout.cxx | 2 +- vcl/source/gdi/virdev.cxx | 2 +- vcl/source/outdev/font.cxx | 2 +- vcl/source/outdev/map.cxx | 32 ++++++++++++++++---------------- vcl/source/window/window.cxx | 2 +- vcl/source/window/window2.cxx | 8 ++++---- 24 files changed, 61 insertions(+), 61 deletions(-) (limited to 'vcl') diff --git a/vcl/inc/window.h b/vcl/inc/window.h index b6ffa3d41640..4448c55c1f6f 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -231,7 +231,7 @@ public: void* mpUserData; vcl::Cursor* mpCursor; Pointer maPointer; - boost::rational maZoom; + boost::rational maZoom; OUString maText; vcl::Font* mpControlFont; Color maControlForeground; diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 1bad8034d929..b228c6ab640a 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -860,7 +860,7 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r MapMode aMap( MAP_100TH_INCH ); sal_Int32 nDPI = rConfigItem.ReadInt32( "Resolution", 75 ); - boost::rational aFrac( 1, std::min( std::max( nDPI, sal_Int32( 75 ) ), sal_Int32( 600 ) ) ); + boost::rational aFrac( 1, std::min( std::max( nDPI, sal_Int32( 75 ) ), sal_Int32( 600 ) ) ); aMap.SetScaleX( aFrac ); aMap.SetScaleY( aFrac ); @@ -900,8 +900,8 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r if( aNewSize.Width() && aNewSize.Height() ) { const Size aPreferredSize( aMtf.GetPrefSize() ); - aMtf.Scale( boost::rational( aNewSize.Width(), aPreferredSize.Width() ), - boost::rational( aNewSize.Height(), aPreferredSize.Height() ) ); + aMtf.Scale( boost::rational( aNewSize.Width(), aPreferredSize.Width() ), + boost::rational( aNewSize.Height(), aPreferredSize.Height() ) ); } aGraphic = Graphic( aMtf ); } diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index 9f552e96a953..8c7851b560b2 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -336,8 +336,8 @@ bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm, bool bExtendedInfo ) { MapMode aMap; aMap.SetMapUnit( nUnits == 1 ? MAP_INCH : MAP_CM ); - aMap.SetScaleX( boost::rational( 1, nHorizontalResolution ) ); - aMap.SetScaleY( boost::rational( 1, nVerticalResolution ) ); + aMap.SetScaleX( boost::rational( 1, nHorizontalResolution ) ); + aMap.SetScaleY( boost::rational( 1, nVerticalResolution ) ); aLogSize = OutputDevice::LogicToLogic( aPixSize, aMap, MapMode( MAP_100TH_MM ) ); } } @@ -489,7 +489,7 @@ bool GraphicDescriptor::ImpDetectPCX( SvStream& rStm, bool bExtendedInfo ) // set logical size MapMode aMap( MAP_INCH, Point(), - boost::rational( 1, nDPIx ), boost::rational( 1, nDPIy ) ); + boost::rational( 1, nDPIx ), boost::rational( 1, nDPIy ) ); aLogSize = OutputDevice::LogicToLogic( aPixSize, aMap, MapMode( MAP_100TH_MM ) ); diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx index 5d4c0479e1cf..be3afdfacd65 100644 --- a/vcl/source/filter/jpeg/JpegReader.cxx +++ b/vcl/source/filter/jpeg/JpegReader.cxx @@ -258,8 +258,8 @@ unsigned char * JPEGReader::CreateBitmap( JPEGCreateBitmapParam * pParam ) if( ( ( 1 == nUnit ) || ( 2 == nUnit ) ) && pParam->X_density && pParam->Y_density ) { Point aEmptyPoint; - boost::rational aFractX( 1, pParam->X_density ); - boost::rational aFractY( 1, pParam->Y_density ); + boost::rational aFractX( 1, pParam->X_density ); + boost::rational aFractY( 1, pParam->Y_density ); MapMode aMapMode( nUnit == 1 ? MAP_INCH : MAP_CM, aEmptyPoint, aFractX, aFractY ); Size aPrefSize = OutputDevice::LogicToLogic( aSize, aMapMode, MAP_100TH_MM ); diff --git a/vcl/source/filter/sgfbram.cxx b/vcl/source/filter/sgfbram.cxx index ac119cae625b..2055e9272627 100644 --- a/vcl/source/filter/sgfbram.cxx +++ b/vcl/source/filter/sgfbram.cxx @@ -447,7 +447,7 @@ bool SgfFilterVect(SvStream& rInp, SgfHeader& rHead, SgfEntry&, GDIMetaFile& rMt rMtf.Stop(); rMtf.WindStart(); MapMode aMap( MAP_10TH_MM, Point(), - boost::rational( 1, 4 ), boost::rational( 1, 4 ) ); + boost::rational( 1, 4 ), boost::rational( 1, 4 ) ); rMtf.SetPrefMapMode( aMap ); rMtf.SetPrefSize( Size( (short)rHead.Xsize, (short)rHead.Ysize ) ); return true; diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index 089573a36e17..e297842d93f0 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -830,7 +830,7 @@ bool SgfFilterSDrw( SvStream& rInp, SgfHeader&, SgfEntry&, GDIMetaFile& rMtf ) rMtf.Stop(); rMtf.WindStart(); - MapMode aMap(MAP_10TH_MM,Point(),boost::rational(1,4),boost::rational(1,4)); + MapMode aMap(MAP_10TH_MM,Point(),boost::rational(1,4),boost::rational(1,4)); rMtf.SetPrefMapMode(aMap); rMtf.SetPrefSize(Size((sal_Int16)aPage.Paper.Size.x,(sal_Int16)aPage.Paper.Size.y)); bRet=true; diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx index 7cbf6bf9732f..2544f2bcb173 100644 --- a/vcl/source/filter/sgvtext.cxx +++ b/vcl/source/filter/sgvtext.cxx @@ -688,7 +688,7 @@ void FormatLine(UCHAR* TBuf, sal_uInt16& Index, ObjTextType& Atr0, ObjTextType& sal_uInt16 i,j,k,h; sal_uInt16 re,li; - vOut.SetMapMode(MapMode(MAP_10TH_MM,Point(),boost::rational(1,4),boost::rational(1,4))); + vOut.SetMapMode(MapMode(MAP_10TH_MM,Point(),boost::rational(1,4),boost::rational(1,4))); nChars=0; SetTextContext(vOut,AktAtr,false,0,1,1,1,1); diff --git a/vcl/source/filter/wmf/emfwr.cxx b/vcl/source/filter/wmf/emfwr.cxx index 579ca89f20ee..37ee02a768dd 100644 --- a/vcl/source/filter/wmf/emfwr.cxx +++ b/vcl/source/filter/wmf/emfwr.cxx @@ -1252,8 +1252,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) MapMode aMapMode( aSubstitute.GetPrefMapMode() ); Size aOutSize( OutputDevice::LogicToLogic( pA->GetSize(), maVDev.GetMapMode(), aMapMode ) ); - aMapMode.SetScaleX( boost::rational( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) ); - aMapMode.SetScaleY( boost::rational( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) ); + aMapMode.SetScaleX( boost::rational( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) ); + aMapMode.SetScaleY( boost::rational( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) ); aMapMode.SetOrigin( OutputDevice::LogicToLogic( pA->GetPoint(), maVDev.GetMapMode(), aMapMode ) ); maVDev.SetMapMode( aMapMode ); ImplWrite( aSubstitute ); diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 1aa01fef966b..164d5ca7fc82 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -1510,8 +1510,8 @@ void WinMtfOutput::ImplDrawBitmap( const Point& rPos, const Size& rSize, const B const Size aSizePixel( rBitmap.GetSizePixel() ); if ( aOutputSizePixel.Width() && aOutputSizePixel.Height() ) { - aMapMode.SetScaleX( boost::rational( aSizePixel.Width(), aOutputSizePixel.Width() ) ); - aMapMode.SetScaleY( boost::rational( aSizePixel.Height(), aOutputSizePixel.Height() ) ); + aMapMode.SetScaleX( boost::rational( aSizePixel.Width(), aOutputSizePixel.Width() ) ); + aMapMode.SetScaleY( boost::rational( aSizePixel.Height(), aOutputSizePixel.Height() ) ); } aVDev.SetMapMode( aMapMode ); aVDev.SetOutputSizePixel( aSizePixel ); diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx index fa2dc1b43a53..edd5c6f84426 100644 --- a/vcl/source/filter/wmf/winwmf.cxx +++ b/vcl/source/filter/wmf/winwmf.cxx @@ -1196,7 +1196,7 @@ bool WMFReader::ReadHeader() Size aDevExt( 10000, 10000 ); if( ( labs( aWMFSize.Width() ) > 1 ) && ( labs( aWMFSize.Height() ) > 1 ) ) { - const boost::rational aFrac( 1, nUnitsPerInch ); + const boost::rational aFrac( 1, nUnitsPerInch ); MapMode aWMFMap( MAP_INCH, Point(), aFrac, aFrac ); Size aSize100( OutputDevice::LogicToLogic( aWMFSize, aWMFMap, MAP_100TH_MM ) ); aDevExt = Size( labs( aSize100.Width() ), labs( aSize100.Height() ) ); diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index 95473f08f08c..42d83b6e2a9e 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -1401,8 +1401,8 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) if( pA->GetMapMode().GetMapUnit() == MAP_RELATIVE ) { MapMode aMM = pA->GetMapMode(); - boost::rational aScaleX = aMM.GetScaleX(); - boost::rational aScaleY = aMM.GetScaleY(); + boost::rational aScaleX = aMM.GetScaleX(); + boost::rational aScaleY = aMM.GetScaleY(); Point aOrigin = aSrcMapMode.GetOrigin(); BigInt aX( aOrigin.X() ); @@ -1740,7 +1740,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, aTargetMapMode = MapMode( MAP_INCH ); const long nUnit = pVirDev->LogicToPixel( Size( 1, 1 ), aTargetMapMode ).Width(); - const boost::rational aFrac( 1, nUnit ); + const boost::rational aFrac( 1, nUnit ); aTargetMapMode.SetScaleX( aFrac ); aTargetMapMode.SetScaleY( aFrac ); @@ -1824,14 +1824,14 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode, const Size& rPrefSize) { - boost::rational aDivFrac(2, 1); + boost::rational aDivFrac(2, 1); sal_uInt16 nDivisor = 1; Size aSize = OutputDevice::LogicToLogic( rPrefSize, aSrcMapMode, rMapMode ); while( nDivisor <= 64 && (aSize.Width() > 32767 || aSize.Height() > 32767) ) { - boost::rational aFrac = rMapMode.GetScaleX(); + boost::rational aFrac = rMapMode.GetScaleX(); aFrac *= aDivFrac; rMapMode.SetScaleX(aFrac); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 3d95cc97d59d..398b85dd2f8f 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -139,7 +139,7 @@ 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( nXNum, nXDenom ), boost::rational( nYNum, nYDenom ) ); + rMapMode = MapMode( (MapUnit) nUnit, aOrg, boost::rational( nXNum, nXDenom ), boost::rational( nYNum, nYDenom ) ); } void ImplWriteMapMode( SvStream& rOStm, const MapMode& rMapMode ) diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 2e503ed7dc6b..d32642457c2b 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(1000, aHeader.nXPelsPerMeter), - boost::rational(1000, aHeader.nYPelsPerMeter)); + boost::rational(1000, aHeader.nXPelsPerMeter), + boost::rational(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..0163959fa02e 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 aScaleX( aDestSize.Width(), aTmpPrefSize.Width() ); - boost::rational aScaleY( aDestSize.Height(), aTmpPrefSize.Height() ); + boost::rational aScaleX( aDestSize.Width(), aTmpPrefSize.Width() ); + boost::rational aScaleY( aDestSize.Height(), aTmpPrefSize.Height() ); aScaleX *= aDrawMap.GetScaleX(); aDrawMap.SetScaleX( aScaleX ); aScaleY *= aDrawMap.GetScaleY(); aDrawMap.SetScaleY( aScaleY ); @@ -816,7 +816,7 @@ void GDIMetaFile::Scale( double fScaleX, double fScaleY ) aPrefSize.Height() = FRound( aPrefSize.Height() * fScaleY ); } -void GDIMetaFile::Scale( const boost::rational& rScaleX, const boost::rational& rScaleY ) +void GDIMetaFile::Scale( const boost::rational& rScaleX, const boost::rational& rScaleY ) { Scale( boost::rational_cast(rScaleX), boost::rational_cast(rScaleY) ); } diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 9ec9a2887728..0107ffc4e58c 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( nScaleNumX, nScaleDenomX ), - boost::rational( nScaleNumY, nScaleDenomY ) ); + boost::rational( nScaleNumX, nScaleDenomX ), + boost::rational( nScaleNumY, nScaleDenomY ) ); } nHeaderLen = rIStm.Tell() - nStartPos; diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx index 2ac95ed54b11..e284a8b3c027 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 aDefFraction( 1, 1 ); + boost::rational 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& rScaleX, const boost::rational& rScaleY ) + const boost::rational& rScaleX, const boost::rational& rScaleY ) { mpImplMapMode = new ImplMapMode; @@ -163,14 +163,14 @@ void MapMode::SetOrigin( const Point& rLogicOrg ) mpImplMapMode->maOrigin = rLogicOrg; } -void MapMode::SetScaleX( const boost::rational& rScaleX ) +void MapMode::SetScaleX( const boost::rational& rScaleX ) { ImplMakeUnique(); mpImplMapMode->maScaleX = rScaleX; } -void MapMode::SetScaleY( const boost::rational& rScaleY ) +void MapMode::SetScaleY( const boost::rational& rScaleY ) { ImplMakeUnique(); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 450177671fc5..38746a7ebe0a 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( 1L, pointToPixel(1) ), boost::rational( 1L, pointToPixel(1) ) ), + m_aMapMode( MAP_POINT, Point(), boost::rational( 1L, pointToPixel(1) ), boost::rational( 1L, pointToPixel(1) ) ), m_nCurrentStructElement( 0 ), m_bEmitStructure( true ), m_bNewMCID( false ), diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index a43e61245e52..547f54717d2e 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( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) ); - aMapMode.SetScaleY( boost::rational( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) ); + aMapMode.SetScaleX( boost::rational( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) ); + aMapMode.SetScaleY( boost::rational( 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..fd32d6b1f25a 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 m_aZoom; + const boost::rational 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..94e9bc04b2b0 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& rScale, const Point& rNewOffset, + const Size& rNewSize, const boost::rational& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer, const bool bTopDown ) { if (pBuffer) { diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index f6af60cc6476..098f0e0314c2 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -122,7 +122,7 @@ Size OutputDevice::GetDevFontSize( const vcl::Font& rFont, int nSizeIndex ) cons if ( mbMap ) { aSize.Height() *= 10; - MapMode aMap( MAP_10TH_INCH, Point(), boost::rational( 1, 72 ), boost::rational( 1, 72 ) ); + MapMode aMap( MAP_10TH_INCH, Point(), boost::rational( 1, 72 ), boost::rational( 1, 72 ) ); aSize = PixelToLogic( aSize, aMap ); aSize.Height() += 5; aSize.Height() /= 10; diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 9de77a74bb23..fb39bf9cf428 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -43,14 +43,14 @@ Reduces accuracy until it is a fraction (should become ctor fraction once); we could also do this with BigInts */ -static boost::rational ImplMakeFraction( long nN1, long nN2, long nD1, long nD2 ) +static boost::rational ImplMakeFraction( long nN1, long nN2, long nD1, long nD2 ) { if( nD1 == 0 || nD2 == 0 ) { DBG_ASSERT(false,"Invalid parameter for ImplMakeFraction"); - return boost::rational( 1, 1 ); + return boost::rational( 1, 1 ); } - return boost::rational( nN1, nD1 ) * boost::rational( nN2, nD2 ); + return boost::rational( nN1, nD1 ) * boost::rational( nN2, nD2 ); } // Fraction.GetNumerator() @@ -220,8 +220,8 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, break; } - boost::rational aScaleX = rMapMode.GetScaleX(); - boost::rational aScaleY = rMapMode.GetScaleY(); + boost::rational aScaleX = rMapMode.GetScaleX(); + boost::rational aScaleY = rMapMode.GetScaleY(); // set offset according to MapMode Point aOrigin = rMapMode.GetOrigin(); @@ -286,11 +286,11 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, // calculate scaling factor according to MapMode // aTemp? = rMapRes.mnMapSc? * aScale? - boost::rational aTempX = ImplMakeFraction( rMapRes.mnMapScNumX, + boost::rational aTempX = ImplMakeFraction( rMapRes.mnMapScNumX, aScaleX.numerator(), rMapRes.mnMapScDenomX, aScaleX.denominator() ); - boost::rational aTempY = ImplMakeFraction( rMapRes.mnMapScNumY, + boost::rational aTempY = ImplMakeFraction( rMapRes.mnMapScNumY, aScaleY.numerator(), rMapRes.mnMapScDenomY, aScaleY.denominator() ); @@ -739,11 +739,11 @@ void OutputDevice::SetMapMode( const MapMode& rNewMapMode ) { Point aOrigin( maMapRes.mnMapOfsX, maMapRes.mnMapOfsY ); // aScale? = maMapMode.GetScale?() * rNewMapMode.GetScale?() - boost::rational aScaleX = ImplMakeFraction( maMapMode.GetScaleX().numerator(), + boost::rational aScaleX = ImplMakeFraction( maMapMode.GetScaleX().numerator(), rNewMapMode.GetScaleX().numerator(), maMapMode.GetScaleX().denominator(), rNewMapMode.GetScaleX().denominator() ); - boost::rational aScaleY = ImplMakeFraction( maMapMode.GetScaleY().numerator(), + boost::rational aScaleY = ImplMakeFraction( maMapMode.GetScaleY().numerator(), rNewMapMode.GetScaleY().numerator(), maMapMode.GetScaleY().denominator(), rNewMapMode.GetScaleY().denominator() ); @@ -785,11 +785,11 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) MapUnit eNew = rNewMapMode.GetMapUnit(); // a?F = rNewMapMode.GetScale?() / maMapMode.GetScale?() - boost::rational aXF = ImplMakeFraction( rNewMapMode.GetScaleX().numerator(), + boost::rational aXF = ImplMakeFraction( rNewMapMode.GetScaleX().numerator(), maMapMode.GetScaleX().denominator(), rNewMapMode.GetScaleX().denominator(), maMapMode.GetScaleX().numerator() ); - boost::rational aYF = ImplMakeFraction( rNewMapMode.GetScaleY().numerator(), + boost::rational aYF = ImplMakeFraction( rNewMapMode.GetScaleY().numerator(), maMapMode.GetScaleY().denominator(), rNewMapMode.GetScaleY().denominator(), maMapMode.GetScaleY().numerator() ); @@ -807,7 +807,7 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) } else { - boost::rational aF( aImplNumeratorAry[eNew] * aImplDenominatorAry[eOld], + boost::rational aF( aImplNumeratorAry[eNew] * aImplDenominatorAry[eOld], aImplNumeratorAry[eOld] * aImplDenominatorAry[eNew] ); // a?F = a?F * aF @@ -817,13 +817,13 @@ void OutputDevice::SetRelativeMapMode( const MapMode& rNewMapMode ) aYF.denominator(), aF.denominator() ); if ( eOld == MAP_PIXEL ) { - aXF *= boost::rational( mnDPIX, 1 ); - aYF *= boost::rational( mnDPIY, 1 ); + aXF *= boost::rational( mnDPIX, 1 ); + aYF *= boost::rational( mnDPIY, 1 ); } else if ( eNew == MAP_PIXEL ) { - aXF *= boost::rational( 1, mnDPIX ); - aYF *= boost::rational( 1, mnDPIY ); + aXF *= boost::rational( 1, mnDPIX ); + aYF *= boost::rational( 1, mnDPIY ); } } } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index cc9763b17ed9..57b7a4b51c07 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -572,7 +572,7 @@ Window::~Window() WindowImpl::WindowImpl( WindowType nType ) { - maZoom = boost::rational( 1, 1 ); + maZoom = boost::rational( 1, 1 ); maWinRegion = vcl::Region(true); maWinClipRegion = vcl::Region(true); mpWinData = NULL; // Extra Window Data, that we dont need for all windows diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index bf09d53b4e94..10c4070c0777 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -507,7 +507,7 @@ bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore ) } } -void Window::SetZoom( const boost::rational& rZoom ) +void Window::SetZoom( const boost::rational& rZoom ) { if ( mpWindowImpl->maZoom != rZoom ) { @@ -523,7 +523,7 @@ inline long WinFloatRound( double fVal ) void Window::SetZoomedPointFont( const vcl::Font& rFont ) { - const boost::rational& rZoom = GetZoom(); + const boost::rational& rZoom = GetZoom(); if ( rZoom.numerator() != rZoom.denominator() ) { vcl::Font aFont( rFont ); @@ -562,7 +562,7 @@ void Window::SetZoomedPointFont( const vcl::Font& rFont ) long Window::CalcZoom( long nCalc ) const { - const boost::rational& rZoom = GetZoom(); + const boost::rational& rZoom = GetZoom(); if ( rZoom.numerator() != rZoom.denominator() ) { double n = (double)nCalc; @@ -1318,7 +1318,7 @@ vcl::Cursor* Window::GetCursor() const return mpWindowImpl->mpCursor; } -const boost::rational& Window::GetZoom() const +const boost::rational& Window::GetZoom() const { return mpWindowImpl->maZoom; } -- cgit