diff options
Diffstat (limited to 'drawinglayer')
-rw-r--r-- | drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 2 | ||||
-rw-r--r-- | drawinglayer/source/primitive2d/textlayoutdevice.cxx | 4 | ||||
-rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index dc922b5a4759..943e16a37acd 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -1997,7 +1997,7 @@ namespace { // preapare DXArray (if used) std::vector< double > aDXArray; - sal_Int32* pDXArray = pA->GetDXArray(); + long* pDXArray = pA->GetDXArray(); if(pDXArray) { diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 3abe03d78b0a..cbd21e37d898 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -241,7 +241,7 @@ namespace drawinglayer if(nDXArrayCount) { OSL_ENSURE(nDXArrayCount == nTextLength, "DXArray size does not correspond to text portion size (!)"); - std::vector< sal_Int32 > aIntegerDXArray(nDXArrayCount); + std::vector< long > aIntegerDXArray(nDXArrayCount); for(sal_uInt32 a(0); a < nDXArrayCount; a++) { @@ -347,7 +347,7 @@ namespace drawinglayer if(nTextLength) { aRetval.reserve(nTextLength); - ::std::vector<sal_Int32> aArray(nTextLength); + ::std::vector<long> aArray(nTextLength); mrDevice.GetTextArray(rText, &aArray[0], nIndex, nLength); aRetval.assign(aArray.begin(), aArray.end()); } diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 9b904718d9d2..137901eb3f9e 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -242,7 +242,7 @@ namespace drawinglayer } // create transformed integer DXArray in view coordinate system - ::std::vector< sal_Int32 > aTransformedDXArray; + ::std::vector< long > aTransformedDXArray; if(rTextCandidate.getDXArray().size()) { @@ -277,7 +277,7 @@ namespace drawinglayer sal_Int32 nPos = rTextCandidate.getTextPosition(); sal_Int32 nLen = rTextCandidate.getTextLength(); - sal_Int32* pDXArray = aTransformedDXArray.size() ? &(aTransformedDXArray[0]) : NULL ; + long* pDXArray = aTransformedDXArray.size() ? &(aTransformedDXArray[0]) : NULL ; if ( rTextCandidate.isFilled() ) { @@ -287,8 +287,7 @@ namespace drawinglayer long nWidthToFill = static_cast<long>(rTextCandidate.getWidthToFill( ) * aFontScaling.getX() / aOldFontScaling.getX()); - long nWidth = mpOutputDevice->GetTextArray( - rTextCandidate.getText(), pDXArray, 0, 1 ); + long nWidth = mpOutputDevice->GetTextArray( rTextCandidate.getText(), pDXArray, 0, 1 ); long nChars = 2; if ( nWidth ) nChars = nWidthToFill / nWidth; |