core.git: sc/qa

Noel Grandin (via logerrit) Tue, 21 May 2024 09:14:52 -0700

 sc/qa/extras/accessibility/basics.cxx                                |    3 
 sc/qa/extras/htmlexporttest.cxx                                      |   12 
 sc/qa/extras/macros-test.cxx                                         |  225 
 sc/qa/extras/new_cond_format.cxx                                     |   64 
 sc/qa/extras/scannotationobj.cxx                                     |    4 
 sc/qa/extras/scannotationshapeobj.cxx                                |   10 
 sc/qa/extras/scannotationsobj.cxx                                    |    2 
 sc/qa/extras/scarealinkobj.cxx                                       |    8 
 sc/qa/extras/scarealinksobj.cxx                                      |    9 
 sc/qa/extras/scautoformatobj.cxx                                     |   10 
 sc/qa/extras/scautoformatsobj.cxx                                    |   27 
 sc/qa/extras/sccellcursorobj.cxx                                     |    8 
 sc/qa/extras/sccellfieldsobj.cxx                                     |    8 
 sc/qa/extras/sccellformatsenumeration.cxx                            |    4 
 sc/qa/extras/sccellformatsobj.cxx                                    |    4 
 sc/qa/extras/sccellobj.cxx                                           |    6 
 sc/qa/extras/sccellrangeobj.cxx                                      |    6 
 sc/qa/extras/sccellrangesobj.cxx                                     |   22 
 sc/qa/extras/sccellsearchobj.cxx                                     |    8 
 sc/qa/extras/sccellsenumeration.cxx                                  |    8 
 sc/qa/extras/sccellsobj.cxx                                          |    8 
 sc/qa/extras/scchartobj.cxx                                          |   56 
 sc/qa/extras/scchartsobj.cxx                                         |   52 
 sc/qa/extras/sccheck_data_pilot_field.cxx                            |   18 
 sc/qa/extras/sccheck_data_pilot_table.cxx                            |   18 
 sc/qa/extras/sccheck_xcell_ranges_query.cxx                          |    8 
 sc/qa/extras/scconsolidationdescriptorobj.cxx                        |    4 
 sc/qa/extras/scdatabaserangeobj.cxx                                  |    6 
 sc/qa/extras/scdatabaserangesobj.cxx                                 |   16 
 sc/qa/extras/scdatapilotfieldgroupitemobj.cxx                        |   41 
 sc/qa/extras/scdatapilotfieldgroupobj.cxx                            |   40 
 sc/qa/extras/scdatapilotfieldgroupsobj.cxx                           |   41 
 sc/qa/extras/scdatapilotfieldobj.cxx                                 |   12 
 sc/qa/extras/scdatapilotfieldsobj.cxx                                |   10 
 sc/qa/extras/scdatapilotitemobj.cxx                                  |   18 
 sc/qa/extras/scdatapilotitemsobj.cxx                                 |   17 
 sc/qa/extras/scdatapilottableobj.cxx                                 |    8 
 sc/qa/extras/scdatapilottablesobj.cxx                                |   10 
 sc/qa/extras/scddelinkobj.cxx                                        |    8 
 sc/qa/extras/scddelinksobj.cxx                                       |   10 
 sc/qa/extras/scdocumentconfigurationobj.cxx                          |    6 
 sc/qa/extras/scdrawpageobj.cxx                                       |    6 
 sc/qa/extras/scdrawpagesobj.cxx                                      |    6 
 sc/qa/extras/sceditfieldobj_cell.cxx                                 |   22 
 sc/qa/extras/sceditfieldobj_header.cxx                               |   19 
 sc/qa/extras/scfilterdescriptorbase.cxx                              |    8 
 sc/qa/extras/scfunctiondescriptionobj.cxx                            |    6 
 sc/qa/extras/scfunctionlistobj.cxx                                   |    6 
 sc/qa/extras/scheaderfieldsobj.cxx                                   |   17 
 sc/qa/extras/scheaderfootercontentobj.cxx                            |   20 
 sc/qa/extras/scimportdescriptorbaseobj.cxx                           |    4 
 sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx       |    6 
 sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx         |    9 
 sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx        |    8 
 sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx       |    6 
 sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx        |   12 
 sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx       |    6 
 sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx              |   14 
 sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx   |    7 
 sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx           |    6 
 sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx           |    8 
 sc/qa/extras/scindexenumeration_scenariosenumeration.cxx             |   10 
 sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx       |   24 
 sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx            |   10 
 sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx          |    4 
 sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx  |    4 
 sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx        |    4 
 sc/qa/extras/scindexenumeration_tableautoformatenumeration.cxx       |    6 
 sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx           |   48 
 sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx          |    4 
 sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx |   18 
 sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx             |    7 
 sc/qa/extras/scindexenumeration_textfieldenumeration.cxx             |    8 
 sc/qa/extras/sclabelrangeobj.cxx                                     |    8 
 sc/qa/extras/sclabelrangesobj.cxx                                    |    8 
 sc/qa/extras/scmodelobj.cxx                                          |    4 
 sc/qa/extras/scnamedrangeobj.cxx                                     |    8 
 sc/qa/extras/scnamedrangesobj.cxx                                    |   14 
 sc/qa/extras/scoutlineobj.cxx                                        |    2 
 sc/qa/extras/scpdfexport.cxx                                         |   84 
 sc/qa/extras/screcentfunctionsobj.cxx                                |    6 
 sc/qa/extras/screcordchanges.cxx                                     |   26 
 sc/qa/extras/scscenariosobj.cxx                                      |   12 
 sc/qa/extras/scshapeobj.cxx                                          |    8 
 sc/qa/extras/scsheetlinkobj.cxx                                      |    8 
 sc/qa/extras/scsheetlinksobj.cxx                                     |   10 
 sc/qa/extras/scsortdescriptorbaseobj.cxx                             |    4 
 sc/qa/extras/scspreadsheetsettings.cxx                               |   12 
 sc/qa/extras/scspreadsheetsettingsobj.cxx                            |   13 
 sc/qa/extras/scstylefamiliesobj.cxx                                  |    8 
 sc/qa/extras/scstylefamilyobj.cxx                                    |   21 
 sc/qa/extras/scstyleobj.cxx                                          |   76 
 sc/qa/extras/scsubtotaldescriptorbase.cxx                            |    6 
 sc/qa/extras/scsubtotalfieldobj.cxx                                  |    4 
 sc/qa/extras/sctablecolumnobj.cxx                                    |   84 
 sc/qa/extras/sctablecolumnsobj.cxx                                   |   12 
 sc/qa/extras/sctableconditionalentryobj.cxx                          |   10 
 sc/qa/extras/sctableconditionalformat.cxx                            |   13 
 sc/qa/extras/sctablerowobj.cxx                                       |   82 
 sc/qa/extras/sctablerowsobj.cxx                                      |    6 
 sc/qa/extras/sctablesheetobj.cxx                                     |   36 
 sc/qa/extras/sctablesheetsobj.cxx                                    |   16 
 sc/qa/extras/sctablevalidationobj.cxx                                |   10 
 sc/qa/extras/sctabviewobj.cxx                                        |    6 
 sc/qa/extras/scuniquecellformatsenumeration.cxx                      |   20 
 sc/qa/extras/scuniquecellformatsobj.cxx                              |    4 
 sc/qa/extras/scviewpaneobj.cxx                                       |    8 
 sc/qa/extras/vba-macro-test.cxx                                      |  378 
 sc/qa/filter/html/html.cxx                                           |   60 
 sc/qa/unit/PivotTableFormatsImportExport.cxx                         |   30 
 sc/qa/unit/SparklineImportExportTest.cxx                             |   60 
 sc/qa/unit/ThemeImportExportTest.cxx                                 |  102 
 sc/qa/unit/anchor.cxx                                                |   18 
 sc/qa/unit/chart2dataprovider.cxx                                    |   18 
 sc/qa/unit/cond_format_merge.cxx                                     |    6 
 sc/qa/unit/copy_paste_test.cxx                                       |   48 
 sc/qa/unit/datacache.cxx                                             |   39 
 sc/qa/unit/dataproviders_test.cxx                                    |   58 
 sc/qa/unit/filters-test.cxx                                          |   20 
 sc/qa/unit/functions_addin.cxx                                       |    4 
 sc/qa/unit/functions_array.cxx                                       |    8 
 sc/qa/unit/functions_database.cxx                                    |    4 
 sc/qa/unit/functions_datetime.cxx                                    |    4 
 sc/qa/unit/functions_financial.cxx                                   |    4 
 sc/qa/unit/functions_information.cxx                                 |    4 
 sc/qa/unit/functions_logical.cxx                                     |    4 
 sc/qa/unit/functions_mathematical.cxx                                |    4 
 sc/qa/unit/functions_old.cxx                                         |    4 
 sc/qa/unit/functions_spreadsheet.cxx                                 |    4 
 sc/qa/unit/functions_statistical.cxx                                 |    4 
 sc/qa/unit/functions_text.cxx                                        |    4 
 sc/qa/unit/helper/qahelper.cxx                                       |   20 
 sc/qa/unit/helper/scfiltertestbase.cxx                               |    4 
 sc/qa/unit/helper/shared_test_impl.hxx                               |    2 
 sc/qa/unit/jumbosheets-test.cxx                                      |   56 
 sc/qa/unit/opencl-test-1.cxx                                         |    2 
 sc/qa/unit/opencl-test-2.cxx                                         |    2 
 sc/qa/unit/parallelism.cxx                                           |    2 
 sc/qa/unit/pivottable_filters_test.cxx                               |  583 -
 sc/qa/unit/screenshots/screenshots.cxx                               |    6 
 sc/qa/unit/scshapetest.cxx                                           |  150 
 sc/qa/unit/subsequent_export_test.cxx                                |  725 -
 sc/qa/unit/subsequent_export_test2.cxx                               |  585 -
 sc/qa/unit/subsequent_export_test3.cxx                               |  297 
 sc/qa/unit/subsequent_export_test4.cxx                               |  571 -
 sc/qa/unit/subsequent_filters_test.cxx                               |  202 
 sc/qa/unit/subsequent_filters_test2.cxx                              |  267 
 sc/qa/unit/subsequent_filters_test3.cxx                              |   84 
 sc/qa/unit/subsequent_filters_test4.cxx                              |  228 
 sc/qa/unit/tiledrendering/tiledrendering.cxx                         |  276 
 sc/qa/unit/tiledrendering2/tiledrendering2.cxx                       |   14 
 sc/qa/unit/ucalc.cxx                                                 | 1024 +-
 sc/qa/unit/ucalc_DocumentThemes.cxx                                  |    4 
 sc/qa/unit/ucalc_condformat.cxx                                      |  170 
 sc/qa/unit/ucalc_copypaste.cxx                                       | 4944 
++++------
 sc/qa/unit/ucalc_datatransformation.cxx                              |  208 
 sc/qa/unit/ucalc_formula.cxx                                         | 1500 +--
 sc/qa/unit/ucalc_formula2.cxx                                        | 1034 +-
 sc/qa/unit/ucalc_parallelism.cxx                                     |   62 
 sc/qa/unit/ucalc_pivottable.cxx                                      |  160 
 sc/qa/unit/ucalc_range.cxx                                           |    6 
 sc/qa/unit/ucalc_sharedformula.cxx                                   |  426 
 sc/qa/unit/ucalc_solver.cxx                                          |   92 
 sc/qa/unit/ucalc_sort.cxx                                            |  266 
 sc/qa/unit/ucalc_sparkline.cxx                                       |   28 
 sc/qa/unit/uicalc/uicalc.cxx                                         | 1013 +-
 sc/qa/unit/uicalc/uicalc2.cxx                                        |  776 -
 167 files changed, 9267 insertions(+), 9258 deletions(-)


New commits:
commit bc456ccf9f81bd36216c199ab42fa2fe77c5e17c
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue May 21 11:59:04 2024 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 21 18:14:10 2024 +0200

    loplugin:ostr in sc/qa
    
    Change-Id: If731102d69667eaaa088cf804a8c7563b24ded5a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167893
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sc/qa/extras/accessibility/basics.cxx 
b/sc/qa/extras/accessibility/basics.cxx
index 30c857571fdb..7bed8a58f114 100644
--- a/sc/qa/extras/accessibility/basics.cxx
+++ b/sc/qa/extras/accessibility/basics.cxx
@@ -58,7 +58,8 @@ CPPUNIT_TEST_FIXTURE(test::AccessibleTestBase, TestCalcMenu)
     std::cout << "A1 (value): " << value << std::endl;
     uno::Reference<util::XNumberFormatsSupplier> xSupplier(mxDocument, 
uno::UNO_QUERY_THROW);
     util::Date nullDate;
-    
CPPUNIT_ASSERT(xSupplier->getNumberFormatSettings()->getPropertyValue("NullDate")
 >>= nullDate);
+    
CPPUNIT_ASSERT(xSupplier->getNumberFormatSettings()->getPropertyValue(u"NullDate"_ustr)
+                   >>= nullDate);
     const Date afterDate(Date::SYSTEM);
     CPPUNIT_ASSERT_GREATEREQUAL(double(beforeDate - nullDate), value);
     CPPUNIT_ASSERT_LESSEQUAL(double(afterDate - nullDate), value);
diff --git a/sc/qa/extras/htmlexporttest.cxx b/sc/qa/extras/htmlexporttest.cxx
index 859b5a90d008..acc9a5b20081 100644
--- a/sc/qa/extras/htmlexporttest.cxx
+++ b/sc/qa/extras/htmlexporttest.cxx
@@ -16,21 +16,21 @@ class ScHTMLExportTest : public UnoApiXmlTest, public 
HtmlTestTools
 {
 public:
     ScHTMLExportTest()
-        : UnoApiXmlTest("/sc/qa/extras/testdocuments/")
+        : UnoApiXmlTest(u"/sc/qa/extras/testdocuments/"_ustr)
     {}
 
     void testHtmlSkipImage()
     {
         loadFromFile(u"BaseForHTMLExport.ods");
-        save("HTML (StarCalc)");
+        save(u"HTML (StarCalc)"_ustr);
         htmlDocUniquePtr pDoc = parseHtml(maTempFile);
         CPPUNIT_ASSERT (pDoc);
 
         assertXPath(pDoc, "/html/body"_ostr, 1);
         assertXPath(pDoc, "/html/body/table/tr/td/img"_ostr, 1);
 
-        setFilterOptions("SkipImages");
-        save("HTML (StarCalc)");
+        setFilterOptions(u"SkipImages"_ustr);
+        save(u"HTML (StarCalc)"_ustr);
 
         pDoc = parseHtml(maTempFile);
         CPPUNIT_ASSERT (pDoc);
@@ -41,14 +41,14 @@ public:
     void testTdf155244()
     {
         loadFromFile(u"default-styles.ods");
-        save("XHTML Calc File");
+        save(u"XHTML Calc File"_ustr);
 
         xmlDocUniquePtr pXmlDoc = parseXml(maTempFile);
         CPPUNIT_ASSERT(pXmlDoc);
 
         assertXPath(pXmlDoc, "/xhtml:html"_ostr, 1);
         // the problem was that there were 2 CSS styles named "Default"
-        assertXPath(pXmlDoc, 
"/xhtml:html/xhtml:body/xhtml:table/xhtml:tr/xhtml:td"_ostr, "class"_ostr, 
"cell-Default");
+        assertXPath(pXmlDoc, 
"/xhtml:html/xhtml:body/xhtml:table/xhtml:tr/xhtml:td"_ostr, "class"_ostr, 
u"cell-Default"_ustr);
         OUString const styles = getXPathContent(pXmlDoc, 
"/xhtml:html/xhtml:head/xhtml:style"_ostr);
         CPPUNIT_ASSERT(styles.indexOf(".graphic-Default{ 
background-color:#729fcf;") != -1);
         CPPUNIT_ASSERT(styles.indexOf(".cell-Default{ font-size:10pt; 
font-family:'Liberation Sans'; }") != -1);
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 965c3423885f..dca489dddd4f 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -45,12 +45,12 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testMSP)
 {
     createScDoc("MasterScriptProviderProblem.ods");
 
-    Any aRet = 
executeMacro("vnd.sun.Star.script:Standard.Module1.TestMSP?language=Basic&location=document");
+    Any aRet = 
executeMacro(u"vnd.sun.Star.script:Standard.Module1.TestMSP?language=Basic&location=document"_ustr);
     OUString sResult;
     aRet >>= sResult;
 
     SAL_INFO("sc.qa", "Result is " << sResult );
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("TestMSP ( for fdo#67547) failed", 
OUString("OK"), sResult);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("TestMSP ( for fdo#67547) failed", 
u"OK"_ustr, sResult);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testPasswordProtectedStarBasic)
@@ -59,24 +59,24 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, 
testPasswordProtectedStarBasic)
     ScDocument* pDoc = getScDoc();
 
     // User defined types
-    
executeMacro("vnd.sun.Star.script:Standard.Module1.LoadAndExecuteTest?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:Standard.Module1.LoadAndExecuteTest?language=Basic&location=document"_ustr);
 
     OUString aValue = pDoc->GetString(0,0,0);
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("User defined types script did not change the 
value of Sheet1.A1", OUString("success"), aValue);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("User defined types script did not change the 
value of Sheet1.A1", u"success"_ustr, aValue);
 
     // Big Module
 
-    
executeMacro("vnd.sun.Star.script:MyLibrary.BigModule.bigMethod?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:MyLibrary.BigModule.bigMethod?language=Basic&location=document"_ustr);
 
     aValue = pDoc->GetString(1,0,0);
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Big module script did not change the value 
of Sheet1.B1", OUString("success"), aValue);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Big module script did not change the value 
of Sheet1.B1", u"success"_ustr, aValue);
 
     // far big method tdf#94617
 
-    
executeMacro("vnd.sun.Star.script:MyLibrary.BigModule.farBigMethod?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:MyLibrary.BigModule.farBigMethod?language=Basic&location=document"_ustr);
 
     aValue = pDoc->GetString(2,0,0);
-    CPPUNIT_ASSERT_EQUAL_MESSAGE("Far Method script did not change the value 
of Sheet1.C1", OUString("success"), aValue);
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Far Method script did not change the value 
of Sheet1.C1", u"success"_ustr, aValue);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf142391)
@@ -86,24 +86,24 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf142391)
 
     // User defined types
     executeMacro(
-        
"vnd.sun.Star.script:Standard.Module1.LoadAndExecuteTest?language=Basic&location=document");
+        
u"vnd.sun.Star.script:Standard.Module1.LoadAndExecuteTest?language=Basic&location=document"_ustr);
     OUString aValue = pDoc->GetString(0, 0, 0);
     CPPUNIT_ASSERT_EQUAL_MESSAGE("User defined types script did not change the 
value of Sheet1.A1",
-                                 OUString("success"), aValue);
+                                 u"success"_ustr, aValue);
 
     // Big Module
     executeMacro(
-        
"vnd.sun.Star.script:MyLibrary.BigModule.bigMethod?language=Basic&location=document");
+        
u"vnd.sun.Star.script:MyLibrary.BigModule.bigMethod?language=Basic&location=document"_ustr);
     aValue = pDoc->GetString(1, 0, 0);
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Big module script did not change the value 
of Sheet1.B1",
-                                 OUString("success"), aValue);
+                                 u"success"_ustr, aValue);
 
     // tdf#142391 - method exceeds 0xffff offset for methods
     executeMacro(
-        
"vnd.sun.Star.script:MyLibrary.BigModule.farBigMethod?language=Basic&location=document");
+        
u"vnd.sun.Star.script:MyLibrary.BigModule.farBigMethod?language=Basic&location=document"_ustr);
     aValue = pDoc->GetString(2, 0, 0);
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Far Method script did not change the value 
of Sheet1.C1",
-                                 OUString("success"), aValue);
+                                 u"success"_ustr, aValue);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testStarBasic)
@@ -111,7 +111,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testStarBasic)
     createScDoc("StarBasic.ods");
     ScDocument* pDoc = getScDoc();
 
-    
executeMacro("vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:Standard.Module1.Macro1?language=Basic&location=document"_ustr);
     double aValue = pDoc->GetValue(0,0,0);
     CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("script did not change the value of 
Sheet1.A1",2.0, aValue, 0.00001);
 }
@@ -121,12 +121,12 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testRowColumn)
     createScDoc("StarBasic.ods");
     ScDocument* pDoc = getScDoc();
 
-    
executeMacro("vnd.sun.Star.script:Standard.Module1.Macro_RowHeight?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:Standard.Module1.Macro_RowHeight?language=Basic&location=document"_ustr);
 
     sal_uInt16 nHeight = o3tl::convert(pDoc->GetRowHeight(0, 0), 
o3tl::Length::twip, o3tl::Length::mm100);
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(2000), nHeight);
 
-    
executeMacro("vnd.sun.Star.script:Standard.Module1.Macro_ColumnWidth?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:Standard.Module1.Macro_ColumnWidth?language=Basic&location=document"_ustr);
     sal_uInt16 nWidth  = o3tl::convert(pDoc->GetColWidth(0, 0), 
o3tl::Length::twip, o3tl::Length::mm100);
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt16>(4001), nWidth);
 }
@@ -136,17 +136,17 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf146742)
     createScDoc("tdf146742.ods");
 
     // Export to ODS and reload the file
-    saveAndReload("calc8");
+    saveAndReload(u"calc8"_ustr);
     ScDocument* pDoc = getScDoc();
 
-    CPPUNIT_ASSERT_EQUAL(OUString("1"), pDoc->GetString(ScAddress(0,0,0)));
-    CPPUNIT_ASSERT_EQUAL(OUString("2"), pDoc->GetString(ScAddress(0,1,0)));
+    CPPUNIT_ASSERT_EQUAL(u"1"_ustr, pDoc->GetString(ScAddress(0,0,0)));
+    CPPUNIT_ASSERT_EQUAL(u"2"_ustr, pDoc->GetString(ScAddress(0,1,0)));
 
-    CPPUNIT_ASSERT_EQUAL(OUString("TRUE"), pDoc->GetString(ScAddress(1,0,0)));
+    CPPUNIT_ASSERT_EQUAL(u"TRUE"_ustr, pDoc->GetString(ScAddress(1,0,0)));
     // Without the fix in place, this test would have failed with
     // - Expected: FALSE
     // - Actual  : TRUE
-    CPPUNIT_ASSERT_EQUAL(OUString("FALSE"), pDoc->GetString(ScAddress(1,1,0)));
+    CPPUNIT_ASSERT_EQUAL(u"FALSE"_ustr, pDoc->GetString(ScAddress(1,1,0)));
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testMacroButtonFormControlXlsxExport)
@@ -155,19 +155,19 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, 
testMacroButtonFormControlXlsxExport)
     createScDoc("macro-button-form-control.xlsm");
 
     // When exporting to XLSM:
-    save("Calc MS Excel 2007 VBA XML");
+    save(u"Calc MS Excel 2007 VBA XML"_ustr);
 
     // Then make sure that the macro is associated with the control:
-    xmlDocUniquePtr pSheetDoc = parseExport("xl/worksheets/sheet1.xml");
+    xmlDocUniquePtr pSheetDoc = parseExport(u"xl/worksheets/sheet1.xml"_ustr);
     CPPUNIT_ASSERT(pSheetDoc);
     // Without the fix in place, this test would have failed with:
     // - XPath '//x:controlPr' no attribute 'macro' exist
     // i.e. the macro was lost on export.
-    assertXPath(pSheetDoc, "//x:controlPr"_ostr, "macro"_ostr, 
"Module1.Button1_Click");
+    assertXPath(pSheetDoc, "//x:controlPr"_ostr, "macro"_ostr, 
u"Module1.Button1_Click"_ustr);
 
     // Then also make sure that there is no defined name for the macro, which 
is only needed for
     // XLS:
-    xmlDocUniquePtr pWorkbookDoc = parseExport("xl/workbook.xml");
+    xmlDocUniquePtr pWorkbookDoc = parseExport(u"xl/workbook.xml"_ustr);
     CPPUNIT_ASSERT(pWorkbookDoc);
     assertXPath(pWorkbookDoc, "//x:workbook/definedNames"_ostr, 0);
 }
@@ -176,13 +176,13 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf104902)
 {
     createScDoc("tdf104902.ods");
 
-    
executeMacro("vnd.sun.Star.script:Standard.Module1.display_bug?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:Standard.Module1.display_bug?language=Basic&location=document"_ustr);
 
     // Export to ODS
-    saveAndReload("calc8");
+    saveAndReload(u"calc8"_ustr);
     ScDocument* pDoc = getScDoc();
 
-    CPPUNIT_ASSERT_EQUAL(OUString("string no newlines"), 
pDoc->GetString(ScAddress(0, 0, 0)));
+    CPPUNIT_ASSERT_EQUAL(u"string no newlines"_ustr, 
pDoc->GetString(ScAddress(0, 0, 0)));
 
     // Without the fix in place, this test would have failed with
     // - Expected: string with
@@ -205,11 +205,11 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf64639)
     // Without the fix in place, this test would have crashed here
     for (size_t i = 0; i < 5; ++i)
     {
-        
executeMacro("vnd.sun.Star.script:Standard.Module1.DrawGraph?language=Basic&location=document");
+        
executeMacro(u"vnd.sun.Star.script:Standard.Module1.DrawGraph?language=Basic&location=document"_ustr);
 
         CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pPage->GetObjCount());
 
-        
executeMacro("vnd.sun.Star.script:Standard.Module1.DeleteGraph?language=Basic&location=document");
+        
executeMacro(u"vnd.sun.Star.script:Standard.Module1.DeleteGraph?language=Basic&location=document"_ustr);
 
         CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), pPage->GetObjCount());
     }
@@ -219,14 +219,14 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf142033)
 {
     createScDoc("tdf142033.ods");
 
-    
executeMacro("vnd.sun.Star.script:Standard.Module1.display_bug?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:Standard.Module1.display_bug?language=Basic&location=document"_ustr);
 
     // Export to ODS
-    saveAndReload("calc8");
+    saveAndReload(u"calc8"_ustr);
     ScDocument* pDoc = getScDoc();
 
-    CPPUNIT_ASSERT_EQUAL(OUString("string no newlines"), 
pDoc->GetString(ScAddress(0,0,0)));
-    CPPUNIT_ASSERT_EQUAL(OUString("string no newlines"), 
pDoc->GetString(ScAddress(0,1,0)));
+    CPPUNIT_ASSERT_EQUAL(u"string no newlines"_ustr, 
pDoc->GetString(ScAddress(0,0,0)));
+    CPPUNIT_ASSERT_EQUAL(u"string no newlines"_ustr, 
pDoc->GetString(ScAddress(0,1,0)));
 
     // Without the fix in place, this test would have failed with
     // - Expected: string with
@@ -240,26 +240,26 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf89920)
 {
     createScDoc("tdf89920.ods");
 
-    
executeMacro("vnd.sun.Star.script:Standard.Module1.SearchAndReplaceNewline?language=Basic&"
-                 "location=document");
+    
executeMacro(u"vnd.sun.Star.script:Standard.Module1.SearchAndReplaceNewline?language=Basic&"
+                 "location=document"_ustr);
 
     // Export to ODS
-    saveAndReload("calc8");
+    saveAndReload(u"calc8"_ustr);
 
-    xmlDocUniquePtr pContentXml = parseExport("content.xml");
+    xmlDocUniquePtr pContentXml = parseExport(u"content.xml"_ustr);
     CPPUNIT_ASSERT(pContentXml);
 
     assertXPathContent(pContentXml,
                        
"/office:document-content/office:body/office:spreadsheet/table:table[1]/"
                        "table:table-row[1]/table:table-cell[1]/text:p[1]"_ostr,
-                       "aa bb");
+                       u"aa bb"_ustr);
 
     // Without the fix in place, this test would have failed here with
     // - Expression: xmlXPathNodeSetGetLength(pXmlNodes) > 0
     assertXPathContent(pContentXml,
                        
"/office:document-content/office:body/office:spreadsheet/table:table[1]/"
                        "table:table-row[1]/table:table-cell[1]/text:p[2]"_ostr,
-                       "cc dd");
+                       u"cc dd"_ustr);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testPasswordProtectedUnicodeString)
@@ -287,12 +287,12 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, 
testPasswordProtectedUnicodeString)
     css::uno::Reference<css::script::XLibraryContainerPassword> xPasswd(xLC, 
UNO_QUERY_THROW);
     CPPUNIT_ASSERT(xPasswd->isLibraryPasswordProtected(sLibName));
     CPPUNIT_ASSERT(!xPasswd->isLibraryPasswordVerified(sLibName));
-    CPPUNIT_ASSERT(xPasswd->verifyLibraryPassword(sLibName, "password"));
+    CPPUNIT_ASSERT(xPasswd->verifyLibraryPassword(sLibName, u"password"_ustr));
     xLC->loadLibrary(sLibName);
     CPPUNIT_ASSERT(xLC->isLibraryLoaded(sLibName));
 
     // Now check that saving stores Unicode data correctly in image's string 
pool
-    saveAndReload("calc8");
+    saveAndReload(u"calc8"_ustr);
 
     {
         Any aRet = executeMacro(sMacroURL);
@@ -327,12 +327,12 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, 
testPasswordProtectedArrayInUserType)
     css::uno::Reference<css::script::XLibraryContainerPassword> xPasswd(xLC, 
UNO_QUERY_THROW);
     CPPUNIT_ASSERT(xPasswd->isLibraryPasswordProtected(sLibName));
     CPPUNIT_ASSERT(!xPasswd->isLibraryPasswordVerified(sLibName));
-    CPPUNIT_ASSERT(xPasswd->verifyLibraryPassword(sLibName, "password"));
+    CPPUNIT_ASSERT(xPasswd->verifyLibraryPassword(sLibName, u"password"_ustr));
     xLC->loadLibrary(sLibName);
     CPPUNIT_ASSERT(xLC->isLibraryLoaded(sLibName));
 
     // Now check that saving stores array bounds correctly
-    saveAndReload("calc8");
+    saveAndReload(u"calc8"_ustr);
 
     {
         Any aRet = executeMacro(sMacroURL);
@@ -354,7 +354,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf114427)
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), xDraws->getCount());
 
     // Without the fix in place, it would have crashed here
-    
executeMacro("vnd.sun.Star.script:Standard.Module1.DeletingFrame?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:Standard.Module1.DeletingFrame?language=Basic&location=document"_ustr);
 
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), xDraws->getCount());
 }
@@ -415,29 +415,29 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf46119)
     createScDoc("tdf46119.ods");
     ScDocument* pDoc = getScDoc();
 
-    
executeMacro("vnd.sun.Star.script:Standard.Module1.Main?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:Standard.Module1.Main?language=Basic&location=document"_ustr);
 
