summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2013-12-08 00:05:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-07-11 10:23:10 +0000
commit52772b80988952d176fa57075e674df06356d43d (patch)
tree3c7a9771e9c77df94910ce39c48fa38ea7769278
parent2bb52f5d2c5901ffa3cde6981119406c351ea168 (diff)
fdo#80201: msfilter: fix infinite loop during export
(regression from 6c5557c60f97778fd732c01f054553356ce7f258) (cherry picked from commit 86b9f03c3f754f7b753893ff2772f6b17bf3de3c) Signed-off-by: Michael Stahl <mstahl@redhat.com> Change-Id: I75bfafbc7343aaddbbc5c7433e28b5d4154177dc (cherry picked from commit 11d6ae6df8dfff1db182ac455d4abcaf7c18ded1) Reviewed-on: https://gerrit.libreoffice.org/10209 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--filter/source/msfilter/eschesdo.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 25efbad47d8b..0e20dfb03c3d 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -101,6 +101,8 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty
// for position calculations, we normalize the angle between 0 and 90 degrees
if ( nAngle < 0 )
nAngle = ( 36000 + nAngle ) % 36000;
+ if ( nAngle % 18000 == 0 )
+ nAngle = 0;
while ( nAngle > 9000 )
nAngle = ( 18000 - ( nAngle % 18000 ) );