diff options
Diffstat (limited to 'sw/qa/extras/odfexport/odfexport.cxx')
| -rw-r--r-- | sw/qa/extras/odfexport/odfexport.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index c2da82ffcaa3..375d7ed04958 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -13,7 +13,6 @@ #include <initializer_list> -#if !defined(MACOSX) #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/container/XIndexReplace.hpp> @@ -1828,7 +1827,7 @@ DECLARE_ODFEXPORT_TEST(testImageMimetype, "image-mimetype.odt") DECLARE_ODFEXPORT_TEST(testEmbeddedFontProps, "embedded-font-props.odt") { -#if !defined(WNT) +#if !defined(MACOSX) && !defined(WNT) // Test that font style/weight of embedded fonts is exposed. // Test file is a normal ODT, except EmbedFonts is set to true in settings.xml. if (xmlDocPtr pXmlDoc = parseExport("content.xml")) @@ -1946,8 +1945,10 @@ DECLARE_ODFEXPORT_TEST(testBulletAsImage, "BulletAsImage.odt") Graphic aGraphic(uno::Reference<graphic::XGraphic>(xBitmap, uno::UNO_QUERY)); CPPUNIT_ASSERT_EQUAL(GraphicType::Bitmap, aGraphic.GetType()); CPPUNIT_ASSERT(aGraphic.GetSizeBytes() > sal_uLong(0)); +#if !defined(MACOSX) //TODO: 17 vs. 15 CPPUNIT_ASSERT_EQUAL(15L, aGraphic.GetSizePixel().Width()); CPPUNIT_ASSERT_EQUAL(15L, aGraphic.GetSizePixel().Height()); +#endif } DECLARE_ODFEXPORT_TEST(testSignatureLineProperties, "signatureline-properties.fodt") @@ -2007,7 +2008,5 @@ DECLARE_ODFEXPORT_TEST(testSpellOutNumberingTypes, "spellout-numberingtypes.odt" } } -#endif - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |