[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - filter/source

[Markus Mohrhard]

 filter/source/msfilter/eschesdo.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 52772b80988952d176fa57075e674df06356d43d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sun Dec 8 00:05:59 2013 +0100

    fdo#80201: msfilter: fix infinite loop during export
    
    (regression from 6c5557c60f97778fd732c01f054553356ce7f258)
    
    (cherry picked from commit 86b9f03c3f754f7b753893ff2772f6b17bf3de3c)
    Signed-off-by: Michael Stahl <mstahl at redhat.com>
    
    Change-Id: I75bfafbc7343aaddbbc5c7433e28b5d4154177dc
    (cherry picked from commit 11d6ae6df8dfff1db182ac455d4abcaf7c18ded1)
    Reviewed-on: https://gerrit.libreoffice.org/10209
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 25efbad..0e20dfb 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 ) );