sw/qa/extras/rtfexport/rtfexport.cxx | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit 7dc6c9af4ba313f054331f5130470d83d875bc16
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Oct 11 14:46:57 2014 +0200
CppunitTest_sw_rtfexport: enable on Windows
Change-Id: I232f13e8294ff1039519f943c3380f114f6821be
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index f0071cd..954dc2f 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -8,8 +8,6 @@
#include <swmodeltestbase.hxx>
-#if !defined(WNT)
-
#include <com/sun/star/awt/Gradient.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
@@ -161,10 +159,10 @@ DECLARE_RTFEXPORT_TEST(testFdo38244, "fdo38244.rtf")
DECLARE_RTFEXPORT_TEST(testCommentsNested, "comments-nested.odt")
{
uno::Reference<beans::XPropertySet> xOuter(getProperty<
uno::Reference<beans::XPropertySet> >(getRun(getParagraph(1), 2), "TextField"),
uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(OUString("Outer"), getProperty<OUString>(xOuter,
"Content"));
+ CPPUNIT_ASSERT_EQUAL(OUString("Outer"), getProperty<OUString>(xOuter,
"Content").trim());
uno::Reference<beans::XPropertySet> xInner(getProperty<
uno::Reference<beans::XPropertySet> >(getRun(getParagraph(1), 4), "TextField"),
uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(OUString("Inner"), getProperty<OUString>(xInner,
"Content"));
+ CPPUNIT_ASSERT_EQUAL(OUString("Inner"), getProperty<OUString>(xInner,
"Content").trim());
}
DECLARE_RTFEXPORT_TEST(testMathAccents, "math-accents.rtf")
@@ -698,8 +696,6 @@ DECLARE_RTFEXPORT_TEST(testNumberingFont,
"numbering-font.rtf")
CPPUNIT_ASSERT_EQUAL(OUString("Verdana"), getProperty<OUString>(xStyle,
"CharFontName"));
}
-#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
