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

Markus Mohrhard markus.mohrhard at googlemail.com
Fri May 19 01:24:40 UTC 2017


 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit fa89a464ca9c76332f533da0ab641da5acd00b52
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri May 19 02:27:18 2017 +0200

    conditionaly execute tests that depend on additional fonts
    
    Change-Id: Ie32c69d0ec66006807adfc58ea956a8a0906d238
    Reviewed-on: https://gerrit.libreoffice.org/37798
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 2aff1fb23ed1..186f7a8d1eb9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -124,11 +124,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf41542_borderlessPadding, "tdf41542_borderlessPad
     CPPUNIT_ASSERT_EQUAL( 3, getPages() );
 }
 
+#if HAVE_MORE_FONTS
 DECLARE_OOXMLEXPORT_TEST(tdf105490_negativeMargins, "tdf105490_negativeMargins.docx")
 {
     // negative margins should change to minimal margins, not default margins.
     CPPUNIT_ASSERT_EQUAL( 1, getPages() );
 }
+#endif
 
 DECLARE_OOXMLEXPORT_TEST(testTdf104061_tableSectionColumns,"tdf104061_tableSectionColumns.docx")
 {
@@ -490,6 +492,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf107033, "tdf107033.docx")
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(25), getProperty<sal_Int32>(xPageStyle, "FootnoteLineRelativeWidth"));
 }
 
+#if HAVE_MORE_FONTS
 DECLARE_OOXMLEXPORT_TEST(testTdf107889, "tdf107889.docx")
 {
     uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
@@ -497,6 +500,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf107889, "tdf107889.docx")
     // This was 1, multi-page table was imported as a floating one.
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), xDrawPage->getCount());
 }
+#endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 


More information about the Libreoffice-commits mailing list