summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-10-15 17:20:00 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-10-15 17:25:17 +0200
commit265c7d62364ab2382491367f66fc14b95681a5a7 (patch)
treed53c9dbffc3ae766762923e55466a74b376af82f
parent1f6435d986fff97095c5619a908ea67906405e3c (diff)
sw: enable (most of) CppunitTest_sw_ooxmlimport/export on Mac
This used to be problematic due to the flashing windows, but it was stated recently that we already have those anyway due to e.g. gengal. It turns out all our DOCX filter tests pass just fine on Mac, except one checksum test -- make *that* an exception instead. Change-Id: Id5e620a33b9b05f154e4072a8a49f335837079ea
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx2
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx4
2 files changed, 4 insertions, 2 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 0f8486d0cdad..523063564341 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -124,7 +124,7 @@ public:
void testCharHighlight();
CPPUNIT_TEST_SUITE(Test);
-#if !defined(MACOSX) && !defined(WNT)
+#if !defined(WNT)
CPPUNIT_TEST(run);
#endif
CPPUNIT_TEST_SUITE_END();
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 22395409c3e8..1f7e831dc691 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -141,7 +141,7 @@ public:
void testFdo43093();
CPPUNIT_TEST_SUITE(Test);
-#if !defined(MACOSX) && !defined(WNT)
+#if !defined(WNT)
CPPUNIT_TEST(run);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -808,6 +808,7 @@ void Test::testN775899()
void Test::testN777345()
{
+#if !defined(MACOSX)
// The problem was that v:imagedata inside v:rect was ignored.
uno::Reference<document::XEmbeddedObjectSupplier2> xSupplier(getShape(1), uno::UNO_QUERY);
uno::Reference<graphic::XGraphic> xGraphic = xSupplier->getReplacementGraphic();
@@ -815,6 +816,7 @@ void Test::testN777345()
// If this changes later, feel free to update it, but make sure it's not
// the checksum of a white/transparent placeholder rectangle.
CPPUNIT_ASSERT_EQUAL(sal_uLong(2529763117U), aGraphic.GetChecksum());
+#endif
}
void Test::testN777337()