diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-21 15:26:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-22 08:07:45 +0200 |
| commit | 180dd91c189de0bf03d5062e33c20da94c5d35d9 (patch) | |
| tree | c44efef174c8ba3ba07cb6eeb5b5aca388729c6e /emfio | |
| parent | f308520f1e3624c88e2a0e99be2eb26e2f2d0fc4 (diff) | |
long->tools::Long in emfio..filter
Change-Id: I961cee10d45d628ff70dea0694a7a63a4fe867ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104624
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'emfio')
| -rw-r--r-- | emfio/inc/mtftools.hxx | 4 | ||||
| -rw-r--r-- | emfio/source/reader/mtftools.cxx | 8 | ||||
| -rw-r--r-- | emfio/source/reader/wmfreader.cxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx index 9506b4f5f31c..5c0c60973350 100644 --- a/emfio/inc/mtftools.hxx +++ b/emfio/inc/mtftools.hxx @@ -625,8 +625,8 @@ namespace emfio ); void DrawText(Point& rPosition, OUString const & rString, - long* pDXArry = nullptr, - long* pDYArry = nullptr, + tools::Long* pDXArry = nullptr, + tools::Long* pDYArry = nullptr, bool bRecordPath = false, sal_Int32 nGraphicsMode = GM_COMPATIBLE); diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index 080521ed0523..e32b0f2be502 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -266,7 +266,7 @@ namespace emfio aFont.SetFontSize( aFontSize ); pVDev->SetFont( aFont ); FontMetric aMetric( pVDev->GetFontMetric() ); - long nHeight = aMetric.GetAscent() + aMetric.GetDescent(); + tools::Long nHeight = aMetric.GetAscent() + aMetric.GetDescent(); if (nHeight) { double fHeight = (static_cast<double>(aFontSize.Height()) * rFont.lfHeight ) / nHeight; @@ -743,7 +743,7 @@ namespace emfio if ( pLineStyle->aLineInfo.GetStyle() == LineStyle::Dash ) { aSize.AdjustWidth(1 ); - long nDotLen = ImplMap( aSize ).Width(); + tools::Long nDotLen = ImplMap( aSize ).Width(); pLineStyle->aLineInfo.SetDistance( nDotLen ); pLineStyle->aLineInfo.SetDotLen( nDotLen ); pLineStyle->aLineInfo.SetDashLen( nDotLen * 3 ); @@ -1413,7 +1413,7 @@ namespace emfio } } - void MtfTools::DrawText( Point& rPosition, OUString const & rText, long* pDXArry, long* pDYArry, bool bRecordPath, sal_Int32 nGfxMode ) + void MtfTools::DrawText( Point& rPosition, OUString const & rText, tools::Long* pDXArry, tools::Long* pDYArry, bool bRecordPath, sal_Int32 nGfxMode ) { UpdateClipRegion(); rPosition = ImplMap( rPosition ); @@ -1589,7 +1589,7 @@ namespace emfio { /* because text without dx array is badly scaled, we will create such an array if necessary */ - long* pDX = pDXArry; + tools::Long* pDX = pDXArry; if (!pDXArry) { // #i117968# VirtualDevice is not thread safe, but filter is used in multithreading diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx index 27c42bdc0171..155a74bec48b 100644 --- a/emfio/source/reader/wmfreader.cxx +++ b/emfio/source/reader/wmfreader.cxx @@ -821,9 +821,9 @@ namespace emfio if ( !!aBmp ) { Bitmap::ScopedReadAccess pBmp(aBmp); - for ( long y = 0; y < pBmp->Height(); y++ ) + for ( tools::Long y = 0; y < pBmp->Height(); y++ ) { - for ( long x = 0; x < pBmp->Width(); x++ ) + for ( tools::Long x = 0; x < pBmp->Width(); x++ ) { const BitmapColor aColor( pBmp->GetColor( y, x ) ); @@ -1234,7 +1234,7 @@ namespace emfio } } - const long aMaxWidth = 1024; + const tools::Long aMaxWidth = 1024; bool WmfReader::ReadHeader() { |