[Libreoffice-commits] core.git: Branch 'distro/collabora/cd-5.3' - oox/source

Regina Henschel rb.henschel at t-online.de
Thu Sep 7 18:12:44 UTC 2017


 oox/source/ppt/timenodelistcontext.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 649b14eb85205f6cfa31e01138e3bc6ce393f9a0
Author: Regina Henschel <rb.henschel at t-online.de>
Date:   Tue Feb 14 20:18:51 2017 +0100

    tdf#99617 convert powerpoint angle to degree
    
    1 powerpoint angle unit = 1/60000 degree
    Roundtrip test not yet possible because of tdf#106002.
    
    Change-Id: I5854c4f9f013f1a2db7e9536fc9cf5198c7a02ed
    Reviewed-on: https://gerrit.libreoffice.org/34279
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/42076
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index e795b6e8b129..287e67ebf066 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -711,18 +711,18 @@ namespace oox { namespace ppt {
                 // sd/source/filter/ppt/pptinanimations.cxx
                 if(attribs.hasAttribute( XML_by ) )
                 {
-                    sal_Int32 nBy = attribs.getInteger( XML_by, 0 );
-                    pNode->setBy( makeAny( (double) nBy ) );
+                    double fBy = attribs.getDouble( XML_by, 0.0 ) / PER_DEGREE; //1 PowerPoint-angle-unit = 1/60000 degree
+                    pNode->setBy( makeAny( fBy ) );
                 }
                 if(attribs.hasAttribute( XML_from ) )
                 {
-                    sal_Int32 nFrom = attribs.getInteger( XML_from, 0 );
-                    pNode->setFrom( makeAny( (double) nFrom ) );
+                    double fFrom = attribs.getDouble( XML_from, 0.0 ) / PER_DEGREE;
+                    pNode->setFrom( makeAny( fFrom ) );
                 }
                 if(attribs.hasAttribute( XML_to ) )
                 {
-                    sal_Int32 nTo = attribs.getInteger( XML_to, 0 );
-                    pNode->setTo( makeAny( (double) nTo ) );
+                    double fTo = attribs.getDouble( XML_to, 0.0 ) / PER_DEGREE;
+                    pNode->setTo( makeAny( fTo ) );
                 }
             }
 


More information about the Libreoffice-commits mailing list