summaryrefslogtreecommitdiff
path: root/sw/qa/extras/odfexport/odfexport.cxx
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2019-06-25 19:56:13 +0000
committerJan-Marek Glogowski <glogow@fbihome.de>2019-07-05 20:05:59 +0200
commit3f7e8ddea89f6340cd18b5b34f5a7c5f503962be (patch)
tree32b7a033e628e5493fb5e18a8593f442eed23389 /sw/qa/extras/odfexport/odfexport.cxx
parent368c996b24e09c427a30972b3405493328db6779 (diff)
Enable many more unit tests on all archs
This depends on commit "Make font-based unit test depend on instdir fonts, not that it's sure that this really fixes the problem, as its origin is really unknown. It especially enables all the font-based tests I could find on all archs. Same for many more test where I couldn't see any reason they don't work generally. To get rid of even more ifdefs, it moves these from the class to the functions, so there is actually just one needed for any test. As a result some few tests run but do nothing. There is still some problem with embedded fonts on MacOS and with delayed graphics loading on Windows, so these ifdefs are kept. Change-Id: I63f8424e9debda6cbf3e5777c93245e09f8eb0f2 Reviewed-on: https://gerrit.libreoffice.org/74719 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sw/qa/extras/odfexport/odfexport.cxx')
-rw-r--r--sw/qa/extras/odfexport/odfexport.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 4c17893e2310..0d7253924d50 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -11,7 +11,6 @@
#include <swmodeltestbase.hxx>
#include <config_features.h>
-#if !defined(MACOSX)
#include <com/sun/star/awt/FontSlant.hpp>
#include <com/sun/star/awt/Gradient.hpp>
#include <com/sun/star/container/XIndexReplace.hpp>
@@ -1978,7 +1977,7 @@ DECLARE_ODFEXPORT_TEST(testImageMimetype, "image-mimetype.odt")
DECLARE_ODFEXPORT_TEST(testEmbeddedFontProps, "embedded-font-props.odt")
{
-#if !defined(WNT)
+#if !defined(MACOSX)
// 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"))
@@ -2229,7 +2228,6 @@ DECLARE_ODFEXPORT_TEST(tdf99631, "tdf99631.docx")
assertXPathContent(pXmlDoc2, "//config:config-item[@config:name='VisibleAreaWidth']", "4515");
assertXPathContent(pXmlDoc2, "//config:config-item[@config:name='VisibleAreaHeight']", "1354");
}
-#endif
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */