diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-03-14 11:59:12 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-03-14 21:41:26 +0000 |
| commit | e597ef0489d9d5504721d21eefa15c65da0fb240 (patch) | |
| tree | 7c9e6e1034830b909c155568f17ecb80c9a41322 /sd/qa | |
| parent | 3fa34da687ba4be98319888a90cba6414b9f3fbe (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 'sd/qa')
| -rw-r--r-- | sd/qa/unit/export-tests-ooxml2.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index e2130861e515..fa83615f268e 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -82,10 +82,7 @@ class SdOOXMLExportTest2 : public SdModelTestBaseXML public: void testTdf93883(); void testTdf91378(); -//This test gives errors due to ATL -#if HAVE_FEATURE_ATL || !defined(_WIN32) void testBnc822341(); -#endif void testMathObject(); void testMathObjectPPT2010(); void testTdf80224(); @@ -109,10 +106,7 @@ public: CPPUNIT_TEST(testTdf93883); CPPUNIT_TEST(testTdf91378); -//This test gives errors due to ATL -#if HAVE_FEATURE_ATL || !defined(_WIN32) CPPUNIT_TEST(testBnc822341); -#endif CPPUNIT_TEST(testMathObject); CPPUNIT_TEST(testMathObjectPPT2010); CPPUNIT_TEST(testTdf80224); @@ -174,8 +168,6 @@ void SdOOXMLExportTest2::testTdf93883() CPPUNIT_ASSERT(!xPropSet->getPropertyValue("NumberingLevel").hasValue()); } -//This test gives errors due to ATL -#if HAVE_FEATURE_ATL || !defined(_WIN32) void SdOOXMLExportTest2::testBnc822341() { // Check import / export of embedded text document @@ -245,7 +237,6 @@ void SdOOXMLExportTest2::testBnc822341() xDocShRef->DoClose(); } -#endif void SdOOXMLExportTest2::testMathObject() { |