summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-10-31 14:51:24 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-10-31 17:33:46 +0100
commit2023a5291984438de52a95e5bc560a82d69eaca1 (patch)
tree40df6446682d3d7d6626e34458c12efd77bf6010 /drawinglayer
parentf3d16ef054acd8c98559716e48b4cd84078c6a4c (diff)
crashtesting: failure on conversion of fdo74498-1.doc to pdf
noticable since... commit 894b4911ffb96ff667fdeb3aec7922316ab7230a Date: Thu Oct 28 09:27:29 2021 +0200 pass DX array around using o3tl::span instead of pointer but presumably a problem since... commit 793905906980e77a9853a8dd01fab95b65ca4f02 Date: Tue Sep 14 15:28:33 2010 +0200 filled-tab-editeng.diff: Filled tab wasn't filled in shapes n#564454 here I assume the right fix is to extend the DXArray (if non-empty) to match the new length using the value of the initial entry of the old DXArray Change-Id: I36a6040c2d05e108c7c6f9cdab9a33557036cd22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124528 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/processor2d/vclprocessor2d.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 831972d187ab..b055ef229ce2 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -307,6 +307,14 @@ void VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D(
aText = aFilled.makeStringAndClear();
nPos = 0;
nLen = nChars;
+
+ if (!aTransformedDXArray.empty())
+ {
+ sal_Int32 nDX = aTransformedDXArray[0];
+ aTransformedDXArray.resize(nLen);
+ for (sal_Int32 i = 1; i < nLen; ++i)
+ aTransformedDXArray[i] = aTransformedDXArray[i - 1] + nDX;
+ }
}
if (!aTransformedDXArray.empty())