fdo#33852 Custom animation (Motionpath Left) isn't being imported correctly from .ppt

f41
David Tardon 11 years ago
parent 7b9072a589
commit 4eb35a459b

@ -0,0 +1,29 @@
From eba6a6789c8832f961ac7054588ed84d04b65480 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 6 Feb 2014 15:16:27 +0100
Subject: [PATCH] fdo#33852 do not remove too much from the path
Change-Id: I1cf89f300530e761df5a287097d05f95d8af2017
---
sd/source/filter/ppt/pptinanimations.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index b6c767f..d761e2b 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -2128,7 +2128,10 @@ void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const R
OUString aStr;
if ( aPath >>= aStr )
{
- aStr = aStr.replace( 'E', ' ' );
+ // E can appear inside a number, so we only check for its presence at the end
+ aStr = aStr.trim();
+ if (aStr.endsWith("E"))
+ aStr = aStr.copy(0, aStr.getLength() - 1);
aStr = aStr.trim();
aPath <<= aStr;
xMotion->setPath( aPath );
--
1.8.4.2

@ -278,6 +278,7 @@ Patch15: 0001-Related-rhbz-1047871-conditional-formatting-doesn-t-.patch
Patch16: 0001-Use-sal_Int32-to-satisfy-oox-helper-helper.hxx-s-con.patch
Patch17: 0001-disable-firebird-unit-test.patch
Patch18: 0001-rhbz-1017379-do-not-remove-too-much-from-the-path.patch
Patch19: 0001-fdo-33852-do-not-remove-too-much-from-the-path.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@ -2176,6 +2177,8 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
* Thu Feb 06 2014 David Tardon <dtardon@redhat.com> - 1:4.2.0.4-3
- Resolves: rhbz#1017379 libreoffice impress imports animated motion paths
incorrectly from powerpoint
- Resolves: fdo#33852 Custom animation (Motionpath Left) isn't being
imported correctly from .ppt
* Thu Jan 30 2014 David Tardon <dtardon@redhat.com> - 1:4.2.0.4-2
- split LibreLogo into a separate subpackage

Loading…
Cancel
Save