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

[David Tardon]

 sd/source/filter/ppt/pptinanimations.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit de82da1b67ce3a293b3ad45030d591cc3b3e12b4
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 6 15:16:27 2014 +0100

    fdo#33852 do not remove too much from the path
    
    Change-Id: I1cf89f300530e761df5a287097d05f95d8af2017
    (cherry picked from commit eba6a6789c8832f961ac7054588ed84d04b65480)
    Reviewed-on: https://gerrit.libreoffice.org/7899
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 3d7daa8..4b3316c 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 );