-    CPPUNIT_ASSERT_EQUAL(OUString("0.074"), pDoc->GetString(ScAddress(2, 24, 
0)));
-    CPPUNIT_ASSERT_EQUAL(OUString("0.067"), pDoc->GetString(ScAddress(2, 25, 
0)));
-    CPPUNIT_ASSERT_EQUAL(OUString("0.273"), pDoc->GetString(ScAddress(2, 26, 
0)));
-    CPPUNIT_ASSERT_EQUAL(OUString("0.259"), pDoc->GetString(ScAddress(2, 27, 
0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.074"_ustr, pDoc->GetString(ScAddress(2, 24, 0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.067"_ustr, pDoc->GetString(ScAddress(2, 25, 0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.273"_ustr, pDoc->GetString(ScAddress(2, 26, 0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.259"_ustr, pDoc->GetString(ScAddress(2, 27, 0)));
 
-    CPPUNIT_ASSERT_EQUAL(OUString("0.097"), pDoc->GetString(ScAddress(3, 24, 
0)));
-    CPPUNIT_ASSERT_EQUAL(OUString("0.087"), pDoc->GetString(ScAddress(3, 25, 
0)));
-    CPPUNIT_ASSERT_EQUAL(OUString("0.311"), pDoc->GetString(ScAddress(3, 26, 
0)));
-    CPPUNIT_ASSERT_EQUAL(OUString("0.296"), pDoc->GetString(ScAddress(3, 27, 
0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.097"_ustr, pDoc->GetString(ScAddress(3, 24, 0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.087"_ustr, pDoc->GetString(ScAddress(3, 25, 0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.311"_ustr, pDoc->GetString(ScAddress(3, 26, 0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.296"_ustr, pDoc->GetString(ScAddress(3, 27, 0)));
 
-    CPPUNIT_ASSERT_EQUAL(OUString("0.149"), pDoc->GetString(ScAddress(4, 24, 
0)));
-    CPPUNIT_ASSERT_EQUAL(OUString("0.134"), pDoc->GetString(ScAddress(4, 25, 
0)));
-    CPPUNIT_ASSERT_EQUAL(OUString("0.386"), pDoc->GetString(ScAddress(4, 26, 
0)));
-    CPPUNIT_ASSERT_EQUAL(OUString("0.366"), pDoc->GetString(ScAddress(4, 27, 
0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.149"_ustr, pDoc->GetString(ScAddress(4, 24, 0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.134"_ustr, pDoc->GetString(ScAddress(4, 25, 0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.386"_ustr, pDoc->GetString(ScAddress(4, 26, 0)));
+    CPPUNIT_ASSERT_EQUAL(u"0.366"_ustr, pDoc->GetString(ScAddress(4, 27, 0)));
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf128218)
 {
     createScDoc("tdf128218.ods");
 
-    Any aRet = 
executeMacro("vnd.sun.Star.script:Standard.Module1.TestRAND?language=Basic&location=document");
+    Any aRet = 
executeMacro(u"vnd.sun.Star.script:Standard.Module1.TestRAND?language=Basic&location=document"_ustr);
 
     OUString aReturnValue;
     aRet >>= aReturnValue;
@@ -446,7 +446,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf128218)
     // - Expected: Double
     // - Actual  : Object()
 
-    CPPUNIT_ASSERT_EQUAL(OUString("Double"), aReturnValue);
+    CPPUNIT_ASSERT_EQUAL(u"Double"_ustr, aReturnValue);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf71271)
@@ -457,10 +457,10 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf71271)
         uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(), 
uno::UNO_QUERY_THROW);
         uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0), 
uno::UNO_QUERY_THROW);
         uno::Reference<beans::XPropertySet> xProps(xSheet, 
uno::UNO_QUERY_THROW);
-        xProps->setPropertyValue("CodeName", 
uno::Any(OUString("NewCodeName")));
+        xProps->setPropertyValue(u"CodeName"_ustr, 
uno::Any(u"NewCodeName"_ustr));
     }
 
-    saveAndReload("");
+    saveAndReload(u""_ustr);
 
     {
         uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, 
uno::UNO_QUERY_THROW);
@@ -469,8 +469,8 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf71271)
         OUString sCodeName;
         uno::Reference<beans::XPropertySet> xProps(xSheet, 
uno::UNO_QUERY_THROW);
         // Without the fix in place the codename would not have been saved
-        xProps->getPropertyValue("CodeName") >>= sCodeName;
-        CPPUNIT_ASSERT_EQUAL(OUString("NewCodeName"), sCodeName);
+        xProps->getPropertyValue(u"CodeName"_ustr) >>= sCodeName;
+        CPPUNIT_ASSERT_EQUAL(u"NewCodeName"_ustr, sCodeName);
     }
 }
 
@@ -498,7 +498,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf75263)
         CPPUNIT_ASSERT_EQUAL(u"проба"_ustr, pDoc->GetString(ScAddress(0, 0, 
0)));
     }
 
-    saveAndReload("Calc MS Excel 2007 VBA XML");
+    saveAndReload(u"Calc MS Excel 2007 VBA XML"_ustr);
 
     {
         ScDocument* pDoc = getScDoc();
@@ -522,7 +522,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf133887)
 
     SfxObjectShell::CallXScript(
         mxComponent,
-        
"vnd.sun.Star.script:Standard.Module1.TestInvoke?language=Basic&location=document",
 aParams,
+        
u"vnd.sun.Star.script:Standard.Module1.TestInvoke?language=Basic&location=document"_ustr,
 aParams,
         aRet, aOutParamIndex, aOutParam);
 
     double aReturnValue;
@@ -546,7 +546,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf133889)
 
     SfxObjectShell::CallXScript(
         mxComponent,
-        
"vnd.sun.Star.script:Standard.Module1.TestInvoke?language=Basic&location=document",
 aParams,
+        
u"vnd.sun.Star.script:Standard.Module1.TestInvoke?language=Basic&location=document"_ustr,
 aParams,
         aRet, aOutParamIndex, aOutParam);
 
     sal_Int32 aReturnValue;
@@ -563,7 +563,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf143582)
 {
     createScDoc("tdf143582.ods");
 
-    Any aRet = 
executeMacro("vnd.sun.Star.script:Standard.Module1.TestScriptInvoke?language=Basic&location=document");
+    Any aRet = 
executeMacro(u"vnd.sun.Star.script:Standard.Module1.TestScriptInvoke?language=Basic&location=document"_ustr);
 
     OUString aReturnValue;
     aRet >>= aReturnValue;
@@ -571,14 +571,14 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf143582)
     // Without the fix in place, this test would have failed with
     // - Expected: Test6
     // - Actual  : TeTest8
-    CPPUNIT_ASSERT_EQUAL(OUString("Test6"), aReturnValue);
+    CPPUNIT_ASSERT_EQUAL(u"Test6"_ustr, aReturnValue);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf144085)
 {
     createScDoc("tdf144085.ods");
 
-    Any aRet = 
executeMacro("vnd.sun.Star.script:Standard.Module1.TestScriptInvoke?language=Basic&location=document");
+    Any aRet = 
executeMacro(u"vnd.sun.Star.script:Standard.Module1.TestScriptInvoke?language=Basic&location=document"_ustr);
 
     OUString aReturnValue;
     aRet >>= aReturnValue;
@@ -586,7 +586,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf144085)
     // Without the fix in place, this test would have failed with
     // - Expected: $Sheet1.$B$5:$E$17
     // - Actual  : $Sheet1.$B$5:$C$10
-    CPPUNIT_ASSERT_EQUAL(OUString("$Sheet1.$B$5:$E$17"), aReturnValue);
+    CPPUNIT_ASSERT_EQUAL(u"$Sheet1.$B$5:$E$17"_ustr, aReturnValue);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf125800)
@@ -600,7 +600,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf125800)
     // Without the fix in place, this test would have failed with
     // - Expression: false
     // - Unexpected dialog:  Error: Inadmissible value or data type. Index out 
of defined range.
-    Any aRet = 
executeMacro("vnd.sun.Star.script:Standard.cf.doItForThisSheetindexThisRange?language=Basic&location=document");
+    Any aRet = 
executeMacro(u"vnd.sun.Star.script:Standard.cf.doItForThisSheetindexThisRange?language=Basic&location=document"_ustr);
 
     OUString aReturnValue;
     aRet >>= aReturnValue;
@@ -620,13 +620,13 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf130307)
 {
     createScDoc("tdf130307.ods");
 
-    Any aRet = 
executeMacro("vnd.sun.Star.script:Standard.Module1.ForEachSheets?language=Basic&location=document");
+    Any aRet = 
executeMacro(u"vnd.sun.Star.script:Standard.Module1.ForEachSheets?language=Basic&location=document"_ustr);
 
     OUString aReturnValue;
     aRet >>= aReturnValue;
 
     // Without the fix in place, this test would have crashed here
-    CPPUNIT_ASSERT_EQUAL(OUString("Sheet1Sheet2"), aReturnValue);
+    CPPUNIT_ASSERT_EQUAL(u"Sheet1Sheet2"_ustr, aReturnValue);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf144970)
@@ -647,7 +647,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf144970)
     // - Unexpected dialog:  Error: BASIC runtime error.
     // An exception occurred
     // Type: com.sun.star.lang.IllegalArgumentException
-    
executeMacro("vnd.sun.Star.script:Standard.Module1.Main?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:Standard.Module1.Main?language=Basic&location=document"_ustr);
 
     CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pPage->GetObjCount());
 }
@@ -699,16 +699,16 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf107572)
     // insert initial library
     css::uno::Reference<css::document::XEmbeddedScripts> xDocScr(mxComponent, 
UNO_QUERY_THROW);
     auto xLibs = xDocScr->getBasicLibraries();
-    auto xLibrary = xLibs->createLibrary("TestLibrary");
+    auto xLibrary = xLibs->createLibrary(u"TestLibrary"_ustr);
     xLibrary->insertByName(
-        "TestModule",
+        u"TestModule"_ustr,
         uno::Any(
-            OUString("Function Main
"
+            u"Function Main
"
                      "  
thisComponent.Sheets(0).getCellRangeByName(\"A1:F14\").autoformat(\"Default\")
"
-                     "End Function
")));
+                     "End Function
"_ustr));
 
     // Without the fix in place, this test would have crashed
-    
executeMacro("vnd.sun.Star.script:TestLibrary.TestModule.Main?language=Basic&location=document");
+    
executeMacro(u"vnd.sun.Star.script:TestLibrary.TestModule.Main?language=Basic&location=document"_ustr);
 
     ScDocument* pDoc = getScDoc();
 
@@ -748,11 +748,11 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testShapeLayerId)
     // insert initial library
     css::uno::Reference<css::document::XEmbeddedScripts> xDocScr(mxComponent, 
UNO_QUERY_THROW);
     auto xLibs = xDocScr->getBasicLibraries();
-    auto xLibrary = xLibs->createLibrary("TestLibrary");
+    auto xLibrary = xLibs->createLibrary(u"TestLibrary"_ustr);
     xLibrary->insertByName(
-        "TestModule",
+        u"TestModule"_ustr,
         uno::Any(
-            OUString("Function TestLayerID
"
+            u"Function TestLayerID
"
                      "  xShape = 
thisComponent.createInstance(\"com.sun.star.drawing.TextShape\")
"
                      "  thisComponent.DrawPages(0).Add(xShape)
"
                      "  origID = xShape.LayerID
"
@@ -763,16 +763,16 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testShapeLayerId)
                      "handler:
"
                      "  ' This is expected to happen
"
                      "  TestLayerID = origID & \" Expected runtime error 
happened\"
"
-                     "End Function
")));
+                     "End Function
"_ustr));
 
-    Any aRet = 
executeMacro("vnd.sun.Star.script:TestLibrary.TestModule.TestLayerID?language=Basic&location=document");
+    Any aRet = 
executeMacro(u"vnd.sun.Star.script:TestLibrary.TestModule.TestLayerID?language=Basic&location=document"_ustr);
     // Without the fix in place, this test would have failed in non-debug 
builds with
     // - Expected : <Any: (string) 0 Expected runtime error happened>
     // - Actual   : <Any: (string) 0 1>
     // In debug builds, it would crash on assertion inside strong_int ctor.
     // The LayerID property of com.sun.star.drawing.Shape service has 'short' 
IDL type.
     // The expected run-time error is because there are only 5 layers there.
-    CPPUNIT_ASSERT_EQUAL(Any(OUString("0 Expected runtime error happened")), 
aRet);
+    CPPUNIT_ASSERT_EQUAL(Any(u"0 Expected runtime error happened"_ustr), aRet);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testFunctionAccessIndirect)
@@ -782,14 +782,14 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, 
testFunctionAccessIndirect)
     const OUString aReference = "'" + aFileName + "'#$Sheet1.A1";
 
     css::uno::Reference<css::sheet::XFunctionAccess> xFunc(
-        
comphelper::getProcessServiceFactory()->createInstance("com.sun.star.sheet.FunctionAccess"),
+        
comphelper::getProcessServiceFactory()->createInstance(u"com.sun.star.sheet.FunctionAccess"_ustr),
         UNO_QUERY_THROW);
 
     // tdf#148040: without the fix in place, this would have failed with:
     //   An uncaught exception of type 
com.sun.star.lang.IllegalArgumentException
     // because of disallowed external link update (needed to obtain the cell 
value).
-    css::uno::Any aResult = xFunc->callFunction("INDIRECT", 
{css::uno::Any(aReference)});
-    CPPUNIT_ASSERT_EQUAL(css::uno::Any(OUString("a1")), aResult);
+    css::uno::Any aResult = xFunc->callFunction(u"INDIRECT"_ustr, 
{css::uno::Any(aReference)});
+    CPPUNIT_ASSERT_EQUAL(css::uno::Any(u"a1"_ustr), aResult);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf147122)
@@ -798,11 +798,11 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf147122)
 
     css::uno::Reference<css::document::XEmbeddedScripts> xDocScr(mxComponent, 
UNO_QUERY_THROW);
     auto xLibs = xDocScr->getBasicLibraries();
-    auto xLibrary = xLibs->createLibrary("TestLibrary");
+    auto xLibrary = xLibs->createLibrary(u"TestLibrary"_ustr);
     xLibrary->insertByName(
-        "TestModule",
+        u"TestModule"_ustr,
         uno::Any(
-            OUString("Function TestMergedSelection
"
+            u"Function TestMergedSelection
"
                      // Insert test string into cell A1
                      "  oActiveSheet = 
ThisComponent.CurrentController.ActiveSheet
"
                      "  oActiveCell = oActiveSheet.getCellRangeByName(\"A1\")
"
@@ -813,15 +813,15 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf147122)
                      "  oActiveCell = ThisComponent.CurrentSelection
"
                      "  oActiveCell.Merge(True)
"
                      "  TestMergedSelection = 
ThisComponent.getCurrentSelection().getString()
"
-                     "End Function
")));
+                     "End Function
"_ustr));
 
-    Any aRet = 
executeMacro("vnd.sun.Star.script:TestLibrary.TestModule.TestMergedSelection?"
-                            "language=Basic&location=document");
+    Any aRet = 
executeMacro(u"vnd.sun.Star.script:TestLibrary.TestModule.TestMergedSelection?"
+                            "language=Basic&location=document"_ustr);
     // Without the fix in place, this test would have failed with
     // - Expression: false
     // - Unexpected dialog: Error: BASIC runtime error.
     // Property or method not found: getString.
-    CPPUNIT_ASSERT_EQUAL(Any(OUString("This is a test")), aRet);
+    CPPUNIT_ASSERT_EQUAL(Any(u"This is a test"_ustr), aRet);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf154803)
@@ -830,11 +830,11 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf154803)
 
     css::uno::Reference<css::document::XEmbeddedScripts> xDocScr(mxComponent, 
UNO_QUERY_THROW);
     auto xLibs = xDocScr->getBasicLibraries();
-    auto xLibrary = xLibs->createLibrary("TestLibrary");
+    auto xLibrary = xLibs->createLibrary(u"TestLibrary"_ustr);
     xLibrary->insertByName(
-        "TestModule",
+        u"TestModule"_ustr,
         uno::Any(
-            OUString("Function TestExtendedMergedSelection
"
+            u"Function TestExtendedMergedSelection
"
                      // Merge A1:B2 cell range
                      "  oActiveSheet = 
ThisComponent.CurrentController.ActiveSheet
"
                      "  oRange = oActiveSheet.getCellRangeByName(\"A1:B2\")
"
@@ -845,15 +845,15 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf154803)
                      "  oRange = oActiveSheet.getCellRangeByName(\"A1:B3\")
"
                      "  ThisComponent.getCurrentController.Select(oRange)
"
                      "  TestExtendedMergedSelection = 
ThisComponent.CurrentSelection.ImplementationName
"
-                     "End Function
")));
+                     "End Function
"_ustr));
 
-    Any aRet = 
executeMacro("vnd.sun.Star.script:TestLibrary.TestModule.TestExtendedMergedSelection?"
-                            "language=Basic&location=document");
+    Any aRet = 
executeMacro(u"vnd.sun.Star.script:TestLibrary.TestModule.TestExtendedMergedSelection?"
+                            "language=Basic&location=document"_ustr);
     // Without the fix in place, this test would have failed with
     // - Expected : ScCellRangeObj
     // - Actual   : ScCellObj
     // i.e. the selection was interpreted as a single cell instead of a range
-    CPPUNIT_ASSERT_EQUAL(Any(OUString("ScCellRangeObj")), aRet);
+    CPPUNIT_ASSERT_EQUAL(Any(u"ScCellRangeObj"_ustr), aRet);
 }
 
 CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf116127)
@@ -862,11 +862,10 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf116127)
 
     css::uno::Reference<css::document::XEmbeddedScripts> xDocScr(mxComponent, 
UNO_QUERY_THROW);
     auto xLibs = xDocScr->getBasicLibraries();
