[Libreoffice-commits] core.git: sw/qa

Markus Mohrhard markus.mohrhard at googlemail.com
Thu May 18 17:14:27 UTC 2017


 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 419a90a0d3f25087624ef741fb8ebac92caa1a2f
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Thu May 18 17:50:16 2017 +0200

    conditional execute test that depends on additional fonts
    
    Change-Id: Ib08cba9074eb6d8149eac518794178c4f72998f0
    Reviewed-on: https://gerrit.libreoffice.org/37784
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
index b538e9f990da..f9b851175202 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
@@ -26,6 +26,8 @@
 
 #include <comphelper/sequenceashashmap.hxx>
 
+#include <config_features.h>
+
 class Test : public SwModelTestBase
 {
 public:
@@ -1030,7 +1032,7 @@ DECLARE_OOXMLEXPORT_TEST(testTextVerticalAdjustment, "tdf36117_verticalAdjustmen
     CPPUNIT_ASSERT_EQUAL( drawing::TextVerticalAdjust_BLOCK, nVA );
 }
 
-
+#if HAVE_MORE_FONTS
 DECLARE_OOXMLEXPORT_TEST(testTDF87348, "tdf87348_linkedTextboxes.docx")
 {
     int followCount=0;
@@ -1093,6 +1095,7 @@ DECLARE_OOXMLEXPORT_TEST(testTDF87348, "tdf87348_linkedTextboxes.docx")
     //  (unknown number of flys, unknown order of leftovers)
     CPPUNIT_ASSERT ( (followCount >= 6) && (precedeCount >= 6) );
 }
+#endif
 
 DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
 {


More information about the Libreoffice-commits mailing list