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

4 files changed, 12 insertions, 12 deletions

diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 5d79439eeb57..56de43967e21 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -150,7 +150,7 @@ public:
     void testFdo90607();
     void testTdf91378();
 //This test gives errors due to ATL
-#if HAVE_FEATURE_ATL
+#if HAVE_FEATURE_ATL || !defined(_WIN32)
     void testBnc822341();
 #endif
     void testMathObject();
@@ -197,7 +197,7 @@ public:
     CPPUNIT_TEST(testTransparentBackground);
     CPPUNIT_TEST(testTdf91378);
 //This test gives errors due to ATL
-#if HAVE_FEATURE_ATL
+#if HAVE_FEATURE_ATL || !defined(_WIN32)
     CPPUNIT_TEST(testBnc822341);
 #endif
     CPPUNIT_TEST(testMathObject);
@@ -1139,7 +1139,7 @@ void SdExportTest::testTdf91378()
 }
 
 //This test gives errors due to ATL
-#if HAVE_FEATURE_ATL
+#if HAVE_FEATURE_ATL || !defined(_WIN32)
 void SdExportTest::testBnc822341()
 {
     // Check import / export of embedded text document
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 9abeccc8927b..6e45fc4ccb9b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -490,7 +490,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
@@ -558,7 +558,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");
@@ -737,7 +737,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.
@@ -917,7 +917,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.