[libreoffice] 01/01: testWatermark still fails, add to disable-tests-somehow-needing-more-fonts.diff

[Rene Engelhard]

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

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

commit 59311725356d46c572f94c536b15942295f3be95
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 18 23:43:34 2017 +0100

    testWatermark still fails, add to disable-tests-somehow-needing-more-fonts.diff
---
 .../disable-tests-somehow-needing-more-fonts.diff  | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/patches/disable-tests-somehow-needing-more-fonts.diff b/patches/disable-tests-somehow-needing-more-fonts.diff
index e9d878e..0f13c0b 100644
--- a/patches/disable-tests-somehow-needing-more-fonts.diff
+++ b/patches/disable-tests-somehow-needing-more-fonts.diff
@@ -24,3 +24,25 @@ work with a --without-fonts build, though.
  #endif
  
  DECLARE_WW8EXPORT_TEST(testTdf76349_textboxMargins, "tdf76349_textboxMargins.doc")
+diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+index e5af806f373b..58c9bd0634c7 100644
+--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
++++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+@@ -1747,6 +1747,8 @@ DECLARE_OOXMLEXPORT_TEST( testObjectCrossReference, "object_cross_reference.odt"
+     CPPUNIT_ASSERT_EQUAL(sal_uInt16(21), nIndex);
+ }
+ 
++/* fails with --without-fonts but works with --with-fonts. But this uses
++Liberation and we _do_ have fonts-liberation2 in Build-Depends... 
+ DECLARE_OOXMLEXPORT_TEST(testWatermark, "watermark.docx")
+ {
+     uno::Reference<drawing::XShape> xShape(getShape(1), uno::UNO_QUERY);
+@@ -1760,7 +1762,7 @@ DECLARE_OOXMLEXPORT_TEST(testWatermark, "watermark.docx")
+     ss << "Difference: " << nDifference << " TotalHeight: " << nHeight;
+     CPPUNIT_ASSERT_MESSAGE(ss.str(), nDifference <= 4);
+     CPPUNIT_ASSERT_MESSAGE(ss.str(), nDifference >= -4);
+-}
++}*/
+ 
+ DECLARE_OOXMLEXPORT_TEST(testWatermarkTrim, "tdf114308.docx")
+ {

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