[libreoffice/f20] fdo#33852 Custom animation (Motionpath Left) isn't being imported correctly from .ppt

[David Tardon]

commit a2e53692bc8a56ad3c8b5374980808294e89efad
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 6 16:27:57 2014 +0100

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

 ...3852-do-not-remove-too-much-from-the-path.patch |   29 ++++++++++++++++++++
 libreoffice.spec                                   |    4 +++
 2 files changed, 33 insertions(+), 0 deletions(-)
---
diff --git a/0001-fdo-33852-do-not-remove-too-much-from-the-path.patch b/0001-fdo-33852-do-not-remove-too-much-from-the-path.patch
new file mode 100644
index 0000000..d062031
--- /dev/null
+++ b/0001-fdo-33852-do-not-remove-too-much-from-the-path.patch
@@ -0,0 +1,29 @@
+From eba6a6789c8832f961ac7054588ed84d04b65480 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at 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
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 28b98d5..61ae391 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -270,6 +270,7 @@ Patch30: 0001-Related-rhbz-1047871-conditional-formatting-doesn-t-.patch
 Patch31: 0001-fdo-66864-Return-from-full-screen-should-restore-too.patch
 Patch32: 0001-Resolves-rhbz-1050162-don-t-draw-to-NULL-window.patch
 Patch33: 0001-rhbz-1017379-do-not-remove-too-much-from-the-path.patch
+Patch34: 0001-fdo-33852-do-not-remove-too-much-from-the-path.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1067,6 +1068,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch31 -p1 -b .fdo-66864-Return-from-full-screen-should-restore-too.patch
 %patch32 -p1 -b .Resolves-rhbz-1050162-don-t-draw-to-NULL-window.patch
 %patch33 -p1 -b .rhbz-1017379-do-not-remove-too-much-from-the-path.patch
+%patch34 -p1 -b .fdo-33852-do-not-remove-too-much-from-the-path.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2169,6 +2171,8 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 - Resolves: rhbz#1050162 don't draw to NULL window
 - 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 23 2014 David Tardon <dtardon at redhat.com> - 1:4.1.4.2-5
 - Related: rhbz#1047017 actually apply the patch