diff --git a/0001-rhbz-1017379-do-not-remove-too-much-from-the-path.patch b/0001-rhbz-1017379-do-not-remove-too-much-from-the-path.patch new file mode 100644 index 0000000..a3ff5dc --- /dev/null +++ b/0001-rhbz-1017379-do-not-remove-too-much-from-the-path.patch @@ -0,0 +1,29 @@ +From 5b35f21f1c69239d0605b0751bed87a410fbffee Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Thu, 6 Feb 2014 13:49:05 +0100 +Subject: [PATCH] rhbz#1017379 do not remove too much from the path + +Change-Id: Ibffa7f2fbe91be9b95217ce36999e286ef444a37 +--- + 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 7a9c3c7..aaeacb8 100644 +--- a/oox/source/ppt/timenodelistcontext.cxx ++++ b/oox/source/ppt/timenodelistcontext.cxx +@@ -785,7 +785,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 ); +-- +1.8.4.2 + diff --git a/libreoffice.spec b/libreoffice.spec index bc492c2..3a15f49 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -43,7 +43,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.4 -Release: 2%{?libo_prerelease}%{?dist} +Release: 3%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 Group: Applications/Productivity URL: http://www.libreoffice.org/default/ @@ -2172,6 +2172,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Thu Feb 06 2014 David Tardon - 1:4.2.0.4-3 +- Resolves: rhbz#1017379 libreoffice impress imports animated motion paths + incorrectly from powerpoint + * Thu Jan 30 2014 David Tardon - 1:4.2.0.4-2 - split LibreLogo into a separate subpackage - create a metapackage depending on all subpackages containing filters,