summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRegina Henschel <rb.henschel@t-online.de>2017-02-14 20:18:51 +0100
committerJan Holesovsky <kendy@collabora.com>2017-09-07 20:12:25 +0200
commit649b14eb85205f6cfa31e01138e3bc6ce393f9a0 (patch)
tree9ce8ecc854b27a4d6c7cb5aa58437a1b735434ec
parenta1ab6d4ec05c5d091db6f3f1ebafe38438efc5ba (diff)
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@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/42076 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r--oox/source/ppt/timenodelistcontext.cxx12
1 files changed, 6 insertions, 6 deletions
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 ) );
}
}