-    auto xLibrary = xLibs->createLibrary("TestLibrary");
+    auto xLibrary = xLibs->createLibrary(u"TestLibrary"_ustr);
     xLibrary->insertByName(
-        "TestModule",
-        uno::Any(OUString(
-            "Function TestClearContents
"
+        u"TestModule"_ustr,
+        uno::Any(u"Function TestClearContents
"
             // Insert test string into cell A1
             "  oActiveSheet = ThisComponent.CurrentController.ActiveSheet
"
             "  oActiveCell = oActiveSheet.getCellRangeByName(\"A1\")
"
@@ -882,10 +881,10 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf116127)
             "  oCursor.gotoStart(False)
"
             "  oCursor.goRight(1, True)
"
             "  TestClearContents = oCursor.CharPosture <> 
com.sun.star.awt.FontSlant.ITALIC
"
-            "End Function
")));
+            "End Function
"_ustr));
 
-    Any aRet = 
executeMacro("vnd.sun.Star.script:TestLibrary.TestModule.TestClearContents?"
-                            "language=Basic&location=document");
+    Any aRet = 
executeMacro(u"vnd.sun.Star.script:TestLibrary.TestModule.TestClearContents?"
+                            "language=Basic&location=document"_ustr);
     // Without the fix in place, this test would have failed with
     // - Expected : true
     // - Actual   : false
@@ -906,7 +905,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf159412)
 
     SfxObjectShell::CallXScript(
         mxComponent,
-        
"vnd.sun.Star.script:Standard.Module1.TestInvoke?language=Basic&location=document",
+        
u"vnd.sun.Star.script:Standard.Module1.TestInvoke?language=Basic&location=document"_ustr,
         aParams, aRet, aOutParamIndex, aOutParam);
 
     OUString aReturnValue;
@@ -921,7 +920,7 @@ CPPUNIT_TEST_FIXTURE(ScMacrosTest, testTdf159412)
 }
 
 ScMacrosTest::ScMacrosTest()
-      : ScModelTestBase("/sc/qa/extras/testdocuments")
+      : ScModelTestBase(u"/sc/qa/extras/testdocuments"_ustr)
 {
 }
 
diff --git a/sc/qa/extras/new_cond_format.cxx b/sc/qa/extras/new_cond_format.cxx
index 9749d639c6cc..37a70d092bc9 100644
--- a/sc/qa/extras/new_cond_format.cxx
+++ b/sc/qa/extras/new_cond_format.cxx
@@ -51,7 +51,7 @@ public:
 };
 
 ScConditionalFormatTest::ScConditionalFormatTest()
-    : UnoApiTest("sc/qa/extras/testdocuments/")
+    : UnoApiTest(u"sc/qa/extras/testdocuments/"_ustr)
 {
 }
 
@@ -69,7 +69,7 @@ void 
ScConditionalFormatTest::testRequestCondFormatListFromSheet()
 {
     uno::Reference<sheet::XSpreadsheet> xSheet(init(), uno::UNO_QUERY_THROW);
     uno::Reference<beans::XPropertySet> xProps(xSheet, uno::UNO_QUERY_THROW);
-    uno::Any aAny = xProps->getPropertyValue("ConditionalFormats");
+    uno::Any aAny = xProps->getPropertyValue(u"ConditionalFormats"_ustr);
     uno::Reference<sheet::XConditionalFormats> xCondFormats;
     CPPUNIT_ASSERT(aAny >>= xCondFormats);
     CPPUNIT_ASSERT(xCondFormats.is());
@@ -81,7 +81,7 @@ uno::Reference<sheet::XConditionalFormats> 
getConditionalFormatList(uno::Referen
 {
     uno::Reference<sheet::XSpreadsheet> xSheet(xInterface, 
uno::UNO_QUERY_THROW);
     uno::Reference<beans::XPropertySet> xProps(xSheet, uno::UNO_QUERY_THROW);
-    uno::Any aAny = xProps->getPropertyValue("ConditionalFormats");
+    uno::Any aAny = xProps->getPropertyValue(u"ConditionalFormats"_ustr);
     uno::Reference<sheet::XConditionalFormats> xCondFormats;
     CPPUNIT_ASSERT(aAny >>= xCondFormats);
     CPPUNIT_ASSERT(xCondFormats.is());
@@ -124,7 +124,7 @@ void ScConditionalFormatTest::testCondFormatProperties()
     uno::Reference<sheet::XConditionalFormat> xCondFormat = xCondFormats[0];
     CPPUNIT_ASSERT(xCondFormat.is());
     uno::Reference<beans::XPropertySet> xPropSet(xCondFormat, 
uno::UNO_QUERY_THROW);
-    uno::Any aAny = xPropSet->getPropertyValue("Range");
+    uno::Any aAny = xPropSet->getPropertyValue(u"Range"_ustr);
     uno::Reference<sheet::XSheetCellRanges> xCellRanges;
     CPPUNIT_ASSERT(aAny >>= xCellRanges);
     CPPUNIT_ASSERT(xCellRanges.is());
@@ -151,7 +151,7 @@ void ScConditionalFormatTest::testCondFormatXIndex()
     CPPUNIT_ASSERT(xCondFormat.is());
 
     uno::Type aType = xCondFormat->getElementType();
-    CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.beans.XPropertySet"), 
aType.getTypeName());
+    CPPUNIT_ASSERT_EQUAL(u"com.sun.star.beans.XPropertySet"_ustr, 
aType.getTypeName());
 
     CPPUNIT_ASSERT(xCondFormat->hasElements());
     CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xCondFormat->getCount());
@@ -165,7 +165,7 @@ namespace {
 void testAxisPosition(uno::Reference<beans::XPropertySet> const & xPropSet, 
sal_Int32 ePos)
 {
     sal_Int32 eAxisPos;
-    uno::Any aAny = xPropSet->getPropertyValue("AxisPosition");
+    uno::Any aAny = xPropSet->getPropertyValue(u"AxisPosition"_ustr);
     CPPUNIT_ASSERT(aAny >>= eAxisPos);
     CPPUNIT_ASSERT_EQUAL(ePos, eAxisPos);
 }
@@ -173,7 +173,7 @@ void testAxisPosition(uno::Reference<beans::XPropertySet> 
const & xPropSet, sal_
 void testShowValue(uno::Reference<beans::XPropertySet> const & xPropSet, bool 
bShowVal)
 {
     bool bShow;
-    uno::Any aAny = xPropSet->getPropertyValue("ShowValue");
+    uno::Any aAny = xPropSet->getPropertyValue(u"ShowValue"_ustr);
     CPPUNIT_ASSERT(aAny >>= bShow);
     CPPUNIT_ASSERT_EQUAL(bShowVal, bShow);
 }
@@ -181,7 +181,7 @@ void testShowValue(uno::Reference<beans::XPropertySet> 
const & xPropSet, bool bS
 void testUseGradient(uno::Reference<beans::XPropertySet> const & xPropSet, 
bool bUseGradient)
 {
     bool bGradient;
-    uno::Any aAny = xPropSet->getPropertyValue("UseGradient");
+    uno::Any aAny = xPropSet->getPropertyValue(u"UseGradient"_ustr);
     CPPUNIT_ASSERT(aAny >>= bGradient);
     CPPUNIT_ASSERT_EQUAL(bUseGradient, bGradient);
 }
@@ -189,7 +189,7 @@ void testUseGradient(uno::Reference<beans::XPropertySet> 
const & xPropSet, bool
 void testPositiveColor(uno::Reference<beans::XPropertySet> const & xPropSet, 
Color aColor)
 {
     ::Color nColor;
-    uno::Any aAny = xPropSet->getPropertyValue("Color");
+    uno::Any aAny = xPropSet->getPropertyValue(u"Color"_ustr);
     CPPUNIT_ASSERT(aAny >>= nColor);
     CPPUNIT_ASSERT_EQUAL(aColor, nColor);
 }
@@ -197,7 +197,7 @@ void testPositiveColor(uno::Reference<beans::XPropertySet> 
const & xPropSet, Col
 void testNegativeColor(uno::Reference<beans::XPropertySet> const & xPropSet, 
Color aColor)
 {
     ::Color nColor;
-    uno::Any aAny = xPropSet->getPropertyValue("NegativeColor");
+    uno::Any aAny = xPropSet->getPropertyValue(u"NegativeColor"_ustr);
     CPPUNIT_ASSERT(aAny >>= nColor);
     CPPUNIT_ASSERT_EQUAL(aColor, nColor);
 }
@@ -205,7 +205,7 @@ void testNegativeColor(uno::Reference<beans::XPropertySet> 
const & xPropSet, Col
 void testAxisColor(uno::Reference<beans::XPropertySet> const & xPropSet, Color 
aColor)
 {
     ::Color nColor;
-    uno::Any aAny = xPropSet->getPropertyValue("AxisColor");
+    uno::Any aAny = xPropSet->getPropertyValue(u"AxisColor"_ustr);
     CPPUNIT_ASSERT(aAny >>= nColor);
     CPPUNIT_ASSERT_EQUAL(aColor, nColor);
 }
@@ -233,7 +233,7 @@ void testDataBarEntries(uno::Reference<beans::XPropertySet> 
const & xPropSet,
         const OUString& rExpectedMinString, sal_Int32 nExpectedMinType,
         const OUString& rExpectedMaxString, sal_Int32 nExpectedMaxType)
 {
-    uno::Any aAny = xPropSet->getPropertyValue("DataBarEntries");
+    uno::Any aAny = xPropSet->getPropertyValue(u"DataBarEntries"_ustr);
     uno::Sequence<uno::Reference<sheet::XDataBarEntry> > aEntries;
     CPPUNIT_ASSERT(aAny >>= aEntries);
 
@@ -264,7 +264,7 @@ void ScConditionalFormatTest::testDataBarProperties()
     CPPUNIT_ASSERT(xCondFormat.is());
 
     uno::Type aType = xCondFormat->getElementType();
-    CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.beans.XPropertySet"), 
aType.getTypeName());
+    CPPUNIT_ASSERT_EQUAL(u"com.sun.star.beans.XPropertySet"_ustr, 
aType.getTypeName());
 
     CPPUNIT_ASSERT(xCondFormat->hasElements());
     CPPUNIT_ASSERT_EQUAL(sal_Int32(5), xCondFormat->getCount());
@@ -280,8 +280,8 @@ void ScConditionalFormatTest::testDataBarProperties()
         testPositiveColor(xPropSet, COL_LIGHTBLUE);
         testNegativeColor(xPropSet, COL_LIGHTRED);
         testAxisColor(xPropSet, COL_BLACK);
-        testDataBarEntries(xPropSet, "", sheet::DataBarEntryType::DATABAR_AUTO,
-                "", sheet::DataBarEntryType::DATABAR_MAX);
+        testDataBarEntries(xPropSet, u""_ustr, 
sheet::DataBarEntryType::DATABAR_AUTO,
+                u""_ustr, sheet::DataBarEntryType::DATABAR_MAX);
     }
     {
         uno::Any aAny = xCondFormat->getByIndex(1);
@@ -293,8 +293,8 @@ void ScConditionalFormatTest::testDataBarProperties()
         testPositiveColor(xPropSet, COL_LIGHTBLUE);
         testNegativeColor(xPropSet, COL_LIGHTRED);
         testAxisColor(xPropSet, COL_BLACK);
-        testDataBarEntries(xPropSet, "", sheet::DataBarEntryType::DATABAR_MIN,
-                "90", sheet::DataBarEntryType::DATABAR_PERCENTILE);
+        testDataBarEntries(xPropSet, u""_ustr, 
sheet::DataBarEntryType::DATABAR_MIN,
+                u"90"_ustr, sheet::DataBarEntryType::DATABAR_PERCENTILE);
     }
     {
         uno::Any aAny = xCondFormat->getByIndex(2);
@@ -306,8 +306,8 @@ void ScConditionalFormatTest::testDataBarProperties()
         testPositiveColor(xPropSet, COL_LIGHTBLUE);
         testNegativeColor(xPropSet, COL_LIGHTRED);
         testAxisColor(xPropSet, COL_BLACK);
-        testDataBarEntries(xPropSet, "2", 
sheet::DataBarEntryType::DATABAR_VALUE,
-                "80", sheet::DataBarEntryType::DATABAR_PERCENT);
+        testDataBarEntries(xPropSet, u"2"_ustr, 
sheet::DataBarEntryType::DATABAR_VALUE,
+                u"80"_ustr, sheet::DataBarEntryType::DATABAR_PERCENT);
     }
     {
         uno::Any aAny = xCondFormat->getByIndex(3);
@@ -335,8 +335,8 @@ void ScConditionalFormatTest::testDataBarProperties()
         testPositiveColor(xPropSet, sal_uInt32(10092390));
         testNegativeColor(xPropSet, sal_uInt32(52428));
         testAxisColor(xPropSet, sal_uInt32(16777113));
-        testDataBarEntries(xPropSet, "", sheet::DataBarEntryType::DATABAR_AUTO,
-                "", sheet::DataBarEntryType::DATABAR_AUTO);
+        testDataBarEntries(xPropSet, u""_ustr, 
sheet::DataBarEntryType::DATABAR_AUTO,
+                u""_ustr, sheet::DataBarEntryType::DATABAR_AUTO);
     }
 }
 
@@ -367,7 +367,7 @@ void 
testColorScaleEntries(uno::Reference<beans::XPropertySet> const & xPropSet,
         sal_Int32 nMediumType, const OUString& rMediumString, Color 
nMediumColor,
         sal_Int32 nMaxType, const OUString& rMaxString, Color nMaxColor)
 {
-    uno::Any aAny = xPropSet->getPropertyValue("ColorScaleEntries");
+    uno::Any aAny = xPropSet->getPropertyValue(u"ColorScaleEntries"_ustr);
     CPPUNIT_ASSERT(aAny.hasValue());
     uno::Sequence<uno::Reference<sheet::XColorScaleEntry> > aEntries;
     CPPUNIT_ASSERT(aAny >>= aEntries);
@@ -398,7 +398,7 @@ void ScConditionalFormatTest::testColorScaleProperties()
     CPPUNIT_ASSERT(xCondFormat.is());
 
     uno::Type aType = xCondFormat->getElementType();
-    CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.beans.XPropertySet"), 
aType.getTypeName());
+    CPPUNIT_ASSERT_EQUAL(u"com.sun.star.beans.XPropertySet"_ustr, 
aType.getTypeName());
 
     CPPUNIT_ASSERT(xCondFormat->hasElements());
     CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xCondFormat->getCount());
@@ -408,25 +408,25 @@ void ScConditionalFormatTest::testColorScaleProperties()
         uno::Any aAny = xCondFormat->getByIndex(0);
         CPPUNIT_ASSERT(aAny.hasValue());
         CPPUNIT_ASSERT(aAny >>= xPropSet);
-        testColorScaleEntries(xPropSet, 3, 
sheet::ColorScaleEntryType::COLORSCALE_MIN, "", sal_uInt32(16777113),
-                sheet::ColorScaleEntryType::COLORSCALE_PERCENTILE, "50", 
sal_uInt32(16737792),
-                sheet::ColorScaleEntryType::COLORSCALE_MAX, "", 
sal_uInt32(16724787));
+        testColorScaleEntries(xPropSet, 3, 
sheet::ColorScaleEntryType::COLORSCALE_MIN, u""_ustr, sal_uInt32(16777113),
+                sheet::ColorScaleEntryType::COLORSCALE_PERCENTILE, u"50"_ustr, 
sal_uInt32(16737792),
+                sheet::ColorScaleEntryType::COLORSCALE_MAX, u""_ustr, 
sal_uInt32(16724787));
     }
     {
         uno::Any aAny = xCondFormat->getByIndex(1);
         CPPUNIT_ASSERT(aAny.hasValue());
         CPPUNIT_ASSERT(aAny >>= xPropSet);
-        testColorScaleEntries(xPropSet, 3, 
sheet::ColorScaleEntryType::COLORSCALE_VALUE, "0", sal_uInt32(16711680),
-                sheet::ColorScaleEntryType::COLORSCALE_PERCENTILE, "50", 
sal_uInt32(10092390),
-                sheet::ColorScaleEntryType::COLORSCALE_PERCENT, "90", 
sal_uInt32(255));
+        testColorScaleEntries(xPropSet, 3, 
sheet::ColorScaleEntryType::COLORSCALE_VALUE, u"0"_ustr, sal_uInt32(16711680),
+                sheet::ColorScaleEntryType::COLORSCALE_PERCENTILE, u"50"_ustr, 
sal_uInt32(10092390),
+                sheet::ColorScaleEntryType::COLORSCALE_PERCENT, u"90"_ustr, 
sal_uInt32(255));
     }
     {
         uno::Any aAny = xCondFormat->getByIndex(2);
         CPPUNIT_ASSERT(aAny.hasValue());
         CPPUNIT_ASSERT(aAny >>= xPropSet);
-        testColorScaleEntries(xPropSet, 2, 
sheet::ColorScaleEntryType::COLORSCALE_FORMULA, "=A1", COL_WHITE,
-                sheet::ColorScaleEntryType::COLORSCALE_PERCENTILE, "not used", 
sal_uInt32(1),
-                sheet::ColorScaleEntryType::COLORSCALE_VALUE, "10", COL_BLACK);
+        testColorScaleEntries(xPropSet, 2, 
sheet::ColorScaleEntryType::COLORSCALE_FORMULA, u"=A1"_ustr, COL_WHITE,
+                sheet::ColorScaleEntryType::COLORSCALE_PERCENTILE, u"not 
used"_ustr, sal_uInt32(1),
+                sheet::ColorScaleEntryType::COLORSCALE_VALUE, u"10"_ustr, 
COL_BLACK);
     }
 }
 
diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx
index 6de209fd6784..3a6b6e9f4baf 100644
--- a/sc/qa/extras/scannotationobj.cxx
+++ b/sc/qa/extras/scannotationobj.cxx
@@ -80,8 +80,8 @@ public:
 };
 
 ScAnnontationObj::ScAnnontationObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
-    , XServiceInfo("ScAnnotationObj", "com.sun.star.sheet.CellAnnotation")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
+    , XServiceInfo(u"ScAnnotationObj"_ustr, 
u"com.sun.star.sheet.CellAnnotation"_ustr)
 {
 }
 
diff --git a/sc/qa/extras/scannotationshapeobj.cxx 
b/sc/qa/extras/scannotationshapeobj.cxx
index eee5d78a351c..2346c47b9107 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -92,15 +92,15 @@ private:
 uno::Reference<text::XTextContent> ScAnnotationShapeObj::m_xField;
 
 ScAnnotationShapeObj::ScAnnotationShapeObj()
-    : UnoApiTest("sc/qa/extras/testdocuments")
-    , XShapeDescriptor("com.sun.star.drawing.CaptionShape")
+    : UnoApiTest(u"sc/qa/extras/testdocuments"_ustr)
+    , XShapeDescriptor(u"com.sun.star.drawing.CaptionShape"_ustr)
 {
 }
 
 void ScAnnotationShapeObj::setUp()
 {
     UnoApiTest::setUp();
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 void ScAnnotationShapeObj::tearDown()
@@ -129,7 +129,7 @@ uno::Reference<uno::XInterface> ScAnnotationShapeObj::init()
     uno::Reference<sheet::XSheetAnnotation> 
xAnnotation(xAnchor->getAnnotation(),
                                                         uno::UNO_SET_THROW);
     uno::Reference<text::XSimpleText> xAnnoText(xAnnotation, 
uno::UNO_QUERY_THROW);
-    xAnnoText->setString("ScAnnotationShapeObj");
+    xAnnoText->setString(u"ScAnnotationShapeObj"_ustr);
 
     uno::Reference<sheet::XSheetAnnotationShapeSupplier> 
xShapeSupp(xAnnotation,
                                                                     
uno::UNO_QUERY_THROW);
@@ -143,7 +143,7 @@ uno::Reference<text::XTextContent> 
ScAnnotationShapeObj::getTextContent()
     if (!m_xField.is())
     {
         uno::Reference<lang::XMultiServiceFactory> xSM(mxComponent, 
uno::UNO_QUERY_THROW);
-        
m_xField.set(xSM->createInstance("com.sun.star.text.TextField.DateTime"),
+        
m_xField.set(xSM->createInstance(u"com.sun.star.text.TextField.DateTime"_ustr),
                      uno::UNO_QUERY_THROW);
     }
     return m_xField;
diff --git a/sc/qa/extras/scannotationsobj.cxx 
b/sc/qa/extras/scannotationsobj.cxx
index e99a1f96ce71..90d4349ee2ca 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -67,7 +67,7 @@ public:
 
 
 ScAnnontationsObj::ScAnnontationsObj()
-       : UnoApiTest("/sc/qa/extras/testdocuments")
+       : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
        , XElementAccess(cppu::UnoType<sheet::XSheetAnnotation>::get())
        , XIndexAccess(1)
 {
diff --git a/sc/qa/extras/scarealinkobj.cxx b/sc/qa/extras/scarealinkobj.cxx
index c58fe9bdec04..03e9ec37977b 100644
--- a/sc/qa/extras/scarealinkobj.cxx
+++ b/sc/qa/extras/scarealinkobj.cxx
@@ -67,7 +67,7 @@ public:
 };
 
 ScAreaLinkObj::ScAreaLinkObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , 
CellAreaLink(m_directories.getURLFromSrc(u"/sc/qa/extras/testdocuments/scarealinkobj.ods"))
 {
 }
@@ -77,13 +77,13 @@ uno::Reference<uno::XInterface> ScAreaLinkObj::init()
     uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, 
uno::UNO_QUERY_THROW);
 
     uno::Reference<beans::XPropertySet> xPropSet(xDoc, uno::UNO_QUERY_THROW);
-    uno::Reference<sheet::XAreaLinks> 
xLinks(xPropSet->getPropertyValue("AreaLinks"),
+    uno::Reference<sheet::XAreaLinks> 
xLinks(xPropSet->getPropertyValue(u"AreaLinks"_ustr),
                                              uno::UNO_QUERY_THROW);
 
     table::CellAddress aCellAddress(1, 2, 3);
     xLinks->insertAtPosition(
         aCellAddress, 
m_directories.getURLFromSrc(u"/sc/qa/extras/testdocuments/scarealinkobj.ods"),
-        "a2:b5", "", "");
+        u"a2:b5"_ustr, u""_ustr, u""_ustr);
 
     uno::Reference<sheet::XAreaLink> xLink(xLinks->getByIndex(0), 
uno::UNO_QUERY_THROW);
     return xLink;
@@ -92,7 +92,7 @@ uno::Reference<uno::XInterface> ScAreaLinkObj::init()
 void ScAreaLinkObj::setUp()
 {
     UnoApiTest::setUp();
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScAreaLinkObj);
diff --git a/sc/qa/extras/scarealinksobj.cxx b/sc/qa/extras/scarealinksobj.cxx
index 94819adc40d1..cf371347d60d 100644
--- a/sc/qa/extras/scarealinksobj.cxx
+++ b/sc/qa/extras/scarealinksobj.cxx
@@ -62,7 +62,7 @@ public:
 };
 
 ScAreaLinksObj::ScAreaLinksObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , XElementAccess(cppu::UnoType<sheet::XAreaLink>::get())
     , XIndexAccess(1)
 {
@@ -74,10 +74,11 @@ uno::Reference<uno::XInterface> ScAreaLinksObj::init()
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<beans::XPropertySet> xPropSet(xDoc, uno::UNO_QUERY_THROW);
-    uno::Reference<sheet::XAreaLinks> 
xLinks(xPropSet->getPropertyValue("AreaLinks"),
+    uno::Reference<sheet::XAreaLinks> 
xLinks(xPropSet->getPropertyValue(u"AreaLinks"_ustr),
                                              uno::UNO_QUERY_THROW);
 
-    xLinks->insertAtPosition(table::CellAddress(1, 2, 3), 
"ScAreaLinksObj.ods", "A2:B5", "", "");
+    xLinks->insertAtPosition(table::CellAddress(1, 2, 3), 
u"ScAreaLinksObj.ods"_ustr, u"A2:B5"_ustr,
+                             u""_ustr, u""_ustr);
 
     return xLinks;
 }
@@ -85,7 +86,7 @@ uno::Reference<uno::XInterface> ScAreaLinksObj::init()
 void ScAreaLinksObj::setUp()
 {
     UnoApiTest::setUp();
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScAreaLinksObj);
diff --git a/sc/qa/extras/scautoformatobj.cxx b/sc/qa/extras/scautoformatobj.cxx
index fbe1fe1d85fa..d3fa6ecc008e 100644
--- a/sc/qa/extras/scautoformatobj.cxx
+++ b/sc/qa/extras/scautoformatobj.cxx
@@ -80,11 +80,11 @@ public:
 };
 
 ScAutoFormatObj::ScAutoFormatObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , XElementAccess(cppu::UnoType<beans::XPropertySet>::get())
     , XIndexAccess(16)
-    , XNamed("Default")
-    , XServiceInfo("ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat")
+    , XNamed(u"Default"_ustr)
+    , XServiceInfo(u"ScAutoFormatObj"_ustr, 
u"com.sun.star.sheet.TableAutoFormat"_ustr)
 {
 }
 
@@ -94,7 +94,7 @@ uno::Reference<uno::XInterface> ScAutoFormatObj::init()
 
     uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, 
uno::UNO_QUERY_THROW);
     uno::Reference<container::XIndexAccess> xIA(
-        xMSF->createInstance("com.sun.star.sheet.TableAutoFormats"), 
uno::UNO_QUERY_THROW);
+        xMSF->createInstance(u"com.sun.star.sheet.TableAutoFormats"_ustr), 
uno::UNO_QUERY_THROW);
 
     uno::Reference<beans::XPropertySet> 
xTableAutoFormat(xIA->getByIndex(xIA->getCount() - 1),
                                                          uno::UNO_QUERY_THROW);
@@ -104,7 +104,7 @@ uno::Reference<uno::XInterface> ScAutoFormatObj::init()
 void ScAutoFormatObj::setUp()
 {
     UnoApiTest::setUp();
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScAutoFormatObj);
diff --git a/sc/qa/extras/scautoformatsobj.cxx 
b/sc/qa/extras/scautoformatsobj.cxx
index e55c40cb38d0..84fd31f397f4 100644
--- a/sc/qa/extras/scautoformatsobj.cxx
+++ b/sc/qa/extras/scautoformatsobj.cxx
@@ -81,13 +81,14 @@ public:
 };
 
 ScAutoFormatsObj::ScAutoFormatsObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , XElementAccess(cppu::UnoType<container::XNamed>::get())
     , XIndexAccess(2)
-    , XNameAccess("Default")
-    , XNameContainer("ScAutoFormatsObj")
-    , XNameReplace("ScAutoFormatsObj")
-    , XServiceInfo("stardiv.StarCalc.ScAutoFormatsObj", 
"com.sun.star.sheet.TableAutoFormats")
+    , XNameAccess(u"Default"_ustr)
+    , XNameContainer(u"ScAutoFormatsObj"_ustr)
+    , XNameReplace(u"ScAutoFormatsObj"_ustr)
+    , XServiceInfo(u"stardiv.StarCalc.ScAutoFormatsObj"_ustr,
+                   u"com.sun.star.sheet.TableAutoFormats"_ustr)
 {
 }
 
@@ -95,19 +96,21 @@ uno::Reference<uno::XInterface> ScAutoFormatsObj::init()
 {
     uno::Reference<lang::XMultiServiceFactory> xMSF(mxComponent, 
uno::UNO_QUERY_THROW);
     uno::Reference<uno::XInterface> xTAF(
-        xMSF->createInstance("com.sun.star.sheet.TableAutoFormats"), 
uno::UNO_SET_THROW);
+        xMSF->createInstance(u"com.sun.star.sheet.TableAutoFormats"_ustr), 
uno::UNO_SET_THROW);
 
     uno::Reference<container::XNameContainer> xNC(xTAF, uno::UNO_QUERY_THROW);
-    if (!xNC->hasByName("ScAutoFormatsObj"))
+    if (!xNC->hasByName(u"ScAutoFormatsObj"_ustr))
     {
-        xNC->insertByName("ScAutoFormatsObj",
-                          
uno::Any(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
+        xNC->insertByName(
+            u"ScAutoFormatsObj"_ustr,
+            
uno::Any(xMSF->createInstance(u"com.sun.star.sheet.TableAutoFormat"_ustr)));
     }
     // XNameContainer
     XNameContainer::setElement(
-        uno::Any(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
+        
uno::Any(xMSF->createInstance(u"com.sun.star.sheet.TableAutoFormat"_ustr)));
     // XNameReplace
-    
XNameReplace::setElement(uno::Any(xMSF->createInstance("com.sun.star.sheet.TableAutoFormat")));
+    XNameReplace::setElement(
+        
uno::Any(xMSF->createInstance(u"com.sun.star.sheet.TableAutoFormat"_ustr)));
 
     return xTAF;
 }
@@ -116,7 +119,7 @@ void ScAutoFormatsObj::setUp()
 {
     UnoApiTest::setUp();
     // create calc document
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScAutoFormatsObj);
diff --git a/sc/qa/extras/sccellcursorobj.cxx b/sc/qa/extras/sccellcursorobj.cxx
index c2b861ccd1b5..74b5e9309a78 100644
--- a/sc/qa/extras/sccellcursorobj.cxx
+++ b/sc/qa/extras/sccellcursorobj.cxx
@@ -156,7 +156,7 @@ public:
 };
 
 ScCellCursorObj::ScCellCursorObj():
-    UnoApiTest("/sc/qa/extras/testdocuments"),
+    UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr),
     apitest::XCellSeries(0, 0),
     apitest::XFormulaQuery(table::CellRangeAddress(0, 15, 15, 15, 15), 
table::CellRangeAddress(0, 0, 15, 0, 15))
 {
@@ -169,14 +169,14 @@ uno::Reference< uno::XInterface > ScCellCursorObj::init()
     uno::Reference<container::XIndexAccess> xIndex (xDoc->getSheets(), 
UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0), 
UNO_QUERY_THROW);
 
-    uno::Reference<table::XCellRange> xCellRange = 
xSheet->getCellRangeByName("$A$1:$D$4");
+    uno::Reference<table::XCellRange> xCellRange = 
xSheet->getCellRangeByName(u"$A$1:$D$4"_ustr);
     uno::Reference<sheet::XSheetCellRange> xSheetCellRange(xCellRange, 
UNO_QUERY_THROW);
     uno::Reference<table::XCellCursor> 
xCellCursor(xSheet->createCursorByRange(xSheetCellRange), UNO_QUERY_THROW);
 
     xSheet->getCellByPosition(1, 1)->setValue(1);
     xSheet->getCellByPosition(4, 5)->setValue(1);
