sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 6a93c7e2075acec81c6b1ad23b33c1742f2e5057
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Jun 22 17:24:28 2014 +0200
CppunitTest_sw_ooxmlexport: enable a subset of these tests on Windows
Change-Id: Ia9bb5f9ea7854e7f85abd8bad347db82b342177f
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index b1869ca..35986b3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -9,8 +9,6 @@
#include <swmodeltestbase.hxx>
-#if !defined(WNT)
-
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/LineJoint.hpp>
@@ -89,6 +87,8 @@ protected:
#define DECLARE_OOXMLEXPORT_TEST(TestName, filename) class disabled##TestName
: public Test { void disabled(); }; void disabled##TestName::disabled()
#endif
+#if !defined(WNT)
+
DECLARE_OOXMLEXPORT_TEST(testZoom, "zoom.docx")
{
uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
@@ -2097,6 +2097,8 @@
DECLARE_OOXMLEXPORT_TEST(testFileOpenInputOutputError,"floatingtbl_with_formula.
assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:pStyle", "val",
"Normal");
}
+#endif
+
DECLARE_OOXMLEXPORT_TEST(testRelorientation, "relorientation.docx")
{
uno::Reference<drawing::XShape> xShape = getShape(1);
@@ -3627,8 +3629,6 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsm,
"fdo79969_xlsm.docx")
"/word/embeddings/oleObject1.xlsm");
}
-#endif
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
