From 6292e49355fff22f1ca549b4b81b20d495735734 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 9 Dec 2020 14:19:27 +0100 Subject: Some OUString::fromUtf(u8"...") simplifications Change-Id: I2b23d115c4df23ef99d162a02fa8f560f9a3a825 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107471 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 2 +- sw/qa/extras/ww8export/ww8export2.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sw/qa') diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index f26d7570d38a..8569a93b29cd 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -307,7 +307,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(u"«Name»"), sValue); uno::Reference xFiledMaster = xDependent->getTextFieldMaster(); uno::Reference xFiledMasterServiceInfo(xFiledMaster, uno::UNO_QUERY_THROW); diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx index 004451247cdf..5b60fb1b87be 100644 --- a/sw/qa/extras/ww8export/ww8export2.cxx +++ b/sw/qa/extras/ww8export/ww8export2.cxx @@ -538,7 +538,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(u"«Name»"), sValue); uno::Reference xFiledMaster = xDependent->getTextFieldMaster(); uno::Reference xFiledMasterServiceInfo(xFiledMaster, uno::UNO_QUERY_THROW); -- cgit