diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-02-06 12:09:27 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-02-18 12:00:04 +0100 |
| commit | 5ead5bd3dc4a3eacef2510baea488361b915ebe8 (patch) | |
| tree | aad3b6bf9e98e63fe08d4859e690d6dfbd7316f2 | |
| parent | 7d288be25d6fd33ad001d90a7e90cbbf0ddbc6f7 (diff) | |
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 <Michael.Stahl@cib.de>
(cherry picked from commit 45510866fedac63014a3120a1130dbea9fd803ee)
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 5868c9a57880..a10f3b5c2793 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -356,7 +356,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(); } } |