summaryrefslogtreecommitdiff
path: root/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-03-14 11:59:12 +0200
committerTor Lillqvist <tml@collabora.com>2017-03-14 21:41:26 +0000
commite597ef0489d9d5504721d21eefa15c65da0fb240 (patch)
tree7c9e6e1034830b909c155568f17ecb80c9a41322 /sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
parent3fa34da687ba4be98319888a90cba6414b9f3fbe (diff)
No need for --disable-activex and --disable-atl any longer
Change-Id: I7ac4f32cb01bfcc3a2c06e69280c2150d408ec6b Reviewed-on: https://gerrit.libreoffice.org/35174 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'sw/qa/extras/ooxmlexport/ooxmlexport5.cxx')
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport5.cxx12
1 files changed, 0 insertions, 12 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index ef5308c62468..a2b3f60ee6f1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -369,8 +369,6 @@ DECLARE_OOXMLEXPORT_TEST(testFDO77812, "fdo77812.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:cols/w:col[2]", 1);
}
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, "fdo77759.docx")
{
xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -396,7 +394,6 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE, "fdo77759.docx")
"ProgID",
"Excel.Sheet.12");
}
-#endif
DECLARE_OOXMLEXPORT_TEST(testfdo78420, "fdo78420.docx")
{
@@ -733,8 +730,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsm, "fdo79969_xlsm.docx")
"Excel.SheetMacroEnabled.12");
}
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
DECLARE_OOXMLEXPORT_TEST(testfdo80522,"fdo80522.docx")
{
xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -760,10 +755,7 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80522,"fdo80522.docx")
"ProgID",
"Word.DocumentMacroEnabled.12");
}
-#endif
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
DECLARE_OOXMLEXPORT_TEST(testfdo80523_pptm,"fdo80523_pptm.docx")
{
xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml");
@@ -789,7 +781,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80523_pptm,"fdo80523_pptm.docx")
"ProgID",
"PowerPoint.ShowMacroEnabled.12");
}
-#endif
DECLARE_OOXMLEXPORT_TEST(testfdo80523_sldm,"fdo80523_sldm.docx")
{
@@ -817,8 +808,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80523_sldm,"fdo80523_sldm.docx")
"PowerPoint.SlideMacroEnabled.12");
}
-//This test gives errors due to ATL
-#if HAVE_FEATURE_ATL || !defined(_WIN32)
DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx")
{
// This UT for DOCX embedded with binary excel work sheet.
@@ -845,7 +834,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx")
"ProgID",
"Word.Document.8");
}
-#endif
DECLARE_OOXMLEXPORT_TEST(testTableCellWithDirectFormatting, "fdo80800.docx")
{