use more string_view in chart2

Change-Id: I9ab6cd3905bfb7c811e7ad14b54ced6c42d2e077
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133003
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

17 files changed, 393 insertions, 389 deletions

diff --git a/chart2/qa/extras/PivotChartTest.cxx b/chart2/qa/extras/PivotChartTest.cxx
index ee024531e88b..baa1c925132e 100644
--- a/chart2/qa/extras/PivotChartTest.cxx
+++ b/chart2/qa/extras/PivotChartTest.cxx
@@ -316,7 +316,7 @@ void PivotChartTest::testRoundtrip()
 
     std::vector<double> aReference2 { 101879.458079, 178636.929704, 314626.484864 };
 
-    load(u"/chart2/qa/extras/data/ods/", "PivotChartRoundTrip.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"PivotChartRoundTrip.ods");
 
     xChartDoc = getPivotChartDocFromSheet(1, mxComponent);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -371,7 +371,7 @@ void PivotChartTest::testChangePivotTable()
     uno::Sequence<uno::Any> xSequence;
     Reference<chart2::XChartDocument> xChartDoc;
 
-    load(u"/chart2/qa/extras/data/ods/", "PivotTableExample.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"PivotTableExample.ods");
 
     // Check we have the Pivot Table
     OUString sPivotTableName("DataPilot1");
diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx b/chart2/qa/extras/chart2_trendcalculators.cxx
index c13c1666725e..309df9f2bfb4 100644
--- a/chart2/qa/extras/chart2_trendcalculators.cxx
+++ b/chart2/qa/extras/chart2_trendcalculators.cxx
@@ -64,7 +64,7 @@ private:
 void Chart2TrendCalculators::setUp()
 {
     ChartTest::setUp();
-    load(u"/chart2/qa/extras/data/ods/", "trend_calculators.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"trend_calculators.ods");
 }
 
 void Chart2TrendCalculators::tearDown()
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index c333ab9d651e..fc6ffc4d4dbf 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -385,7 +385,7 @@ void checkTrendlinesInChart(uno::Reference< chart2::XChartDocument > const & xCh
 // improve the test
 void Chart2ExportTest::testErrorBarXLSX()
 {
-    load(u"/chart2/qa/extras/data/ods/", "error_bar.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"error_bar.ods");
     {
         // make sure the ODS import was successful
         uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
@@ -421,7 +421,7 @@ void Chart2ExportTest::testErrorBarXLSX()
 
 void Chart2ExportTest::testErrorBarPropXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "testErrorBarProp.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testErrorBarProp.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -441,7 +441,7 @@ void Chart2ExportTest::testErrorBarPropXLSX()
 void Chart2ExportTest::testTrendline()
 {
     mbSkipValidation = true;
-    load(u"/chart2/qa/extras/data/ods/", "trendline.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"trendline.ods");
     checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
     reload("calc8");
     checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -449,7 +449,7 @@ void Chart2ExportTest::testTrendline()
 
 void Chart2ExportTest::testTrendlineOOXML()
 {
-    load(u"/chart2/qa/extras/data/ods/", "trendline.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"trendline.ods");
     checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
     reload("Calc Office Open XML");
     checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -458,7 +458,7 @@ void Chart2ExportTest::testTrendlineOOXML()
 void Chart2ExportTest::testTrendlineXLS()
 {
     mbSkipValidation = true;
-    load(u"/chart2/qa/extras/data/ods/", "trendline.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"trendline.ods");
     checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
     reload("MS Excel 97");
     checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -467,7 +467,7 @@ void Chart2ExportTest::testTrendlineXLS()
 void Chart2ExportTest::testMovingAverage()
 {
     mbSkipValidation = true;
-    load(u"/chart2/qa/extras/data/ods/", "moving-type.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"moving-type.ods");
     reload("calc8");
 
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent);
@@ -502,7 +502,7 @@ void Chart2ExportTest::testStockChart()
      * an attribute val of index should start from 1 and not from 0.
      * Which was problem area.
      */
-    load(u"/chart2/qa/extras/data/docx/", "testStockChart.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testStockChart.docx");
 
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
@@ -517,7 +517,7 @@ void Chart2ExportTest::testStockChart()
 
 void Chart2ExportTest::testBarChart()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testBarChart.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testBarChart.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -528,14 +528,14 @@ void Chart2ExportTest::testCrosses()
 {
     // test crosses val="autoZero" with DOCX
     {
-        load(u"/chart2/qa/extras/data/docx/", "Bar_horizontal_cone.docx");
+        load(u"/chart2/qa/extras/data/docx/", u"Bar_horizontal_cone.docx");
         xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
 
         assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses", "val", "autoZero");
     }
     // tdf#142351: test crossesAt val="-50" with XLSX
     {
-        load(u"/chart2/qa/extras/data/xlsx/", "tdf142351.xlsx");
+        load(u"/chart2/qa/extras/data/xlsx/", u"tdf142351.xlsx");
         xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
         CPPUNIT_ASSERT(pXmlDoc);
 
@@ -545,7 +545,7 @@ void Chart2ExportTest::testCrosses()
 
 void Chart2ExportTest::testScatterChartTextXValues()
 {
-    load(u"/chart2/qa/extras/data/docx/", "scatter-chart-text-x-values.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"scatter-chart-text-x-values.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -593,7 +593,7 @@ void Chart2ExportTest::testScatterChartTextXValues()
 
 void Chart2ExportTest::testScatterXAxisValues()
 {
-    load(u"/chart2/qa/extras/data/odt/", "tdf114657.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"tdf114657.odt");
 
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
@@ -607,7 +607,7 @@ void Chart2ExportTest::testScatterXAxisValues()
 
 void Chart2ExportTest::testScatterXAxisCategories()
 {
-    load(u"/chart2/qa/extras/data/odt/", "tdf131143.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"tdf131143.odt");
 
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
@@ -618,7 +618,7 @@ void Chart2ExportTest::testScatterXAxisCategories()
 
 void Chart2ExportTest::testChartDataTable()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testChartDataTable.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testChartDataTable.docx");
 
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
@@ -629,7 +629,7 @@ void Chart2ExportTest::testChartDataTable()
 
 void Chart2ExportTest::testChartExternalData()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testMultipleChart.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testMultipleChart.docx");
 
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
@@ -644,7 +644,7 @@ void Chart2ExportTest::testEmbeddingsGrabBag()
    // after saving file.
    // This test case tests whether embeddings files grabbagged properly in correct object.
 
-   load(u"/chart2/qa/extras/data/docx/", "testMultiplechartembeddings.docx" );
+   load(u"/chart2/qa/extras/data/docx/", u"testMultiplechartembeddings.docx" );
    uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
    uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY);
    uno::Sequence<beans::PropertyValue> aGrabBag(0);
@@ -679,7 +679,7 @@ void Chart2ExportTest::testEmbeddingsGrabBag()
 
 void Chart2ExportTest::testAreaChartLoad()
 {
-    load (u"/chart2/qa/extras/data/docx/", "testAreaChartLoad.docx");
+    load (u"/chart2/qa/extras/data/docx/", u"testAreaChartLoad.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:showVal", "val", "1");
@@ -698,7 +698,7 @@ void Chart2ExportTest::testUpDownBars()
 
 void Chart2ExportTest::testDoughnutChart()
 {
-    load(u"/chart2/qa/extras/data/docx/", "doughnutChart.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"doughnutChart.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -707,7 +707,7 @@ void Chart2ExportTest::testDoughnutChart()
 
 void Chart2ExportTest::testDisplayUnits()
 {
-    load(u"/chart2/qa/extras/data/docx/", "DisplayUnits.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"DisplayUnits.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -725,7 +725,7 @@ void Chart2ExportTest::testDisplayUnits()
 
 void Chart2ExportTest::testFdo74115WallBitmapFill()
 {
-    load(u"/chart2/qa/extras/data/docx/", "fdo74115_WallBitmapFill.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"fdo74115_WallBitmapFill.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:blipFill");
@@ -733,7 +733,7 @@ void Chart2ExportTest::testFdo74115WallBitmapFill()
 
 void Chart2ExportTest::testPieChartWallLineStyle()
 {
-    load(u"/chart2/qa/extras/data/odt/", "testPieChartWallLineStyle.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"testPieChartWallLineStyle.odt");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:ln/a:noFill");
@@ -743,7 +743,7 @@ void Chart2ExportTest::testPieChartWallLineStyle()
 
 void Chart2ExportTest::testFdo78290LineChartMarkerX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "fdo78290_Line_Chart_Marker_x.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"fdo78290_Line_Chart_Marker_x.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val","x");
@@ -754,7 +754,7 @@ void Chart2ExportTest::testFdo78290LineChartMarkerX()
 
 void Chart2ExportTest::testFdo78290ScatterChartMarkerX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "fdo78290_Scatter_Chart_Marker_x.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"fdo78290_Scatter_Chart_Marker_x.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val","x");
@@ -766,7 +766,7 @@ void Chart2ExportTest::testFdo78290ScatterChartMarkerX()
 
 void Chart2ExportTest::testFdo78290CombinationChartMarkerX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "fdo78290_Combination_Chart_Marker_x.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"fdo78290_Combination_Chart_Marker_x.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val","x");
@@ -776,7 +776,7 @@ void Chart2ExportTest::testFdo78290CombinationChartMarkerX()
 void Chart2ExportTest::testTdf126115IndividualMarker()
 {
     // Check individual marker properties.
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf126115.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf126115.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // 1. series
@@ -826,7 +826,7 @@ void Chart2ExportTest::testAxisNumberFormatODS()
 
     } aTest;
 
-    load(u"/chart2/qa/extras/data/ods/", "axis-numformats-linked.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"axis-numformats-linked.ods");
 
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     aTest.check(xChartDoc);
@@ -882,7 +882,7 @@ void Chart2ExportTest::testAxisNumberFormatXLS()
 
     } aTest;
 
-    load( u"/chart2/qa/extras/data/xls/", "axis_sourceformatting.xls" );
+    load( u"/chart2/qa/extras/data/xls/", u"axis_sourceformatting.xls" );
 
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet( 0, mxComponent );
     aTest.check( xChartDoc, true, util::NumberFormat::PERCENT );
@@ -981,7 +981,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX()
 
     } aTest;
 
-    load(u"/chart2/qa/extras/data/docx/", "data-label-borders.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"data-label-borders.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
 
@@ -1009,7 +1009,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX()
 
 void Chart2ExportTest::testDataLabel3DChartDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "3d-bar-label.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"3d-bar-label.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1025,7 +1025,7 @@ void Chart2ExportTest::testDataLabel3DChartDOCX()
 
 void Chart2ExportTest::testDataLabelBarChartDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "bar-chart-labels.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"bar-chart-labels.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1040,7 +1040,7 @@ void Chart2ExportTest::testDataLabelBarChartDOCX()
 
 void Chart2ExportTest::testDataLabelClusteredBarChartDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "clustered-bar-chart-labels.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"clustered-bar-chart-labels.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1054,7 +1054,7 @@ void Chart2ExportTest::testDataLabelClusteredBarChartDOCX()
 
 void Chart2ExportTest::testDataLabelRadarChartDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "radar-chart-labels.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"radar-chart-labels.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1069,7 +1069,7 @@ void Chart2ExportTest::testDataLabelRadarChartDOCX()
 
 void Chart2ExportTest::testDataLabelDoughnutChartDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "doughnut-chart-labels.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"doughnut-chart-labels.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1084,7 +1084,7 @@ void Chart2ExportTest::testDataLabelDoughnutChartDOCX()
 
 void Chart2ExportTest::testDataLabelAreaChartDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "area-chart-labels.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"area-chart-labels.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1103,7 +1103,7 @@ void Chart2ExportTest::testDataLabelDefaultLineChartDOCX()
     // label position (2010 does).  Make sure its default data label position
     // is RIGHT when exporting.
 
-    load(u"/chart2/qa/extras/data/docx/", "line-chart-label-default-placement.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"line-chart-label-default-placement.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1122,7 +1122,7 @@ void Chart2ExportTest::testDataLabelDefaultLineChartDOCX()
 
 void Chart2ExportTest::testIndividualDataLabelProps()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf122915.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf122915.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr", "b", "1");
@@ -1133,7 +1133,7 @@ void Chart2ExportTest::testIndividualDataLabelProps()
 
 void Chart2ExportTest::testTdf108107()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf108107.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf108107.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx", "val", "1");
@@ -1143,7 +1143,7 @@ void Chart2ExportTest::testTdf108107()
 
 void Chart2ExportTest::testTdf114139()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf114139.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf114139.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1155,7 +1155,7 @@ void Chart2ExportTest::testTdf114139()
 
 void Chart2ExportTest::testTdf64224()
 {
-    load(u"/chart2/qa/extras/data/ods/", "tdf64224.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf64224.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1166,7 +1166,7 @@ void Chart2ExportTest::testTdf64224()
 
 void Chart2ExportTest::testChartTitlePropertiesColorFillDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesColorFill.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testChartTitlePropertiesColorFill.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000");
@@ -1175,7 +1175,7 @@ void Chart2ExportTest::testChartTitlePropertiesColorFillDOCX()
 
 void Chart2ExportTest::testChartTitlePropertiesGradientFillDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesGradientFill.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testChartTitlePropertiesGradientFill.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "cccccc");
@@ -1185,7 +1185,7 @@ void Chart2ExportTest::testChartTitlePropertiesGradientFillDOCX()
 
 void Chart2ExportTest::testChartTitlePropertiesBitmapFillDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesBitmapFill.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testChartTitlePropertiesBitmapFill.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", "rId1");
@@ -1195,7 +1195,7 @@ void Chart2ExportTest::testChartTitlePropertiesBitmapFillDOCX()
 void Chart2ExportTest::testColorGradientWithTransparencyDOCX()
 {
     // Test color gradient (two color) with gradient transparency
-    load(u"/chart2/qa/extras/data/docx/", "testColorGradientWithTransparency.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testColorGradientWithTransparency.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     // Test the transparency of the first color
@@ -1207,7 +1207,7 @@ void Chart2ExportTest::testColorGradientWithTransparencyDOCX()
 void Chart2ExportTest::testColorGradientWithTransparencyODS()
 {
     // Test color gradient (two color) with simple transparency
-    load(u"/chart2/qa/extras/data/ods/", "testColorGradientWithTransparency.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"testColorGradientWithTransparency.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // Test the transparency of the first color
@@ -1219,7 +1219,7 @@ void Chart2ExportTest::testColorGradientWithTransparencyODS()
 void Chart2ExportTest::testColorGradientStopXLSX()
 {
     // Test color gradient (two color) stop of the first color
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf128619.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf128619.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // Test the position of the first color
@@ -1230,7 +1230,7 @@ void Chart2ExportTest::testColorGradientStopXLSX()
 
 void Chart2ExportTest::testRadialColorGradientDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf128794.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf128794.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     // Test the gradient style (if there is no 'a:path' attribute, it is a linear gradient)
@@ -1241,7 +1241,7 @@ void Chart2ExportTest::testRadialColorGradientDOCX()
 
 void Chart2ExportTest::testBarChartDataPointPropDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testBarChartDataPointPropDOCX.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testBarChartDataPointPropDOCX.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1259,7 +1259,7 @@ void Chart2ExportTest::testBarChartDataPointPropDOCX()
 
 void Chart2ExportTest::testBarChartRotation()
 {
-    load (u"/chart2/qa/extras/data/docx/", "barChartRotation.docx");
+    load (u"/chart2/qa/extras/data/docx/", u"barChartRotation.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1274,7 +1274,7 @@ void Chart2ExportTest::testShapeFollowedByChart()
        docPr Id is being repeated, ECMA 20.4.2.5 says that the
        docPr Id should be unique, ensuring the same here.
     */
-    load(u"/chart2/qa/extras/data/docx/", "FDO74430.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"FDO74430.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/document", "Office Open XML Text" );
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1286,7 +1286,7 @@ void Chart2ExportTest::testShapeFollowedByChart()
 
 void Chart2ExportTest::testPieChartDataLabels()
 {
-    load(u"/chart2/qa/extras/data/docx/", "PieChartDataLabels.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"PieChartDataLabels.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos", "val", "outEnd");
@@ -1294,7 +1294,7 @@ void Chart2ExportTest::testPieChartDataLabels()
 
 void Chart2ExportTest::testSeriesIdxOrder()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testSeriesIdxOrder.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testSeriesIdxOrder.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:idx[1]", "val", "1");
@@ -1303,7 +1303,7 @@ void Chart2ExportTest::testSeriesIdxOrder()
 
 void Chart2ExportTest::testScatterPlotLabels()
 {
-    load(u"/chart2/qa/extras/data/odt/", "scatter-plot-labels.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"scatter-plot-labels.odt");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -1335,7 +1335,7 @@ void Chart2ExportTest::testScatterPlotLabels()
 
 void Chart2ExportTest::testErrorBarDataRangeODS()
 {
-    load(u"/chart2/qa/extras/data/ods/", "ErrorBarRange.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"ErrorBarRange.ods");
     reload("calc8");
 
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
@@ -1364,14 +1364,14 @@ void Chart2ExportTest::testErrorBarDataRangeODS()
 
 void Chart2ExportTest::testChartCrash()
 {
-    load(u"/chart2/qa/extras/data/docx/", "FDO75975.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"FDO75975.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
 }
 
 void Chart2ExportTest::testPieChartRotation()
 {
-    load (u"/chart2/qa/extras/data/docx/", "pieChartRotation.docx");
+    load (u"/chart2/qa/extras/data/docx/", u"pieChartRotation.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX", "val", "40");
@@ -1384,7 +1384,7 @@ void Chart2ExportTest::testEmbeddingsOleObjectGrabBag()
    // after saving file.
    // This test case tests whether embeddings files grabbagged properly in correct object.
 
-   load(u"/chart2/qa/extras/data/docx/", "testchartoleobjectembeddings.docx" );
+   load(u"/chart2/qa/extras/data/docx/", u"testchartoleobjectembeddings.docx" );
    uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
    uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY);
    uno::Sequence<beans::PropertyValue> aGrabBag(0);
@@ -1455,7 +1455,7 @@ void checkSheetForGapWidthAndOverlap(uno::Reference< chart2::XChartDocument > co
 
 void Chart2ExportTest::testGapWidthXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "gapWidth.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"gapWidth.xlsx");
 
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
     checkSheetForGapWidthAndOverlap(xChartDoc, 120, -60);
@@ -1474,7 +1474,7 @@ void Chart2ExportTest::testGapWidthXLSX()
 
 void Chart2ExportTest::testSmoothedLines()
 {
-    load(u"/chart2/qa/extras/data/ods/", "smoothedLines.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"smoothedLines.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:smooth", "val", "0");
@@ -1482,7 +1482,7 @@ void Chart2ExportTest::testSmoothedLines()
 
 void Chart2ExportTest::testLabelStringODS()
 {
-    load(u"/chart2/qa/extras/data/ods/", "labelString.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"labelString.ods");
 
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
     Reference< chart2::data::XDataSequence > xLabelSeq =
@@ -1504,7 +1504,7 @@ void Chart2ExportTest::testLabelStringODS()
 
 void Chart2ExportTest::testFdo83058dlblPos()
 {
-    load (u"/chart2/qa/extras/data/docx/", "fdo83058_dlblPos.docx");
+    load (u"/chart2/qa/extras/data/docx/", u"fdo83058_dlblPos.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[2]/c:dLblPos", "val", "outEnd");
@@ -1515,7 +1515,7 @@ void Chart2ExportTest::testFdo83058dlblPos()
 
 void Chart2ExportTest::testAutoTitleDelXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "autotitledel_2007.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"autotitledel_2007.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", "0");
@@ -1523,7 +1523,7 @@ void Chart2ExportTest::testAutoTitleDelXLSX()
 
 void Chart2ExportTest::testDispBlanksAsXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2007.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"dispBlanksAs_2007.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", "gap");
@@ -1531,7 +1531,7 @@ void Chart2ExportTest::testDispBlanksAsXLSX()
 
 void Chart2ExportTest::testMarkerColorXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "markerColor.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"markerColor.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", "92d050");
@@ -1539,7 +1539,7 @@ void Chart2ExportTest::testMarkerColorXLSX()
 
 void Chart2ExportTest::testRoundedCornersXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "markerColor.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"markerColor.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:roundedCorners", "val", "0");
@@ -1547,7 +1547,7 @@ void Chart2ExportTest::testRoundedCornersXLSX()
 
 void Chart2ExportTest::testAxisNumberFormatXLSX()
 {
-    load(u"/chart2/qa/extras/data/ods/", "axis_number_format.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"axis_number_format.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx", 2);
@@ -1560,7 +1560,7 @@ void Chart2ExportTest::testAxisNumberFormatXLSX()
 
 void Chart2ExportTest::testDataPointLabelNumberFormatXLSX()
 {
-    load(u"/chart2/qa/extras/data/ods/", "tdf123774.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf123774.ods");
     {
         xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
         CPPUNIT_ASSERT(pXmlDoc);
@@ -1571,7 +1571,7 @@ void Chart2ExportTest::testDataPointLabelNumberFormatXLSX()
         assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt", "sourceLinked", "0");
     }
 
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf130986.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf130986.xlsx");
     {
         xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
         CPPUNIT_ASSERT(pXmlDoc);
@@ -1583,7 +1583,7 @@ void Chart2ExportTest::testDataPointLabelNumberFormatXLSX()
 
 void Chart2ExportTest::testDataLabelDefaultValuesXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "data_label.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"data_label.xlsx");
     Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent);
     Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0);
     Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW);
@@ -1600,7 +1600,7 @@ void Chart2ExportTest::testDataLabelDefaultValuesXLSX()
 
 void Chart2ExportTest::testDataLabelFillColor()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "data_labels_fill_color.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"data_labels_fill_color.xlsx");
     Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent);
     Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0);
     Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW);
@@ -1615,7 +1615,7 @@ void Chart2ExportTest::testDataLabelFillColor()
 
 void Chart2ExportTest::testTitleOverlayXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "chart_title.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"chart_title.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:overlay", "val", "0");
@@ -1623,7 +1623,7 @@ void Chart2ExportTest::testTitleOverlayXLSX()
 
 void Chart2ExportTest::testInvertIfNegativeXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "bar_chart_simple.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"bar_chart_simple.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:invertIfNegative", "val", "0");
@@ -1631,7 +1631,7 @@ void Chart2ExportTest::testInvertIfNegativeXLSX()
 
 void Chart2ExportTest::testBubble3DXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "bubble_chart_simple.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"bubble_chart_simple.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[1]/c:bubble3D", "val", "0");
@@ -1641,7 +1641,7 @@ void Chart2ExportTest::testBubble3DXLSX()
 
 void Chart2ExportTest::testNoMarkerXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "no_marker.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"no_marker.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:marker/c:symbol", "val", "none");
@@ -1651,7 +1651,7 @@ void Chart2ExportTest::testNoMarkerXLSX()
 
 void Chart2ExportTest::testTitleManualLayoutXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "title_manual_layout.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"title_manual_layout.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:layoutTarget", 0);
@@ -1674,7 +1674,7 @@ void Chart2ExportTest::testTitleManualLayoutXLSX()
 
 void Chart2ExportTest::testPlotAreaManualLayoutXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "plot_area_manual_layout.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"plot_area_manual_layout.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1707,7 +1707,7 @@ void Chart2ExportTest::testPlotAreaManualLayoutXLSX()
 
 void Chart2ExportTest::testLegendManualLayoutXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "legend_manual_layout.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"legend_manual_layout.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1743,7 +1743,7 @@ void Chart2ExportTest::testLegendManualLayoutXLSX()
 
 void Chart2ExportTest::testChartSubTitle()
 {
-    load(u"/chart2/qa/extras/data/ods/", "testChartSubTitle.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"testChartSubTitle.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // test properties of subtitle
@@ -1757,7 +1757,7 @@ void Chart2ExportTest::testChartSubTitle()
 
 void Chart2ExportTest::testChartMainWithSubTitle()
 {
-    load(u"/chart2/qa/extras/data/ods/", "testChartMainWithSubTitle.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"testChartMainWithSubTitle.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // test properties of title
@@ -1772,7 +1772,7 @@ void Chart2ExportTest::testChartMainWithSubTitle()
 
 void Chart2ExportTest::testAutoTitleDeleted()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "testAutoTitleDeleted.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testAutoTitleDeleted.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", "1");
@@ -1780,7 +1780,7 @@ void Chart2ExportTest::testAutoTitleDeleted()
 
 void Chart2ExportTest::testChartTitlePropertiesColorFillXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesColorFill.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testChartTitlePropertiesColorFill.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000");
@@ -1789,7 +1789,7 @@ void Chart2ExportTest::testChartTitlePropertiesColorFillXLSX()
 
 void Chart2ExportTest::testChartTitlePropertiesGradientFillXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesGradientFill.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testChartTitlePropertiesGradientFill.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "cccccc");
@@ -1799,7 +1799,7 @@ void Chart2ExportTest::testChartTitlePropertiesGradientFillXLSX()
 
 void Chart2ExportTest::testChartTitlePropertiesBitmapFillXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesBitmapFill.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testChartTitlePropertiesBitmapFill.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", "rId1");
@@ -1808,7 +1808,7 @@ void Chart2ExportTest::testChartTitlePropertiesBitmapFillXLSX()
 
 void Chart2ExportTest::testBarChartDataPointPropXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "testBarChartDataPointPropXLSX.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testBarChartDataPointPropXLSX.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1826,7 +1826,7 @@ void Chart2ExportTest::testBarChartDataPointPropXLSX()
 
 void Chart2ExportTest::testDataseriesOverlapStackedChartXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "testDataseriesOverlapStackedChart.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testDataseriesOverlapStackedChart.xlsx");
 
     // test the overlap value of a simple Stacked Column Chart
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
@@ -1847,7 +1847,7 @@ void Chart2ExportTest::testDataseriesOverlapStackedChartXLSX()
 
 void Chart2ExportTest::testAxisCharacterPropertiesXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "axis_character_properties.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"axis_character_properties.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1864,7 +1864,7 @@ void Chart2ExportTest::testAxisCharacterPropertiesXLSX()
 
 void Chart2ExportTest::testTitleCharacterPropertiesXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "title_character_properties.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"title_character_properties.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1877,7 +1877,7 @@ void Chart2ExportTest::testTitleCharacterPropertiesXLSX()
 
 void Chart2ExportTest::testPlotVisOnlyXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "hidden_cells.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"hidden_cells.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1886,7 +1886,7 @@ void Chart2ExportTest::testPlotVisOnlyXLSX()
 
 void Chart2ExportTest::testBarChartVaryColorsXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf90876.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf90876.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1895,7 +1895,7 @@ void Chart2ExportTest::testBarChartVaryColorsXLSX()
 
 void Chart2ExportTest::testTdf96161()
 {
-    load(u"/chart2/qa/extras/data/ods/", "tdf96161.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf96161.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1904,7 +1904,7 @@ void Chart2ExportTest::testTdf96161()
 
 void Chart2ExportTest::testTableOnPage3()
 {
-    load(u"/chart2/qa/extras/data/docx/", "TableOnPage3.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"TableOnPage3.docx");
     reload("Office Open XML Text");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
@@ -1920,7 +1920,7 @@ void Chart2ExportTest::testTableOnPage3()
 
 void Chart2ExportTest::testMultipleAxisXLSX()
 {
-    load(u"/chart2/qa/extras/data/ods/", "multiple_axis.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"multiple_axis.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1935,7 +1935,7 @@ void Chart2ExportTest::testMultipleAxisXLSX()
 
 void Chart2ExportTest::testSecondaryAxisXLSX()
 {
-    load(u"/chart2/qa/extras/data/ods/", "secondary_axis.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"secondary_axis.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1951,7 +1951,7 @@ void Chart2ExportTest::testSecondaryAxisXLSX()
 
 void Chart2ExportTest::testBarChartSecondaryAxisXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "testSecondaryAxis.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testSecondaryAxis.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // Collect barchart axID on primary Axis
diff --git a/chart2/qa/extras/chart2export2.cxx b/chart2/qa/extras/chart2export2.cxx
index 1fa862291459..be2902cbb15c 100644
--- a/chart2/qa/extras/chart2export2.cxx
+++ b/chart2/qa/extras/chart2export2.cxx
@@ -168,7 +168,7 @@ void Chart2ExportTest2::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
 
 void Chart2ExportTest2::testSetSeriesToSecondaryAxisXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "add_series_secondary_axis.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"add_series_secondary_axis.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     // Second series
     Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xChartDoc, 1);
@@ -188,7 +188,7 @@ void Chart2ExportTest2::testSetSeriesToSecondaryAxisXLSX()
 void Chart2ExportTest2::testCombinedChartSecondaryAxisXLSX()
 {
     // Original file was created with MS Office
-    load(u"/chart2/qa/extras/data/xlsx/", "combined_chart_secondary_axis.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"combined_chart_secondary_axis.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // Collect barchart axID on secondary Axis
@@ -215,7 +215,7 @@ void Chart2ExportTest2::testCombinedChartSecondaryAxisXLSX()
 void Chart2ExportTest2::testCombinedChartSecondaryAxisODS()
 {
     // Original file was created with LibreOffice
-    load(u"/chart2/qa/extras/data/ods/", "combined_chart_secondary_axis.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"combined_chart_secondary_axis.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // Collect barchart axID on secondary Axis
@@ -245,14 +245,14 @@ void Chart2ExportTest2::testCrossBetweenXLSX()
 {
     // Original files were created with MS Office
     {
-        load(u"/chart2/qa/extras/data/xlsx/", "tdf127777.xlsx");
+        load(u"/chart2/qa/extras/data/xlsx/", u"tdf127777.xlsx");
         xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
         CPPUNIT_ASSERT(pXmlDoc);
         assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val",
                     "between");
     }
     {
-        load(u"/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
+        load(u"/chart2/qa/extras/data/xlsx/", u"tdf132076.xlsx");
         xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
         CPPUNIT_ASSERT(pXmlDoc);
         assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val",
@@ -263,7 +263,7 @@ void Chart2ExportTest2::testCrossBetweenXLSX()
 void Chart2ExportTest2::testCrossBetweenWithDeletedAxis()
 {
     // Original file was created with MS Office (the category axis is deleted in the file)
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf128633.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf128633.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val",
@@ -273,7 +273,7 @@ void Chart2ExportTest2::testCrossBetweenWithDeletedAxis()
 void Chart2ExportTest2::testCrossBetweenODS()
 {
     // Original file was created with LibreOffice
-    load(u"/chart2/qa/extras/data/ods/", "test_CrossBetween.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"test_CrossBetween.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val",
@@ -282,7 +282,7 @@ void Chart2ExportTest2::testCrossBetweenODS()
 
 void Chart2ExportTest2::testAxisTitleRotationXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "axis_title_rotation.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"axis_title_rotation.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -292,7 +292,7 @@ void Chart2ExportTest2::testAxisTitleRotationXLSX()
 
 void Chart2ExportTest2::testAxisTitlePositionDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testAxisTitlePosition.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testAxisTitlePosition.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -324,14 +324,14 @@ void Chart2ExportTest2::testAxisTitlePositionDOCX()
 
 void Chart2ExportTest2::testAxisCrossBetweenDOCX()
 {
-    load(u"/chart2/qa/extras/data/odt/", "axis-position.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"axis-position.odt");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", "midCat");
 }
 
 void Chart2ExportTest2::testPieChartDataPointExplosionXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "pie_chart_datapoint_explosion.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"pie_chart_datapoint_explosion.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -341,7 +341,7 @@ void Chart2ExportTest2::testPieChartDataPointExplosionXLSX()
 
 void Chart2ExportTest2::testCustomDataLabel()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf115107.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf115107.pptx");
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1", "Impress MS PowerPoint 2007 XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // Check the data labels font color for the complete data series
@@ -463,7 +463,7 @@ void Chart2ExportTest2::testDataSeriesName()
 {
     // ODF
     {
-        load(u"/chart2/qa/extras/data/ods/", "ser_labels.ods");
+        load(u"/chart2/qa/extras/data/ods/", u"ser_labels.ods");
         reload("calc8");
         uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
         uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -477,7 +477,7 @@ void Chart2ExportTest2::testDataSeriesName()
 
     // OOXML
     {
-        load(u"/chart2/qa/extras/data/xlsx/", "ser_labels.xlsx");
+        load(u"/chart2/qa/extras/data/xlsx/", u"ser_labels.xlsx");
         reload("Calc Office Open XML");
         uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
         uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -492,7 +492,7 @@ void Chart2ExportTest2::testDataSeriesName()
 
 void Chart2ExportTest2::testCustomPositionofDataLabel()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "testCustomPosDataLabels.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testCustomPosDataLabels.xlsx");
     {
         xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
         CPPUNIT_ASSERT(pXmlDoc);
@@ -516,7 +516,7 @@ void Chart2ExportTest2::testCustomPositionofDataLabel()
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.0742140311063737, nY, 1e-7);
     }
 
-    load(u"/chart2/qa/extras/data/docx/", "testTdf108110.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testTdf108110.docx");
     {
         xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
         CPPUNIT_ASSERT(pXmlDoc);
@@ -540,7 +540,7 @@ void Chart2ExportTest2::testCustomPositionofDataLabel()
         CPPUNIT_ASSERT_DOUBLES_EQUAL(0.172648731408574, nY, 1e-7);
     }
 
-    load(u"/chart2/qa/extras/data/ods/", "tdf136024.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf136024.ods");
     {
         reload("calc8");
         // tdf#136024: test custom position of pie chart data label after an ods export
@@ -562,7 +562,7 @@ void Chart2ExportTest2::testCustomPositionofDataLabel()
 
 void Chart2ExportTest2::testCustomDataLabelMultipleSeries()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf115107-2.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf115107-2.pptx");
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart2", "Impress MS PowerPoint 2007 XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -626,7 +626,7 @@ void Chart2ExportTest2::testCustomDataLabelMultipleSeries()
 
 void Chart2ExportTest2::testLeaderLines()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "testTdf90749.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testTdf90749.xlsx");
     {
         xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
         CPPUNIT_ASSERT(pXmlDoc);
@@ -639,7 +639,7 @@ void Chart2ExportTest2::testLeaderLines()
                     "c15:showLeaderLines",
                     "val", "0");
     }
-    load(u"/chart2/qa/extras/data/docx/", "MSO_Custom_Leader_Line.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"MSO_Custom_Leader_Line.docx");
     {
         xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1", "Office Open XML Text");
         CPPUNIT_ASSERT(pXmlDoc);
@@ -653,7 +653,7 @@ void Chart2ExportTest2::testLeaderLines()
 
 void Chart2ExportTest2::testNumberFormatExportPPTX()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf115859.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf115859.pptx");
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -665,7 +665,7 @@ void Chart2ExportTest2::testNumberFormatExportPPTX()
 
 void Chart2ExportTest2::testLabelSeparatorExportDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testLabelSeparator.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testLabelSeparator.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -686,7 +686,7 @@ void Chart2ExportTest2::testLabelSeparatorExportDOCX()
 
 void Chart2ExportTest2::testChartTitlePropertiesColorFillPPTX()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesColorFill.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"testChartTitlePropertiesColorFill.pptx");
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val",
@@ -696,7 +696,7 @@ void Chart2ExportTest2::testChartTitlePropertiesColorFillPPTX()
 
 void Chart2ExportTest2::testChartTitlePropertiesGradientFillPPTX()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesGradientFill.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"testChartTitlePropertiesGradientFill.pptx");
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc,
@@ -710,7 +710,7 @@ void Chart2ExportTest2::testChartTitlePropertiesGradientFillPPTX()
 
 void Chart2ExportTest2::testChartTitlePropertiesBitmapFillPPTX()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesBitmapFill.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"testChartTitlePropertiesBitmapFill.pptx");
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", "rId1");
@@ -719,7 +719,7 @@ void Chart2ExportTest2::testChartTitlePropertiesBitmapFillPPTX()
 
 void Chart2ExportTest2::testxAxisLabelsRotation()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "xAxisLabelsRotation.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"xAxisLabelsRotation.xlsx");
     xmlDocUniquePtr pXmlDoc1 = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc1);
 
@@ -730,7 +730,7 @@ void Chart2ExportTest2::testxAxisLabelsRotation()
 
 void Chart2ExportTest2::testMultipleCategoryAxisLablesXLSX()
 {
-    load(u"/chart2/qa/extras/data/ods/", "multilevelcat.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"multilevelcat.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // check category axis labels number of first level
@@ -762,7 +762,7 @@ void Chart2ExportTest2::testMultipleCategoryAxisLablesXLSX()
 
 void Chart2ExportTest2::testMultipleCategoryAxisLablesDOCX()
 {
-    load(u"/chart2/qa/extras/data/odt/", "multilevelcat.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"multilevelcat.odt");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
     // check category axis labels number of first level
@@ -794,7 +794,7 @@ void Chart2ExportTest2::testMultipleCategoryAxisLablesDOCX()
 
 void Chart2ExportTest2::testTdf116163()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf116163.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf116163.pptx");
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -804,7 +804,7 @@ void Chart2ExportTest2::testTdf116163()
 
 void Chart2ExportTest2::testTdf111824()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf111824.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf111824.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -818,7 +818,7 @@ void Chart2ExportTest2::testTdf111824()
 
 void Chart2ExportTest2::test3DAreaChartZAxis()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "test3DAreaChartZAxis.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"test3DAreaChartZAxis.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -832,7 +832,7 @@ void Chart2ExportTest2::test3DAreaChartZAxis()
 
 void Chart2ExportTest2::testTdf119029()
 {
-    load(u"/chart2/qa/extras/data/odp/", "tdf119029.odp");
+    load(u"/chart2/qa/extras/data/odp/", u"tdf119029.odp");
     // Only use "chart", without number, because the number depends on the previous tests
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
     CPPUNIT_ASSERT(pXmlDoc);
@@ -844,7 +844,7 @@ void Chart2ExportTest2::testTdf119029()
 
 void Chart2ExportTest2::testTdf108022()
 {
-    load(u"/chart2/qa/extras/data/odt/", "tdf108022.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"tdf108022.odt");
     reload("Office Open XML Text");
 
     // assert we really have two charts
@@ -856,7 +856,7 @@ void Chart2ExportTest2::testTdf108022()
 
 void Chart2ExportTest2::testTdf121744()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf121744.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf121744.docx");
     xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -871,7 +871,7 @@ void Chart2ExportTest2::testTdf121744()
 
 void Chart2ExportTest2::testTdf121189()
 {
-    load(u"/chart2/qa/extras/data/odp/", "tdf121189.odp");
+    load(u"/chart2/qa/extras/data/odp/", u"tdf121189.odp");
     reload("Impress Office Open XML");
 
     uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent, uno::UNO_QUERY_THROW);
@@ -886,7 +886,7 @@ void Chart2ExportTest2::testTdf122031()
 {
     //Checks pie chart data label format.
 
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf122031.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf122031.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -905,7 +905,7 @@ void Chart2ExportTest2::testTdf122031()
 
 void Chart2ExportTest2::testTdf115012()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf115012.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf115012.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // workaround: use-zero instead of leave-gap to show the original line chart
@@ -914,7 +914,7 @@ void Chart2ExportTest2::testTdf115012()
 
 void Chart2ExportTest2::testTdf134118()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf134118.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf134118.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // workaround: use leave-gap instead of zero to show the original line chart
@@ -923,7 +923,7 @@ void Chart2ExportTest2::testTdf134118()
 
 void Chart2ExportTest2::testTdf123206_customLabelText()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf123206.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf123206.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -939,7 +939,7 @@ void Chart2ExportTest2::testTdf123206_customLabelText()
 
 void Chart2ExportTest2::testCustomLabelText()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testCustomlabeltext.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testCustomlabeltext.docx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -974,7 +974,7 @@ void Chart2ExportTest2::testCustomLabelText()
 
 void Chart2ExportTest2::testDeletedLegendEntries()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "deleted_legend_entry.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"deleted_legend_entry.xlsx");
     {
         reload("Calc Office Open XML");
         Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -987,7 +987,7 @@ void Chart2ExportTest2::testDeletedLegendEntries()
         CPPUNIT_ASSERT(!bShowLegendEntry);
     }
 
-    load(u"/chart2/qa/extras/data/xlsx/", "deleted_legend_entry2.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"deleted_legend_entry2.xlsx");
     {
         reload("Calc Office Open XML");
         Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -1013,7 +1013,7 @@ void Chart2ExportTest2::testDeletedLegendEntries()
 
 void Chart2ExportTest2::testTdf60316()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf60316.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf60316.pptx");
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1024,7 +1024,7 @@ void Chart2ExportTest2::testTdf60316()
 
 void Chart2ExportTest2::testTdf130225()
 {
-    load(u"/chart2/qa/extras/data/docx/", "piechart_deleted_legend_entry.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"piechart_deleted_legend_entry.docx");
     reload("Office Open XML Text");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1039,7 +1039,7 @@ void Chart2ExportTest2::testTdf130225()
 
 void Chart2ExportTest2::testTdf59857()
 {
-    load(u"/chart2/qa/extras/data/ods/", "tdf59857.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf59857.ods");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1053,7 +1053,7 @@ void Chart2ExportTest2::testTdf59857()
 
 void Chart2ExportTest2::testTdf126076()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "auto_marker_excel10.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"auto_marker_excel10.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1067,7 +1067,7 @@ void Chart2ExportTest2::testTdf126076()
 
 void Chart2ExportTest2::testTdf75330()
 {
-    load(u"/chart2/qa/extras/data/ods/", "legend_overlay.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"legend_overlay.ods");
     reload("calc8");
     {
         uno::Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0, mxComponent);
@@ -1092,7 +1092,7 @@ void Chart2ExportTest2::testTdf75330()
 
 void Chart2ExportTest2::testTdf127792()
 {
-    load(u"/chart2/qa/extras/data/docx/", "MSO_axis_position.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"MSO_axis_position.docx");
     {
         xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1", "Office Open XML Text");
         CPPUNIT_ASSERT(pXmlDoc);
@@ -1109,7 +1109,7 @@ void Chart2ExportTest2::testTdf127792()
 
 void Chart2ExportTest2::testTdf131979()
 {
-    load(u"/chart2/qa/extras/data/ods/", "tdf131115.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf131115.ods");
     {
         reload("calc8");
         Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -1125,7 +1125,7 @@ void Chart2ExportTest2::testTdf131979()
                                !blinknumberformattosource);
     }
 
-    load(u"/chart2/qa/extras/data/ods/", "tdf131979.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf131979.ods");
     {
         reload("calc8");
         Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -1145,7 +1145,7 @@ void Chart2ExportTest2::testTdf131979()
 void Chart2ExportTest2::testTdf132076()
 {
     {
-        load(u"/chart2/qa/extras/data/ods/", "tdf132076.ods");
+        load(u"/chart2/qa/extras/data/ods/", u"tdf132076.ods");
         xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
         CPPUNIT_ASSERT(pXmlDoc);
         assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt", "formatCode",
@@ -1154,7 +1154,7 @@ void Chart2ExportTest2::testTdf132076()
                     "0");
     }
     {
-        load(u"/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
+        load(u"/chart2/qa/extras/data/xlsx/", u"tdf132076.xlsx");
         xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
         CPPUNIT_ASSERT(pXmlDoc);
         assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt", "formatCode",
@@ -1166,7 +1166,7 @@ void Chart2ExportTest2::testTdf132076()
 
 void Chart2ExportTest2::testTdf125812()
 {
-    load(u"/chart2/qa/extras/data/odp/", "ellipticalGradientFill.odp");
+    load(u"/chart2/qa/extras/data/odp/", u"ellipticalGradientFill.odp");
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path", "path",
@@ -1183,7 +1183,7 @@ void Chart2ExportTest2::testTdf125812()
 
 void Chart2ExportTest2::testTdf133190()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf133190_tdf133191.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1200,7 +1200,7 @@ void Chart2ExportTest2::testTdf133190()
 
 void Chart2ExportTest2::testTdf133191()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf133190_tdf133191.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1213,7 +1213,7 @@ void Chart2ExportTest2::testTdf133191()
 
 void Chart2ExportTest2::testTdf132594()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "chart_pie2007.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"chart_pie2007.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1222,7 +1222,7 @@ void Chart2ExportTest2::testTdf132594()
 
 void Chart2ExportTest2::testTdf134255()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf134255.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf134255.docx");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -1245,7 +1245,7 @@ void Chart2ExportTest2::testTdf134255()
 
 void Chart2ExportTest2::testTdf134977()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "custom_data_label.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"custom_data_label.xlsx");
 
     //import test
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -1271,7 +1271,7 @@ void Chart2ExportTest2::testTdf134977()
 
 void Chart2ExportTest2::testTdf123647()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "empty_chart.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"empty_chart.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1280,7 +1280,7 @@ void Chart2ExportTest2::testTdf123647()
 
 void Chart2ExportTest2::testTdf136267()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf136267.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf136267.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1292,7 +1292,7 @@ void Chart2ExportTest2::testTdf136267()
 
 void Chart2ExportTest2::testDataLabelPlacementPieChart()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf134978.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf134978.xlsx");
     reload("calc8");
     uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent),
                                                     UNO_QUERY_THROW);
@@ -1308,7 +1308,7 @@ void Chart2ExportTest2::testDataLabelPlacementPieChart()
 
 void Chart2ExportTest2::testTdf137917()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf137917.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf137917.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1323,7 +1323,7 @@ void Chart2ExportTest2::testTdf137917()
 
 void Chart2ExportTest2::testTdf138204()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf138204.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf138204.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1391,7 +1391,7 @@ void Chart2ExportTest2::testTdf138204()
 
 void Chart2ExportTest2::testTdf138181()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "piechart_deleted_legendentry.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"piechart_deleted_legendentry.xlsx");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
     Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
@@ -1417,7 +1417,7 @@ void Chart2ExportTest2::testTdf138181()
 
 void Chart2ExportTest2::testCustomShapeText()
 {
-    load(u"/chart2/qa/extras/data/ods/", "tdf72776.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf72776.ods");
     reload("calc8");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
@@ -1433,7 +1433,7 @@ void Chart2ExportTest2::testCustomShapeText()
 
 void Chart2ExportTest2::testuserShapesXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf128621.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf128621.xlsx");
     reload("Calc Office Open XML");
 
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -1461,7 +1461,7 @@ void Chart2ExportTest2::testuserShapesXLSX()
 
 void Chart2ExportTest2::testuserShapesDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf143130.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf143130.docx");
     reload("Office Open XML Text");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
@@ -1489,7 +1489,7 @@ void Chart2ExportTest2::testuserShapesDOCX()
 
 void Chart2ExportTest2::testGraphicBlipXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf143127.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf143127.xlsx");
     reload("Calc Office Open XML");
 
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -1517,7 +1517,7 @@ void Chart2ExportTest2::testGraphicBlipXLSX()
 
 void Chart2ExportTest2::testNameRangeXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "chart_with_name_range.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"chart_with_name_range.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
     // test the syntax of local range name on the local sheet.
@@ -1532,7 +1532,7 @@ void Chart2ExportTest2::testNameRangeXLSX()
 
 void Chart2ExportTest2::testTdf143942()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf143942.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf143942.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -1595,7 +1595,7 @@ void Chart2ExportTest2::testTdf143942()
 
 void Chart2ExportTest2::testDateCategoriesPPTX()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "bnc889755.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"bnc889755.pptx");
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
diff --git a/chart2/qa/extras/chart2geometry.cxx b/chart2/qa/extras/chart2geometry.cxx
index f460ac467621..a6fd4a8b3620 100644
--- a/chart2/qa/extras/chart2geometry.cxx
+++ b/chart2/qa/extras/chart2geometry.cxx
@@ -84,7 +84,7 @@ static OString OU2O(std::u16string_view sOUSource)
 void Chart2GeometryTest::testTdf135184RoundLineCap()
 {
     // It tests chart area, data series line and regression-curve line.
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf135184RoundLineCap.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "calc8");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -111,7 +111,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap()
 void Chart2GeometryTest::testTdf135184RoundLineCap2()
 {
     // It tests legend, data series sector and title.
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap2.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf135184RoundLineCap2.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "calc8");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -140,7 +140,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap2()
 void Chart2GeometryTest::testTdf135184RoundLineCap3()
 {
     // It tests chart area, data series line and regression-curve line.
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf135184RoundLineCap.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -157,7 +157,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap3()
 void Chart2GeometryTest::testTdf135184RoundLineCap4()
 {
     // It tests legend, data series sector and title.
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap2.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf135184RoundLineCap2.xlsx");
     xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -173,7 +173,7 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_export()
 {
     // chart area with color gradient and solid transparency
     // Without the patch the transparency was lost in saved pptx file.
-    load(u"/chart2/qa/extras/data/odp/", "tdf128345_ChartArea_CG_TS.odp");
+    load(u"/chart2/qa/extras/data/odp/", u"tdf128345_ChartArea_CG_TS.odp");
 
     // Make sure the chart area has a transparency in gradient stops in saved pptx file.
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
@@ -192,7 +192,7 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import()
     // Make sure chart area has transparency when pptx document is opened and resaved as odp.
     // As of Aug 2020, the import generates a transparency gradient. When import is changed to
     // generate solid transparency, the test needs to be adapted.
-    load(u"/chart2/qa/extras/data/pptx/", "tdf128345_ChartArea_CG_TS.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf128345_ChartArea_CG_TS.pptx");
 
     // Find transparency gradient name
     xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
@@ -225,7 +225,7 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_export()
 {
     // chart wall with solid color and transparency gradient
     // Without the patch the transparency was lost.
-    load(u"/chart2/qa/extras/data/odp/", "tdf128345_ChartWall_CS_TG.odp");
+    load(u"/chart2/qa/extras/data/odp/", u"tdf128345_ChartWall_CS_TG.odp");
 
     // Make sure the chart has a gradient with transparency in gradient stops in saved pptx file.
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
@@ -243,7 +243,7 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import()
 {
     // This works on the file, which was exported from file tdf128345_ChartWall_CS_TG.odp to pptx.
     // Make sure chart wall has transparency when pptx document is resaved as odp.
-    load(u"/chart2/qa/extras/data/pptx/", "tdf128345_ChartWall_CS_TG.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf128345_ChartWall_CS_TG.pptx");
 
     // Find transparency gradient name
     xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
@@ -274,7 +274,7 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_export()
 {
     // legend with solid color and transparency gradient
     // Without the patch the transparency was lost.
-    load(u"/chart2/qa/extras/data/odp/", "tdf128345_Legend_CS_TG_axial.odp");
+    load(u"/chart2/qa/extras/data/odp/", u"tdf128345_Legend_CS_TG_axial.odp");
 
     // Make sure the chart has a gradient with transparency in gradient stops in saved pptx file.
     xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
@@ -294,7 +294,7 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import()
 {
     // This works on the file, which was exported from file tdf128345_Legend_CS_TG_axial.odp to pptx.
     // Error was, that in case of axial not the middle value was taken but start and end value.
-    load(u"/chart2/qa/extras/data/pptx/", "tdf128345_Legend_CS_TG_axial.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf128345_Legend_CS_TG_axial.pptx");
 
     // Find transparency gradient name
     xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
@@ -325,7 +325,7 @@ void Chart2GeometryTest::testTdf135366LabelOnSeries()
 {
     // Error was, that the fill and line properties of a <chart:data-label> were not
     // imported at all. Here they should be at the series.
-    load(u"/chart2/qa/extras/data/ods/", "tdf135366_data_label_series.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf135366_data_label_series.ods");
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT(xChartDoc.is());
     Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0);
@@ -363,7 +363,7 @@ void Chart2GeometryTest::testTdf135366LabelOnPoint()
 {
     // Error was, that the fill and line properties of a <chart:data-label> were not
     // imported at all. Here they should be at point 2.
-    load(u"/chart2/qa/extras/data/odt/", "tdf135366_data_label_point.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"tdf135366_data_label_point.odt");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
     Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0);
@@ -410,7 +410,7 @@ void Chart2GeometryTest::testTdf135366LabelExport()
     // Error was, that line and fill properties were not exported as
     // graphic-properties of a <chart:data-label> element, but only
     // as loext chart-properties of the <chart:data-point> element.
-    load(u"/chart2/qa/extras/data/odt/", "tdf135366_data_label_export.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"tdf135366_data_label_export.odt");
     xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "writer8");
     CPPUNIT_ASSERT(pXmlDoc);
 
@@ -437,7 +437,7 @@ void Chart2GeometryTest::testTdf135366_CustomLabelText()
     // although the used <chart:data-label> element exists since ODF 1.2.
     const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion(GetODFDefaultVersion());
     SetODFDefaultVersion(SvtSaveOptions::ODFVER_012);
-    load(u"/chart2/qa/extras/data/pptx/", "tdf135366_CustomLabelText.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf135366_CustomLabelText.pptx");
     xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
     CPPUNIT_ASSERT(pXmlDoc);
 
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 70cb393ba7b6..316520fb5197 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -94,7 +94,7 @@ public:
     void testNumberFormatsDOCX();
     void testPercentageNumberFormatsDOCX();
 
-    void testTransparentBackground(OUString const & filename);
+    void testTransparentBackground(std::u16string_view filename);
 
     // below are OOXML default value tests for cases
     // where we fixed the handling of MSO 2007 vs OOXML
@@ -227,7 +227,7 @@ public:
 // split method up into smaller chunks for more detailed tests
 void Chart2ImportTest::Fdo60083()
 {
-    load(u"/chart2/qa/extras/data/ods/", "fdo60083.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"fdo60083.ods");
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -276,7 +276,7 @@ void Chart2ImportTest::Fdo60083()
 
 void Chart2ImportTest::testErrorBarRange()
 {
-    load(u"/chart2/qa/extras/data/ods/", "error_bar_range.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"error_bar_range.ods");
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -305,7 +305,7 @@ void Chart2ImportTest::testErrorBarRange()
 
 void Chart2ImportTest::testErrorBarFormatting()
 {
-    load(u"/chart2/qa/extras/data/ods/", "error_bar_properties.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"error_bar_properties.ods");
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -346,7 +346,7 @@ void Chart2ImportTest::testSteppedLines()
         chart2::CurveStyle_STEP_CENTER_Y
     };
 
-    load(u"/chart2/qa/extras/data/ods/", "stepped_lines.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"stepped_lines.ods");
     for(sal_Int32 nSheet = 0; nSheet < MAXSHEET; ++nSheet)
     {
         uno::Reference< chart2::XChartDocument > xChart2Doc = getChartDocFromSheet( nSheet, mxComponent );
@@ -374,7 +374,7 @@ static uno::Sequence < OUString > getChartColumnDescriptions( uno::Reference< ch
 
 void Chart2ImportTest::testODSChartSeries()
 {
-    load(u"/chart2/qa/extras/data/ods/", "chart.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"chart.ods");
     uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
     uno::Sequence < OUString > seriesList = getChartColumnDescriptions( xChart1Doc);
     CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]);
@@ -385,7 +385,7 @@ void Chart2ImportTest::testODSChartSeries()
 
 void Chart2ImportTest::testXLSXChartSeries()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "chart.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"chart.xlsx");
     uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
     uno::Sequence < OUString > seriesList = getChartColumnDescriptions(xChart1Doc );
     CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]);
@@ -396,7 +396,7 @@ void Chart2ImportTest::testXLSXChartSeries()
 
 void Chart2ImportTest::testXLSChartSeries()
 {
-    load(u"/chart2/qa/extras/data/xls/", "chart.xls");
+    load(u"/chart2/qa/extras/data/xls/", u"chart.xls");
     uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
     uno::Sequence < OUString > seriesList = getChartColumnDescriptions(xChart1Doc );
     CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]);
@@ -407,7 +407,7 @@ void Chart2ImportTest::testXLSChartSeries()
 
 void Chart2ImportTest::testODTChartSeries()
 {
-    load(u"/chart2/qa/extras/data/odt/", "chart.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"chart.odt");
     uno::Sequence< OUString > seriesList = getWriterChartColumnDescriptions(mxComponent);
     CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
     CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]);
@@ -417,7 +417,7 @@ void Chart2ImportTest::testODTChartSeries()
 
 void Chart2ImportTest::testDOCChartSeries()
 {
-    load(u"/chart2/qa/extras/data/doc/", "chart.doc");
+    load(u"/chart2/qa/extras/data/doc/", u"chart.doc");
     uno::Sequence< OUString > seriesList = getWriterChartColumnDescriptions(mxComponent);
     CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
     CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]);
@@ -426,7 +426,7 @@ void Chart2ImportTest::testDOCChartSeries()
 
 void Chart2ImportTest::testDOCXChartSeries()
 {
-    load(u"/chart2/qa/extras/data/docx/", "chart.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"chart.docx");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -442,7 +442,7 @@ void Chart2ImportTest::testDOCXChartSeries()
 
 void Chart2ImportTest::testDOCXChartEmptySeries()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf125337.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf125337.docx");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -468,7 +468,7 @@ void Chart2ImportTest::testDOCXChartEmptySeries()
 
 void Chart2ImportTest::testTdf81396()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf81396.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf81396.xlsx");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
 
@@ -485,7 +485,7 @@ void Chart2ImportTest::testTdf81396()
 
 void Chart2ImportTest::testPPTXChartErrorBars()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf127720.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf127720.pptx");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -498,7 +498,7 @@ void Chart2ImportTest::testPPTXChartErrorBars()
 
 void Chart2ImportTest::testDOCXChartValuesSize()
 {
-    load( u"/chart2/qa/extras/data/docx/", "bubblechart.docx" );
+    load( u"/chart2/qa/extras/data/docx/", u"bubblechart.docx" );
     Reference<chart2::XChartDocument> xChartDoc( getChartDocFromWriter(0), uno::UNO_QUERY );
     CPPUNIT_ASSERT( xChartDoc.is() );
 
@@ -531,7 +531,7 @@ void Chart2ImportTest::testPPTChartSeries()
 void Chart2ImportTest::testPPTXChartSeries()
 {
     //test chart series names for pptx
-    load(u"/chart2/qa/extras/data/pptx/", "chart.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"chart.pptx");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -548,7 +548,7 @@ void Chart2ImportTest::testPPTXChartSeries()
 void Chart2ImportTest::testPPTXSparseChartSeries()
 {
     //test chart series sparse data for pptx
-    load(u"/chart2/qa/extras/data/pptx/", "sparse-chart.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"sparse-chart.pptx");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -569,7 +569,7 @@ void Chart2ImportTest::testPPTXSparseChartSeries()
 
 void Chart2ImportTest::testPPTXHiddenDataSeries()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "stacked-bar-chart-hidden-series.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"stacked-bar-chart-hidden-series.pptx");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -608,7 +608,7 @@ void Chart2ImportTest::testPPTXHiddenDataSeries()
 
 void Chart2ImportTest::testPPTXPercentageNumberFormats()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "percentage-number-formats.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"percentage-number-formats.pptx");
 
     // 1st chart
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
@@ -674,7 +674,7 @@ void Chart2ImportTest::testPPTXPercentageNumberFormats()
 
 void Chart2ImportTest::testPieChartLabelsNumFormat()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdfPieNumFormat.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdfPieNumFormat.xlsx");
     uno::Reference< chart::XChartDocument > xChartDoc(getChartCompFromSheet(0, mxComponent), UNO_QUERY_THROW);
     CPPUNIT_ASSERT(xChartDoc.is());
     // test data point labels format
@@ -686,7 +686,7 @@ void Chart2ImportTest::testPieChartLabelsNumFormat()
 
 void Chart2ImportTest::testPPTXStackedNonStackedYAxis()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "stacked-non-stacked-mix-y-axis.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"stacked-non-stacked-mix-y-axis.pptx");
 
     // 1st chart is a normal stacked column.
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
@@ -770,7 +770,7 @@ void Chart2ImportTest::testBnc864396()
 
 void Chart2ImportTest::testBnc889755()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "bnc889755.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"bnc889755.pptx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 5), uno::UNO_QUERY_THROW);
     CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider());
 
@@ -802,7 +802,7 @@ void Chart2ImportTest::testBnc889755()
 
 void Chart2ImportTest::testBnc882383()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "bnc882383.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"bnc882383.pptx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY_THROW);
     uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
     CPPUNIT_ASSERT(xDataSeries.is());
@@ -815,7 +815,7 @@ void Chart2ImportTest::testBnc882383()
 
 void Chart2ImportTest::testTransparencyGradientValue()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf128732.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf128732.xlsx");
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT(xChartDoc.is());
     uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -838,7 +838,7 @@ void Chart2ImportTest::testTransparencyGradientValue()
 
 void Chart2ImportTest::testSimpleStrictXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "strict_chart.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"strict_chart.xlsx");
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -849,7 +849,7 @@ void Chart2ImportTest::testSimpleStrictXLSX()
 
 void Chart2ImportTest::testDelayedCellImport()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "fdo70609.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"fdo70609.xlsx");
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
     Reference< chart2::data::XDataSequence > xDataSeq =
         getDataSequenceFromDocByRole(xChartDoc, u"values-x");
@@ -860,7 +860,7 @@ void Chart2ImportTest::testDelayedCellImport()
 
 void Chart2ImportTest::testFlatODSStackedColumnChart()
 {
-    load(u"/chart2/qa/extras/data/fods/", "stacked-column-chart.fods");
+    load(u"/chart2/qa/extras/data/fods/", u"stacked-column-chart.fods");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -877,7 +877,7 @@ void Chart2ImportTest::testFlatODSStackedColumnChart()
 
 void Chart2ImportTest::testFdo78080()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "fdo78080.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"fdo78080.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -888,7 +888,7 @@ void Chart2ImportTest::testFdo78080()
 
 void Chart2ImportTest::testTdf127811()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf127811.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf127811.pptx");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -907,7 +907,7 @@ void Chart2ImportTest::testTdf127811()
 
 void Chart2ImportTest::testTdf86624()
 {
-    load(u"/chart2/qa/extras/data/ods/", "tdf86624.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf86624.ods");
     uno::Reference< chart2::XChartDocument > xChart2Doc = getChartDocFromSheet(0, mxComponent);
     uno::Reference< chart::XChartDocument > xChartDoc (xChart2Doc, uno::UNO_QUERY);
     uno::Reference<drawing::XShape> xLegend = xChartDoc->getLegend();
@@ -918,7 +918,7 @@ void Chart2ImportTest::testTdf86624()
 
 void Chart2ImportTest::testTdf105517()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf105517.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf105517.pptx");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -946,7 +946,7 @@ void Chart2ImportTest::testTdf105517()
 
 void Chart2ImportTest::testTdf106217()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf106217.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf106217.pptx");
     uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromDrawImpress(0, 0);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -969,7 +969,7 @@ void Chart2ImportTest::testTdf106217()
 void Chart2ImportTest::testTdf108021()
 {
     // Tdf108021 : To check TextBreak value is true.
-    load(u"/chart2/qa/extras/data/ods/", "tdf108021.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf108021.ods");
     uno::Reference< chart::XDiagram > mxDiagram;
     uno::Reference< beans::XPropertySet > xAxisProp;
     bool bTextBreak = false;
@@ -987,7 +987,7 @@ void Chart2ImportTest::testTdf108021()
 void Chart2ImportTest::testTdf100084()
 {
     // The test file was created with IBM Cognos, make sure there is a diagram.
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf100084.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf100084.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     Reference<beans::XPropertySet> xDiagram(xChartDoc->getFirstDiagram(), UNO_QUERY);
@@ -996,7 +996,7 @@ void Chart2ImportTest::testTdf100084()
 
 void Chart2ImportTest::testTdf124817()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf124817.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf124817.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1027,7 +1027,7 @@ void Chart2ImportTest::testTdf124817()
 
 void Chart2ImportTest::testTdf126033()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf126033.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf126033.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1042,7 +1042,7 @@ void Chart2ImportTest::testTdf126033()
     CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(176), aSymblProp.Size.Height);
 }
 
-void Chart2ImportTest::testTransparentBackground(OUString const & filename)
+void Chart2ImportTest::testTransparentBackground(std::u16string_view filename)
 {
     load(u"/chart2/qa/extras/data/xlsx/", filename);
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -1062,16 +1062,16 @@ void Chart2ImportTest::testTransparentBackground(OUString const & filename)
 // 2 test methods here so that tearDown() can dispose the document
 void Chart2ImportTest::testFdo54361()
 {
-    testTransparentBackground("fdo54361.xlsx");
+    testTransparentBackground(u"fdo54361.xlsx");
 }
 void Chart2ImportTest::testFdo54361_1()
 {
-    testTransparentBackground("fdo54361-1.xlsx");
+    testTransparentBackground(u"fdo54361-1.xlsx");
 }
 
 void Chart2ImportTest::testAutoBackgroundXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "chart-auto-background.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"chart-auto-background.xlsx");
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1088,7 +1088,7 @@ void Chart2ImportTest::testAutoBackgroundXLSX()
 
 void Chart2ImportTest::testAutoChartAreaBorderPropXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "chart-area-style-border.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"chart-area-style-border.xlsx");
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1108,7 +1108,7 @@ void Chart2ImportTest::testAutoChartAreaBorderPropXLSX()
 
 void Chart2ImportTest::testChartAreaStyleBackgroundXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "chart-area-style-background.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"chart-area-style-background.xlsx");
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1125,7 +1125,7 @@ void Chart2ImportTest::testChartAreaStyleBackgroundXLSX()
 
 void Chart2ImportTest::testChartHatchFillXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "chart-hatch-fill.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"chart-hatch-fill.xlsx");
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1167,7 +1167,7 @@ void Chart2ImportTest::testChartHatchFillXLSX()
 
 void Chart2ImportTest::testAxisTextRotationXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "axis-label-rotation.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"axis-label-rotation.xlsx");
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1205,7 +1205,7 @@ void Chart2ImportTest::testTextCanOverlapXLSX()
 void Chart2ImportTest::testTextBreakXLSX()
 {
     // tdf#122091: To check textbreak value is true in case of 0° degree of Axis label rotation.
-    load(u"/chart2/qa/extras/data/xlsx/", "chart_label_text_break.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"chart_label_text_break.xlsx");
     uno::Reference< chart::XDiagram > mxDiagram;
     uno::Reference< beans::XPropertySet > xAxisProp;
     bool textBreak = false;
@@ -1223,7 +1223,7 @@ void Chart2ImportTest::testTextBreakXLSX()
 
 void Chart2ImportTest::testNumberFormatsXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "number-formats.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"number-formats.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1275,7 +1275,7 @@ void Chart2ImportTest::testNumberFormatsXLSX()
 
 void Chart2ImportTest::testNumberFormatsDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf132174.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf132174.docx");
     {
         uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
         CPPUNIT_ASSERT(xChartDoc.is());
@@ -1296,7 +1296,7 @@ void Chart2ImportTest::testNumberFormatsDOCX()
         CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to false.", !bLinkNumberFormatToSource);
     }
 
-    load(u"/chart2/qa/extras/data/docx/", "tdf136650.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf136650.docx");
     {
         uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
         CPPUNIT_ASSERT(xChartDoc.is());
@@ -1320,7 +1320,7 @@ void Chart2ImportTest::testNumberFormatsDOCX()
 
 void Chart2ImportTest::testPercentageNumberFormatsDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf133632.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf133632.docx");
     uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -1341,7 +1341,7 @@ void Chart2ImportTest::testPercentageNumberFormatsDOCX()
 
 void Chart2ImportTest::testAutoTitleDelDefaultValue2007XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "autotitledel_2007.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"autotitledel_2007.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1353,7 +1353,7 @@ void Chart2ImportTest::testAutoTitleDelDefaultValue2007XLSX()
 
 void Chart2ImportTest::testAutoTitleDelDefaultValue2013XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "autotitledel_2013.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"autotitledel_2013.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1365,7 +1365,7 @@ void Chart2ImportTest::testAutoTitleDelDefaultValue2013XLSX()
 
 void Chart2ImportTest::testDispBlanksAsDefaultValue2007XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2007.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"dispBlanksAs_2007.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1379,7 +1379,7 @@ void Chart2ImportTest::testDispBlanksAsDefaultValue2007XLSX()
 
 void Chart2ImportTest::testDispBlanksAsDefaultValue2013XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2013.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"dispBlanksAs_2013.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -1393,7 +1393,7 @@ void Chart2ImportTest::testDispBlanksAsDefaultValue2013XLSX()
 
 void Chart2ImportTest::testSmoothDefaultValue2007XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "smoothed_series2007.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"smoothed_series2007.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1411,7 +1411,7 @@ void Chart2ImportTest::testSmoothDefaultValue2007XLSX()
 
 void Chart2ImportTest::testSmoothDefaultValue2013XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "smoothed_series.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"smoothed_series.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1429,7 +1429,7 @@ void Chart2ImportTest::testSmoothDefaultValue2013XLSX()
 
 void Chart2ImportTest::testTrendlineDefaultValue2007XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "trendline2007.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"trendline2007.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1455,7 +1455,7 @@ void Chart2ImportTest::testTrendlineDefaultValue2007XLSX()
 
 void Chart2ImportTest::testTrendlineDefaultValue2013XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "trendline.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"trendline.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1481,7 +1481,7 @@ void Chart2ImportTest::testTrendlineDefaultValue2013XLSX()
 
 void Chart2ImportTest::testVaryColorDefaultValues2007XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "vary_color2007.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"vary_color2007.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1496,7 +1496,7 @@ void Chart2ImportTest::testVaryColorDefaultValues2007XLSX()
 
 void Chart2ImportTest::testVaryColorDefaultValues2013XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "vary_color.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"vary_color.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1511,7 +1511,7 @@ void Chart2ImportTest::testVaryColorDefaultValues2013XLSX()
 
 void Chart2ImportTest::testPlotVisOnlyDefaultValue2013XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "plotVisOnly.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"plotVisOnly.xlsx");
     uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
     Reference<beans::XPropertySet> xPropSet(xChart1Doc->getDiagram(), uno::UNO_QUERY_THROW);
     uno::Any aAny = xPropSet->getPropertyValue("IncludeHiddenCells");
@@ -1523,7 +1523,7 @@ void Chart2ImportTest::testPlotVisOnlyDefaultValue2013XLSX()
 
 void Chart2ImportTest::testRAngAxDefaultValue2013XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "rAngAx.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"rAngAx.xlsx");
     uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
     Reference<beans::XPropertySet> xPropSet(xChart1Doc->getDiagram(), uno::UNO_QUERY_THROW);
     uno::Any aAny = xPropSet->getPropertyValue("RightAngledAxes");
@@ -1535,7 +1535,7 @@ void Chart2ImportTest::testRAngAxDefaultValue2013XLSX()
 
 void Chart2ImportTest::testMajorTickMarksDefaultValue2013XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "majorTickMark.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"majorTickMark.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     Reference<chart2::XAxis> xXAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
@@ -1550,7 +1550,7 @@ void Chart2ImportTest::testMajorTickMarksDefaultValue2013XLSX()
 
 void Chart2ImportTest::testMinorTickMarksDefaultValue2013XLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "minorTickMark.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"minorTickMark.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     Reference<chart2::XAxis> xXAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
@@ -1565,7 +1565,7 @@ void Chart2ImportTest::testMinorTickMarksDefaultValue2013XLSX()
 
 void Chart2ImportTest::testAxisTitleDefaultRotationXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "axis_title_default_rotation.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"axis_title_default_rotation.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     Reference<chart2::XAxis> xYAxis = getAxisFromDoc(xChartDoc, 0, 1, 0);
@@ -1582,7 +1582,7 @@ void Chart2ImportTest::testAxisTitleDefaultRotationXLSX()
 
 void Chart2ImportTest::testSecondaryAxisTitleDefaultRotationXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "secondary_axis_title_default_rotation.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"secondary_axis_title_default_rotation.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     Reference<chart2::XAxis> xYAxis = getAxisFromDoc(xChartDoc, 0, 1, 1);
@@ -1599,7 +1599,7 @@ void Chart2ImportTest::testSecondaryAxisTitleDefaultRotationXLSX()
 
 void Chart2ImportTest::testAxisTitleRotationXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "axis_title_rotated.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"axis_title_rotated.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     {
@@ -1631,7 +1631,7 @@ void Chart2ImportTest::testAxisTitleRotationXLSX()
 
 void Chart2ImportTest::testAxisTitlePositionDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testAxisTitlePosition.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testAxisTitlePosition.docx");
     uno::Reference< chart::XDiagram > mxDiagram;
     uno::Reference< drawing::XShape > xAxisTitle;
     uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromWriter(0);
@@ -1663,7 +1663,7 @@ void Chart2ImportTest::testAxisTitlePositionDOCX()
 
 void Chart2ImportTest::testCombinedChartAttachedAxisXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "testCombinedChartAxis.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testCombinedChartAxis.xlsx");
     Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     // First series
     Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xChartDoc, 0);
@@ -1689,7 +1689,7 @@ void Chart2ImportTest::testCombinedChartAttachedAxisXLSX()
 
 void Chart2ImportTest::testTdf140489MultiSeriesChartAxisXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf140489.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf140489.xlsx");
     Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     // First series
     Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xChartDoc, 0);
@@ -1767,7 +1767,7 @@ void Chart2ImportTest::testInternalDataProvider() {
 
 void Chart2ImportTest::testTdf90510()
 {
-    load(u"/chart2/qa/extras/data/xls/", "piechart_outside.xls");
+    load(u"/chart2/qa/extras/data/xls/", u"piechart_outside.xls");
     uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW );
     Reference<beans::XPropertySet> xPropSet( xChart1Doc->getDiagram()->getDataPointProperties( 0, 0 ), uno::UNO_SET_THROW );
     uno::Any aAny = xPropSet->getPropertyValue( "LabelPlacement" );
@@ -1779,7 +1779,7 @@ void Chart2ImportTest::testTdf90510()
 
 void Chart2ImportTest::testTdf109858()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "piechart_outside.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"piechart_outside.xlsx");
     uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW );
 
     // test data point labels position
@@ -1799,7 +1799,7 @@ void Chart2ImportTest::testTdf109858()
 
 void Chart2ImportTest::testTdf130105()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "barchart_outend.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"barchart_outend.xlsx");
     uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT(xChartDoc.is());
     uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -1815,13 +1815,13 @@ void Chart2ImportTest::testTdf130105()
 
 void Chart2ImportTest::testTdf111173()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf111173.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf111173.xlsx");
     uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW );
 }
 
 void Chart2ImportTest::testTdf122226()
 {
-    load( u"/chart2/qa/extras/data/docx/", "testTdf122226.docx" );
+    load( u"/chart2/qa/extras/data/docx/", u"testTdf122226.docx" );
     uno::Reference< chart2::XChartDocument > xChartDoc ( getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT( xChartDoc.is() );
 
@@ -1839,7 +1839,7 @@ void Chart2ImportTest::testTdf122226()
 
 void Chart2ImportTest::testTdf115107()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf115107.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf115107.pptx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1930,7 +1930,7 @@ void Chart2ImportTest::testTdf115107()
 
 void Chart2ImportTest::testTdf115107_2()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf115107-2.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf115107-2.pptx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -1985,7 +1985,7 @@ void Chart2ImportTest::testTdf115107_2()
 
 void Chart2ImportTest::testTdf116163()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf116163.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf116163.pptx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -2050,7 +2050,7 @@ void Chart2ImportTest::testTdf116163()
 
 void Chart2ImportTest::testTdf48041()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf48041.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf48041.pptx");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -2100,7 +2100,7 @@ void Chart2ImportTest::testTdf48041()
 
 void Chart2ImportTest::testTdf121205()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf121205.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf121205.pptx");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
 
     uno::Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW);
@@ -2118,7 +2118,7 @@ void Chart2ImportTest::testFixedSizeBarChartVeryLongLabel()
     // case the best course of action is to just crop the label text. This
     // test checks that the rendered text is actually cropped.
 
-    load(u"/chart2/qa/extras/data/odp/", "BarChartVeryLongLabel.odp");
+    load(u"/chart2/qa/extras/data/odp/", u"BarChartVeryLongLabel.odp");
 
     // Select shape 0 which has fixed size chart
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
@@ -2187,7 +2187,7 @@ void Chart2ImportTest::testAutomaticSizeBarChartVeryLongLabel()
     // Bar chart area size is automatic so we expect the label to be broken
     // into multiple lines.
 
-    load(u"/chart2/qa/extras/data/odp/", "BarChartVeryLongLabel.odp");
+    load(u"/chart2/qa/extras/data/odp/", u"BarChartVeryLongLabel.odp");
 
     // Select shape 1, which has an automatic sized chart
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 1), uno::UNO_QUERY);
diff --git a/chart2/qa/extras/chart2import2.cxx b/chart2/qa/extras/chart2import2.cxx
index e35473717655..ee41c37dd48a 100644
--- a/chart2/qa/extras/chart2import2.cxx
+++ b/chart2/qa/extras/chart2import2.cxx
@@ -107,7 +107,7 @@ public:
 
 void Chart2ImportTest2::testTdf114179()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testTdf114179.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testTdf114179.docx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
     css::uno::Reference<chart2::XDiagram> xDiagram;
@@ -121,7 +121,7 @@ void Chart2ImportTest2::testTdf114179()
 
 void Chart2ImportTest2::testTdf124243()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf124243.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf124243.docx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -138,7 +138,7 @@ void Chart2ImportTest2::testTdf124243()
 
 void Chart2ImportTest2::testTdf127393()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf127393.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf127393.pptx");
 
     // 1st chart
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
@@ -165,7 +165,7 @@ void Chart2ImportTest2::testTdf127393()
 
 void Chart2ImportTest2::testTdf128733()
 {
-    load(u"/chart2/qa/extras/data/odt/", "tdf128733.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"tdf128733.odt");
 
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -180,7 +180,7 @@ void Chart2ImportTest2::testTdf128733()
 
 void Chart2ImportTest2::testTdf128432()
 {
-    load(u"/chart2/qa/extras/data/ods/", "tdf128432.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf128432.ods");
 
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -195,7 +195,7 @@ void Chart2ImportTest2::testTdf128432()
 
 void Chart2ImportTest2::testTdf128627()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf128627.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf128627.xlsx");
     // Test ShiftedCategoryPosition for Radar Chart
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -210,7 +210,7 @@ void Chart2ImportTest2::testTdf128627()
 
 void Chart2ImportTest2::testTdf128634()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf128634.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf128634.xlsx");
     // Test ShiftedCategoryPosition for 3D Charts
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -225,7 +225,7 @@ void Chart2ImportTest2::testTdf128634()
 
 void Chart2ImportTest2::testTdf130657()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf130657.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf130657.xlsx");
     // Test ShiftedCategoryPosition for charts which is not contain a "crossbetween" OOXML tag.
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -254,7 +254,7 @@ void checkDataLabelProperties(const Reference<chart2::XDataSeries>& xDataSeries,
 
 void Chart2ImportTest2::testDeletedDataLabel()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "deleted_data_labels.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"deleted_data_labels.xlsx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent),
                                                      UNO_QUERY_THROW);
     Reference<chart2::XDataSeries> xDataSeries0 = getDataSeriesFromDoc(xChartDoc, 0);
@@ -271,7 +271,7 @@ void Chart2ImportTest2::testDeletedDataLabel()
 
 void Chart2ImportTest2::testDataPointInheritedColorDOCX()
 {
-    load(u"/chart2/qa/extras/data/docx/", "data_point_inherited_color.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"data_point_inherited_color.docx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
     css::uno::Reference<chart2::XDiagram> xDiagram(xChartDoc->getFirstDiagram(), UNO_SET_THROW);
@@ -286,7 +286,7 @@ void Chart2ImportTest2::testDataPointInheritedColorDOCX()
 
 void Chart2ImportTest2::testExternalStrRefsXLSX()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "external_str_ref.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"external_str_ref.xlsx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent),
                                                      UNO_QUERY_THROW);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -300,7 +300,7 @@ void Chart2ImportTest2::testExternalStrRefsXLSX()
 
 void Chart2ImportTest2::testSourceNumberFormatComplexCategoriesXLS()
 {
-    load(u"/chart2/qa/extras/data/xls/", "source_number_format_axis.xls");
+    load(u"/chart2/qa/extras/data/xls/", u"source_number_format_axis.xls");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent),
                                                      UNO_QUERY_THROW);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -313,7 +313,7 @@ void Chart2ImportTest2::testSourceNumberFormatComplexCategoriesXLS()
 
 void Chart2ImportTest2::testSimpleCategoryAxis()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testSimpleCategoryAxis.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testSimpleCategoryAxis.docx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -341,7 +341,7 @@ void Chart2ImportTest2::testSimpleCategoryAxis()
 
 void Chart2ImportTest2::testMultilevelCategoryAxis()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testMultilevelCategoryAxis.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testMultilevelCategoryAxis.docx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -370,7 +370,7 @@ void Chart2ImportTest2::testMultilevelCategoryAxis()
 
 void Chart2ImportTest2::testXaxisValues()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf124083.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf124083.docx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
 
@@ -387,7 +387,7 @@ void Chart2ImportTest2::testXaxisValues()
 
 void Chart2ImportTest2::testTdf123504()
 {
-    load(u"/chart2/qa/extras/data/ods/", "pie_chart_100_and_0.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"pie_chart_100_and_0.ods");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
 
@@ -419,7 +419,7 @@ void Chart2ImportTest2::testTdf123504()
 void Chart2ImportTest2::testTdf122765()
 {
     // The horizontal position of the slices was wrong.
-    load(u"/chart2/qa/extras/data/pptx/", "tdf122765.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf122765.pptx");
     Reference<chart::XChartDocument> xChartDoc = getChartDocFromDrawImpress(0, 0);
     Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
     Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW);
@@ -458,7 +458,7 @@ void Chart2ImportTest2::testTdf123206CustomLabelField()
 
 void Chart2ImportTest2::testTdf125444PercentageCustomLabel()
 {
-    load(u"/chart2/qa/extras/data/pptx/", "tdf125444.pptx");
+    load(u"/chart2/qa/extras/data/pptx/", u"tdf125444.pptx");
 
     // 1st chart
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
@@ -479,7 +479,7 @@ void Chart2ImportTest2::testTdf125444PercentageCustomLabel()
 void Chart2ImportTest2::testDataPointLabelCustomPos()
 {
     // test CustomLabelPosition on Bar chart
-    load(u"/chart2/qa/extras/data/xlsx/", "testDataPointLabelCustomPos.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testDataPointLabelCustomPos.xlsx");
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT(xChartDoc.is());
     uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -502,7 +502,7 @@ void Chart2ImportTest2::testDataPointLabelCustomPos()
 void Chart2ImportTest2::testTdf130032()
 {
     // test CustomLabelPosition on Line chart
-    load(u"/chart2/qa/extras/data/xlsx/", "testTdf130032.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"testTdf130032.xlsx");
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT(xChartDoc.is());
     uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -525,7 +525,7 @@ void Chart2ImportTest2::testTdf130032()
 void Chart2ImportTest2::testTdf134978()
 {
     // test CustomLabelPosition on Pie chart
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf134978.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf134978.xlsx");
     uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT(xChartDoc.is());
     uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -543,7 +543,7 @@ void Chart2ImportTest2::testTdf134978()
 
 void Chart2ImportTest2::testTdf119138MissingAutoTitleDeleted()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf119138-missing-autotitledeleted.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf119138-missing-autotitledeleted.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
 
@@ -555,7 +555,7 @@ void Chart2ImportTest2::testTdf119138MissingAutoTitleDeleted()
 
 void Chart2ImportTest2::testStockChartShiftedCategoryPosition()
 {
-    load(u"/chart2/qa/extras/data/odt/", "stock_chart_LO_6_2.odt");
+    load(u"/chart2/qa/extras/data/odt/", u"stock_chart_LO_6_2.odt");
 
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -575,7 +575,7 @@ void Chart2ImportTest2::testTdf133376()
     if (!IsDefaultDPI())
         return;
 
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf133376.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf133376.xlsx");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
 
@@ -596,7 +596,7 @@ void Chart2ImportTest2::testTdf133376()
 
 void Chart2ImportTest2::testTdf134225()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf134225.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf134225.xlsx");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
 
@@ -633,7 +633,7 @@ void Chart2ImportTest2::testTdf136105()
     if (!IsDefaultDPI())
         return;
 
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf136105.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf136105.xlsx");
     // 1st chart with fix inner position and size
     {
         Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
@@ -676,7 +676,7 @@ void Chart2ImportTest2::testTdf136105()
 
 void Chart2ImportTest2::testTdf91250()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf91250.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf91250.docx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
     Reference<chart2::XInternalDataProvider> xInternalProvider(xChartDoc->getDataProvider(),
@@ -698,7 +698,7 @@ void Chart2ImportTest2::testTdf91250()
 void Chart2ImportTest2::testTdf134111()
 {
     // tdf134111 : To check TextBreak value is true
-    load(u"/chart2/qa/extras/data/docx/", "tdf134111.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf134111.docx");
     uno::Reference<chart::XChartDocument> xChartDoc = getChartDocFromWriter(0);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     uno::Reference<chart::XDiagram> mxDiagram(xChartDoc->getDiagram());
@@ -714,7 +714,7 @@ void Chart2ImportTest2::testTdf134111()
 
 void Chart2ImportTest2::testTdf136752()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf136752.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf136752.xlsx");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
 
@@ -735,7 +735,7 @@ void Chart2ImportTest2::testTdf136752()
 
 void Chart2ImportTest2::testTdf137505()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf137505.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf137505.xlsx");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
 
@@ -755,7 +755,7 @@ void Chart2ImportTest2::testTdf137505()
 
 void Chart2ImportTest2::testTdf137734()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "tdf137734.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"tdf137734.xlsx");
     Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
     CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
     CPPUNIT_ASSERT(xChartDoc.is());
@@ -782,7 +782,7 @@ void Chart2ImportTest2::testTdf137734()
 
 void Chart2ImportTest2::testTdf137874()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "piechart_legend.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"piechart_legend.xlsx");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
     Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
@@ -796,7 +796,7 @@ void Chart2ImportTest2::testTdf137874()
 
 void Chart2ImportTest2::testTdf146463()
 {
-    load(u"/chart2/qa/extras/data/ods/", "tdf146463.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf146463.ods");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
     Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
@@ -819,7 +819,7 @@ void Chart2ImportTest2::testTdf146463()
 
 void Chart2ImportTest2::testTdfCustomShapePos()
 {
-    load(u"/chart2/qa/extras/data/docx/", "testcustomshapepos.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"testcustomshapepos.docx");
     Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), UNO_QUERY_THROW);
     Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
     Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW);
@@ -847,7 +847,7 @@ void Chart2ImportTest2::testTdfCustomShapePos()
 
 void Chart2ImportTest2::testTdf121281()
 {
-    load(u"/chart2/qa/extras/data/xlsx/", "incorrect_label_position.xlsx");
+    load(u"/chart2/qa/extras/data/xlsx/", u"incorrect_label_position.xlsx");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
     Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
@@ -866,7 +866,7 @@ void Chart2ImportTest2::testTdf121281()
 
 void Chart2ImportTest2::testTdf139658()
 {
-    load(u"/chart2/qa/extras/data/docx/", "tdf139658.docx");
+    load(u"/chart2/qa/extras/data/docx/", u"tdf139658.docx");
     uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xChartDoc.is());
     Reference<chart2::XInternalDataProvider> xInternalProvider(xChartDoc->getDataProvider(),
@@ -886,7 +886,7 @@ void Chart2ImportTest2::testTdf139658()
 
 void Chart2ImportTest2::testTdf146066()
 {
-    load(u"/chart2/qa/extras/data/ods/", "tdf146066.ods");
+    load(u"/chart2/qa/extras/data/ods/", u"tdf146066.ods");
     Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
                                                UNO_QUERY_THROW);
     uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY);
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 02ad9675d930..0097229cfe34 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -115,11 +115,11 @@ class ChartTest : public test::BootstrapFixture, public unotest::MacrosTest, pub
 {
 public:
     ChartTest():mbSkipValidation(false) {}
-    void load( std::u16string_view rDir, const OUString& rFileName );
+    void load( std::u16string_view rDir, std::u16string_view rFileName );
     std::shared_ptr<utl::TempFile> save( const OUString& rFileName );
     std::shared_ptr<utl::TempFile> reload( const OUString& rFileName );
     uno::Sequence < OUString > getImpressChartColumnDescriptions( std::u16string_view pDir, const char* pName );
-    OUString getFileExtension( const OUString& rFileName );
+    std::u16string_view getFileExtension( std::u16string_view rFileName );
 
     uno::Reference< chart::XChartDocument > getChartDocFromImpress( std::u16string_view pDir, const char* pName );
 
@@ -147,25 +147,25 @@ protected:
     xmlDocUniquePtr parseExport(const OUString& rDir, const OUString& rFilterFormat);
 };
 
-OUString ChartTest::getFileExtension( const OUString& aFileName )
+std::u16string_view ChartTest::getFileExtension( std::u16string_view aFileName )
 {
-    sal_Int32 nDotLocation = aFileName.lastIndexOf('.');
-    CPPUNIT_ASSERT(nDotLocation != -1);
-    return aFileName.copy(nDotLocation+1); // Skip the dot.
+    size_t nDotLocation = aFileName.rfind('.');
+    CPPUNIT_ASSERT(nDotLocation != std::u16string_view::npos);
+    return aFileName.substr(nDotLocation+1); // Skip the dot.
 }
 
-void ChartTest::load( std::u16string_view aDir, const OUString& aName )
+void ChartTest::load( std::u16string_view aDir, std::u16string_view aName )
 {
-    OUString extension = getFileExtension(aName);
-    if (extension == "ods" || extension == "xlsx" || extension == "fods")
+    std::u16string_view extension = getFileExtension(aName);
+    if (extension == u"ods" || extension == u"xlsx" || extension == u"fods")
     {
         maServiceName = "com.sun.star.sheet.SpreadsheetDocument";
     }
-    else if (extension == "docx")
+    else if (extension == u"docx")
     {
         maServiceName = "com.sun.star.text.TextDocument";
     }
-    else if (extension == "odg")
+    else if (extension == u"odg")
     {
         maServiceName = "com.sun.star.drawing.DrawingDocument";
     }
diff --git a/chart2/qa/extras/xshape/chart2xshape.cxx b/chart2/qa/extras/xshape/chart2xshape.cxx
index 18141a9ede88..fd9e3ba4016c 100644
--- a/chart2/qa/extras/xshape/chart2xshape.cxx
+++ b/chart2/qa/extras/xshape/chart2xshape.cxx
@@ -115,7 +115,7 @@ void Chart2XShapeTest::testPieChartLabels1()
         return;
 
     // inside placement for the best fit case
-    load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-1.xlsx");
+    load(u"chart2/qa/extras/xshape/data/xlsx/", u"tdf90839-1.xlsx");
     compareAgainstReference(u"tdf90839-1.xml");
 }
 
@@ -127,7 +127,7 @@ void Chart2XShapeTest::testPieChartLabels2()
         return;
 
     // text wrap: wrap all text labels except one
-    load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-2.xlsx");
+    load(u"chart2/qa/extras/xshape/data/xlsx/", u"tdf90839-2.xlsx");
     compareAgainstReference(u"tdf90839-2.xml");
 }
 
@@ -139,7 +139,7 @@ void Chart2XShapeTest::testPieChartLabels3()
         return;
 
     // text wrap: wrap no text label except one
-    load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-3.xlsx");
+    load(u"chart2/qa/extras/xshape/data/xlsx/", u"tdf90839-3.xlsx");
     compareAgainstReference(u"tdf90839-3.xml");
 }
 
@@ -151,7 +151,7 @@ void Chart2XShapeTest::testPieChartLabels4()
         return;
 
     // data value and percent value are centered horizontally
-    load(u"chart2/qa/extras/xshape/data/ods/", "tdf90839-4.ods");
+    load(u"chart2/qa/extras/xshape/data/ods/", u"tdf90839-4.ods");
     compareAgainstReference(u"tdf90839-4.xml");
 }
 
@@ -160,7 +160,7 @@ void Chart2XShapeTest::testTdf76649TrendLineBug()
     // This bug prevents that the trendline (regression curve) is drawn
     // if the first cell is empty. See tdf#76649 for details.
 
-    load(u"chart2/qa/extras/xshape/data/ods/", "tdf76649_TrendLineBug.ods");
+    load(u"chart2/qa/extras/xshape/data/ods/", u"tdf76649_TrendLineBug.ods");
 
     xmlDocUniquePtr pXmlDoc = getXShapeDumpXmlDoc();
 
@@ -171,7 +171,7 @@ void Chart2XShapeTest::testTdf76649TrendLineBug()
 
 void Chart2XShapeTest::testTdf88154LabelRotatedLayout()
 {
-    load(u"chart2/qa/extras/xshape/data/pptx/", "tdf88154_LabelRotatedLayout.pptx");
+    load(u"chart2/qa/extras/xshape/data/pptx/", u"tdf88154_LabelRotatedLayout.pptx");
     uno::Reference<chart::XChartDocument> xChartDoc = getChartDocFromDrawImpress(0, 5);
     uno::Reference<qa::XDumper> xDumper(xChartDoc, UNO_QUERY_THROW);
     OUString rDump = xDumper->dump();
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 3918462e4ac4..4327297360d4 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -70,6 +70,7 @@
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <tools/diagnose_ex.h>
+#include <o3tl/string_view.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::chart::wrapper;
@@ -473,21 +474,21 @@ sal_Int32 lcl_getNewAPIIndexForOldAPIIndex(
     return nNewAPIIndex;
 }
 
-OUString lcl_getDiagramType( const OUString & rTemplateServiceName )
+OUString lcl_getDiagramType( std::u16string_view rTemplateServiceName )
 {
     static const OUStringLiteral aPrefix(u"com.sun.star.chart2.template.");
 
-    if( rTemplateServiceName.match( aPrefix ))
+    if( o3tl::starts_with(rTemplateServiceName, aPrefix) )
     {
-        const OUString aName( rTemplateServiceName.copy( aPrefix.getLength()));
+        const std::u16string_view aName( rTemplateServiceName.substr( aPrefix.getLength()));
 
         // "Area" "StackedArea" "PercentStackedArea" "ThreeDArea"
         // "StackedThreeDArea" "PercentStackedThreeDArea"
-        if( aName.indexOf( "Area" ) != -1 )
+        if( aName.find( u"Area" ) != std::u16string_view::npos )
             return "com.sun.star.chart.AreaDiagram";
 
         // "Pie" "PieAllExploded" "ThreeDPie" "ThreeDPieAllExploded"
-        if( aName.indexOf( "Pie" ) != -1 )
+        if( aName.find( u"Pie" ) != std::u16string_view::npos )
             return "com.sun.star.chart.PieDiagram";
 
         // "Column" "StackedColumn" "PercentStackedColumn" "ThreeDColumnDeep"
@@ -496,33 +497,33 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName )
         // "PercentStackedBar" "ThreeDBarDeep" "ThreeDBarFlat"
         // "StackedThreeDBarFlat" "PercentStackedThreeDBarFlat" "ColumnWithLine"
         // "StackedColumnWithLine"
-        if( aName.indexOf( "Column" ) != -1 || aName.indexOf( "Bar" ) != -1 )
+        if( aName.find( u"Column" ) != std::u16string_view::npos || aName.find( u"Bar" ) != std::u16string_view::npos )
             return "com.sun.star.chart.BarDiagram";
 
         // "Donut" "DonutAllExploded" "ThreeDDonut" "ThreeDDonutAllExploded"
-        if( aName.indexOf( "Donut" ) != -1 )
+        if( aName.find( u"Donut" ) != std::u16string_view::npos )
             return "com.sun.star.chart.DonutDiagram";
 
         // "ScatterLineSymbol" "ScatterLine" "ScatterSymbol" "ThreeDScatter"
-        if( aName.indexOf( "Scatter" ) != -1 )
+        if( aName.find( u"Scatter" ) != std::u16string_view::npos )
             return "com.sun.star.chart.XYDiagram";
 
         // "FilledNet" "StackedFilledNet" "PercentStackedFilledNet"
-        if( aName.indexOf( "FilledNet" ) != -1 )
+        if( aName.find( u"FilledNet" ) != std::u16string_view::npos )
             return "com.sun.star.chart.FilledNetDiagram";
 
         // "Net" "NetSymbol" "NetLine" "StackedNet" "StackedNetSymbol"
         // "StackedNetLine" "PercentStackedNet" "PercentStackedNetSymbol"
         // "PercentStackedNetLine"
-        if( aName.indexOf( "Net" ) != -1 )
+        if( aName.find( u"Net" ) != std::u16string_view::npos )
             return "com.sun.star.chart.NetDiagram";
 
         // "StockLowHighClose" "StockOpenLowHighClose" "StockVolumeLowHighClose"
         // "StockVolumeOpenLowHighClose"
-        if( aName.indexOf( "Stock" ) != -1 )
+        if( aName.find( u"Stock" ) != std::u16string_view::npos )
             return "com.sun.star.chart.StockDiagram";
 
-        if( aName.indexOf( "Bubble" ) != -1 )
+        if( aName.find( u"Bubble" ) != std::u16string_view::npos )
             return "com.sun.star.chart.BubbleDiagram";
 
         // Note: this must be checked after Bar, Net and Scatter
@@ -531,7 +532,7 @@ OUString lcl_getDiagramType( const OUString & rTemplateServiceName )
         // "PercentStackedLine" "LineSymbol" "StackedLineSymbol"
         // "PercentStackedLineSymbol" "ThreeDLine" "StackedThreeDLine"
         // "PercentStackedThreeDLine" "ThreeDLineDeep"
-        if( aName.indexOf( "Line" ) != -1 || aName.indexOf( "Symbol" ) != -1 )
+        if( aName.find( u"Line" ) != std::u16string_view::npos || aName.find( u"Symbol" ) != std::u16string_view::npos )
             return "com.sun.star.chart.LineDiagram";
 
         OSL_FAIL( "unknown template" );
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 8ffb67543473..926b81a0ae15 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -52,6 +52,7 @@
 #include <com/sun/star/chart2/XDataSeries.hpp>
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <tools/diagnose_ex.h>
+#include <o3tl/string_view.hxx>
 
 namespace chart
 {
@@ -506,7 +507,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const rtl:
         rtl::Reference< DataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartModel );
         if( xDiagram.is() && xSeries.is() )
         {
-            sal_Int32 nPointIndex( ObjectIdentifier::getParticleID(rObjectCID).toInt32() );
+            sal_Int32 nPointIndex = o3tl::toInt32(ObjectIdentifier::getParticleID(rObjectCID));
 
             //replace data point index
             OUString aWildcard(  "%POINTNUMBER" );
@@ -728,7 +729,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
         rtl::Reference< DataSeries > xSeries = ObjectIdentifier::getDataSeriesForCID( rObjectCID , xChartDocument );
         if( xDiagram.is() && xSeries.is() )
         {
-            sal_Int32 nPointIndex( ObjectIdentifier::getParticleID(rObjectCID).toInt32() );
+            sal_Int32 nPointIndex = o3tl::toInt32( ObjectIdentifier::getParticleID(rObjectCID) );
 
             // replace data point index
             replaceParamterInString( aRet, "%POINTNUMBER", OUString::number( nPointIndex + 1 ));
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 44bcdcaffcb8..7a14b9680d45 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -108,8 +108,8 @@ ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const OUString
         , m_bComplexCategoriesAxis( false )
         , m_nNbPoints( 0 )
 {
-    OUString aParticleID = ObjectIdentifier::getParticleID( m_aObjectCID );
-    m_bAffectsMultipleObjects = (aParticleID == "ALLELEMENTS");
+    std::u16string_view aParticleID = ObjectIdentifier::getParticleID( m_aObjectCID );
+    m_bAffectsMultipleObjects = (aParticleID == u"ALLELEMENTS");
 }
 ObjectPropertiesDialogParameter::~ObjectPropertiesDialogParameter()
 {
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 58bac63b0484..b04e43a82cfa 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -61,6 +61,7 @@
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <com/sun/star/util/CloseVetoException.hpp>
 #include <comphelper/servicehelper.hxx>
+#include <o3tl/string_view.hxx>
 
 #include <memory>
 
@@ -92,8 +93,8 @@ wrapper::ItemConverter* createItemConverter(
         return nullptr;
     }
 
-    OUString aParticleID = ObjectIdentifier::getParticleID( aObjectCID );
-    bool bAffectsMultipleObjects = aParticleID == "ALLELEMENTS";
+    std::u16string_view aParticleID = ObjectIdentifier::getParticleID( aObjectCID );
+    bool bAffectsMultipleObjects = aParticleID == u"ALLELEMENTS";
     if( !bAffectsMultipleObjects )
     {
         uno::Reference< beans::XPropertySet > xObjectProperties =
@@ -218,7 +219,7 @@ wrapper::ItemConverter* createItemConverter(
                 sal_Int32 nPointIndex = -1; /*-1 for whole series*/
                 if(!bDataSeries)
                 {
-                    nPointIndex = aParticleID.toInt32();
+                    nPointIndex = o3tl::toInt32(aParticleID);
                     bool bVaryColorsByPoint = false;
                     if( xSeries.is() &&
                         (xSeries->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint) &&
@@ -530,7 +531,7 @@ OUString lcl_getObjectCIDForCommand( std::string_view rDispatchCommand, const rt
             return rSelectedCID;
         else
         {
-            sal_Int32 nPointIndex = ObjectIdentifier::getParticleID( rSelectedCID ).toInt32();
+            sal_Int32 nPointIndex = o3tl::toInt32(ObjectIdentifier::getParticleID( rSelectedCID ));
             if( nPointIndex>=0 )
             {
                 OUString aSeriesParticle = ObjectIdentifier::getSeriesParticleFromCID( rSelectedCID );
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 92035d9d1bbd..905b84a6724c 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -144,7 +144,7 @@ bool lcl_deleteDataCurve(
     {
         uno::Reference< chart2::XRegressionCurveContainer > xRegressionCurveContainer(
             ObjectIdentifier::getObjectPropertySet(
-                ObjectIdentifier::getFullParentParticle( rCID ), xModel), uno::UNO_QUERY );
+                OUString(ObjectIdentifier::getFullParentParticle( rCID )), xModel), uno::UNO_QUERY );
 
         if( xRegressionCurveContainer.is())
         {
@@ -662,7 +662,7 @@ bool ChartController::executeDispatch_Delete()
             {
                 uno::Reference< chart2::XRegressionCurveContainer > xRegCurveCnt(
                     ObjectIdentifier::getObjectPropertySet(
-                        ObjectIdentifier::getFullParentParticle( aCID ), getChartModel()), uno::UNO_QUERY );
+                        OUString(ObjectIdentifier::getFullParentParticle( aCID )), getChartModel()), uno::UNO_QUERY );
                 if( xRegCurveCnt.is())
                 {
                     UndoGuard aUndoGuard(
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 834c7e814dd0..9edd510417c3 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -166,9 +166,9 @@ public:
         );
 
     static bool isCID( std::u16string_view rName );
-    static OUString getDragMethodServiceName( const OUString& rClassifiedIdentifier );
-    static OUString getDragParameterString( const OUString& rCID );
-    static bool isDragableObject( const OUString& rClassifiedIdentifier );
+    static std::u16string_view getDragMethodServiceName( std::u16string_view rClassifiedIdentifier );
+    static std::u16string_view getDragParameterString( std::u16string_view rCID );
+    static bool isDragableObject( std::u16string_view rClassifiedIdentifier );
     bool isDragableObject() const;
     static bool isRotateableObject( std::u16string_view rClassifiedIdentifier );
     static bool isMultiClickObject( std::u16string_view rClassifiedIdentifier );
@@ -189,8 +189,8 @@ public:
     static OUString createDataCurveEquationCID( std::u16string_view rSeriesParticle, sal_Int32 nCurveIndex );
 
     SAL_DLLPRIVATE static OUString getObjectID( const OUString& rCID );
-    static OUString getParticleID( const OUString& rCID );
-    static OUString getFullParentParticle( const OUString& rCID );
+    static std::u16string_view getParticleID( std::u16string_view rCID );
+    static std::u16string_view getFullParentParticle( std::u16string_view rCID );
 
     //returns the series particle of a CID when the CID is a child of the series
     static OUString getSeriesParticleFromCID( const OUString& rCID );
@@ -228,7 +228,7 @@ public:
         , css::awt::Point& rMinimumPosition
         , css::awt::Point& rMaximumPosition );
 
-    static TitleHelper::eTitleType getTitleTypeForCID( const OUString& rCID );
+    static TitleHelper::eTitleType getTitleTypeForCID( std::u16string_view rCID );
 
     static OUString getMovedSeriesCID( const OUString& rObjectCID, bool bForward );
 
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 9e08f108b12b..e1b05d023630 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -48,6 +48,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
 #include <o3tl/string_view.hxx>
+#include <comphelper/string.hxx>
 
 namespace com::sun::star::drawing { class XShape; }
 
@@ -60,8 +61,8 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
 
 const sal_Unicode m_aMultiClick[] = u"MultiClick";
-const char m_aDragMethodEquals[] = "DragMethod=";
-const char m_aDragParameterEquals[] = "DragParameter=";
+const sal_Unicode m_aDragMethodEquals[] = u"DragMethod=";
+const sal_Unicode m_aDragParameterEquals[] = u"DragParameter=";
 const sal_Unicode m_aProtocol[] = u"CID/";
 const OUString m_aPieSegmentDragMethodServiceName("PieSegmentDragging");
 
@@ -631,57 +632,57 @@ bool ObjectIdentifier::parsePieSegmentDragParameterString(
     return nCharacterIndex >= 0;
 }
 
-OUString ObjectIdentifier::getDragMethodServiceName( const OUString& rCID )
+std::u16string_view ObjectIdentifier::getDragMethodServiceName( std::u16string_view rCID )
 {
-    OUString aRet;
+    std::u16string_view aRet;
 
-    sal_Int32 nIndexStart = rCID.indexOf( m_aDragMethodEquals );
-    if( nIndexStart != -1 )
+    size_t nIndexStart = rCID.find( m_aDragMethodEquals );
+    if( nIndexStart != std::u16string_view::npos )
     {
-        nIndexStart = rCID.indexOf( '=', nIndexStart );
-        if( nIndexStart != -1 )
+        nIndexStart = rCID.find( '=', nIndexStart );
+        if( nIndexStart != std::u16string_view::npos )
         {
             nIndexStart++;
-            sal_Int32 nNextSlash = rCID.indexOf( '/', nIndexStart );
-            if( nNextSlash != -1 )
+            size_t nNextSlash = rCID.find( '/', nIndexStart );
+            if( nNextSlash != std::u16string_view::npos )
             {
                 sal_Int32 nIndexEnd = nNextSlash;
-                sal_Int32 nNextColon = rCID.indexOf( ':', nIndexStart );
-                if( nNextColon < nNextSlash )
+                size_t nNextColon = rCID.find( ':', nIndexStart );
+                if( nNextColon == std::u16string_view::npos || nNextColon < nNextSlash )
                     nIndexEnd = nNextColon;
-                aRet = rCID.copy(nIndexStart,nIndexEnd-nIndexStart);
+                aRet = rCID.substr(nIndexStart,nIndexEnd-nIndexStart);
             }
         }
     }
     return aRet;
 }
 
-OUString ObjectIdentifier::getDragParameterString( const OUString& rCID )
+std::u16string_view ObjectIdentifier::getDragParameterString( std::u16string_view rCID )
 {
-    OUString aRet;
+    std::u16string_view aRet;
 
-    sal_Int32 nIndexStart = rCID.indexOf( m_aDragParameterEquals );
-    if( nIndexStart != -1 )
+    size_t nIndexStart = rCID.find( m_aDragParameterEquals );
+    if( nIndexStart != std::u16string_view::npos )
     {
-        nIndexStart = rCID.indexOf( '=', nIndexStart );
-        if( nIndexStart != -1 )
+        nIndexStart = rCID.find( '=', nIndexStart );
+        if( nIndexStart != std::u16string_view::npos )
         {
             nIndexStart++;
-            sal_Int32 nNextSlash = rCID.indexOf( '/', nIndexStart );
-            if( nNextSlash != -1 )
+            size_t nNextSlash = rCID.find( '/', nIndexStart );
+            if( nNextSlash != std::u16string_view::npos )
             {
                 sal_Int32 nIndexEnd = nNextSlash;
-                sal_Int32 nNextColon = rCID.indexOf( ':', nIndexStart );
-                if( nNextColon < nNextSlash )
+                size_t nNextColon = rCID.find( ':', nIndexStart );
+                if( nNextColon == std::u16string_view::npos || nNextColon < nNextSlash )
                     nIndexEnd = nNextColon;
-                aRet = rCID.copy(nIndexStart,nIndexEnd-nIndexStart);
+                aRet = rCID.substr(nIndexStart,nIndexEnd-nIndexStart);
             }
         }
     }
     return aRet;
 }
 
-bool ObjectIdentifier::isDragableObject( const OUString& rClassifiedIdentifier )
+bool ObjectIdentifier::isDragableObject( std::u16string_view rClassifiedIdentifier )
 {
     bool bReturn = false;
     ObjectType eObjectType = ObjectIdentifier::getObjectType( rClassifiedIdentifier );
@@ -1027,27 +1028,27 @@ OUString ObjectIdentifier::createPointCID( std::u16string_view rPointCID_Stub, s
     return rPointCID_Stub + OUString::number( nIndex );
 }
 
-OUString ObjectIdentifier::getParticleID( const OUString& rCID )
+std::u16string_view ObjectIdentifier::getParticleID( std::u16string_view rCID )
 {
-    OUString aRet;
-    sal_Int32 nLast = rCID.lastIndexOf('=');
-    if(nLast>=0)
-        aRet = rCID.copy(++nLast);
+    std::u16string_view aRet;
+    size_t nLast = rCID.rfind('=');
+    if(nLast != std::u16string_view::npos)
+        aRet = rCID.substr(++nLast);
     return aRet;
 }
 
-OUString ObjectIdentifier::getFullParentParticle( const OUString& rCID )
+std::u16string_view ObjectIdentifier::getFullParentParticle( std::u16string_view rCID )
 {
-    OUString aRet;
+    std::u16string_view aRet;
 
-    sal_Int32 nStartPos = rCID.lastIndexOf('/');
-    if( nStartPos>=0 )
+    size_t nStartPos = rCID.rfind('/');
+    if( nStartPos != std::u16string_view::npos )
     {
         nStartPos++;
-        sal_Int32 nEndPos = rCID.lastIndexOf(':');
-        if( nEndPos>=0 && nStartPos < nEndPos )
+        size_t nEndPos = rCID.rfind(':');
+        if( nEndPos != std::u16string_view::npos && nStartPos < nEndPos )
         {
-            aRet = rCID.copy(nStartPos,nEndPos-nStartPos);
+            aRet = rCID.substr(nStartPos,nEndPos-nStartPos);
         }
     }
 
@@ -1088,7 +1089,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
     try
     {
         ObjectType eObjectType = ObjectIdentifier::getObjectType( rObjectCID );
-        OUString aParticleID = ObjectIdentifier::getParticleID( rObjectCID );
+        std::u16string_view aParticleID = ObjectIdentifier::getParticleID( rObjectCID );
 
         rtl::Reference< Diagram > xDiagram;
         rtl::Reference< BaseCoordinateSystem > xCooSys;
@@ -1177,7 +1178,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
                         rObjectCID, xChartModel );
                     if(xSeries.is())
                     {
-                        sal_Int32 nIndex = aParticleID.toInt32();
+                        sal_Int32 nIndex = o3tl::toInt32(aParticleID);
                         xObjectProperties = xSeries->getDataPointByIndex( nIndex );
                     }
                     break;
@@ -1213,7 +1214,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet(
                         rObjectCID, xChartModel );
                     if(xRegressionContainer.is())
                     {
-                        sal_Int32 nIndex = aParticleID.toInt32();
+                        sal_Int32 nIndex = o3tl::toInt32(aParticleID);
                         const std::vector< rtl::Reference< RegressionCurveModel > > & aCurveList =
                             xRegressionContainer->getRegressionCurves2();
                         if( nIndex >= 0 && nIndex < static_cast<sal_Int32>(aCurveList.size()) )
@@ -1304,11 +1305,11 @@ rtl::Reference< Diagram > ObjectIdentifier::getDiagramForCID(
     return xDiagram;
 }
 
-TitleHelper::eTitleType ObjectIdentifier::getTitleTypeForCID( const OUString& rCID )
+TitleHelper::eTitleType ObjectIdentifier::getTitleTypeForCID( std::u16string_view rCID )
 {
     TitleHelper::eTitleType eRet( TitleHelper::MAIN_TITLE );
 
-    OUString aParentParticle = ObjectIdentifier::getFullParentParticle( rCID );
+    std::u16string_view aParentParticle = ObjectIdentifier::getFullParentParticle( rCID );
     const tTitleMap& rMap = lcl_getTitleMap();
     tTitleMap::const_iterator aIt = std::find_if(rMap.begin(), rMap.end(),
         [&aParentParticle](tTitleMap::const_reference rEntry) { return aParentParticle == rEntry.second; });
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index d77c3b591900..196a0396542a 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -104,7 +104,7 @@ void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, OUStr
 }
 
 void lcl_getSingleCellAddressFromXMLString(
-    const OUString& rXMLString,
+    std::u16string_view rXMLString,
     sal_Int32 nStartPos, sal_Int32 nEndPos,
     ::chart::XMLRangeHelper::Cell & rOutCell )
 {
@@ -112,7 +112,7 @@ void lcl_getSingleCellAddressFromXMLString(
     static const sal_Unicode aDollar( '$' );
     static const sal_Unicode aLetterA( 'A' );
 
-    OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase();
+    OUString aCellStr = OUString(rXMLString.substr( nStartPos, nEndPos - nStartPos + 1 )).toAsciiUpperCase();
     const sal_Unicode* pStrArray = aCellStr.getStr();
     sal_Int32 nLength = aCellStr.getLength();
     sal_Int32 i = nLength - 1, nColumn = 0;