[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa

[Miklos Vajna]

 sw/qa/extras/ww8export/ww8export.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fa51103a1ea4034af6c746b34eeeddd39f7ab4f
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Jan 2 11:06:01 2015 +0100

    CppunitTest_sw_ww8export: use SAL_NEWLINE_STRING
    
    This makes CppunitTest_sw_ww8export pass on Windows again.
    
    Change-Id: I16fed4eabbe7b9ccdcc0c71361b85b0e13f2245a
    (cherry picked from commit 4d3b725000e537ce6199f0abd1c80580c9bf95c8)

diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 357b06a..e03c3cc 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -449,7 +449,7 @@ DECLARE_WW8EXPORT_TEST(testCommentedTable, "commented-table.doc")
     uno::Reference<text::XTextContent> xField(xFields->nextElement(), uno::UNO_QUERY);
     // After first import, there was an off-by-one during import, so this was "efore.\nA1\nB1\nAfte". (Notice the additional "e" prefix.)
     // After export and import, things got worse, this was "\nA1\nB1\nAfte".
-    CPPUNIT_ASSERT_EQUAL(OUString("fore.\nA1\nB1\nAfte"), xField->getAnchor()->getString());
+    CPPUNIT_ASSERT_EQUAL(OUString("fore." SAL_NEWLINE_STRING "A1" SAL_NEWLINE_STRING "B1" SAL_NEWLINE_STRING "Afte"), xField->getAnchor()->getString());
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();