From 863c8c5e0488d5e69ff5ea14adee33990f4e2bfd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 6 Feb 2019 12:09:27 +0000 Subject: fix assert seen on opening attachment from tdf#123163 I imagine it should have been seqPos-(idPos+2) seems to be like this since the initial commit of commit 091fe76b6329b4bb974987554369cbfadd8f2401 Date: Tue Jun 30 12:55:18 2015 +0300 tdf#87348 implement mso-next-textbox vml-style textbox chaining import Change-Id: Ic2f527ede2102c01c8589d58d8c705d59b0a6ffe Reviewed-on: https://gerrit.libreoffice.org/67454 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 45510866fedac63014a3120a1130dbea9fd803ee) --- oox/source/vml/vmlshape.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 45e7e40ab831..66facd3da275 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -350,7 +350,8 @@ Reference< XShape > ShapeBase::convertAndInsert( const Reference< XShapes >& rxS sal_Int32 seqPos = sLinkChainName.indexOf("_s",idPos); if (idPos < seqPos) { - id = sLinkChainName.copy(idPos+2,seqPos-idPos+2).toInt32(); + auto idPosEnd = idPos+2; + id = sLinkChainName.copy(idPosEnd, seqPos - idPosEnd).toInt32(); seq = sLinkChainName.copy(seqPos+2).toInt32(); } } -- cgit v1.2.3