summaryrefslogtreecommitdiff
path: root/sw/qa/extras/mailmerge
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-11-22 18:15:56 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-11-22 18:19:24 +0100
commitf508776ccc72e58b69c1f5fa827a39de8a8e0855 (patch)
treefeea4720cb4febaa3f8dc2557968dec8ac6dd96f /sw/qa/extras/mailmerge
parent0e351284f4514bc7484699a7edd970e831ab31e7 (diff)
CppunitTest_sw_mailmerge: enable on Windows
Change-Id: Ie24f43e2073bdb381c233bd81aea9f98781d7e6d
Diffstat (limited to 'sw/qa/extras/mailmerge')
-rw-r--r--sw/qa/extras/mailmerge/mailmerge.cxx4
1 files changed, 0 insertions, 4 deletions
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index 9fa68bb075a8..c4ca5b5827af 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -12,8 +12,6 @@
#include <swmodeltestbase.hxx>
-#if !defined(WNT)
-
#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/style/PageStyleLayout.hpp>
#include <com/sun/star/table/XCell.hpp>
@@ -395,7 +393,5 @@ DECLARE_SHELL_MAILMERGE_TEST(testPageBoundaries2Pages, "simple-mail-merge-2pages
}
}
-#endif
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */