diff options
Diffstat (limited to 'drawinglayer/source')
| -rw-r--r-- | drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2 | ||||
| -rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drawinglayer/source/primitive2d/textlayoutdevice.cxx b/drawinglayer/source/primitive2d/textlayoutdevice.cxx index 0a0ab23b7d22..c36c73658a08 100644 --- a/drawinglayer/source/primitive2d/textlayoutdevice.cxx +++ b/drawinglayer/source/primitive2d/textlayoutdevice.cxx @@ -309,7 +309,7 @@ std::vector<double> TextLayouterDevice::getTextArray(const OUString& rText, sal_ { aRetval.reserve(nTextLength); std::vector<tools::Long> aArray(nTextLength); - mrDevice.GetTextArray(rText, aArray.data(), nIndex, nLength); + 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 30de0626d6e5..77a3adae255d 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -286,8 +286,8 @@ void VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D( sal_Int32 nPos = rTextCandidate.getTextPosition(); sal_Int32 nLen = rTextCandidate.getTextLength(); - tools::Long* pDXArray - = !aTransformedDXArray.empty() ? aTransformedDXArray.data() : nullptr; + std::vector<tools::Long>* pDXArray + = !aTransformedDXArray.empty() ? &aTransformedDXArray : nullptr; if (rTextCandidate.isFilled()) { @@ -314,7 +314,8 @@ void VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D( if (!aTransformedDXArray.empty()) { - mpOutputDevice->DrawTextArray(aStartPoint, aText, pDXArray, nPos, nLen); + mpOutputDevice->DrawTextArray(aStartPoint, aText, + pDXArray ? pDXArray->data() : nullptr, nPos, nLen); } else { |