[libreoffice] 01/04: backport patch from gerrit to fix i386 tests

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit bfb15393f832f5751e80cd53273d791f09839e31
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Jun 10 06:35:54 2017 +0200

    backport patch from gerrit to fix i386 tests
---
 changelog                 |  2 ++
 patches/gerrit_38597.diff | 62 +++++++++++++++++++++++++++++++++++++++++++++++
 patches/series            |  1 +
 3 files changed, 65 insertions(+)

diff --git a/changelog b/changelog
index 4c3ef50..99dfdf7 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ libreoffice (1:5.4.0~beta2-4) UNRELEASED; urgency=medium
     (from master)
   * debian/patches/odk-settings-JAVA_PROC_TYPE.diff: set correct
     JAVA_PROC_TYPE for arm{el,hf}, mips* and ppc64el
+  * debian/patches/gerrit_38597.diff: add from gerrit for master, fixes
+    i386 tests
 
  -- Rene Engelhard <rene at debian.org>  Thu, 01 Jun 2017 20:46:05 +0200
 
diff --git a/patches/gerrit_38597.diff b/patches/gerrit_38597.diff
new file mode 100644
index 0000000..1f5c729
--- /dev/null
+++ b/patches/gerrit_38597.diff
@@ -0,0 +1,62 @@
+From: Szymon Kłos <szymon.klos at collabora.com>
+Date: Fri, 9 Jun 2017 09:10:28 +0000 (+0200)
+Subject: Watermark: reuse existing rotation property
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff_plain;h=92335d5b39d186da44f032da5ad74c8a8b962092
+
+Watermark: reuse existing rotation property
+
+Change-Id: I0cade407883a60d8d802b487668882e95f42ddce
+---
+
+diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
+index 8d6965c..6f73f82 100644
+--- a/sw/source/core/edit/edfcol.cxx
++++ b/sw/source/core/edit/edfcol.cxx
+@@ -302,7 +302,7 @@ SfxWatermarkItem SwEditShell::GetWatermark()
+             sal_uInt32 nColor;
+             sal_Int16 nTransparency;
+             OUString aFont;
+-            drawing::HomogenMatrix3 aMatrix;
++            sal_Int64 nAngle;
+ 
+             aItem.SetText(xTextRange->getString());
+ 
+@@ -310,14 +310,8 @@ SfxWatermarkItem SwEditShell::GetWatermark()
+                 aItem.SetFont(aFont);
+             if (xPropertySet->getPropertyValue(UNO_NAME_FILLCOLOR) >>= nColor)
+                 aItem.SetColor(nColor);
+-            if (xPropertySet->getPropertyValue("Transformation") >>= aMatrix)
+-            {
+-                double y = aMatrix.Line2.Column1;
+-                double x = aMatrix.Line1.Column1;
+-                double nRad = atan2(y, x) * -1;
+-                double nDeg = nRad * 180.0 / F_PI;
+-                aItem.SetAngle(nDeg);
+-            }
++            if (xPropertySet->getPropertyValue("RotateAngle") >>= nAngle)
++                aItem.SetAngle(nAngle / 100);
+             if (xPropertySet->getPropertyValue(UNO_NAME_FILL_TRANSPARENCE) >>= nTransparency)
+                 aItem.SetTransparency(nTransparency);
+ 
+@@ -366,18 +360,15 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem& rWatermark)
+             drawing::HomogenMatrix3 aMatrix;
+             sal_uInt32 nColor = 0xc0c0c0;
+             sal_Int16 nTransparency = 50;
+-            sal_Int16 nAngle = 45;
++            sal_Int64 nAngle = 45;
+             OUString aFont = "";
+ 
+             uno::Reference<beans::XPropertySet> xPropertySet(xWatermark, uno::UNO_QUERY);
+             xPropertySet->getPropertyValue(UNO_NAME_CHAR_FONT_NAME) >>= aFont;
+             xPropertySet->getPropertyValue(UNO_NAME_FILLCOLOR) >>= nColor;
+             xPropertySet->getPropertyValue(UNO_NAME_FILL_TRANSPARENCE) >>= nTransparency;
+-            xPropertySet->getPropertyValue("Transformation") >>= aMatrix;
+-            double y = aMatrix.Line2.Column1;
+-            double x = aMatrix.Line1.Column1;
+-            double nRad = atan2(y, x) * -1;
+-            nAngle = nRad * 180.0 / F_PI;
++            xPropertySet->getPropertyValue("RotateAngle") >>= nAngle;
++            nAngle /= 100;
+ 
+             // If the header already contains a watermark, see if it its text is up to date.
+             uno::Reference<text::XTextRange> xTextRange(xWatermark, uno::UNO_QUERY);
diff --git a/patches/series b/patches/series
index cdde233..856af0e 100644
--- a/patches/series
+++ b/patches/series
@@ -33,3 +33,4 @@ cppunit-optional.diff
 disable-unused-test-programs.diff
 gb_SUPPRESS_TESTS.diff
 odk-settings-JAVA_PROC_TYPE.diff
+gerrit_38597.diff

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