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 /drawinglayer | |
| 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 'drawinglayer')
| -rw-r--r-- | drawinglayer/source/primitive2d/textlayoutdevice.cxx | 4 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 2 | ||||
| -rw-r--r-- | drawinglayer/source/tools/wmfemfhelper.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 11e903027122..3dfd0258f099 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -231,7 +231,7 @@ void TextLayouterDevice::getTextOutlines(basegfx::B2DPolyPolygonVector& rB2DPoly { OSL_ENSURE(nDXArrayCount == nTextLength, "DXArray size does not correspond to text portion size (!)"); - std::vector<tools::Long> aIntegerDXArray(nDXArrayCount); + std::vector<sal_Int32> aIntegerDXArray(nDXArrayCount); for (sal_uInt32 a(0); a < nDXArrayCount; a++) { @@ -308,7 +308,7 @@ std::vector<double> TextLayouterDevice::getTextArray(const OUString& rText, sal_ if (nTextLength) { aRetval.reserve(nTextLength); - std::vector<tools::Long> aArray(nTextLength); + std::vector<sal_Int32> aArray(nTextLength); mrDevice.GetTextArray(rText, &aArray, nIndex, nLength); aRetval.assign(aArray.begin(), aArray.end()); } diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 034e82e1f50e..796a9dbe8b75 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -248,7 +248,7 @@ void VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D( } // create transformed integer DXArray in view coordinate system - std::vector<tools::Long> aTransformedDXArray; + std::vector<sal_Int32> aTransformedDXArray; if (!rTextCandidate.getDXArray().empty()) { diff --git a/drawinglayer/source/tools/wmfemfhelper.cxx b/drawinglayer/source/tools/wmfemfhelper.cxx index 78b178355fbd..f9cfbc60cbd3 100644 --- a/drawinglayer/source/tools/wmfemfhelper.cxx +++ b/drawinglayer/source/tools/wmfemfhelper.cxx @@ -1828,7 +1828,7 @@ namespace wmfemfhelper { // prepare DXArray (if used) std::vector< double > aDXArray; - const std::vector<tools::Long> & rDXArray = pA->GetDXArray(); + const std::vector<sal_Int32> & rDXArray = pA->GetDXArray(); if(!rDXArray.empty()) { |