-    xSheet->getCellByPosition(3, 2)->setFormula("xTextDoc");
-    xSheet->getCellByPosition(3, 3)->setFormula("xTextDoc");
+    xSheet->getCellByPosition(3, 2)->setFormula(u"xTextDoc"_ustr);
+    xSheet->getCellByPosition(3, 3)->setFormula(u"xTextDoc"_ustr);
 
     return xCellCursor;
 }
diff --git a/sc/qa/extras/sccellfieldsobj.cxx b/sc/qa/extras/sccellfieldsobj.cxx
index e1e08a25931e..5cde219c0dd7 100644
--- a/sc/qa/extras/sccellfieldsobj.cxx
+++ b/sc/qa/extras/sccellfieldsobj.cxx
@@ -60,7 +60,7 @@ public:
 };
 
 ScCellFieldsObj::ScCellFieldsObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , XElementAccess(cppu::UnoType<text::XTextField>::get())
 {
 }
@@ -71,8 +71,8 @@ uno::Reference<uno::XInterface> ScCellFieldsObj::init()
     CPPUNIT_ASSERT_MESSAGE("no calc document", xDoc.is());
 
     uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, 
uno::UNO_QUERY_THROW);
-    uno::Reference<text::XTextContent> 
xTC(xMSF->createInstance("com.sun.star.text.TextField.URL"),
-                                           uno::UNO_QUERY_THROW);
+    uno::Reference<text::XTextContent> xTC(
+        xMSF->createInstance(u"com.sun.star.text.TextField.URL"_ustr), 
uno::UNO_QUERY_THROW);
 
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), 
uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
@@ -89,7 +89,7 @@ uno::Reference<uno::XInterface> ScCellFieldsObj::init()
 void ScCellFieldsObj::setUp()
 {
     UnoApiTest::setUp();
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFieldsObj);
diff --git a/sc/qa/extras/sccellformatsenumeration.cxx 
b/sc/qa/extras/sccellformatsenumeration.cxx
index b8210975a848..9e887571e8bf 100644
--- a/sc/qa/extras/sccellformatsenumeration.cxx
+++ b/sc/qa/extras/sccellformatsenumeration.cxx
@@ -43,7 +43,7 @@ public:
 };
 
 ScCellFormatsEnumeration::ScCellFormatsEnumeration()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
 {
 }
 
@@ -67,7 +67,7 @@ uno::Reference<uno::XInterface> 
ScCellFormatsEnumeration::init()
 void ScCellFormatsEnumeration::setUp()
 {
     UnoApiTest::setUp();
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFormatsEnumeration);
diff --git a/sc/qa/extras/sccellformatsobj.cxx 
b/sc/qa/extras/sccellformatsobj.cxx
index 62e23b319e69..160d63b082de 100644
--- a/sc/qa/extras/sccellformatsobj.cxx
+++ b/sc/qa/extras/sccellformatsobj.cxx
@@ -57,7 +57,7 @@ public:
 };
 
 ScCellFormatsObj::ScCellFormatsObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , XElementAccess(cppu::UnoType<table::XCellRange>::get())
     , XIndexAccess(1)
 {
@@ -80,7 +80,7 @@ uno::Reference<uno::XInterface> ScCellFormatsObj::init()
 void ScCellFormatsObj::setUp()
 {
     UnoApiTest::setUp();
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScCellFormatsObj);
diff --git a/sc/qa/extras/sccellobj.cxx b/sc/qa/extras/sccellobj.cxx
index 5a97bce97b1f..922acd55328d 100644
--- a/sc/qa/extras/sccellobj.cxx
+++ b/sc/qa/extras/sccellobj.cxx
@@ -91,7 +91,7 @@ public:
 };
 
 ScCellObj::ScCellObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , apitest::XFormulaQuery(table::CellRangeAddress(0, 2, 3, 2, 3),
                              table::CellRangeAddress(0, 0, 0, 3, 0), 0, 0)
 {
@@ -108,7 +108,7 @@ uno::Reference<uno::XInterface> ScCellObj::init()
     uno::Reference<sheet::XSheetAnnotationsSupplier> 
xSheetAnnosSupplier(xSheet, UNO_QUERY_THROW);
     uno::Reference<sheet::XSheetAnnotations> 
xSheetAnnos(xSheetAnnosSupplier->getAnnotations(),
                                                          UNO_SET_THROW);
-    xSheetAnnos->insertNew(table::CellAddress(0, 2, 3), "xSheetAnnotation");
+    xSheetAnnos->insertNew(table::CellAddress(0, 2, 3), 
u"xSheetAnnotation"_ustr);
 
     return xSheet->getCellByPosition(2, 3);
 }
@@ -129,7 +129,7 @@ uno::Reference<uno::XInterface> ScCellObj::getXSpreadsheet()
 void ScCellObj::setUp()
 {
     UnoApiTest::setUp();
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScCellObj);
diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx
index 5470ae757906..3d69b25deb9f 100644
--- a/sc/qa/extras/sccellrangeobj.cxx
+++ b/sc/qa/extras/sccellrangeobj.cxx
@@ -177,12 +177,12 @@ public:
 };
 
 ScCellRangeObj::ScCellRangeObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , XCellSeries(2, 1)
     , XFormulaQuery(table::CellRangeAddress(0, 15, 15, 15, 15),
                     table::CellRangeAddress(0, 0, 15, 0, 15))
-    , XReplaceable("15", "35")
-    , XSearchable("15", 1)
+    , XReplaceable(u"15"_ustr, u"35"_ustr)
+    , XSearchable(u"15"_ustr, 1)
 {
 }
 
diff --git a/sc/qa/extras/sccellrangesobj.cxx b/sc/qa/extras/sccellrangesobj.cxx
index 0c27f584c678..0c32b1edc609 100644
--- a/sc/qa/extras/sccellrangesobj.cxx
+++ b/sc/qa/extras/sccellrangesobj.cxx
@@ -80,7 +80,7 @@ public:
 };
 
 ScCellRangesObj::ScCellRangesObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , apitest::XFormulaQuery(table::CellRangeAddress(0, 4, 1, 5, 4),
                              table::CellRangeAddress(0, 4, 1, 5, 4))
 {
@@ -94,17 +94,17 @@ uno::Reference<uno::XInterface> ScCellRangesObj::init()
     uno::Reference<sheet::XSpreadsheet> xSheet(xIndexAccess->getByIndex(0), 
uno::UNO_QUERY_THROW);
     uno::Reference<lang::XMultiServiceFactory> xMSF(xDoc, 
uno::UNO_QUERY_THROW);
     uno::Reference<container::XNameContainer> xRanges(
-        xMSF->createInstance("com.sun.star.sheet.SheetCellRanges"), 
uno::UNO_QUERY_THROW);
+        xMSF->createInstance(u"com.sun.star.sheet.SheetCellRanges"_ustr), 
uno::UNO_QUERY_THROW);
 
     uno::Any xCellRange;
-    xCellRange <<= xSheet->getCellRangeByName("C1:D4");
-    xRanges->insertByName("Range1", xCellRange);
-    xCellRange <<= xSheet->getCellRangeByName("E2:F5");
-    xRanges->insertByName("Range2", xCellRange);
-    xCellRange <<= xSheet->getCellRangeByName("G2:H3");
-    xRanges->insertByName("Range3", xCellRange);
-    xCellRange <<= xSheet->getCellRangeByName("I7:J8");
-    xRanges->insertByName("Range4", xCellRange);
+    xCellRange <<= xSheet->getCellRangeByName(u"C1:D4"_ustr);
+    xRanges->insertByName(u"Range1"_ustr, xCellRange);
+    xCellRange <<= xSheet->getCellRangeByName(u"E2:F5"_ustr);
+    xRanges->insertByName(u"Range2"_ustr, xCellRange);
+    xCellRange <<= xSheet->getCellRangeByName(u"G2:H3"_ustr);
+    xRanges->insertByName(u"Range3"_ustr, xCellRange);
+    xCellRange <<= xSheet->getCellRangeByName(u"I7:J8"_ustr);
+    xRanges->insertByName(u"Range4"_ustr, xCellRange);
 
     for (int i = 0; i < 10; i++)
     {
@@ -134,7 +134,7 @@ void ScCellRangesObj::setUp()
 {
     UnoApiTest::setUp();
     // create a calc document
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScCellRangesObj);
diff --git a/sc/qa/extras/sccellsearchobj.cxx b/sc/qa/extras/sccellsearchobj.cxx
index 936f4b413176..1493a461d9a3 100644
--- a/sc/qa/extras/sccellsearchobj.cxx
+++ b/sc/qa/extras/sccellsearchobj.cxx
@@ -67,9 +67,9 @@ public:
 };
 
 ScCellSearchObj::ScCellSearchObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
-    , XServiceInfo("ScCellSearchObj",
-                   { "com.sun.star.util.ReplaceDescriptor", 
"com.sun.star.util.SearchDescriptor" })
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
+    , XServiceInfo(u"ScCellSearchObj"_ustr, { 
u"com.sun.star.util.ReplaceDescriptor"_ustr,
+                                              
u"com.sun.star.util.SearchDescriptor"_ustr })
 {
 }
 
@@ -88,7 +88,7 @@ void ScCellSearchObj::setUp()
 {
     UnoApiTest::setUp();
     // create calc document
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScCellSearchObj);
diff --git a/sc/qa/extras/sccellsenumeration.cxx 
b/sc/qa/extras/sccellsenumeration.cxx
index d13ce302eac1..e3cee9bb4589 100644
--- a/sc/qa/extras/sccellsenumeration.cxx
+++ b/sc/qa/extras/sccellsenumeration.cxx
@@ -46,7 +46,7 @@ public:
 };
 
 ScCellsEnumeration::ScCellsEnumeration()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
 {
 }
 
@@ -61,14 +61,14 @@ uno::Reference<uno::XInterface> ScCellsEnumeration::init()
     uno::Reference<table::XCellRange> xCellRange(xIA->getByIndex(0), 
uno::UNO_QUERY_THROW);
     uno::Reference<table::XCell> xCell0(xCellRange->getCellByPosition(0, 0), 
uno::UNO_SET_THROW);
     uno::Reference<text::XTextRange> xTextRange0(xCell0, uno::UNO_QUERY_THROW);
-    xTextRange0->setString("Test string 1");
+    xTextRange0->setString(u"Test string 1"_ustr);
 
     uno::Reference<table::XCell> xCell1(xCellRange->getCellByPosition(5, 1), 
uno::UNO_SET_THROW);
     xCell1->setValue(15);
 
     uno::Reference<table::XCell> xCell2(xCellRange->getCellByPosition(3, 9), 
uno::UNO_SET_THROW);
     uno::Reference<text::XTextRange> xTextRange1(xCell2, uno::UNO_QUERY_THROW);
-    xTextRange1->setString("Test string 2");
+    xTextRange1->setString(u"Test string 2"_ustr);
 
     uno::Reference<sheet::XCellRangesQuery> xCellRangesQuery(xCellRange, 
uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSheetCellRanges> 
xSCR(xCellRangesQuery->queryVisibleCells(),
@@ -80,7 +80,7 @@ uno::Reference<uno::XInterface> ScCellsEnumeration::init()
 void ScCellsEnumeration::setUp()
 {
     UnoApiTest::setUp();
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScCellsEnumeration);
diff --git a/sc/qa/extras/sccellsobj.cxx b/sc/qa/extras/sccellsobj.cxx
index 0e1d891730b8..be2ff14a37d9 100644
--- a/sc/qa/extras/sccellsobj.cxx
+++ b/sc/qa/extras/sccellsobj.cxx
@@ -53,7 +53,7 @@ public:
 };
 
 ScCellsObj::ScCellsObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , XElementAccess(cppu::UnoType<table::XCell>::get())
 {
 }
@@ -69,14 +69,14 @@ uno::Reference<uno::XInterface> ScCellsObj::init()
 
     uno::Reference<table::XCell> xCell0(xCellRange->getCellByPosition(0, 0), 
uno::UNO_SET_THROW);
     uno::Reference<text::XTextRange> xTextRange0(xCell0, uno::UNO_QUERY_THROW);
-    xTextRange0->setString("ScCellsObj test 1");
+    xTextRange0->setString(u"ScCellsObj test 1"_ustr);
 
     uno::Reference<table::XCell> xCell1(xCellRange->getCellByPosition(5, 1), 
uno::UNO_SET_THROW);
     xCell1->setValue(15);
 
     uno::Reference<table::XCell> xCell2(xCellRange->getCellByPosition(3, 9), 
uno::UNO_SET_THROW);
     uno::Reference<text::XTextRange> xTextRange2(xCell2, uno::UNO_QUERY_THROW);
-    xTextRange2->setString("ScCellsObj test 2");
+    xTextRange2->setString(u"ScCellsObj test 2"_ustr);
 
     uno::Reference<sheet::XCellRangesQuery> xCRQ(xCellRange, 
uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSheetCellRanges> xSCR(xCRQ->queryVisibleCells(), 
uno::UNO_SET_THROW);
@@ -87,7 +87,7 @@ uno::Reference<uno::XInterface> ScCellsObj::init()
 void ScCellsObj::setUp()
 {
     UnoApiTest::setUp();
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScCellsObj);
diff --git a/sc/qa/extras/scchartobj.cxx b/sc/qa/extras/scchartobj.cxx
index 9b94ddc2d46b..450362024b6b 100644
--- a/sc/qa/extras/scchartobj.cxx
+++ b/sc/qa/extras/scchartobj.cxx
@@ -75,9 +75,9 @@ public:
 };
 
 ScChartObj::ScChartObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
-    , XNamed("ScChartObj")
-    , XServiceInfo("ScChartObj", "com.sun.star.table.TableChart")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
+    , XNamed(u"ScChartObj"_ustr)
+    , XServiceInfo(u"ScChartObj"_ustr, u"com.sun.star.table.TableChart"_ustr)
 {
 }
 
@@ -88,21 +88,21 @@ uno::Reference<uno::XInterface> ScChartObj::init()
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), 
uno::UNO_QUERY_THROW);
 
-    xSheet0->getCellByPosition(1, 0)->setFormula("JAN");
-    xSheet0->getCellByPosition(2, 0)->setFormula("FEB");
-    xSheet0->getCellByPosition(3, 0)->setFormula("MAR");
-    xSheet0->getCellByPosition(4, 0)->setFormula("APR");
-    xSheet0->getCellByPosition(5, 0)->setFormula("MAY");
-    xSheet0->getCellByPosition(6, 0)->setFormula("JUN");
-    xSheet0->getCellByPosition(7, 0)->setFormula("JUL");
-    xSheet0->getCellByPosition(8, 0)->setFormula("AUG");
-    xSheet0->getCellByPosition(9, 0)->setFormula("SEP");
-    xSheet0->getCellByPosition(10, 0)->setFormula("OCT");
-    xSheet0->getCellByPosition(11, 0)->setFormula("NOV");
-    xSheet0->getCellByPosition(12, 0)->setFormula("DEC");
-    xSheet0->getCellByPosition(13, 0)->setFormula("SUM");
-
-    xSheet0->getCellByPosition(0, 1)->setFormula("Smith");
+    xSheet0->getCellByPosition(1, 0)->setFormula(u"JAN"_ustr);
+    xSheet0->getCellByPosition(2, 0)->setFormula(u"FEB"_ustr);
+    xSheet0->getCellByPosition(3, 0)->setFormula(u"MAR"_ustr);
+    xSheet0->getCellByPosition(4, 0)->setFormula(u"APR"_ustr);
+    xSheet0->getCellByPosition(5, 0)->setFormula(u"MAY"_ustr);
+    xSheet0->getCellByPosition(6, 0)->setFormula(u"JUN"_ustr);
+    xSheet0->getCellByPosition(7, 0)->setFormula(u"JUL"_ustr);
+    xSheet0->getCellByPosition(8, 0)->setFormula(u"AUG"_ustr);
+    xSheet0->getCellByPosition(9, 0)->setFormula(u"SEP"_ustr);
+    xSheet0->getCellByPosition(10, 0)->setFormula(u"OCT"_ustr);
+    xSheet0->getCellByPosition(11, 0)->setFormula(u"NOV"_ustr);
+    xSheet0->getCellByPosition(12, 0)->setFormula(u"DEC"_ustr);
+    xSheet0->getCellByPosition(13, 0)->setFormula(u"SUM"_ustr);
+
+    xSheet0->getCellByPosition(0, 1)->setFormula(u"Smith"_ustr);
     xSheet0->getCellByPosition(1, 1)->setValue(42);
     xSheet0->getCellByPosition(2, 1)->setValue(58.9);
     xSheet0->getCellByPosition(3, 1)->setValue(-66.5);
