diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-07-12 18:45:24 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2017-07-12 18:46:14 +0200 |
| commit | db63ae291136379cc3b417b9daa070921a1372c9 (patch) | |
| tree | e74dc074d37070c54876a88c727b88121ea7bab7 /sc | |
| parent | a315d6921c696c687fd9cfcc92049bc28da6213a (diff) | |
loplugin:unreffun
Fix some HAVE_MORE_FONTS dependent tests.
Change-Id: I79fec705d02b38222d66368759a95b667604335c
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/subsequent_export-test.cxx | 9 | ||||
| -rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 4 |
2 files changed, 12 insertions, 1 deletions
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() { |