summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/filter/graphicfilter.cxx6
-rw-r--r--vcl/source/filter/graphicfilter2.cxx6
-rw-r--r--vcl/source/filter/jpeg/JpegReader.cxx4
-rw-r--r--vcl/source/filter/sgfbram.cxx2
-rw-r--r--vcl/source/filter/sgvmain.cxx2
-rw-r--r--vcl/source/filter/sgvtext.cxx2
-rw-r--r--vcl/source/filter/wmf/emfwr.cxx4
-rw-r--r--vcl/source/filter/wmf/winmtf.cxx4
-rw-r--r--vcl/source/filter/wmf/winwmf.cxx2
-rw-r--r--vcl/source/filter/wmf/wmfwr.cxx10
-rw-r--r--vcl/source/gdi/cvtsvm.cxx2
-rw-r--r--vcl/source/gdi/dibtools.cxx4
-rw-r--r--vcl/source/gdi/gdimtf.cxx6
-rw-r--r--vcl/source/gdi/impgraph.cxx4
-rw-r--r--vcl/source/gdi/mapmod.cxx8
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl2.cxx4
-rw-r--r--vcl/source/gdi/textlayout.cxx2
-rw-r--r--vcl/source/gdi/virdev.cxx2
-rw-r--r--vcl/source/outdev/font.cxx2
-rw-r--r--vcl/source/outdev/map.cxx32
-rw-r--r--vcl/source/window/window.cxx2
-rw-r--r--vcl/source/window/window2.cxx8
23 files changed, 60 insertions, 60 deletions
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<long> aFrac( 1, std::min( std::max( nDPI, sal_Int32( 75 ) ), sal_Int32( 600 ) ) );
+ boost::rational<sal_Int64> 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<long>( aNewSize.Width(), aPreferredSize.Width() ),
- boost::rational<long>( aNewSize.Height(), aPreferredSize.Height() ) );
+ aMtf.Scale( boost::rational<sal_Int64>( aNewSize.Width(), aPreferredSize.Width() ),
+ boost::rational<sal_Int64>( 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<long>( 1, nHorizontalResolution ) );
- aMap.SetScaleY( boost::rational<long>( 1, nVerticalResolution ) );
+ aMap.SetScaleX( boost::rational<sal_Int64>( 1, nHorizontalResolution ) );
+ aMap.SetScaleY( boost::rational<sal_Int64>( 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<long>( 1, nDPIx ), boost::rational<long>( 1, nDPIy ) );
+ boost::rational<sal_Int64>( 1, nDPIx ), boost::rational<sal_Int64>( 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<long> aFractX( 1, pParam->X_density );
- boost::rational<long> aFractY( 1, pParam->Y_density );
+ boost::rational<sal_Int64> aFractX( 1, pParam->X_density );
+ boost::rational<sal_Int64> 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<long>( 1, 4 ), boost::rational<long>( 1, 4 ) );
+ boost::rational<sal_Int64>( 1, 4 ), boost::rational<sal_Int64>( 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<long>(1,4),boost::rational<long>(1,4));
+ MapMode aMap(MAP_10TH_MM,Point(),boost::rational<sal_Int64>(1,4),boost::rational<sal_Int64>(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<long>(1,4),boost::rational<long>(1,4)));
+ vOut.SetMapMode(MapMode(MAP_10TH_MM,Point(),boost::rational<sal_Int64>(1,4),boost::rational<sal_Int64>(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<long>( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) );
- aMapMode.SetScaleY( boost::rational<long>( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) );
+ aMapMode.SetScaleX( boost::rational<sal_Int64>( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) );
+ aMapMode.SetScaleY( boost::rational<sal_Int64>( 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<long>( aSizePixel.Width(), aOutputSizePixel.Width() ) );
- aMapMode.SetScaleY( boost::rational<long>( aSizePixel.Height(), aOutputSizePixel.Height() ) );
+ aMapMode.SetScaleX( boost::rational<sal_Int64>( aSizePixel.Width(), aOutputSizePixel.Width() ) );
+ aMapMode.SetScaleY( boost::rational<sal_Int64>( 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<long> aFrac( 1, nUnitsPerInch );
+ const boost::rational<sal_Int64> 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<long> aScaleX = aMM.GetScaleX();
- boost::rational<long> aScaleY = aMM.GetScaleY();
+ boost::rational<sal_Int64> aScaleX = aMM.GetScaleX();
+ boost::rational<sal_Int64> 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<long> aFrac( 1, nUnit );
+ const boost::rational<sal_Int64> 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<long> aDivFrac(2, 1);
+ boost::rational<sal_Int64> 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<long> aFrac = rMapMode.GetScaleX();
+ boost::rational<sal_Int64> 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<long>( nXNum, nXDenom ), boost::rational<long>( nYNum, nYDenom ) );
+ rMapMode = MapMode( (MapUnit) nUnit, aOrg, boost::rational<sal_Int64>( nXNum, nXDenom ), boost::rational<sal_Int64>( 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<long>(1000, aHeader.nXPelsPerMeter),
- boost::rational<long>(1000, aHeader.nYPelsPerMeter));
+ boost::rational<sal_Int64>(1000, aHeader.nXPelsPerMeter),
+ boost::rational<sal_Int64>(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<long> aScaleX( aDestSize.Width(), aTmpPrefSize.Width() );
- boost::rational<long> aScaleY( aDestSize.Height(), aTmpPrefSize.Height() );
+ boost::rational<sal_Int64> aScaleX( aDestSize.Width(), aTmpPrefSize.Width() );
+ boost::rational<sal_Int64> 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<long>& rScaleX, const boost::rational<long>& rScaleY )
+void GDIMetaFile::Scale( const boost::rational<sal_Int64>& rScaleX, const boost::rational<sal_Int64>& rScaleY )
{
Scale( boost::rational_cast<double>(rScaleX), boost::rational_cast<double>(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<long>( nScaleNumX, nScaleDenomX ),
- boost::rational<long>( nScaleNumY, nScaleDenomY ) );
+ boost::rational<sal_Int64>( nScaleNumX, nScaleDenomX ),
+ boost::rational<sal_Int64>( 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<long> aDefFraction( 1, 1 );
+ boost::rational<sal_Int64> 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 boost::rational<sal_Int64>& rScaleX, const boost::rational<sal_Int64>& 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 boost::rational<sal_Int64>& rScaleX )
{
ImplMakeUnique();
mpImplMapMode->maScaleX = rScaleX;
}
-void MapMode::SetScaleY( const boost::rational<long>& rScaleY )
+void MapMode::SetScaleY( const boost::rational<sal_Int64>& 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<long>( 1L, pointToPixel(1) ), boost::rational<long>( 1L, pointToPixel(1) ) ),
+ m_aMapMode( MAP_POINT, Point(), boost::rational<sal_Int64>( 1L, pointToPixel(1) ), boost::rational<sal_Int64>( 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<long>( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) );
- aMapMode.SetScaleY( boost::rational<long>( aOutSize.Height(), aSubstitute.GetPrefSize().Height() ) );
+ aMapMode.SetScaleX( boost::rational<sal_Int64>( aOutSize.Width(), aSubstitute.GetPrefSize().Width() ) );
+ aMapMode.SetScaleY( boost::rational<sal_Int64>( 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<long> m_aZoom;
+ const boost::rational<sal_Int64> 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<long>& rScale, const Point& rNewOffset,
+ const Size& rNewSize, const boost::rational<sal_Int64>& 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<long>( 1, 72 ), boost::rational<long>( 1, 72 ) );
+ MapMode aMap( MAP_10TH_INCH, Point(), boost::rational<sal_Int64>( 1, 72 ), boost::rational<sal_Int64>( 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<long> ImplMakeFraction( long nN1, long nN2, long nD1, long nD2 )
+static boost::rational<sal_Int64> ImplMakeFraction( long nN1, long nN2, long nD1, long nD2 )
{
if( nD1 == 0 || nD2 == 0 )
{
DBG_ASSERT(false,"Invalid parameter for ImplMakeFraction");
- return boost::rational<long>( 1, 1 );
+ return boost::rational<sal_Int64>( 1, 1 );
}
- return boost::rational<long>( nN1, nD1 ) * boost::rational<long>( nN2, nD2 );
+ return boost::rational<sal_Int64>( nN1, nD1 ) * boost::rational<sal_Int64>( nN2, nD2 );
}
// Fraction.GetNumerator()
@@ -220,8 +220,8 @@ static void ImplCalcMapResolution( const MapMode& rMapMode,
break;
}
- boost::rational<long> aScaleX = rMapMode.GetScaleX();
- boost::rational<long> aScaleY = rMapMode.GetScaleY();
+ boost::rational<sal_Int64> aScaleX = rMapMode.GetScaleX();
+ boost::rational<sal_Int64> 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<long> aTempX = ImplMakeFraction( rMapRes.mnMapScNumX,
+ boost::rational<sal_Int64> aTempX = ImplMakeFraction( rMapRes.mnMapScNumX,
aScaleX.numerator(),
rMapRes.mnMapScDenomX,
aScaleX.denominator() );
- boost::rational<long> aTempY = ImplMakeFraction( rMapRes.mnMapScNumY,
+ boost::rational<sal_Int64> 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<long> aScaleX = ImplMakeFraction( maMapMode.GetScaleX().numerator(),
+ boost::rational<sal_Int64> aScaleX = ImplMakeFraction( maMapMode.GetScaleX().numerator(),
rNewMapMode.GetScaleX().numerator(),
maMapMode.GetScaleX().denominator(),
rNewMapMode.GetScaleX().denominator() );
- boost::rational<long> aScaleY = ImplMakeFraction( maMapMode.GetScaleY().numerator(),
+ boost::rational<sal_Int64> 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<long> aXF = ImplMakeFraction( rNewMapMode.GetScaleX().numerator(),
+ boost::rational<sal_Int64> aXF = ImplMakeFraction( rNewMapMode.GetScaleX().numerator(),
maMapMode.GetScaleX().denominator(),
rNewMapMode.GetScaleX().denominator(),
maMapMode.GetScaleX().numerator() );
- boost::rational<long> aYF = ImplMakeFraction( rNewMapMode.GetScaleY().numerator(),
+ boost::rational<sal_Int64> 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<long> aF( aImplNumeratorAry[eNew] * aImplDenominatorAry[eOld],
+ boost::rational<sal_Int64> 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<long>( mnDPIX, 1 );
- aYF *= boost::rational<long>( mnDPIY, 1 );
+ aXF *= boost::rational<sal_Int64>( mnDPIX, 1 );
+ aYF *= boost::rational<sal_Int64>( mnDPIY, 1 );
}
else if ( eNew == MAP_PIXEL )
{
- aXF *= boost::rational<long>( 1, mnDPIX );
- aYF *= boost::rational<long>( 1, mnDPIY );
+ aXF *= boost::rational<sal_Int64>( 1, mnDPIX );
+ aYF *= boost::rational<sal_Int64>( 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<long>( 1, 1 );
+ maZoom = boost::rational<sal_Int64>( 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<long>& rZoom )
+void Window::SetZoom( const boost::rational<sal_Int64>& rZoom )
{
if ( mpWindowImpl->maZoom != rZoom )
{
@@ -523,7 +523,7 @@ inline long WinFloatRound( double fVal )
void Window::SetZoomedPointFont( const vcl::Font& rFont )
{
- const boost::rational<long>& rZoom = GetZoom();
+ const boost::rational<sal_Int64>& 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<long>& rZoom = GetZoom();
+ const boost::rational<sal_Int64>& 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<long>& Window::GetZoom() const
+const boost::rational<sal_Int64>& Window::GetZoom() const
{
return mpWindowImpl->maZoom;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 18:19:14 +0000