sw/qa/extras/mailmerge/mailmerge.cxx | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit f508776ccc72e58b69c1f5fa827a39de8a8e0855
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Nov 22 18:15:56 2014 +0100
CppunitTest_sw_mailmerge: enable on Windows
Change-Id: Ie24f43e2073bdb381c233bd81aea9f98781d7e6d
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 9fa68bb..c4ca5b5 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: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
