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

[Jan-Marek Glogowski]

 sc/qa/unit/subsequent_export-test.cxx  |    9 ++++++++-
 sc/qa/unit/subsequent_filters-test.cxx |    4 ++++
 sw/qa/extras/uiwriter/uiwriter.cxx     |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit db63ae291136379cc3b417b9daa070921a1372c9
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Wed Jul 12 18:45:24 2017 +0200

    loplugin:unreffun
    
    Fix some HAVE_MORE_FONTS dependent tests.
    
    Change-Id: I79fec705d02b38222d66368759a95b667604335c

diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 41f600b9e7d7..b8a0cfd8a378 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -114,10 +114,14 @@ public:
 
 
     void testCommentExportXLSX();
+#if HAVE_MORE_FONTS
     void testCustomColumnWidthExportXLSX();
+#endif
     void testXfDefaultValuesXLSX();
     void testColumnWidthResaveXLSX();
+#if HAVE_MORE_FONTS
     void testColumnWidthExportFromODStoXLSX();
+#endif
     void testOutlineExportXLSX();
     void testHiddenEmptyRowsXLSX();
     void testAllRowsHiddenXLSX();
@@ -552,6 +556,7 @@ void ScExportTest::testCommentExportXLSX()
 
 }
 
+#if HAVE_MORE_FONTS
 void ScExportTest::testCustomColumnWidthExportXLSX()
 {
     //tdf#100946 FILESAVE Excel on OS X ignored column widths in XLSX last saved by LO
@@ -643,6 +648,7 @@ void ScExportTest::testCustomColumnWidthExportXLSX()
     assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "customFormat", "false");
     assertXPath(pSheet, "/x:worksheet/x:sheetData/x:row[1]", "customHeight", "false");
 }
+#endif
 
 void ScExportTest::testXfDefaultValuesXLSX()
 {
@@ -705,7 +711,7 @@ void ScExportTest::testColumnWidthResaveXLSX()
     assertXPath(pSheet, "/x:worksheet/x:cols/x:col", 6);
 }
 
-
+#if HAVE_MORE_FONTS
 void ScExportTest::testColumnWidthExportFromODStoXLSX()
 {
     // tdf#91475 FILESAVE: Column width is not preserved in XLSX / after round trip.
@@ -769,6 +775,7 @@ void ScExportTest::testColumnWidthExportFromODStoXLSX()
 
     xXlsxDocSh->DoClose();
 }
+#endif
 
 void ScExportTest::testOutlineExportXLSX()
 {
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 2186af3e08bf..131ae7bd1c73 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -182,7 +182,9 @@ public:
     //test shape import
     void testControlImport();
     void testChartImportODS();
+#if HAVE_MORE_FONTS
     void testChartImportXLS();
+#endif
 
     void testNumberFormatHTML();
     void testNumberFormatCSV();
@@ -1659,6 +1661,7 @@ void ScFiltersTest::testChartImportODS()
     xDocSh->DoClose();
 }
 
+#if HAVE_MORE_FONTS
 void ScFiltersTest::testChartImportXLS()
 {
     ScDocShellRef xDocSh = loadDoc("chartx.", FORMAT_XLS);
@@ -1675,6 +1678,7 @@ void ScFiltersTest::testChartImportXLS()
 
     xDocSh->DoClose();
 }
+#endif
 
 void ScFiltersTest::testNumberFormatHTML()
 {
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 453c62dece55..d3b59c560463 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -3780,6 +3780,7 @@ void SwUiWriterTest::testTdf87922()
     CPPUNIT_ASSERT_EQUAL(COL_WHITE, aFont.GetColor().GetColor());
 }
 
+#if HAVE_MORE_FONTS
 struct PortionItem
 {
     PortionItem(OUString const & sItemType, sal_Int32 nLength = 0,
@@ -3837,7 +3838,6 @@ class PortionHandler : public SwPortionHandler
     }
 };
 
-#if HAVE_MORE_FONTS
 void SwUiWriterTest::testTdf77014()
 {
     // The problem described in the bug tdf#77014 is that the input