@@ -115,9 +115,9 @@ uno::Reference<uno::XInterface> ScChartObj::init()
     xSheet0->getCellByPosition(10, 1)->setValue(-97.3);
     xSheet0->getCellByPosition(11, 1)->setValue(22.4);
     xSheet0->getCellByPosition(11, 1)->setValue(23.5);
-    xSheet0->getCellByPosition(13, 1)->setFormula("SUM(B2:M2");
+    xSheet0->getCellByPosition(13, 1)->setFormula(u"SUM(B2:M2"_ustr);
 
-    xSheet0->getCellByPosition(0, 2)->setFormula("Jones");
+    xSheet0->getCellByPosition(0, 2)->setFormula(u"Jones"_ustr);
     xSheet0->getCellByPosition(1, 2)->setValue(21);
     xSheet0->getCellByPosition(2, 2)->setValue(40.9);
     xSheet0->getCellByPosition(3, 2)->setValue(-57.5);
@@ -130,9 +130,9 @@ uno::Reference<uno::XInterface> ScChartObj::init()
     xSheet0->getCellByPosition(10, 2)->setValue(57.3);
     xSheet0->getCellByPosition(11, 2)->setValue(25.4);
     xSheet0->getCellByPosition(11, 2)->setValue(28.5);
-    xSheet0->getCellByPosition(13, 2)->setFormula("SUM(B3:M3");
+    xSheet0->getCellByPosition(13, 2)->setFormula(u"SUM(B3:M3"_ustr);
 
-    xSheet0->getCellByPosition(0, 3)->setFormula("Brown");
+    xSheet0->getCellByPosition(0, 3)->setFormula(u"Brown"_ustr);
     xSheet0->getCellByPosition(1, 3)->setValue(31.45);
     xSheet0->getCellByPosition(2, 3)->setValue(-20.9);
     xSheet0->getCellByPosition(3, 3)->setValue(-117.5);
@@ -145,10 +145,10 @@ uno::Reference<uno::XInterface> ScChartObj::init()
     xSheet0->getCellByPosition(10, 3)->setValue(71.3);
     xSheet0->getCellByPosition(11, 3)->setValue(25.4);
     xSheet0->getCellByPosition(11, 3)->setValue(38.5);
-    xSheet0->getCellByPosition(13, 3)->setFormula("SUM(A4:L4");
+    xSheet0->getCellByPosition(13, 3)->setFormula(u"SUM(A4:L4"_ustr);
 
     uno::Reference<table::XCellRange> xCellRange0(xSheet0, 
uno::UNO_QUERY_THROW);
-    uno::Reference<table::XCellRange> 
xCellRange1(xCellRange0->getCellRangeByName("A1:N4"),
+    uno::Reference<table::XCellRange> 
xCellRange1(xCellRange0->getCellRangeByName(u"A1:N4"_ustr),
                                                   uno::UNO_SET_THROW);
     uno::Reference<sheet::XCellRangeAddressable> xCRA(xCellRange1, 
uno::UNO_QUERY_THROW);
 
@@ -156,10 +156,12 @@ uno::Reference<uno::XInterface> ScChartObj::init()
 
     uno::Reference<table::XTableChartsSupplier> xTCS(xSheet0, 
uno::UNO_QUERY_THROW);
     uno::Reference<table::XTableCharts> xTC = xTCS->getCharts();
-    xTC->addNewByName("ScChartObj", awt::Rectangle(500, 3000, 25000, 11000), 
aCRA, true, true);
+    xTC->addNewByName(u"ScChartObj"_ustr, awt::Rectangle(500, 3000, 25000, 
11000), aCRA, true,
+                      true);
 
     uno::Reference<container::XNameAccess> xNA(xTC, uno::UNO_QUERY_THROW);
-    uno::Reference<table::XTableChart> xChart(xNA->getByName("ScChartObj"), 
uno::UNO_QUERY_THROW);
+    uno::Reference<table::XTableChart> 
xChart(xNA->getByName(u"ScChartObj"_ustr),
+                                              uno::UNO_QUERY_THROW);
     return xChart;
 }
 
@@ -167,7 +169,7 @@ void ScChartObj::setUp()
 {
     UnoApiTest::setUp();
     // create a calc document
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScChartObj);
diff --git a/sc/qa/extras/scchartsobj.cxx b/sc/qa/extras/scchartsobj.cxx
index 93a4c20aca08..27f74dbeae4e 100644
--- a/sc/qa/extras/scchartsobj.cxx
+++ b/sc/qa/extras/scchartsobj.cxx
@@ -80,11 +80,11 @@ public:
 };
 
 ScChartsObj::ScChartsObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , XElementAccess(cppu::UnoType<table::XTableChart>::get())
     , XIndexAccess(1)
-    , XNameAccess("ScChartsObj")
-    , XServiceInfo("ScChartsObj", "com.sun.star.table.TableCharts")
+    , XNameAccess(u"ScChartsObj"_ustr)
+    , XServiceInfo(u"ScChartsObj"_ustr, u"com.sun.star.table.TableCharts"_ustr)
 {
 }
 
@@ -95,21 +95,21 @@ uno::Reference<uno::XInterface> ScChartsObj::init()
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), 
uno::UNO_QUERY_THROW);
 
-    xSheet0->getCellByPosition(1, 0)->setFormula("JAN");
-    xSheet0->getCellByPosition(2, 0)->setFormula("FEB");
-    xSheet0->getCellByPosition(3, 0)->setFormula("MAR");
-    xSheet0->getCellByPosition(4, 0)->setFormula("APR");
-    xSheet0->getCellByPosition(5, 0)->setFormula("MAY");
-    xSheet0->getCellByPosition(6, 0)->setFormula("JUN");
-    xSheet0->getCellByPosition(7, 0)->setFormula("JUL");
-    xSheet0->getCellByPosition(8, 0)->setFormula("AUG");
-    xSheet0->getCellByPosition(9, 0)->setFormula("SEP");
-    xSheet0->getCellByPosition(10, 0)->setFormula("OCT");
-    xSheet0->getCellByPosition(11, 0)->setFormula("NOV");
-    xSheet0->getCellByPosition(12, 0)->setFormula("DEC");
-    xSheet0->getCellByPosition(13, 0)->setFormula("SUM");
-
-    xSheet0->getCellByPosition(0, 1)->setFormula("Smith");
+    xSheet0->getCellByPosition(1, 0)->setFormula(u"JAN"_ustr);
+    xSheet0->getCellByPosition(2, 0)->setFormula(u"FEB"_ustr);
+    xSheet0->getCellByPosition(3, 0)->setFormula(u"MAR"_ustr);
+    xSheet0->getCellByPosition(4, 0)->setFormula(u"APR"_ustr);
+    xSheet0->getCellByPosition(5, 0)->setFormula(u"MAY"_ustr);
+    xSheet0->getCellByPosition(6, 0)->setFormula(u"JUN"_ustr);
+    xSheet0->getCellByPosition(7, 0)->setFormula(u"JUL"_ustr);
+    xSheet0->getCellByPosition(8, 0)->setFormula(u"AUG"_ustr);
+    xSheet0->getCellByPosition(9, 0)->setFormula(u"SEP"_ustr);
+    xSheet0->getCellByPosition(10, 0)->setFormula(u"OCT"_ustr);
+    xSheet0->getCellByPosition(11, 0)->setFormula(u"NOV"_ustr);
+    xSheet0->getCellByPosition(12, 0)->setFormula(u"DEC"_ustr);
+    xSheet0->getCellByPosition(13, 0)->setFormula(u"SUM"_ustr);
+
+    xSheet0->getCellByPosition(0, 1)->setFormula(u"Smith"_ustr);
     xSheet0->getCellByPosition(1, 1)->setValue(42);
     xSheet0->getCellByPosition(2, 1)->setValue(58.9);
     xSheet0->getCellByPosition(3, 1)->setValue(-66.5);
@@ -122,9 +122,9 @@ uno::Reference<uno::XInterface> ScChartsObj::init()
     xSheet0->getCellByPosition(10, 1)->setValue(-97.3);
     xSheet0->getCellByPosition(11, 1)->setValue(22.4);
     xSheet0->getCellByPosition(11, 1)->setValue(23.5);
-    xSheet0->getCellByPosition(13, 1)->setFormula("SUM(B2:M2");
+    xSheet0->getCellByPosition(13, 1)->setFormula(u"SUM(B2:M2"_ustr);
 
-    xSheet0->getCellByPosition(0, 2)->setFormula("Jones");
+    xSheet0->getCellByPosition(0, 2)->setFormula(u"Jones"_ustr);
     xSheet0->getCellByPosition(1, 2)->setValue(21);
     xSheet0->getCellByPosition(2, 2)->setValue(40.9);
     xSheet0->getCellByPosition(3, 2)->setValue(-57.5);
@@ -137,9 +137,9 @@ uno::Reference<uno::XInterface> ScChartsObj::init()
     xSheet0->getCellByPosition(10, 2)->setValue(57.3);
     xSheet0->getCellByPosition(11, 2)->setValue(25.4);
     xSheet0->getCellByPosition(11, 2)->setValue(28.5);
-    xSheet0->getCellByPosition(13, 2)->setFormula("SUM(B3:M3");
+    xSheet0->getCellByPosition(13, 2)->setFormula(u"SUM(B3:M3"_ustr);
 
-    xSheet0->getCellByPosition(0, 3)->setFormula("Brown");
+    xSheet0->getCellByPosition(0, 3)->setFormula(u"Brown"_ustr);
     xSheet0->getCellByPosition(1, 3)->setValue(31.45);
     xSheet0->getCellByPosition(2, 3)->setValue(-20.9);
     xSheet0->getCellByPosition(3, 3)->setValue(-117.5);
@@ -152,16 +152,16 @@ uno::Reference<uno::XInterface> ScChartsObj::init()
     xSheet0->getCellByPosition(10, 3)->setValue(71.3);
     xSheet0->getCellByPosition(11, 3)->setValue(25.4);
     xSheet0->getCellByPosition(11, 3)->setValue(38.5);
-    xSheet0->getCellByPosition(13, 3)->setFormula("SUM(A4:L4");
+    xSheet0->getCellByPosition(13, 3)->setFormula(u"SUM(A4:L4"_ustr);
 
     uno::Reference<table::XCellRange> xCellRange0(xSheet0, 
uno::UNO_QUERY_THROW);
-    uno::Reference<table::XCellRange> 
xCellRange1(xCellRange0->getCellRangeByName("A1:N4"),
+    uno::Reference<table::XCellRange> 
xCellRange1(xCellRange0->getCellRangeByName(u"A1:N4"_ustr),
                                                   uno::UNO_SET_THROW);
     uno::Reference<sheet::XCellRangeAddressable> xCRA(xCellRange1, 
uno::UNO_QUERY_THROW);
 
     uno::Reference<table::XTableChartsSupplier> xTCS(xSheet0, 
uno::UNO_QUERY_THROW);
     uno::Reference<table::XTableCharts> xTC = xTCS->getCharts();
-    xTC->addNewByName("ScChartsObj", awt::Rectangle(500, 3000, 25000, 11000),
+    xTC->addNewByName(u"ScChartsObj"_ustr, awt::Rectangle(500, 3000, 25000, 
11000),
                       { xCRA->getRangeAddress() }, true, true);
 
     return xTC;
@@ -171,7 +171,7 @@ void ScChartsObj::setUp()
 {
     UnoApiTest::setUp();
     // create calc document
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScChartsObj);
diff --git a/sc/qa/extras/sccheck_data_pilot_field.cxx 
b/sc/qa/extras/sccheck_data_pilot_field.cxx
index 6d65b0e12a27..343d702d398b 100644
--- a/sc/qa/extras/sccheck_data_pilot_field.cxx
+++ b/sc/qa/extras/sccheck_data_pilot_field.cxx
@@ -65,8 +65,8 @@ bool CheckDataPilotField::isPropertyIgnored(const OUString& 
rName)
 }
 
 CheckDataPilotField::CheckDataPilotField()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
-    , apitest::XNamed("Col1")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
+    , apitest::XNamed(u"Col1"_ustr)
 {
 }
 
@@ -75,7 +75,7 @@ uno::Reference<uno::XInterface> CheckDataPilotField::init()
     // create a calc document
     if (!mxComponent.is())
         // Load an empty document.
-        mxComponent = loadFromDesktop("private:factory/scalc");
+        mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
     else
         return mxObject;
 
@@ -99,7 +99,7 @@ uno::Reference<uno::XInterface> CheckDataPilotField::init()
     uno::Reference<container::XIndexAccess> oIndexAccess(xSpreadsheets, 
uno::UNO_QUERY_THROW);
 
     // Per default there's now just one sheet, make sure we have at least two, 
then
-    xSpreadsheets->insertNewByName("Some Sheet", 0);
+    xSpreadsheets->insertNewByName(u"Some Sheet"_ustr, 0);
     uno::Any aAny = oIndexAccess->getByIndex(0);
     uno::Reference<sheet::XSpreadsheet> oSheet;
     CPPUNIT_ASSERT(aAny >>= oSheet);
@@ -146,16 +146,16 @@ uno::Reference<uno::XInterface> 
CheckDataPilotField::init()
 
     uno::Any sum;
     sum <<= sheet::GeneralFunction_SUM;
-    fieldPropSet->setPropertyValue("Function", sum);
+    fieldPropSet->setPropertyValue(u"Function"_ustr, sum);
 
     uno::Any data;
     data <<= sheet::DataPilotFieldOrientation_DATA;
-    fieldPropSet->setPropertyValue("Orientation", data);
+    fieldPropSet->setPropertyValue(u"Orientation"_ustr, data);
 
     //Insert the DataPilotTable
-    if (DPT->hasByName("DataPilotField"))
-        DPT->removeByName("DataPilotField");
-    DPT->insertNewByName("DataPilotTField", sCellAddress, DPDsc);
+    if (DPT->hasByName(u"DataPilotField"_ustr))
+        DPT->removeByName(u"DataPilotField"_ustr);
+    DPT->insertNewByName(u"DataPilotTField"_ustr, sCellAddress, DPDsc);
 
     uno::Reference<container::XIndexAccess> IA = DPDsc->getDataPilotFields();
     uno::Reference<uno::XInterface> xDataPilotFieldObject;
diff --git a/sc/qa/extras/sccheck_data_pilot_table.cxx 
b/sc/qa/extras/sccheck_data_pilot_table.cxx
index 1f60ab72d191..e864de6e0d02 100644
--- a/sc/qa/extras/sccheck_data_pilot_table.cxx
+++ b/sc/qa/extras/sccheck_data_pilot_table.cxx
@@ -69,8 +69,8 @@ private:
 };
 
 CheckDataPilotTable::CheckDataPilotTable()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
-    , apitest::XNamed("DataPilotTable")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
+    , apitest::XNamed(u"DataPilotTable"_ustr)
 {
 }
 
@@ -79,7 +79,7 @@ uno::Reference<uno::XInterface> CheckDataPilotTable::init()
     // create a calc document
     if (!mxComponent.is())
         // Load an empty document.
-        mxComponent = loadFromDesktop("private:factory/scalc");
+        mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
     else
         return mxObject;
 
