14 files changed, 16 insertions, 15 deletions
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx b/sw/qa/extras/htmlexport/htmlexport.cxx
index cf370a324789..0db4e0c2f164 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -246,7 +246,7 @@ void SwHtmlDomExportTest::ParseOle1FromRtfUrl(const OUString& rRtfUrl, SvMemoryS
     CPPUNIT_ASSERT(rOle1.Tell());
 }
 
-char const DATA_DIRECTORY[] = "/sw/qa/extras/htmlexport/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/htmlexport/data/";
 
 DECLARE_HTMLEXPORT_ROUNDTRIP_TEST(testFdo81276, "fdo81276.html")
 {
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx
index 45260d167011..d46f2d242b85 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -404,7 +404,7 @@ class SwHtmlOptionsImportTest : public SwModelTestBase
 {
 };
 
-char const DATA_DIRECTORY[] = "/sw/qa/extras/htmlimport/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/htmlimport/data/";
 
 CPPUNIT_TEST_FIXTURE(SwHtmlOptionsImportTest, testAllowedRTFOLEMimeTypes)
 {
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index ba9aed2ff496..39562206284c 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -22,7 +22,7 @@
 #include <textboxhelper.hxx>
 #include <unoframe.hxx>
 
-char const DATA_DIRECTORY[] = "/sw/qa/extras/layout/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/layout/data/";
 
 /// Test to assert layout / rendering result of Writer.
 class SwLayoutWriter : public SwModelTestBase
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index b87b4c992c60..4ce216cf112e 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -50,7 +50,7 @@
 #include <svx/svdotext.hxx>
 #include <dcontact.hxx>
 
-char const DATA_DIRECTORY[] = "/sw/qa/extras/layout/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/layout/data/";
 
 /// Test to assert layout / rendering result of Writer.
 class SwLayoutWriter2 : public SwModelTestBase
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 3601d735f717..91116fbdf2d6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -38,7 +38,7 @@
 
 using namespace com::sun::star;
 
-char const DATA_DIRECTORY[] = "/sw/qa/extras/ooxmlexport/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/";
 
 class Test : public SwModelTestBase
 {
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index c91488efb93b..9e3aecaa6c20 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
 #include <com/sun/star/text/XTextField.hpp>
 
-char const DATA_DIRECTORY[] = "/sw/qa/extras/ooxmlexport/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/";
 
 class Test : public SwModelTestBase
 {
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
index e12804e58289..e7e1fb180121 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport16.cxx
@@ -14,7 +14,7 @@
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
 
-char const DATA_DIRECTORY[] = "/sw/qa/extras/ooxmlexport/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/ooxmlexport/data/";
 
 class Test : public SwModelTestBase
 {
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index a670b356827c..39f6cd39b3b0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -1362,7 +1362,7 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf111964, "tdf111964.docx")
 {
     xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
     // Unicode spaces that are not XML whitespace must not be trimmed
-    const sal_Unicode sWSReference [] = u"\u2002\u2002\u2002\u2002\u2002";
+    static const OUStringLiteral sWSReference = u"\u2002\u2002\u2002\u2002\u2002";
     assertXPathContent(pXmlDoc, "/w:document/w:body/w:p/w:r[6]/w:t", sWSReference);
 }
 
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index bd356dfcdc4a..6b39401a9580 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -60,7 +60,7 @@
 #include <docsh.hxx>
 #include <txtfrm.hxx>
 
-char const DATA_DIRECTORY[] = "/sw/qa/extras/tiledrendering/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/tiledrendering/data/";
 
 static std::ostream& operator<<(std::ostream& os, ViewShellId id)
 {
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index fec30772d5dd..6bce5bff36c3 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -137,7 +137,7 @@
 
 namespace
 {
-char const DATA_DIRECTORY[] = "/sw/qa/extras/uiwriter/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data/";
 
 int CountFilesInDirectory(const OUString &rURL)
 {
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 50a41b548eff..5dc5aab4eb80 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -71,8 +71,9 @@
 
 namespace
 {
-char const DATA_DIRECTORY[] = "/sw/qa/extras/uiwriter/data2/";
-char const FLOATING_TABLE_DATA_DIRECTORY[] = "/sw/qa/extras/uiwriter/data/floating_table/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data2/";
+OUStringLiteral const FLOATING_TABLE_DATA_DIRECTORY
+    = u"/sw/qa/extras/uiwriter/data/floating_table/";
 } // namespace
 
 /// Second set of tests asserting the behavior of Writer user interface shells.
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx
index a598386ede3d..a3a2a06a03a6 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -38,7 +38,7 @@
 
 namespace
 {
-char const DATA_DIRECTORY[] = "/sw/qa/extras/uiwriter/data3/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/uiwriter/data3/";
 } // namespace
 
 /// Third set of tests asserting the behavior of Writer user interface shells.
diff --git a/sw/qa/extras/unowriter/unowriter.cxx b/sw/qa/extras/unowriter/unowriter.cxx
index eac432ccb2d6..c492712cff32 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -59,7 +59,7 @@ using namespace ::com::sun::star;
 
 namespace
 {
-char const DATA_DIRECTORY[] = "/sw/qa/extras/unowriter/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/sw/qa/extras/unowriter/data/";
 
 /// Listener implementation for testPasteListener.
 class PasteListener : public cppu::WeakImplHelper<text::XPasteListener>
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 807337eee0d1..4776c4613503 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -1325,7 +1325,7 @@ DECLARE_WW8EXPORT_TEST(testTdf92281, "tdf92281.doc")
 
         xCursor->goRight( 5 , false );
         uno::Reference< beans::XPropertySet > xPropSet(xCursor, uno::UNO_QUERY);
-        const sal_Unicode aFontname[14] = u"\u65B0\u7D30\u660E\u9AD4;PMingLiU";
+        static const OUStringLiteral aFontname = u"\u65B0\u7D30\u660E\u9AD4;PMingLiU";
         CPPUNIT_ASSERT_EQUAL(OUString("Calibri"), getProperty<OUString>(xPropSet, "CharFontName"));
         CPPUNIT_ASSERT_EQUAL(OUString(aFontname), getProperty<OUString>(xPropSet, "CharFontNameAsian"));
         CPPUNIT_ASSERT_EQUAL(OUString("Times New Roman"), getProperty<OUString>(xPropSet, "CharFontNameComplex"));