[Libreoffice-commits] core.git: sw/qa

Miklos Vajna vmiklos at collabora.co.uk
Sat Oct 18 06:20:26 PDT 2014


 sw/qa/extras/odfimport/odfimport.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 42f767f49c4d7569b305b3a377197ba263b19c39
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Oct 18 13:14:49 2014 +0200

    CppunitTest_sw_odfimport: enable all but one asserts on OS X
    
    Change-Id: I95421d51a2750507aec5a576e161efe578fef812
    Reviewed-on: https://gerrit.libreoffice.org/12020
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 6174dc5..fb4cf65 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -8,7 +8,7 @@
 
 #include <swmodeltestbase.hxx>
 
-#if !defined(MACOSX) && !defined(WNT)
+#if !defined(WNT)
 
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/style/PageStyleLayout.hpp>
@@ -450,7 +450,9 @@ DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
     // Previously copy&paste failed to copy the table in case it was the document-starting one.
     uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
     uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+#ifndef MACOSX // FIXME
     CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables->getCount());
+#endif
 }
 
 DECLARE_ODFIMPORT_TEST(testFdo69862, "fdo69862.odt")


More information about the Libreoffice-commits mailing list