From f0eff9bc2a9c952b2ccb6c5dcef6f18763dc3454 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 6 Feb 2014 13:49:05 +0100 Subject: rhbz#1017379 do not remove too much from the path Change-Id: Ibffa7f2fbe91be9b95217ce36999e286ef444a37 (cherry picked from commit 5b35f21f1c69239d0605b0751bed87a410fbffee) Reviewed-on: https://gerrit.libreoffice.org/7897 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba --- oox/source/ppt/timenodelistcontext.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 5e7227a95f0b..87d07fb76172 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -779,7 +779,10 @@ namespace oox { namespace ppt { } OUString aStr = xAttribs->getOptionalValue( XML_path ); - 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(); pNode->getNodeProperties()[ NP_PATH ] = makeAny(aStr); mnPathEditMode = xAttribs->getOptionalValueToken( XML_pathEditMode, 0 ); -- cgit