diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-06-30 15:57:26 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-05 09:38:10 +0000 |
| commit | c0ab57c24e8d39d8cacf350c2cd69b35ea5619b1 (patch) | |
| tree | b00b68177a3c8e34a8d1ca8bc50341a7a56c14e9 /sw | |
| parent | 58fa9256ec012bf0e4aa4c668056191a0d24e2a1 (diff) | |
re-enable unit tests accidentally disabled with HAVE_FEATURE_ATL
Macro is only true on WNT, but the tests should be enabled then.
Change-Id: Ife5657c8204c9906afd42b4b4671a7fa6356a748
(cherry picked from commit 110a500b68bbc9010cf1cf896ef611c397c27d6f)
Reviewed-on: https://gerrit.libreoffice.org/26864
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 2 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 8 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 9260cd12e648..4bb34edb9382 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -82,7 +82,7 @@ protected: }; //This test gives errors due to ATL -#if HAVE_FEATURE_ATL +#if HAVE_FEATURE_ATL || !defined(_WIN32) DECLARE_OOXMLEXPORT_TEST(testfdo81381, "fdo81381.docx") { if (xmlDocPtr pXmlDoc = parseExport("word/document.xml")) diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index bc2eab2788df..20ee525f0e0c 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -467,7 +467,7 @@ DECLARE_OOXMLEXPORT_TEST(testAbi11739, "abi11739.docx") } //This test gives error due to ATL -#if HAVE_FEATURE_ATL +#if HAVE_FEATURE_ATL || !defined(_WIN32) DECLARE_OOXMLEXPORT_TEST(testEmbeddedXlsx, "embedded-xlsx.docx") { // check there are two objects and they are FrameShapes @@ -535,7 +535,7 @@ DECLARE_OOXMLEXPORT_TEST(testPageBreak,"fdo74566.docx") } //This test gives errors due to ATL -#if HAVE_FEATURE_ATL +#if HAVE_FEATURE_ATL || !defined(_WIN32) DECLARE_OOXMLEXPORT_TEST(testOleObject, "test_ole_object.docx") { xmlDocPtr pXmlDoc = parseExport("word/document.xml"); @@ -714,7 +714,7 @@ DECLARE_OOXMLEXPORT_TEST(testParagraphWithComments, "paragraphWithComments.docx" } //This features gives error due to ATL -#if HAVE_FEATURE_ATL +#if HAVE_FEATURE_ATL || !defined(_WIN32) DECLARE_OOXMLEXPORT_TEST(testOLEObjectinHeader, "2129393649.docx") { // fdo#76015 : Document contains oleobject in header xml. @@ -894,7 +894,7 @@ DECLARE_OOXMLEXPORT_TEST(testSimpleSdts, "simple-sdts.docx") } //This feature gives error due to ATL -#if HAVE_FEATURE_ATL +#if HAVE_FEATURE_ATL || !defined(_WIN32) DECLARE_OOXMLEXPORT_TEST(testEmbeddedExcelChart, "EmbeddedExcelChart.docx") { xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml"); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index 24bee007af57..d4c99766b730 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -374,7 +374,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO77812, "fdo77812.docx") } //This test gives errors due to ATL -#if HAVE_FEATURE_ATL +#if HAVE_FEATURE_ATL || !defined(_WIN32) DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, "fdo77759.docx") { xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml"); @@ -738,7 +738,7 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsm, "fdo79969_xlsm.docx") } //This test gives errors due to ATL -#if HAVE_FEATURE_ATL +#if HAVE_FEATURE_ATL || !defined(_WIN32) DECLARE_OOXMLEXPORT_TEST(testfdo80522,"fdo80522.docx") { xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml"); @@ -767,7 +767,7 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80522,"fdo80522.docx") #endif //This test gives errors due to ATL -#if HAVE_FEATURE_ATL +#if HAVE_FEATURE_ATL || !defined(_WIN32) DECLARE_OOXMLEXPORT_TEST(testfdo80523_pptm,"fdo80523_pptm.docx") { xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml"); @@ -822,7 +822,7 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80523_sldm,"fdo80523_sldm.docx") } //This test gives errors due to ATL -#if HAVE_FEATURE_ATL +#if HAVE_FEATURE_ATL || !defined(_WIN32) DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx") { // This UT for DOCX embedded with binary excel work sheet. |