[libreoffice] 65/152: remove xmloff patch

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit efcca95e3ef0852d05404c5a5d5ff2f566923509
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Apr 4 23:48:21 2016 +0200

    remove xmloff patch
---
 changelog                |  1 +
 patches/build-fixes.diff | 13 -------------
 patches/series           |  1 -
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/changelog b/changelog
index 9bc69bf..0f71d6f 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
 libreoffice (1:5.1.2~rc2-0ubuntu1~xenial1) xenial; urgency=medium
 
   * new upstream rc
+  * remove xmloff patch again for better upstream fix
 
  -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 30 Mar 2016 12:37:01 +0200
 
diff --git a/patches/build-fixes.diff b/patches/build-fixes.diff
deleted file mode 100644
index d3e2296..0000000
--- a/patches/build-fixes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/xmloff/source/draw/ximp3dscene.cxx
-===================================================================
---- a/xmloff/source/draw/ximp3dscene.cxx
-+++ b/xmloff/source/draw/ximp3dscene.cxx
-@@ -66,7 +66,7 @@ SdXML3DLightContext::SdXML3DLightContext
-             {
-                 ::basegfx::B3DVector aVal;
-                 SvXMLUnitConverter::convertB3DVector(aVal, sValue);
--                if (!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ()))
-+                if (!std::isnan(aVal.getX()) && !std::isnan(aVal.getY()) && !std::isnan(aVal.getZ()))
-                 {
-                     maDirection = aVal;
-                 }
diff --git a/patches/series b/patches/series
index 6c22064..4e71c1a 100644
--- a/patches/series
+++ b/patches/series
@@ -30,4 +30,3 @@ disable-npapi-plugin-support.diff
 lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 integraltrans.diff
 unity-default-breeze.diff
-build-fixes.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git