@@ -103,7 +103,7 @@ uno::Reference<uno::XInterface> CheckDataPilotTable::init()
     uno::Reference<container::XIndexAccess> oIndexAccess(xSpreadsheets, 
uno::UNO_QUERY_THROW);
 
     // Per default there's now just one sheet, make sure we have at least two, 
then
-    xSpreadsheets->insertNewByName("Some Sheet", 0);
+    xSpreadsheets->insertNewByName(u"Some Sheet"_ustr, 0);
     uno::Any aAny = oIndexAccess->getByIndex(0);
     uno::Reference<sheet::XSpreadsheet> oSheet;
     CPPUNIT_ASSERT(aAny >>= oSheet);
@@ -150,16 +150,16 @@ uno::Reference<uno::XInterface> 
CheckDataPilotTable::init()
 
     uno::Any sum;
     sum <<= sheet::GeneralFunction_SUM;
-    fieldPropSet->setPropertyValue("Function", sum);
+    fieldPropSet->setPropertyValue(u"Function"_ustr, sum);
 
     uno::Any data;
     data <<= sheet::DataPilotFieldOrientation_DATA;
-    fieldPropSet->setPropertyValue("Orientation", data);
+    fieldPropSet->setPropertyValue(u"Orientation"_ustr, data);
 
     //Insert the DataPilotTable
-    if (DPT->hasByName("DataPilotTable"))
-        DPT->removeByName("DataPilotTable");
-    DPT->insertNewByName("DataPilotTable", sCellAddress, DPDsc);
+    if (DPT->hasByName(u"DataPilotTable"_ustr))
+        DPT->removeByName(u"DataPilotTable"_ustr);
+    DPT->insertNewByName(u"DataPilotTable"_ustr, sCellAddress, DPDsc);
 
     uno::Reference<uno::XInterface> xDataPilotTableObject;
     data = DPT->getByName(DPT->getElementNames()[0]);
diff --git a/sc/qa/extras/sccheck_xcell_ranges_query.cxx 
b/sc/qa/extras/sccheck_xcell_ranges_query.cxx
index d5e9a5c8905f..82b4d5555e45 100644
--- a/sc/qa/extras/sccheck_xcell_ranges_query.cxx
+++ b/sc/qa/extras/sccheck_xcell_ranges_query.cxx
@@ -46,7 +46,7 @@ private:
 };
 
 CheckXCellRangesQuery::CheckXCellRangesQuery()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
 {
 }
 
@@ -55,7 +55,7 @@ uno::Reference<uno::XInterface> CheckXCellRangesQuery::init()
     // create a calc document
     if (!mxComponent.is())
         // Load an empty document.
-        mxComponent = loadFromDesktop("private:factory/scalc");
+        mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 
     uno::Reference<sheet::XSpreadsheetDocument> xSheetDoc(mxComponent, 
uno::UNO_QUERY_THROW);
 
@@ -76,7 +76,7 @@ uno::Reference<uno::XInterface> CheckXCellRangesQuery::init()
     // set one value for comparison.
     xSpreadSheet->getCellByPosition(1, 1)->setValue(15);
     xSpreadSheet->getCellByPosition(1, 3)->setValue(5);
-    xSpreadSheet->getCellByPosition(2, 1)->setFormula("=B2+B4");
+    xSpreadSheet->getCellByPosition(2, 1)->setFormula(u"=B2+B4"_ustr);
 
     return xSpreadSheet;
 }
@@ -119,7 +119,7 @@ void CheckXCellRangesQuery::checkFilledCell()
     // compare a cell with value 5 with a cell with value 15
     _queryRowDifferences(sSheetName + ".C4");
     // try to get nothing
-    _queryEmptyCells("");
+    _queryEmptyCells(u""_ustr);
 }
 
 /**
diff --git a/sc/qa/extras/scconsolidationdescriptorobj.cxx 
b/sc/qa/extras/scconsolidationdescriptorobj.cxx
index f80adb431d76..96bd1e45bff7 100644
--- a/sc/qa/extras/scconsolidationdescriptorobj.cxx
+++ b/sc/qa/extras/scconsolidationdescriptorobj.cxx
@@ -50,7 +50,7 @@ public:
 };
 
 ScConsolidationDescriptorObj::ScConsolidationDescriptorObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
 {
 }
 
@@ -66,7 +66,7 @@ void ScConsolidationDescriptorObj::setUp()
 {
     UnoApiTest::setUp();
     // create a calc document
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScConsolidationDescriptorObj);
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx 
b/sc/qa/extras/scdatabaserangeobj.cxx
index 4ddc137e4b25..4a035847bba8 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -67,13 +67,13 @@ public:
 };
 
 ScDatabaseRangeObj::ScDatabaseRangeObj()
-      : UnoApiTest("/sc/qa/extras/testdocuments")
+      : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
 {
 }
 
 uno::Reference<uno::XInterface> ScDatabaseRangeObj::init()
 {
-    return init("DataArea");
+    return init(u"DataArea"_ustr);
 }
 
 uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( const OUString& 
rDBName )
@@ -81,7 +81,7 @@ uno::Reference< uno::XInterface > ScDatabaseRangeObj::init( 
const OUString& rDBN
     uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, 
UNO_QUERY_THROW);
 
     uno::Reference< beans::XPropertySet > xPropSet(xDoc, UNO_QUERY_THROW);
-    uno::Reference< container::XNameAccess > xNameAccess( 
xPropSet->getPropertyValue("DatabaseRanges"), UNO_QUERY_THROW);
+    uno::Reference< container::XNameAccess > xNameAccess( 
xPropSet->getPropertyValue(u"DatabaseRanges"_ustr), UNO_QUERY_THROW);
 
     uno::Reference<sheet::XCellRangeReferrer> 
xCRR(xNameAccess->getByName(rDBName), UNO_QUERY_THROW);
     uno::Reference<sheet::XCellRangeAddressable> 
xCRA(xCRR->getReferredCells(), UNO_QUERY_THROW);
diff --git a/sc/qa/extras/scdatabaserangesobj.cxx 
b/sc/qa/extras/scdatabaserangesobj.cxx
index 16074375cce5..bd7953fb3c42 100644
--- a/sc/qa/extras/scdatabaserangesobj.cxx
+++ b/sc/qa/extras/scdatabaserangesobj.cxx
@@ -76,11 +76,11 @@ public:
 };
 
 ScDatabaseRangesObj::ScDatabaseRangesObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , XElementAccess(cppu::UnoType<sheet::XDatabaseRange>::get())
     , XIndexAccess(1)
-    , XNameAccess("DbRange")
-    , XServiceInfo("ScDatabaseRangesObj", "com.sun.star.sheet.DatabaseRanges")
+    , XNameAccess(u"DbRange"_ustr)
+    , XServiceInfo(u"ScDatabaseRangesObj"_ustr, 
u"com.sun.star.sheet.DatabaseRanges"_ustr)
 {
 }
 
@@ -89,11 +89,11 @@ uno::Reference<uno::XInterface> ScDatabaseRangesObj::init()
     uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, 
UNO_QUERY_THROW);
 
     uno::Reference<beans::XPropertySet> xPropSet(xDoc, UNO_QUERY_THROW);
-    uno::Reference<sheet::XDatabaseRanges> 
xDbRanges(xPropSet->getPropertyValue("DatabaseRanges"),
-                                                     UNO_QUERY_THROW);
+    uno::Reference<sheet::XDatabaseRanges> xDbRanges(
+        xPropSet->getPropertyValue(u"DatabaseRanges"_ustr), UNO_QUERY_THROW);
 
-    if (!xDbRanges->hasByName("DbRange"))
-        xDbRanges->addNewByName("DbRange", table::CellRangeAddress(0, 2, 4, 5, 
6));
+    if (!xDbRanges->hasByName(u"DbRange"_ustr))
+        xDbRanges->addNewByName(u"DbRange"_ustr, table::CellRangeAddress(0, 2, 
4, 5, 6));
 
     return xDbRanges;
 }
@@ -102,7 +102,7 @@ void ScDatabaseRangesObj::setUp()
 {
     UnoApiTest::setUp();
     // create a calc document
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScDatabaseRangesObj);
diff --git a/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx 
b/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
index 4f109fd9c6b1..8ad6b575696f 100644
--- a/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldgroupitemobj.cxx
@@ -65,9 +65,10 @@ private:
 };
 
 ScDataPilotFieldGroupItemObj::ScDataPilotFieldGroupItemObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
-    , XNamed("aName")
-    , XServiceInfo("ScDataPilotFieldGroupItemObj", 
"com.sun.star.sheet.DataPilotFieldGroupItem")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
+    , XNamed(u"aName"_ustr)
+    , XServiceInfo(u"ScDataPilotFieldGroupItemObj"_ustr,
+                   u"com.sun.star.sheet.DataPilotFieldGroupItem"_ustr)
 {
 }
 
@@ -79,7 +80,7 @@ uno::Reference<uno::XInterface> 
ScDataPilotFieldGroupItemObj::init()
     uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, 
uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheets> xSheets(xDoc->getSheets(), 
uno::UNO_SET_THROW);
     uno::Reference<container::XIndexAccess> xIA(xSheets, uno::UNO_QUERY_THROW);
-    xSheets->insertNewByName("Some Sheet", 0);
+    xSheets->insertNewByName(u"Some Sheet"_ustr, 0);
 
     uno::Reference<sheet::XSpreadsheet> xSheet0(xIA->getByIndex(0), 
uno::UNO_QUERY_THROW);
     uno::Reference<sheet::XSpreadsheet> xSheet1(xIA->getByIndex(1), 
uno::UNO_QUERY_THROW);
@@ -101,11 +102,11 @@ uno::Reference<uno::XInterface> 
ScDataPilotFieldGroupItemObj::init()
         }
     }
 
-    xSheet0->getCellByPosition(1, 1)->setFormula("aName");
-    xSheet0->getCellByPosition(1, 2)->setFormula("otherName");
-    xSheet0->getCellByPosition(1, 3)->setFormula("una");
-    xSheet0->getCellByPosition(1, 4)->setFormula("otherName");
-    xSheet0->getCellByPosition(1, 5)->setFormula("somethingelse");
+    xSheet0->getCellByPosition(1, 1)->setFormula(u"aName"_ustr);
+    xSheet0->getCellByPosition(1, 2)->setFormula(u"otherName"_ustr);
+    xSheet0->getCellByPosition(1, 3)->setFormula(u"una"_ustr);
+    xSheet0->getCellByPosition(1, 4)->setFormula(u"otherName"_ustr);
+    xSheet0->getCellByPosition(1, 5)->setFormula(u"somethingelse"_ustr);
 
     xSheet0->getCellByPosition(1, 5);
     xSheet0->getCellByPosition(aCellAddress.Column, aCellAddress.Row + 3);
@@ -119,19 +120,21 @@ uno::Reference<uno::XInterface> 
ScDataPilotFieldGroupItemObj::init()
 
     uno::Reference<beans::XPropertySet> 
xPropertySet0(xDPD->getDataPilotFields()->getByIndex(0),
                                                       uno::UNO_QUERY_THROW);
-    xPropertySet0->setPropertyValue("Orientation", 
uno::Any(sheet::DataPilotFieldOrientation_ROW));
+    xPropertySet0->setPropertyValue(u"Orientation"_ustr,
+                                    
uno::Any(sheet::DataPilotFieldOrientation_ROW));
 
     uno::Reference<beans::XPropertySet> 
xPropertySet1(xDPD->getDataPilotFields()->getByIndex(1),
                                                       uno::UNO_QUERY_THROW);
-    xPropertySet1->setPropertyValue("Function", 
uno::Any(sheet::GeneralFunction_SUM));
-    xPropertySet1->setPropertyValue("Orientation", 
uno::Any(sheet::DataPilotFieldOrientation_DATA));
+    xPropertySet1->setPropertyValue(u"Function"_ustr, 
uno::Any(sheet::GeneralFunction_SUM));
+    xPropertySet1->setPropertyValue(u"Orientation"_ustr,
+                                    
uno::Any(sheet::DataPilotFieldOrientation_DATA));
 
     uno::Reference<beans::XPropertySet> 
xPropertySet2(xDPD->getDataPilotFields()->getByIndex(2),
                                                       uno::UNO_QUERY_THROW);
-    xPropertySet2->setPropertyValue("Orientation",
+    xPropertySet2->setPropertyValue(u"Orientation"_ustr,
                                     
uno::Any(sheet::DataPilotFieldOrientation_COLUMN));
 
-    xDPT->insertNewByName("DataPilotTable", aCellAddress, xDPD);
+    xDPT->insertNewByName(u"DataPilotTable"_ustr, aCellAddress, xDPD);
 
     uno::Reference<container::XIndexAccess> 
xIA_DPT0(xDPTS->getDataPilotTables(),
                                                      uno::UNO_QUERY_THROW);
@@ -141,7 +144,7 @@ uno::Reference<uno::XInterface> 
ScDataPilotFieldGroupItemObj::init()
 
     uno::Reference<sheet::XDataPilotFieldGrouping> 
xDPFG(xIA_RF0->getByIndex(0),
                                                          uno::UNO_QUERY_THROW);
-    xDPFG->createNameGroup({ "aName", "otherName" });
+    xDPFG->createNameGroup({ u"aName"_ustr, u"otherName"_ustr });
 
     uno::Reference<container::XIndexAccess> 
xIA_DPT1(xDPTS->getDataPilotTables(),
                                                      uno::UNO_QUERY_THROW);
@@ -154,16 +157,16 @@ uno::Reference<uno::XInterface> 
ScDataPilotFieldGroupItemObj::init()
     {
         uno::Reference<beans::XPropertySet> 
xPropertySet(xIA_RF1->getByIndex(i),
                                                          uno::UNO_QUERY_THROW);
-        if 
(::comphelper::getBOOL(xPropertySet->getPropertyValue("IsGroupField")))
+        if 
(::comphelper::getBOOL(xPropertySet->getPropertyValue(u"IsGroupField"_ustr)))
         {
-            CPPUNIT_ASSERT(xPropertySet->getPropertyValue("GroupInfo") >>= 
aDPFGI);
+            CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"GroupInfo"_ustr) 
>>= aDPFGI);
         }
     }
 
     uno::Reference<container::XIndexAccess> xIA_GI(aDPFGI.Groups, 
uno::UNO_QUERY_THROW);
     uno::Reference<container::XNameAccess> xNA_GN(xIA_GI->getByIndex(0), 
uno::UNO_QUERY_THROW);
 
-    uno::Reference<uno::XInterface> xReturn(xNA_GN->getByName("aName"), 
uno::UNO_QUERY_THROW);
+    uno::Reference<uno::XInterface> xReturn(xNA_GN->getByName(u"aName"_ustr), 
uno::UNO_QUERY_THROW);
     return xReturn;
 }
 
@@ -171,7 +174,7 @@ void ScDataPilotFieldGroupItemObj::setUp()
 {
     UnoApiTest::setUp();
     // create a calc document
-    mxComponent = loadFromDesktop("private:factory/scalc");
+    mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScDataPilotFieldGroupItemObj);
diff --git a/sc/qa/extras/scdatapilotfieldgroupobj.cxx 
b/sc/qa/extras/scdatapilotfieldgroupobj.cxx
index 8057725d7f4f..78282f2717b1 100644
--- a/sc/qa/extras/scdatapilotfieldgroupobj.cxx
+++ b/sc/qa/extras/scdatapilotfieldgroupobj.cxx
@@ -88,12 +88,12 @@ private:
 };
 
 ScDataPilotFieldGroupObj::ScDataPilotFieldGroupObj()
-    : UnoApiTest("/sc/qa/extras/testdocuments")
+    : UnoApiTest(u"/sc/qa/extras/testdocuments"_ustr)
     , XElementAccess(cppu::UnoType<container::XNamed>::get())
     , XIndexAccess(2)
-    , XNameAccess("aName")
-    , XNamed("Group1")
-e 
... etc. - the rest is truncated

core.git: sc/qa

Reply via email to