sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 2 +- sw/qa/extras/ww8export/ww8export2.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit c4050a4240fbbf2472a859f2a195388a8ef3075e Author: Mike Kaganski <[email protected]> Date: Wed Nov 29 11:03:50 2017 +0200 Use UTF-8 sequences (VS2013 doesn't accept u8) Change-Id: I8c969646cff1c69107a5a6cfbfdc0e59c88b6641 Reviewed-on: https://gerrit.libreoffice.org/45468 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index 08de896708f8..14731d28dbfa 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -585,7 +585,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf67207_MERGEFIELD, "mailmerge.docx") CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextField.Database")); OUString sValue; xTextField->getPropertyValue("Content") >>= sValue; - CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8(u8"«Name»"), sValue); + CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8("\xC2\xABName\xC2\xBB"), sValue); uno::Reference<beans::XPropertySet> xFiledMaster = xDependent->getTextFieldMaster(); uno::Reference<lang::XServiceInfo> xFiledMasterServiceInfo(xFiledMaster, uno::UNO_QUERY_THROW); diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx index f4761cc6b381..fb58fbcb47dc 100644 --- a/sw/qa/extras/ww8export/ww8export2.cxx +++ b/sw/qa/extras/ww8export/ww8export2.cxx @@ -172,7 +172,7 @@ DECLARE_WW8EXPORT_TEST(testTdf67207_MERGEFIELD, "mailmerge.doc") CPPUNIT_ASSERT(xServiceInfo->supportsService("com.sun.star.text.TextField.Database")); OUString sValue; xTextField->getPropertyValue("Content") >>= sValue; - CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8(u8"«Name»"), sValue); + CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8("\xC2\xABName\xC2\xBB"), sValue); uno::Reference<beans::XPropertySet> xFiledMaster = xDependent->getTextFieldMaster(); uno::Reference<lang::XServiceInfo> xFiledMasterServiceInfo(xFiledMaster, uno::UNO_QUERY_THROW);
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
