diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-10-30 11:03:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-10-30 15:43:23 +0200 |
| commit | bc413e15fae3672f580894a3cd7b077d533d8e6c (patch) | |
| tree | 0e6306258a5f0086354f4972bd9eeb628672bfab /emfio | |
| parent | Add comments for defaults of bEvaluateFormulas (diff) | |
| download | core-bc413e15fae3672f580894a3cd7b077d533d8e6c.tar.gz core-bc413e15fae3672f580894a3cd7b077d533d8e6c.zip | |
tools::Long->sal_Int32 in the DX arrays
Change-Id: I36ddc11b39763dc77086591fe9bb756195b4294f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124459
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'emfio')
| -rw-r--r-- | emfio/inc/mtftools.hxx | 2 | ||||
| -rw-r--r-- | emfio/source/reader/emfreader.cxx | 2 | ||||
| -rw-r--r-- | emfio/source/reader/mtftools.cxx | 8 | ||||
| -rw-r--r-- | emfio/source/reader/wmfreader.cxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx index a9de54706f6d..3bae0285a9bc 100644 --- a/emfio/inc/mtftools.hxx +++ b/emfio/inc/mtftools.hxx @@ -675,7 +675,7 @@ namespace emfio ); void DrawText(Point& rPosition, OUString const & rString, - std::vector<tools::Long>* pDXArry = nullptr, + std::vector<sal_Int32>* pDXArry = nullptr, tools::Long* pDYArry = nullptr, bool bRecordPath = false, sal_Int32 nGraphicsMode = GM_COMPATIBLE); diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index ff258182595f..632dca430a98 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -1939,7 +1939,7 @@ namespace emfio SAL_INFO("emfio", "\t\tText: " << aText); SAL_INFO("emfio", "\t\tDxBuffer:"); - std::vector<tools::Long> aDXAry; + std::vector<sal_Int32> aDXAry; std::unique_ptr<tools::Long[]> pDYAry; sal_Int32 nDxSize; diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx index d43a62e665e1..0d62f4f9a373 100644 --- a/emfio/source/reader/mtftools.cxx +++ b/emfio/source/reader/mtftools.cxx @@ -1677,7 +1677,7 @@ namespace emfio } } - void MtfTools::DrawText( Point& rPosition, OUString const & rText, std::vector<tools::Long>* pDXArry, tools::Long* pDYArry, bool bRecordPath, sal_Int32 nGfxMode ) + void MtfTools::DrawText( Point& rPosition, OUString const & rText, std::vector<sal_Int32>* pDXArry, tools::Long* pDYArry, bool bRecordPath, sal_Int32 nGfxMode ) { UpdateClipRegion(); rPosition = ImplMap( rPosition ); @@ -1861,15 +1861,15 @@ namespace emfio { Point aCharDisplacement( i ? (*pDXArry)[i-1] : 0, i ? pDYArry[i-1] : 0 ); Point().RotateAround(aCharDisplacement, maFont.GetOrientation()); - mpGDIMetaFile->AddAction( new MetaTextArrayAction( rPosition + aCharDisplacement, OUString( rText[i] ), o3tl::span<const tools::Long>{}, 0, 1 ) ); + mpGDIMetaFile->AddAction( new MetaTextArrayAction( rPosition + aCharDisplacement, OUString( rText[i] ), o3tl::span<const sal_Int32>{}, 0, 1 ) ); } } else { /* because text without dx array is badly scaled, we will create such an array if necessary */ - o3tl::span<const tools::Long> pDX; - std::vector<tools::Long> aMyDXArray; + o3tl::span<const sal_Int32> pDX; + std::vector<sal_Int32> aMyDXArray; if (pDXArry) { pDX = { pDXArry->data(), pDXArry->size() }; diff --git a/emfio/source/reader/wmfreader.cxx b/emfio/source/reader/wmfreader.cxx index 9a04cdeb9823..41f7564c1295 100644 --- a/emfio/source/reader/wmfreader.cxx +++ b/emfio/source/reader/wmfreader.cxx @@ -721,7 +721,7 @@ namespace emfio IntersectClipRect( aRect ); } SAL_INFO( "emfio", "\t\t\t Text : " << aText ); - std::vector<tools::Long> aDXAry; + std::vector<sal_Int32> aDXAry; std::unique_ptr<tools::Long[]> pDYAry; auto nDxArySize = nMaxStreamPos - mpInputStream->Tell(); auto nDxAryEntries = nDxArySize >> 1; @@ -1257,7 +1257,7 @@ namespace emfio { Point aPt; sal_uInt32 nStringLen, nDXCount; - std::vector<tools::Long> aDXAry; + std::vector<sal_Int32> aDXAry; SvMemoryStream aMemoryStream( nEscLen ); aMemoryStream.WriteBytes(pData.get(), nEscLen); aMemoryStream.Seek( STREAM_SEEK_TO_BEGIN ); |