core.git: chart2/qa embeddedobj/qa emfio/qa filter/qa include/test o3tl/CppunitTest_o3tl_tests.mk o3tl/qa oox/qa sc/qa sdext/qa sd/qa sfx2/qa starmath/qa svgio/qa svx/qa sw/qa test/qa test/source vcl/qa writerperfect/qa xmloff/qa xmlscript/qa xmlsecurity/qa

[Mike Kaganski (via logerrit)]

 chart2/qa/extras/chart2export.cxx                       |  152 
 chart2/qa/extras/chart2export2.cxx                      |  501 +-
 chart2/qa/extras/chart2export3.cxx                      |  382 +-
 chart2/qa/extras/chart2geometry.cxx                     |   40 
 chart2/qa/extras/chart2import.cxx                       |    6 
 chart2/qa/extras/xshape/chart2xshape.cxx                |   42 
 embeddedobj/qa/cppunit/msole.cxx                        |    2 
 emfio/qa/cppunit/emf/EmfImportTest.cxx                  | 1229 ++----
 emfio/qa/cppunit/wmf/wmfimporttest.cxx                  |  378 --
 filter/qa/unit/svg.cxx                                  |   83 
 include/test/cppunitasserthelper.hxx                    |    7 
 include/test/xmltesttools.hxx                           |   97 
 o3tl/CppunitTest_o3tl_tests.mk                          |    3 
 o3tl/qa/test-string_view.cxx                            |    8 
 oox/qa/unit/export.cxx                                  |  709 +--
 oox/qa/unit/mcgr.cxx                                    |   48 
 oox/qa/unit/testscene3d.cxx                             |   18 
 sc/qa/extras/htmlexporttest.cxx                         |   14 
 sc/qa/extras/macros-test.cxx                            |   12 
 sc/qa/filter/html/html.cxx                              |   26 
 sc/qa/unit/SparklineImportExportTest.cxx                |   61 
 sc/qa/unit/ThemeImportExportTest.cxx                    |   56 
 sc/qa/unit/jumbosheets-test.cxx                         |   14 
 sc/qa/unit/pivottable_filters_test.cxx                  |  715 +--
 sc/qa/unit/subsequent_export_test.cxx                   |  573 +--
 sc/qa/unit/subsequent_export_test2.cxx                  |  465 +-
 sc/qa/unit/subsequent_export_test3.cxx                  |  144 
 sc/qa/unit/subsequent_export_test4.cxx                  |  374 -
 sc/qa/unit/subsequent_filters_test5.cxx                 |    2 
 sd/qa/filter/eppt/eppt.cxx                              |    6 
 sd/qa/unit/HtmlExportTest.cxx                           |   50 
 sd/qa/unit/SVGExportTests.cxx                           |  100 
 sd/qa/unit/ShapeImportExportTest.cxx                    |  150 
 sd/qa/unit/export-tests-ooxml1.cxx                      |  455 +-
 sd/qa/unit/export-tests-ooxml2.cxx                      |  731 +--
 sd/qa/unit/export-tests-ooxml3.cxx                      |  322 -
 sd/qa/unit/export-tests-ooxml4.cxx                      |  269 -
 sd/qa/unit/export-tests.cxx                             |  210 -
 sd/qa/unit/layout-tests.cxx                             |  115 
 sd/qa/unit/misc-tests.cxx                               |    3 
 sd/qa/unit/tiledrendering/tiledrendering.cxx            |   20 
 sdext/qa/unit/pdfimport.cxx                             |  104 
 sfx2/qa/cppunit/test_misc.cxx                           |   10 
 starmath/qa/extras/mmlexport-test.cxx                   |   43 
 svgio/qa/cppunit/SvgImportTest.cxx                      | 1692 ++++----
 svx/qa/unit/sdr.cxx                                     |   48 
 svx/qa/unit/svdraw.cxx                                  |  155 
 svx/qa/unit/table.cxx                                   |   38 
 svx/qa/unit/unodraw.cxx                                 |    4 
 sw/qa/core/doc/doc.cxx                                  |    5 
 sw/qa/core/frmedt/frmedt.cxx                            |    3 
 sw/qa/core/header_footer/HeaderFooterTest.cxx           |  332 -
 sw/qa/core/layout/calcmove.cxx                          |   16 
 sw/qa/core/layout/ftnfrm.cxx                            |    9 
 sw/qa/core/layout/layout.cxx                            |  112 
 sw/qa/core/layout/paintfrm.cxx                          |   16 
 sw/qa/core/layout/tabfrm.cxx                            |    3 
 sw/qa/core/objectpositioning/objectpositioning.cxx      |   68 
 sw/qa/core/text/text.cxx                                |  133 
 sw/qa/core/txtnode/txtnode.cxx                          |    9 
 sw/qa/core/unocore/unocore.cxx                          |   21 
 sw/qa/extras/docbookexport/docbookexport.cxx            |    2 
 sw/qa/extras/fodfexport/fodfexport.cxx                  |    8 
 sw/qa/extras/globalfilter/globalfilter.cxx              |   66 
 sw/qa/extras/htmlexport/htmlexport.cxx                  |  621 +--
 sw/qa/extras/htmlexport/xhtmlexport.cxx                 |    6 
 sw/qa/extras/indexing/IndexingExportTest.cxx            |  260 -
 sw/qa/extras/layout/layout.cxx                          | 3021 +++++++---------
 sw/qa/extras/layout/layout2.cxx                         | 1517 +++-----
 sw/qa/extras/layout/layout3.cxx                         | 1819 ++++-----
 sw/qa/extras/mailmerge/mailmerge.cxx                    |   44 
 sw/qa/extras/mailmerge/mailmerge2.cxx                   |   28 
 sw/qa/extras/odfexport/odfexport.cxx                    |  346 -
 sw/qa/extras/odfexport/odfexport2.cxx                   |  374 -
 sw/qa/extras/odfimport/odfimport.cxx                    |   62 
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx                |  216 -
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx              |   54 
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx              |   60 
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx              |  812 +---
 sw/qa/extras/ooxmlexport/ooxmlexport13.cxx              |  230 -
 sw/qa/extras/ooxmlexport/ooxmlexport14.cxx              |  394 +-
 sw/qa/extras/ooxmlexport/ooxmlexport15.cxx              |  245 -
 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx              |  122 
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx              |  146 
 sw/qa/extras/ooxmlexport/ooxmlexport18.cxx              |  108 
 sw/qa/extras/ooxmlexport/ooxmlexport19.cxx              |   77 
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx               |  140 
 sw/qa/extras/ooxmlexport/ooxmlexport20.cxx              |  537 +-
 sw/qa/extras/ooxmlexport/ooxmlexport21.cxx              |  518 +-
 sw/qa/extras/ooxmlexport/ooxmlexport3.cxx               |  362 -
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx               |  322 -
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx               |  242 -
 sw/qa/extras/ooxmlexport/ooxmlexport6.cxx               |  290 -
 sw/qa/extras/ooxmlexport/ooxmlexport7.cxx               |  622 +--
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx               |   12 
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx               |  358 -
 sw/qa/extras/ooxmlexport/ooxmlexport_template.cxx       |    6 
 sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx           |  194 -
 sw/qa/extras/ooxmlexport/ooxmllinks.cxx                 |   28 
 sw/qa/extras/ooxmlexport/ooxmlw14export.cxx             |  766 ++--
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx                |   44 
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx               |   17 
 sw/qa/extras/rtfexport/rtfexport2.cxx                   |    5 
 sw/qa/extras/rtfexport/rtfexport3.cxx                   |    9 
 sw/qa/extras/rtfexport/rtfexport4.cxx                   |   61 
 sw/qa/extras/rtfexport/rtfexport5.cxx                   |   33 
 sw/qa/extras/rtfexport/rtfexport6.cxx                   |   26 
 sw/qa/extras/rtfexport/rtfexport8.cxx                   |   64 
 sw/qa/extras/rtfimport/rtfimport.cxx                    |   20 
 sw/qa/extras/tiledrendering/tiledrendering.cxx          |   12 
 sw/qa/extras/uiwriter/uiwriter.cxx                      |    8 
 sw/qa/extras/uiwriter/uiwriter2.cxx                     |  162 
 sw/qa/extras/uiwriter/uiwriter3.cxx                     |  257 -
 sw/qa/extras/uiwriter/uiwriter4.cxx                     |  410 +-
 sw/qa/extras/uiwriter/uiwriter5.cxx                     |  270 -
 sw/qa/extras/uiwriter/uiwriter6.cxx                     |  216 -
 sw/qa/extras/uiwriter/uiwriter7.cxx                     |   24 
 sw/qa/extras/uiwriter/uiwriter8.cxx                     |  195 -
 sw/qa/extras/uiwriter/uiwriter9.cxx                     |   16 
 sw/qa/extras/ww8export/ww8export.cxx                    |   58 
 sw/qa/extras/ww8export/ww8export2.cxx                   |   18 
 sw/qa/extras/ww8export/ww8export3.cxx                   |   16 
 sw/qa/extras/ww8export/ww8export4.cxx                   |   70 
 sw/qa/extras/ww8import/ww8import.cxx                    |    6 
 sw/qa/filter/html/html.cxx                              |   17 
 sw/qa/filter/ww8/ww8.cxx                                |   34 
 sw/qa/uibase/uiview/uiview.cxx                          |    3 
 sw/qa/writerfilter/dmapper/DomainMapperTableHandler.cxx |   12 
 sw/qa/writerfilter/dmapper/GraphicImport.cxx            |    6 
 sw/qa/writerfilter/dmapper/SettingsTable.cxx            |    8 
 sw/qa/writerfilter/filter/WriterFilter.cxx              |   10 
 sw/qa/writerfilter/rtftok/rtfdispatchsymbol.cxx         |    2 
 test/qa/cppunit/test_xpath.cxx                          |   16 
 test/source/xmltesttools.cxx                            |  116 
 vcl/qa/cppunit/graphicfilter/filters-pict-test.cxx      |    8 
 vcl/qa/cppunit/svm/svmtest.cxx                          | 1024 ++---
 writerperfect/qa/unit/EPUBExportTest.cxx                |  254 -
 xmloff/qa/unit/draw.cxx                                 |  106 
 xmloff/qa/unit/style.cxx                                |  132 
 xmloff/qa/unit/text.cxx                                 |  115 
 xmloff/qa/unit/text/txtprmap.cxx                        |    3 
 xmlscript/qa/cppunit/test.cxx                           |  111 
 xmlsecurity/qa/unit/signing/signing.cxx                 |   26 
 xmlsecurity/qa/unit/signing/signing2.cxx                |  284 -
 144 files changed, 14565 insertions(+), 16187 deletions(-)

New commits:
commit a6a69211230226ac8b6c17d016fc19eb8ee11261
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Oct 3 11:40:13 2024 +0500
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Oct 5 10:06:44 2024 +0200

    Use good old string literals in assertXPath and friends
    
    These are only sent to an external API expecting char*-like strings,
    or for comparison. Having every assertXPath having three of _[ou]str
    is too much syntactic noise, making the unit tests almost unreadable.
    
    Change-Id: Ic004a36ea75e7bfe0b96f405c40f926a957b51cc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174416
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Tested-by: Jenkins

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index babf3433a74b..c57c238ef3b0 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -233,14 +233,14 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testErrorBarPropXLSX)
     CPPUNIT_ASSERT(pXmlDoc);
 
     // test y error bars property
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:errDir"_ostr,
 "val"_ostr, u"y"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln"_ostr,
 "w"_ostr, u"12600"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr,
 "val"_ostr, u"ff0000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:errDir", 
"val", u"y");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln",
 "w", u"12600");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln/a:solidFill/a:srgbClr",
 "val", u"ff0000");
 
     // test x error bars property
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:errDir"_ostr,
 "val"_ostr, u"x"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln"_ostr,
 "w"_ostr, u"9360"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr,
 "val"_ostr, u"595959"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:errDir", 
"val", u"x");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln",
 "w", u"9360");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln/a:solidFill/a:srgbClr",
 "val", u"595959");
 }
 
 // This method tests the preservation of properties for trendlines / 
regression curves
@@ -315,12 +315,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testStockChart)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:idx"_ostr, 
"val"_ostr, u"1"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:order"_ostr, 
"val"_ostr, u"1"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:idx", "val", u"1");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:order", "val", u"1");
     assertXPathContent(
         pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v"_ostr,
-        u"Open"_ustr);
+        
"/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v",
+        u"Open");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChart)
@@ -330,7 +330,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChart)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:barDir"_ostr, "val"_ostr, 
u"col"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:barDir", "val", u"col");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testCrosses)
@@ -341,7 +341,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testCrosses)
         save(u"Office Open XML Text"_ustr);
         xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
 
-        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses"_ostr, "val"_ostr, 
u"autoZero"_ustr);
+        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses", "val", u"autoZero");
     }
     // tdf#142351: test crossesAt val="-50" with XLSX
     {
@@ -350,7 +350,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testCrosses)
         xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
         CPPUNIT_ASSERT(pXmlDoc);
 
-        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crossesAt"_ostr, "val"_ostr, 
u"-50"_ustr);
+        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crossesAt", "val", u"-50");
     }
 }
 
@@ -400,7 +400,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testScatterChartTextXValues)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser[1]/c:xVal[1]/c:numRef[1]/c:numCache[1]/c:pt[1]/c:v[1]"_ostr,
 u"1"_ustr);
+    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser[1]/c:xVal[1]/c:numRef[1]/c:numCache[1]/c:pt[1]/c:v[1]", 
u"1");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterXAxisValues)
@@ -411,11 +411,11 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testScatterXAxisValues)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:ptCount"_ostr, "val"_ostr, 
u"5"_ustr);
-    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[1]/c:v"_ostr, 
u"15"_ustr);
-    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[2]/c:v"_ostr, 
u"11"_ustr);
-    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[3]/c:v"_ostr, 
u"20"_ustr);
-    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[4]/c:v"_ostr, 
u"16"_ustr);
+    assertXPath(pXmlDoc, 
"//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:ptCount", "val", u"5");
+    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[1]/c:v", u"15");
+    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[2]/c:v", u"11");
+    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[3]/c:v", u"20");
+    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[4]/c:v", u"16");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterXAxisCategories)
@@ -425,9 +425,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testScatterXAxisCategories)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:ptCount"_ostr, 
"val"_ostr, u"4"_ustr);
-    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[1]/c:v"_ostr, u"Row 
1"_ustr);
-    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[2]/c:v"_ostr, u"Row 
2"_ustr);
+    assertXPath(pXmlDoc, 
"//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:ptCount", "val", u"4");
+    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[1]/c:v", u"Row 1");
+    assertXPathContent(pXmlDoc, 
"//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[2]/c:v", u"Row 2");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartDataTable)
@@ -437,9 +437,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartDataTable)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showHorzBorder"_ostr, "val"_ostr, 
u"1"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showVertBorder"_ostr, "val"_ostr, 
u"1"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showOutline"_ostr, "val"_ostr, 
u"1"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showHorzBorder", "val", u"1");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showVertBorder", "val", u"1");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showOutline", "val", u"1");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartExternalData)
@@ -449,7 +449,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testChartExternalData)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, "/c:chartSpace/c:externalData"_ostr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:externalData");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testEmbeddingsGrabBag)
@@ -501,8 +501,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAreaChartLoad)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:showVal"_ostr, 
"val"_ostr, u"1"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLbl"_ostr, 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:showVal", "val", 
u"1");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLbl", 0);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testUpDownBars)
@@ -511,7 +511,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testUpDownBars)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:upDownBars"_ostr, 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:upDownBars", 0);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDoughnutChart)
@@ -521,7 +521,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDoughnutChart)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:doughnutChart"_ostr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:doughnutChart");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieOfPieChart)
@@ -531,8 +531,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieOfPieChart)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart"_ostr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:ofPieType[1]"_ostr, 
"val"_ostr, u"pie"_ustr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:ofPieType[1]", "val", u"pie");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarOfPieChart)
@@ -542,8 +542,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarOfPieChart)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart"_ostr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:ofPieType[1]"_ostr, 
"val"_ostr, u"bar"_ustr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:ofPieType[1]", "val", u"bar");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDisplayUnits)
@@ -553,7 +553,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDisplayUnits)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:dispUnits/c:builtInUnit"_ostr, 
"val"_ostr, u"billions"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:dispUnits/c:builtInUnit", "val", 
u"billions");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallGradientFill)
@@ -563,7 +563,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testFdo74115WallGradientFill)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill"_ostr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallBitmapFill)
@@ -572,7 +572,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testFdo74115WallBitmapFill)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:blipFill"_ostr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:blipFill");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartWallLineStyle)
@@ -585,7 +585,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testPieChartWallLineStyle)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:ln/a:noFill"_ostr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:ln/a:noFill");
 }
 
 //The below test case tests the built in marker 'x' for Office 2010 in Line 
charts
@@ -596,8 +596,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testFdo78290LineChartMarkerX)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     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]"_ostr,"val"_ostr,u"x"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]"_ostr,"val"_ostr,u"7"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val",u"x");
+    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val",u"7");
 }
 
 // We can also use the built in marker 'x' in scatter chart, hence writing the 
test case for the same.
@@ -608,8 +608,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testFdo78290ScatterChartMarkerX)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     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]"_ostr,"val"_ostr,u"x"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:size[1]"_ostr,"val"_ostr,u"7"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val",u"x");
+    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val",u"7");
 }
 
 // Also in a combination of charts like a column chart and line chart, we can 
use the built in marker 'x'
@@ -621,8 +621,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testFdo78290CombinationChartMarkerX)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     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]"_ostr,"val"_ostr,u"x"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]"_ostr,"val"_ostr,u"7"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val",u"x");
+    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val",u"7");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTdf126115IndividualMarker)
@@ -633,13 +633,13 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testTdf126115IndividualMarker)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
     // 1. series
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:symbol"_ostr,
 "val"_ostr, u"square"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:size"_ostr,
 "val"_ostr, u"8"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr"_ostr,
 "val"_ostr, u"ff0000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:symbol",
 "val", u"square");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:size",
 "val", u"8");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr",
 "val", u"ff0000");
     // 2. series
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:symbol"_ostr,
 "val"_ostr, u"x"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:size"_ostr,
 "val"_ostr, u"15"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr"_ostr,
 "val"_ostr, u"7030a0"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:symbol",
 "val", u"x");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:size",
 "val", u"15");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr",
 "val", u"7030a0");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatODS)
@@ -839,8 +839,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testDataLabel3DChartDOCX)
 
     // We must not export label position attributes for 3D bar charts. The
     // same rule also applies to several other 3D charts, apparently.
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:bar3DChart/c:ser/c:dLbls/c:dLblPos"_ostr, 
0);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:bar3DChart/c:ser/c:dLbls/c:dLbl/c:dLblPos"_ostr,
 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:bar3DChart/c:ser/c:dLbls/c:dLblPos", 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:bar3DChart/c:ser/c:dLbls/c:dLbl/c:dLblPos", 
0);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBarChartDOCX)
@@ -854,9 +854,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testDataLabelBarChartDOCX)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLblPos"_ostr, 
"val"_ostr, u"ctr"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:dLblPos"_ostr, 
"val"_ostr, u"inEnd"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:dLblPos"_ostr, 
"val"_ostr, u"inBase"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLblPos", 
"val", u"ctr");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:dLblPos", 
"val", u"inEnd");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:dLblPos", 
"val", u"inBase");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelClusteredBarChartDOCX)
@@ -874,7 +874,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testDataLabelClusteredBarChartDOCX)
     CPPUNIT_ASSERT(pXmlDoc);
 
     // This was "t", should be one of the allowed values.
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLbl[2]/c:dLblPos"_ostr,
 "val"_ostr, u"outEnd"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLbl[2]/c:dLblPos",
 "val", u"outEnd");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelRadarChartDOCX)
@@ -889,8 +889,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testDataLabelRadarChartDOCX)
     CPPUNIT_ASSERT(pXmlDoc);
 
     // We must not export label position attributes for radar charts.
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:radarChart/c:ser/c:dLbls/c:dLblPos"_ostr, 
0);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:radarChart/c:ser/c:dLbls/c:dLbl/c:dLblPos"_ostr,
 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:radarChart/c:ser/c:dLbls/c:dLblPos", 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:radarChart/c:ser/c:dLbls/c:dLbl/c:dLblPos", 
0);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelDoughnutChartDOCX)
@@ -908,8 +908,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testDataLabelDoughnutChartDOCX)
     CPPUNIT_ASSERT(pXmlDoc);
 
     // We must not export label position attributes for doughnut charts.
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:dLblPos"_ostr,
 0);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:dLbl/c:dLblPos"_ostr,
 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:dLblPos", 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:dLbl/c:dLblPos",
 0);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelAreaChartDOCX)
@@ -927,8 +927,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testDataLabelAreaChartDOCX)
     CPPUNIT_ASSERT(pXmlDoc);
 
     // We must not export label position attributes for area charts.
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLblPos"_ostr, 0);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLbl/c:dLblPos"_ostr,
 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLblPos", 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLbl/c:dLblPos", 
0);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelDefaultLineChartDOCX)
@@ -964,10 +964,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testIndividualDataLabelProps)
     save(u"Calc Office Open XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     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"_ostr,
 "b"_ostr, u"1"_ustr);
-    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"_ostr,
 "sz"_ostr, u"1600"_ustr);
-    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/a:solidFill/a:srgbClr"_ostr,
 "val"_ostr, u"ff0000"_ustr);
-    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/a:latin"_ostr,
 "typeface"_ostr, u"Times New Roman"_ustr);
+    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", u"1");
+    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",
 "sz", u"1600");
+    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/a:solidFill/a:srgbClr",
 "val", u"ff0000");
+    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/a:latin",
 "typeface", u"Times New Roman");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChartRotation)
@@ -977,8 +977,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChartRotation)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX"_ostr, 
"val"_ostr, u"30"_ustr);
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY"_ostr, 
"val"_ostr, u"50"_ustr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX", "val", 
u"30");
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY", "val", 
u"50");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testShapeFollowedByChart)
@@ -997,8 +997,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testShapeFollowedByChart)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    OUString aValueOfFirstDocPR = getXPath(pXmlDoc, 
"/w:document/w:body/w:p[3]/w:r[1]/w:drawing[1]/wp:inline[1]/wp:docPr[1]"_ostr, 
"id"_ostr);
-    OUString aValueOfSecondDocPR = getXPath(pXmlDoc, 
"/w:document/w:body/w:p[3]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:docPr[1]"_ostr,
 "id"_ostr);
+    OUString aValueOfFirstDocPR = getXPath(pXmlDoc, 
"/w:document/w:body/w:p[3]/w:r[1]/w:drawing[1]/wp:inline[1]/wp:docPr[1]", "id");
+    OUString aValueOfSecondDocPR = getXPath(pXmlDoc, 
"/w:document/w:body/w:p[3]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:docPr[1]",
 "id");
 
     CPPUNIT_ASSERT( aValueOfFirstDocPR != aValueOfSecondDocPR );
 }
@@ -1013,7 +1013,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testPieChartDataLabels)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos"_ostr,
 "val"_ostr, u"outEnd"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos",
 "val", u"outEnd");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSeriesIdxOrder)
@@ -1022,8 +1022,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSeriesIdxOrder)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:idx[1]"_ostr,
 "val"_ostr, u"1"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:order[1]"_ostr,
 "val"_ostr, u"1"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:idx[1]", 
"val", u"1");
+    assertXPath(pXmlDoc, 
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:order[1]", 
"val", u"1");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterPlotLabels)
@@ -1147,8 +1147,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, 
testPieChartRotation)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX"_ostr, 
"val"_ostr, u"40"_ustr);
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY"_ostr, 
"val"_ostr, u"30"_ustr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX", "val", 
u"40");
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY", "val", 
u"30");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testEmbeddingsOleObjectGrabBag)
@@ -1266,7 +1266,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSmoothedLines)
     save(u"Calc Office Open XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:smooth"_ostr, 
"val"_ostr, u"0"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:smooth", "val", u"0");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testLabelStringODS)
diff --git a/chart2/qa/extras/chart2export2.cxx 
b/chart2/qa/extras/chart2export2.cxx
index d4c060d5f381..12977d0ec44a 100644
--- a/chart2/qa/extras/chart2export2.cxx
+++ b/chart2/qa/extras/chart2export2.cxx
@@ -46,7 +46,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testSetSeriesToSecondaryAxisXLSX)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
     // Check there are only two <lineChart> tag in the XML, one for the 
primary and one for the secondary axis.
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart"_ostr, 
2);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart", 2);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCombinedChartSecondaryAxisXLSX)
@@ -57,23 +57,23 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testCombinedChartSecondaryAxisXLSX)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
     // Collect barchart axID on secondary Axis
-    OUString XValueIdOfBarchart = getXPath(
-        pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[1]"_ostr, 
"val"_ostr);
-    OUString YValueIdOfBarchart = getXPath(
-        pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[2]"_ostr, 
"val"_ostr);
+    OUString XValueIdOfBarchart
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[1]", "val");
+    OUString YValueIdOfBarchart
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[2]", "val");
     // Collect linechart axID on primary Axis
-    OUString XValueIdOfLinechart = getXPath(
-        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[1]"_ostr, "val"_ostr);
-    OUString YValueIdOfLinechart = getXPath(
-        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]"_ostr, "val"_ostr);
+    OUString XValueIdOfLinechart
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[1]", "val");
+    OUString YValueIdOfLinechart
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]", "val");
     // Check which c:catAx and c:valAx contain the AxisId of charttypes
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx[1]/c:axId"_ostr, "val"_ostr,
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[1]/c:axId", 
"val",
                 XValueIdOfLinechart);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:axId"_ostr, "val"_ostr,
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:axId", 
"val",
                 YValueIdOfLinechart);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:axId"_ostr, "val"_ostr,
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:axId", 
"val",
                 XValueIdOfBarchart);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:axId"_ostr, "val"_ostr,
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:axId", 
"val",
                 YValueIdOfBarchart);
 }
 
@@ -85,26 +85,26 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testCombinedChartSecondaryAxisODS)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
     // Collect barchart axID on secondary Axis
-    OUString XValueIdOfBarchart = getXPath(
-        pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[1]"_ostr, 
"val"_ostr);
-    OUString YValueIdOfBarchart = getXPath(
-        pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[2]"_ostr, 
"val"_ostr);
+    OUString XValueIdOfBarchart
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[1]", "val");
+    OUString YValueIdOfBarchart
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[2]", "val");
     // Collect linechart axID on primary Axis
-    OUString XValueIdOfLinechart = getXPath(
-        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[1]"_ostr, "val"_ostr);
-    OUString YValueIdOfLinechart = getXPath(
-        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]"_ostr, "val"_ostr);
+    OUString XValueIdOfLinechart
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[1]", "val");
+    OUString YValueIdOfLinechart
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]", "val");
     // Check which c:catAx and c:valAx contain the AxisId of charttypes
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx[1]/c:axId"_ostr, "val"_ostr,
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[1]/c:axId", 
"val",
                 XValueIdOfLinechart);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:axId"_ostr, "val"_ostr,
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:axId", 
"val",
                 YValueIdOfLinechart);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:axId"_ostr, "val"_ostr,
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:axId", 
"val",
                 XValueIdOfBarchart);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:axId"_ostr, "val"_ostr,
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:axId", 
"val",
                 YValueIdOfBarchart);
     // do not need CT_crosses tag if the actual axis is deleted, so we need to 
make sure it is not saved
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:crosses"_ostr, 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:crosses", 0);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenXLSX)
@@ -118,16 +118,16 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testCrossBetweenXLSX)
         save(u"Calc Office Open XML"_ustr);
         xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
         CPPUNIT_ASSERT(pXmlDoc);
-        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr,
-                    "val"_ostr, u"between"_ustr);
+        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val",
+                    u"between");
     }
     {
         loadFromFile(u"xlsx/tdf132076.xlsx");
         save(u"Calc Office Open XML"_ustr);
         xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
         CPPUNIT_ASSERT(pXmlDoc);
-        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr,
-                    "val"_ostr, u"between"_ustr);
+        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val",
+                    u"between");
     }
 }
 
@@ -138,8 +138,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testCrossBetweenWithDeletedAxis)
     save(u"Calc Office Open XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr, "val"_ostr,
-                u"between"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val",
+                u"between");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenODS)
@@ -149,8 +149,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenODS)
     save(u"Calc Office Open XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr, "val"_ostr,
-                u"between"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val",
+                u"between");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisTitleRotationXLSX)
@@ -160,9 +160,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testAxisTitleRotationXLSX)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:tx/c:rich/a:bodyPr"_ostr,
-                "rot"_ostr, u"0"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:tx/c:rich/a:bodyPr",
+                "rot", u"0");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisTitlePositionDOCX)
@@ -174,29 +173,25 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testAxisTitlePositionDOCX)
 
     // test X Axis title position
     OUString aXVal = getXPath(
-        pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:title/c:layout/c:manualLayout/c:x"_ostr,
-        "val"_ostr);
+        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:title/c:layout/c:manualLayout/c:x",
+        "val");
     double nX = aXVal.toDouble();
     CPPUNIT_ASSERT_DOUBLES_EQUAL(0.698208543867708, nX, 1e-3);
     OUString aYVal = getXPath(
-        pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:title/c:layout/c:manualLayout/c:y"_ostr,
-        "val"_ostr);
+        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:title/c:layout/c:manualLayout/c:y",
+        "val");
     double nY = aYVal.toDouble();
     CPPUNIT_ASSERT_DOUBLES_EQUAL(0.805152435594555, nY, 1e-3);
 
     // test Y Axis title position
-    aXVal = getXPath(
-        pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:layout/c:manualLayout/c:x"_ostr,
-        "val"_ostr);
+    aXVal = getXPath(pXmlDoc,
+                     
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:layout/c:manualLayout/c:x",
+                     "val");
     nX = aXVal.toDouble();
     CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0253953671500755, nX, 1e-3);
-    aYVal = getXPath(
-        pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:layout/c:manualLayout/c:y"_ostr,
-        "val"_ostr);
+    aYVal = getXPath(pXmlDoc,
+                     
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:layout/c:manualLayout/c:y",
+                     "val");
     nY = aYVal.toDouble();
     // just test the first two decimal digits because it is not perfect in 
docx yet.
     CPPUNIT_ASSERT_DOUBLES_EQUAL(0.384070199122511, nY, 1e-2);
@@ -211,7 +206,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testAxisCrossBetweenDOCX)
 
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
-    assertXPath(pXmlDoc, "(//c:crossBetween)[1]"_ostr, "val"_ostr, 
u"midCat"_ustr);
+    assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", u"midCat");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testPieChartDataPointExplosionXLSX)
@@ -221,8 +216,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testPieChartDataPointExplosionXLSX)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dPt/c:explosion"_ostr,
-                "val"_ostr, u"28"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dPt/c:explosion",
+                "val", u"28");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabel)
@@ -342,8 +337,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabel)
     // Check the data labels font color for the complete data series
     assertXPath(pXmlDoc,
                 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:txPr/a:p/a:pPr/"
-                "a:defRPr/a:solidFill/a:srgbClr"_ostr,
-                "val"_ostr, u"404040"_ustr);
+                "a:defRPr/a:solidFill/a:srgbClr",
+                "val", u"404040");
 }
 
 /// Test for tdf#94235
@@ -390,21 +385,20 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testCustomPositionofDataLabel)
         CPPUNIT_ASSERT(pXmlDoc);
 
         // test custom position of data label (xlsx)
-        assertXPath(
-            pXmlDoc,
-            
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx"_ostr,
-            "val"_ostr, u"2"_ustr);
+        assertXPath(pXmlDoc,
+                    
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx",
+                    "val", u"2");
         OUString aXVal = getXPath(pXmlDoc,
                                   
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/"
-                                  "c:dLbl[1]/c:layout/c:manualLayout/c:x"_ostr,
-                                  "val"_ostr);
+                                  "c:dLbl[1]/c:layout/c:manualLayout/c:x",
+                                  "val");
         double nX = aXVal.toDouble();
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.11027682973075476, nX, 1e-7);
 
         OUString aYVal = getXPath(pXmlDoc,
                                   
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/"
-                                  "c:dLbl[1]/c:layout/c:manualLayout/c:y"_ostr,
-                                  "val"_ostr);
+                                  "c:dLbl[1]/c:layout/c:manualLayout/c:y",
+                                  "val");
         double nY = aYVal.toDouble();
         CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.0742140311063737, nY, 1e-7);
     }
@@ -416,21 +410,20 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testCustomPositionofDataLabel)
         CPPUNIT_ASSERT(pXmlDoc);
 
         // test custom position of data label (docx)
-        assertXPath(
-            pXmlDoc,
-            
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[2]/c:idx"_ostr,
-            "val"_ostr, u"2"_ustr);
+        assertXPath(pXmlDoc,
+                    
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[2]/c:idx",
+                    "val", u"2");
         OUString aXVal = getXPath(pXmlDoc,
                                   
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/"
-                                  "c:dLbl[2]/c:layout/c:manualLayout/c:x"_ostr,
-                                  "val"_ostr);
+                                  "c:dLbl[2]/c:layout/c:manualLayout/c:x",
+                                  "val");
         double nX = aXVal.toDouble();
         CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0227256488772236, nX, 1e-7);
 
         OUString aYVal = getXPath(pXmlDoc,
                                   
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/"
-                                  "c:dLbl[2]/c:layout/c:manualLayout/c:y"_ostr,
-                                  "val"_ostr);
+                                  "c:dLbl[2]/c:layout/c:manualLayout/c:y",
+                                  "val");
         double nY = aYVal.toDouble();
         CPPUNIT_ASSERT_DOUBLES_EQUAL(0.172648731408574, nY, 1e-7);
     }
@@ -466,21 +459,20 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testTdf161571PiechartCustomPosDataLabels
     CPPUNIT_ASSERT(pXmlDoc);
 
     // test custom position of data label (xlsx)
-    assertXPath(
-        pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:dLbl[2]/c:idx"_ostr,
-        "val"_ostr, u"1"_ustr);
+    assertXPath(pXmlDoc,
+                
"/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:dLbl[2]/c:idx",
+                "val", u"1");
     OUString aXVal = getXPath(pXmlDoc,
                               
"/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/"
-                              "c:dLbl[2]/c:layout/c:manualLayout/c:x"_ostr,
-                              "val"_ostr);
+                              "c:dLbl[2]/c:layout/c:manualLayout/c:x",
+                              "val");
     double nX = aXVal.toDouble();
     CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.13500189609404625, nX, 1e-7);
 
     OUString aYVal = getXPath(pXmlDoc,
                               
"/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/"
-                              "c:dLbl[2]/c:layout/c:manualLayout/c:y"_ostr,
-                              "val"_ostr);
+                              "c:dLbl[2]/c:layout/c:manualLayout/c:y",
+                              "val");
     double nY = aYVal.toDouble();
     CPPUNIT_ASSERT_DOUBLES_EQUAL(0.15994818221025045, nY, 1e-7);
 }
@@ -559,12 +551,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLeaderLines)
         CPPUNIT_ASSERT(pXmlDoc);
         assertXPath(pXmlDoc,
                     
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:dLbls/c:extLst/c:ext/"
-                    "c15:showLeaderLines"_ostr,
-                    "val"_ostr, u"1"_ustr);
+                    "c15:showLeaderLines",
+                    "val", u"1");
         assertXPath(pXmlDoc,
                     
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:dLbls/c:extLst/c:ext/"
-                    "c15:showLeaderLines"_ostr,
-                    "val"_ostr, u"0"_ustr);
+                    "c15:showLeaderLines",
+                    "val", u"0");
     }
     loadFromFile(u"docx/MSO_Custom_Leader_Line.docx");
     {
@@ -574,8 +566,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLeaderLines)
         // tdf#134571: Check the leader line is switch off.
         assertXPath(pXmlDoc,
                     
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:extLst/c:ext/"
-                    "c15:showLeaderLines"_ostr,
-                    "val"_ostr, u"0"_ustr);
+                    "c15:showLeaderLines",
+                    "val", u"0");
     }
 }
 
@@ -593,8 +585,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testTdf161607PieChartLeaderLinesColorWid
     OUString aWidth = getXPath(
         pXmlDoc,
         
"/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:leaderLines/c:spPr/"
-        "a:ln"_ostr,
-        "w"_ostr);
+        "a:ln",
+        "w");
     sal_Int32 nWidth = aWidth.toInt32();
     CPPUNIT_ASSERT_LESSEQUAL(static_cast<sal_Int32>(100), std::abs(nWidth - 
88900));
 
@@ -602,8 +594,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testTdf161607PieChartLeaderLinesColorWid
     assertXPath(
         pXmlDoc,
         
"/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:leaderLines/c:spPr/"
-        "a:ln/a:solidFill/a:srgbClr"_ostr,
-        "val"_ostr, u"7030a0"_ustr);
+        "a:ln/a:solidFill/a:srgbClr",
+        "val", u"7030a0");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testNumberFormatExportPPTX)
@@ -613,10 +605,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testNumberFormatExportPPTX)
     xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:numFmt"_ostr,
-                "formatCode"_ostr, u"#,##0.00,\K"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:numFmt"_ostr,
-                "sourceLinked"_ostr, u"0"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:numFmt",
+                "formatCode", u"#,##0.00,\K");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:numFmt",
+                "sourceLinked", u"0");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLabelSeparatorExportDOCX)
@@ -632,16 +624,13 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testLabelSeparatorExportDOCX)
 
     // The text separator should be a new line
     assertXPathContent(
-        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:separator"_ostr,
-        u"
"_ustr);
+        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:separator", u"
");
     // The text separator should be a comma
     assertXPathContent(
-        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:separator"_ostr,
-        u", "_ustr);
+        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:separator", u", 
");
     // The text separator should be a semicolon
     assertXPathContent(
-        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:separator"_ostr,
-        u"; "_ustr);
+        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:separator", u"; 
");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesColorFillPPTX)
@@ -650,9 +639,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testChartTitlePropertiesColorFillPPTX)
     save(u"Impress MS PowerPoint 2007 XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr"_ostr,
-                "val"_ostr, u"ff0000"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val",
+                u"ff0000");
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 
1);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testChartTitlePropertiesGradientFillPPTX)
@@ -662,12 +651,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testChartTitlePropertiesGradientFillPPTX
     xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr,
-                "val"_ostr, u"f6f8fc"_ustr);
+                
"/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", 
"val",
+                u"f6f8fc");
     assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr,
-                "val"_ostr, u"c7d5ed"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1);
+                
"/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr", 
"val",
+                u"c7d5ed");
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 
1);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesBitmapFillPPTX)
@@ -676,9 +665,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testChartTitlePropertiesBitmapFillPPTX)
     save(u"Impress MS PowerPoint 2007 XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip"_ostr,
-                "embed"_ostr, u"rId1"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed",
+                u"rId1");
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 
1);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testxAxisLabelsRotation)
@@ -689,8 +678,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testxAxisLabelsRotation)
     CPPUNIT_ASSERT(pXmlDoc1);
 
     // Chart1 xAxis labels should be 45 degree
-    assertXPath(pXmlDoc1, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:bodyPr"_ostr,
-                "rot"_ostr, u"2700000"_ustr);
+    assertXPath(pXmlDoc1, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:bodyPr", "rot",
+                u"2700000");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesXLSX)
@@ -702,29 +691,28 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testMultipleCategoryAxisLablesXLSX)
     // check category axis labels number of first level
     assertXPath(pXmlDoc,
                 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:multiLvlStrRef/"
-                "c:multiLvlStrCache/c:ptCount"_ostr,
-                "val"_ostr, u"6"_ustr);
+                "c:multiLvlStrCache/c:ptCount",
+                "val", u"6");
     // check category axis labels text of first level
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/"
-                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[1]/c:v"_ostr,
-                       u"Categoria 1"_ustr);
+                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[1]/c:v",
+                       u"Categoria 1");
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/"
-                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[6]/c:v"_ostr,
-                       u"Categoria 6"_ustr);
+                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[6]/c:v",
+                       u"Categoria 6");
     // check category axis labels text of second level
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/"
-                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[1]/c:v"_ostr,
-                       u"2011"_ustr);
+                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[1]/c:v",
+                       u"2011");
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/"
-                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[3]/c:v"_ostr,
-                       u"2013"_ustr);
+                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[3]/c:v",
+                       u"2013");
     // check the 'noMultiLvlLbl' tag - ChartExport.cxx:2950 FIXME: seems not 
support, so check the default noMultiLvlLbl value.
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:noMultiLvlLbl"_ostr,
-                "val"_ostr, u"0"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:noMultiLvlLbl", "val", u"0");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesDOCX)
@@ -736,29 +724,28 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testMultipleCategoryAxisLablesDOCX)
     // check category axis labels number of first level
     assertXPath(pXmlDoc,
                 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:multiLvlStrRef/"
-                "c:multiLvlStrCache/c:ptCount"_ostr,
-                "val"_ostr, u"4"_ustr);
+                "c:multiLvlStrCache/c:ptCount",
+                "val", u"4");
     // check category axis labels text of first level
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/"
-                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[1]/c:v"_ostr,
-                       u"Categoria 1"_ustr);
+                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[1]/c:v",
+                       u"Categoria 1");
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/"
-                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[4]/c:v"_ostr,
-                       u"Categoria 4"_ustr);
+                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[4]/c:v",
+                       u"Categoria 4");
     // check category axis labels text of second level
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/"
-                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[1]/c:v"_ostr,
-                       u"2011"_ustr);
+                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[1]/c:v",
+                       u"2011");
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/"
-                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[2]/c:v"_ostr,
-                       u"2012"_ustr);
+                       
"c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[2]/c:v",
+                       u"2012");
     // check the 'noMultiLvlLbl' tag - ChartExport.cxx:2950 FIXME: seems not 
support, so check the default noMultiLvlLbl value.
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:noMultiLvlLbl"_ostr,
-                "val"_ostr, u"0"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:noMultiLvlLbl", "val", u"0");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf116163)
@@ -768,8 +755,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf116163)
     xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:bodyPr"_ostr,
-                "rot"_ostr, u"-5400000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:bodyPr", "rot",
+                u"-5400000");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf111824)
@@ -780,10 +767,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf111824)
     CPPUNIT_ASSERT(pXmlDoc);
 
     // Collect 3D barchart Z axID
-    OUString zAxisIdOf3DBarchart = getXPath(
-        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:bar3DChart/c:axId[3]"_ostr, "val"_ostr);
+    OUString zAxisIdOf3DBarchart
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:bar3DChart/c:axId[3]", "val");
     // 3D barchart Z axis properties should be in a serAx OOXML tag instead of 
catAx
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:serAx/c:axId"_ostr, "val"_ostr,
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:serAx/c:axId", 
"val",
                 zAxisIdOf3DBarchart);
 }
 
@@ -795,10 +782,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
test3DAreaChartZAxis)
     CPPUNIT_ASSERT(pXmlDoc);
 
     // Collect 3D area chart Z axID
-    OUString zAxisIdOf3DAreachart = getXPath(
-        pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:area3DChart/c:axId[3]"_ostr, "val"_ostr);
+    OUString zAxisIdOf3DAreachart
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:area3DChart/c:axId[3]", "val");
     // 3D area chart z-axis properties should be in a serAx OOXML element 
instead of catAx
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:serAx/c:axId"_ostr, "val"_ostr,
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:serAx/c:axId", 
"val",
                 zAxisIdOf3DAreachart);
 }
 
@@ -811,8 +798,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf119029)
     CPPUNIT_ASSERT(pXmlDoc);
 
     assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:txPr/a:bodyPr"_ostr,
-                "rot"_ostr, u"-5400000"_ustr);
+                
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:txPr/a:bodyPr", 
"rot",
+                u"-5400000");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf108022)
@@ -834,15 +821,13 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121744)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    OUString XValueId = getXPath(
-        pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[1]"_ostr, 
"val"_ostr);
-    OUString YValueId = getXPath(
-        pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[2]"_ostr, 
"val"_ostr);
+    OUString XValueId
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[1]", "val");
+    OUString YValueId
+        = getXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:axId[2]", "val");
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[1]"_ostr, "val"_ostr,
-                XValueId);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]"_ostr, "val"_ostr,
-                YValueId);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[1]", "val", XValueId);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]", "val", YValueId);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121189)
@@ -870,17 +855,17 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf122031)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt"_ostr,
-                "formatCode"_ostr, u"0.000%"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt",
+                "formatCode", u"0.000%");
     assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt"_ostr,
-                "formatCode"_ostr, u"0.000%"_ustr);
+                
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt",
+                "formatCode", u"0.000%");
     assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[2]/c:numFmt"_ostr,
-                "formatCode"_ostr, u"0.000%"_ustr);
+                
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[2]/c:numFmt",
+                "formatCode", u"0.000%");
     assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[3]/c:numFmt"_ostr,
-                "formatCode"_ostr, u"0.000%"_ustr);
+                
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[3]/c:numFmt",
+                "formatCode", u"0.000%");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf115012)
@@ -890,7 +875,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf115012)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
     // workaround: use-zero instead of leave-gap to show the original line 
chart
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs"_ostr, 
"val"_ostr, u"zero"_ustr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", 
u"zero");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134118)
@@ -904,7 +889,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134118)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
     // workaround: use leave-gap instead of zero to show the original line 
chart
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs"_ostr, 
"val"_ostr, u"gap"_ustr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", 
u"gap");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123206_customLabelText)
@@ -923,8 +908,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testTdf123206_customLabelText)
 
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[2]/c:tx/"
-                       "c:rich/a:p/a:r/a:t"_ostr,
-                       u"kiscica"_ustr);
+                       "c:rich/a:p/a:r/a:t",
+                       u"kiscica");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomLabelText)
@@ -942,28 +927,28 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testCustomLabelText)
     CPPUNIT_ASSERT(pXmlDoc);
 
     assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[1]/c:idx"_ostr,
-                "val"_ostr, u"2"_ustr);
+                
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[1]/c:idx", 
"val",
+                u"2");
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[1]/c:tx/"
-                       "c:rich/a:p/a:r[1]/a:t"_ostr,
-                       u"3.5"_ustr);
+                       "c:rich/a:p/a:r[1]/a:t",
+                       u"3.5");
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[1]/c:tx/"
-                       "c:rich/a:p/a:r[3]/a:t"_ostr,
-                       u"CustomLabel 1"_ustr);
+                       "c:rich/a:p/a:r[3]/a:t",
+                       u"CustomLabel 1");
 
     assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[2]/c:idx"_ostr,
-                "val"_ostr, u"3"_ustr);
+                
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[2]/c:idx", 
"val",
+                u"3");
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[2]/c:tx/"
-                       "c:rich/a:p/a:r[1]/a:t"_ostr,
-                       u"4.5"_ustr);
+                       "c:rich/a:p/a:r[1]/a:t",
+                       u"4.5");
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[2]/c:tx/"
-                       "c:rich/a:p/a:r[3]/a:t"_ostr,
-                       u"CustomLabel 2"_ustr);
+                       "c:rich/a:p/a:r[3]/a:t",
+                       u"CustomLabel 2");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDeletedLegendEntries)
@@ -1015,8 +1000,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf60316)
     CPPUNIT_ASSERT(pXmlDoc);
 
     // Without the fix in place, the shape would have had a solidFill 
background
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:noFill"_ostr, 1);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:solidFill"_ostr, 0);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:noFill", 
1);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:solidFill", 0);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf130225)
@@ -1041,12 +1026,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf59857)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:floor/c:spPr/a:ln/a:noFill"_ostr, 1);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:floor/c:spPr/a:solidFill/a:srgbClr"_ostr,
-                "val"_ostr, u"cccccc"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:backWall/c:spPr/a:ln/a:noFill"_ostr, 0);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:backWall/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr,
-                "val"_ostr, u"b3b3b3"_ustr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:floor/c:spPr/a:ln/a:noFill", 
1);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:floor/c:spPr/a:solidFill/a:srgbClr", "val",
+                u"cccccc");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:backWall/c:spPr/a:ln/a:noFill", 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:backWall/c:spPr/a:ln/a:solidFill/a:srgbClr",
+                "val", u"b3b3b3");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf126076)
@@ -1059,10 +1044,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf126076)
     // This was 12: all series exported with square markers
     assertXPath(
         pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker/c:symbol[@val='square']"_ostr,
-        0);
+        
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker/c:symbol[@val='square']",
 0);
     // instead of skipping markers
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker"_ostr, 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker", 0);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf75330)
@@ -1096,13 +1080,13 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf127792)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr, "val"_ostr,
-                u"between"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val",
+                u"between");
 
     pXmlDoc = parseExport(u"word/charts/chart2.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr, "val"_ostr,
-                u"midCat"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val",
+                u"midCat");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf131979)
@@ -1150,20 +1134,20 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132076)
         save(u"Calc Office Open XML"_ustr);
         xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
         CPPUNIT_ASSERT(pXmlDoc);
-        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt"_ostr,
-                    "formatCode"_ostr, u"dd"_ustr);
-        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt"_ostr,
-                    "sourceLinked"_ostr, u"0"_ustr);
+        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt", "formatCode",
+                    u"dd");
+        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt", "sourceLinked",
+                    u"0");
     }
     {
         loadFromFile(u"xlsx/tdf132076.xlsx");
         save(u"Calc Office Open XML"_ustr);
         xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
         CPPUNIT_ASSERT(pXmlDoc);
-        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt"_ostr,
-                    "formatCode"_ostr, u"dd"_ustr);
-        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt"_ostr,
-                    "sourceLinked"_ostr, u"0"_ustr);
+        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt", "formatCode",
+                    u"dd");
+        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt", "sourceLinked",
+                    u"0");
     }
 }
 
@@ -1173,20 +1157,16 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf125812)
     save(u"Impress MS PowerPoint 2007 XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path"_ostr,
-                "path"_ostr, u"circle"_ustr);
-    assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect"_ostr,
-                "l"_ostr, u"50000"_ustr);
-    assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect"_ostr,
-                "t"_ostr, u"49000"_ustr);
-    assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect"_ostr,
-                "r"_ostr, u"50000"_ustr);
-    assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect"_ostr,
-                "b"_ostr, u"51000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path", "path",
+                u"circle");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect",
+                "l", u"50000");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect",
+                "t", u"49000");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect",
+                "r", u"50000");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect",
+                "b", u"51000");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133190)
@@ -1203,12 +1183,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133190)
     // Test word wrap of data point label
     assertXPath(
         pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:bodyPr"_ostr,
-        "wrap"_ostr, u"none"_ustr);
+        
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:bodyPr",
+        "wrap", u"none");
     assertXPath(
         pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[2]/c:txPr/a:bodyPr"_ostr,
-        "wrap"_ostr, u"square"_ustr);
+        
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[2]/c:txPr/a:bodyPr",
+        "wrap", u"square");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133191)
@@ -1225,8 +1205,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133191)
     // Test rotation of data point label
     assertXPath(
         pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[3]/c:txPr/a:bodyPr"_ostr,
-        "rot"_ostr, u"-4500000"_ustr);
+        
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[3]/c:txPr/a:bodyPr",
+        "rot", u"-4500000");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132594)
@@ -1236,7 +1216,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132594)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:cat"_ostr, 1);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:cat", 1);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134255)
@@ -1262,8 +1242,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134255)
     CPPUNIT_ASSERT(pXmlDoc);
 
     assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:txPr/a:bodyPr"_ostr,
-                "wrap"_ostr, u"square"_ustr);
+                
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:txPr/a:bodyPr", 
"wrap",
+                u"square");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134977)
@@ -1292,8 +1272,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134977)
     CPPUNIT_ASSERT(pXmlDoc);
     assertXPath(pXmlDoc,
                 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:tx/c:rich/a:p/"
-                "a:r/a:rPr"_ostr,
-                "sz"_ostr, u"900"_ustr);
+                "a:r/a:rPr",
+                "sz", u"900");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123647)
@@ -1303,7 +1283,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123647)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart"_ostr, 
1);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart", 1);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf136267)
@@ -1319,8 +1299,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf136267)
 
     assertXPathContent(
         pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:cat/c:strRef/c:strCache/c:pt/c:v"_ostr,
-        u"John"_ustr);
+        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:cat/c:strRef/c:strCache/c:pt/c:v",
+        u"John");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataLabelPlacementPieChart)
@@ -1349,16 +1329,14 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf137917)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:baseTimeUnit"_ostr,
-                "val"_ostr, u"days"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:majorUnit"_ostr, "val"_ostr,
-                u"1"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:majorTimeUnit"_ostr,
-                "val"_ostr, u"months"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:minorUnit"_ostr, "val"_ostr,
-                u"7"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:minorTimeUnit"_ostr,
-                "val"_ostr, u"days"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:baseTimeUnit", "val",
+                u"days");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:majorUnit", "val", u"1");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:majorTimeUnit", "val",
+                u"months");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:minorUnit", "val", u"7");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:minorTimeUnit", "val",
+                u"days");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204)
@@ -1425,13 +1403,13 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204)
     // Check the first data label field type
     assertXPath(
         pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLbl/c:tx/c:rich/a:p/a:fld"_ostr,
-        "type"_ostr, u"CELLRANGE"_ustr);
+        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLbl/c:tx/c:rich/a:p/a:fld",
+        "type", u"CELLRANGE");
 
     assertXPath(
         pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:dLbl/c:tx/c:rich/a:p/a:fld"_ostr,
-        "type"_ostr, u"CELLRANGE"_ustr);
+        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:dLbl/c:tx/c:rich/a:p/a:fld",
+        "type", u"CELLRANGE");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138181)
@@ -1566,12 +1544,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testNameRangeXLSX)
     CPPUNIT_ASSERT(pXmlDoc);
     // test the syntax of local range name on the local sheet.
     assertXPathContent(pXmlDoc,
-                       
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:cat/c:strRef/c:f"_ostr,
-                       u"Sheet1!local_name_range"_ustr);
+                       
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:cat/c:strRef/c:f",
+                       u"Sheet1!local_name_range");
     // test the syntax of a global range name.
     assertXPathContent(pXmlDoc,
-                       
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:val/c:numRef/c:f"_ostr,
-                       u"[0]!series1"_ustr);
+                       
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:val/c:numRef/c:f",
+                       u"[0]!series1");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942)
@@ -1614,27 +1592,26 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc,
-                
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/c:ext"_ostr,
-                "uri"_ostr, u"{02D57815-91ED-43cb-92C2-25804820EDAC}"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/c:ext",
+                "uri", u"{02D57815-91ED-43cb-92C2-25804820EDAC}");
     assertXPath(pXmlDoc,
                 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/c:ext/"
-                "c15:datalabelsRange/c15:dlblRangeCache/c:ptCount"_ostr,
-                "val"_ostr, u"4"_ustr);
+                "c15:datalabelsRange/c15:dlblRangeCache/c:ptCount",
+                "val", u"4");
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/c:ext/"
-                       "c15:datalabelsRange/c15:f"_ostr,
+                       "c15:datalabelsRange/c15:f",
                        aCellRange);
     for (size_t i = 0; i < nLabels; ++i)
     {
         assertXPath(pXmlDoc,
                     
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dLbls/c:dLbl["
                         + OString::number(i + 1) + "]/c:tx/c:rich/a:p/a:fld",
-                    "type"_ostr, u"CELLRANGE"_ustr);
+                    "type", u"CELLRANGE");
         assertXPath(pXmlDoc,
                     
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dLbls/c:dLbl["
                         + OString::number(i + 1) + 
"]/c:extLst/c:ext/c15:showDataLabelsRange",
-                    "val"_ostr, u"1"_ustr);
+                    "val", u"1");
         // Check if the actual label is stored under c15:datalabelsRange
         assertXPathContent(pXmlDoc,
                            
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/"
@@ -1661,15 +1638,15 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testDateCategoriesPPTX)
         41426, 41456, 41487, 41518, 41548, 41579, 41609, 41640,
     };
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat"_ostr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat");
     assertXPathContent(pXmlDoc,
                        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:numRef/"
-                       "c:numCache/c:formatCode"_ostr,
-                       u"mmm\-yy"_ustr);
+                       "c:numCache/c:formatCode",
+                       u"mmm\-yy");
     assertXPath(
         pXmlDoc,
-        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:numRef/c:numCache/c:ptCount"_ostr,
-        "val"_ostr, OUString::number(nCats));
+        
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:numRef/c:numCache/c:ptCount",
+        "val", OUString::number(nCats));
 
     for (size_t i = 0; i < nCats; ++i)
     {
@@ -1677,7 +1654,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, 
testDateCategoriesPPTX)
             pXmlDoc,
             
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:numRef/c:numCache/c:pt["
                 + OString::number(i + 1) + "]",
-            "idx"_ostr, OUString::number(i));
+            "idx", OUString::number(i));
         assertXPathContent(
             pXmlDoc,
             
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:numRef/c:numCache/c:pt["
diff --git a/chart2/qa/extras/chart2export3.cxx 
b/chart2/qa/extras/chart2export3.cxx
index a4654e7d1ed9..f3cf492c85a5 100644
--- a/chart2/qa/extras/chart2export3.cxx
+++ b/chart2/qa/extras/chart2export3.cxx
@@ -33,9 +33,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf108107)
     save(u"Calc Office Open XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx"_ostr,
 "val"_ostr, u"1"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr"_ostr,
 "b"_ostr, u"1"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr"_ostr,
 "sz"_ostr, u"2000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx", 
"val", u"1");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr",
 "b", u"1");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr",
 "sz", u"2000");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf114139)
@@ -45,10 +45,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf114139)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart"_ostr, 
1);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart", 1);
     //no fill
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr"_ostr, 0);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:solidFill"_ostr, 0);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr", 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:solidFill", 0);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf64224)
@@ -59,8 +59,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf64224)
     CPPUNIT_ASSERT(pXmlDoc);
 
     //no fill
-    assertXPath(pXmlDoc, "/c:chartSpace/c:spPr/a:noFill"_ostr, 1);
-    assertXPath(pXmlDoc, "/c:chartSpace/c:spPr/a:solidFill"_ostr, 0);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:spPr/a:noFill", 1);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:spPr/a:solidFill", 0);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesColorFillDOCX)
@@ -69,8 +69,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testChartTitlePropertiesColorFillDOCX)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, 
u"ff0000"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", u"ff0000");
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 
1);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testChartTitlePropertiesGradientFillDOCX)
@@ -79,9 +79,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testChartTitlePropertiesGradientFillDOCX
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr,
 "val"_ostr, u"cccccc"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr,
 "val"_ostr, u"666666"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", 
"val", u"cccccc");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr", 
"val", u"666666");
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 
1);
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesBitmapFillDOCX)
@@ -90,8 +90,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testChartTitlePropertiesBitmapFillDOCX)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip"_ostr, "embed"_ostr, 
u"rId1"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", u"rId1");
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 
1);
 }
 
 
@@ -103,9 +103,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testColorGradientWithTransparencyDOCX)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
     // Test the transparency of the first color
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr/a:alpha"_ostr,
 "val"_ostr, u"60000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr/a:alpha",
 "val", u"60000");
     // Test the transparency of the second color
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha"_ostr,
 "val"_ostr, u"90000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha",
 "val", u"90000");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientWithTransparencyODS)
@@ -116,9 +116,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testColorGradientWithTransparencyODS)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
     // Test the transparency of the first color
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr/a:alpha"_ostr,
 "val"_ostr, u"60000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr/a:alpha",
 "val", u"60000");
     // Test the transparency of the second color
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha"_ostr,
 "val"_ostr, u"60000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha",
 "val", u"60000");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientStopXLSX)
@@ -129,9 +129,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testColorGradientStopXLSX)
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
     // Test the position of the first color
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]"_ostr,
 "pos"_ostr, u"45000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]",
 "pos", u"45000");
     // Test the position of the second color
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]"_ostr,
 "pos"_ostr, u"100000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]",
 "pos", u"100000");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRadialColorGradientDOCX)
@@ -141,9 +141,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testRadialColorGradientDOCX)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
     // Test the gradient style (if there is no 'a:path' attribute, it is a 
linear gradient)
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path"_ostr, 0);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path", 0);
     // Test the linear gradient angle
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:lin"_ostr, "ang"_ostr, 
u"13500000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:lin", "ang", u"13500000");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartDataPointPropDOCX)
@@ -153,16 +153,16 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testBarChartDataPointPropDOCX)
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors"_ostr, "val"_ostr, 
u"0"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors", "val", u"0");
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:idx"_ostr, 
"val"_ostr, u"1"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr,
 "val"_ostr, u"f6f8fc"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr,
 "val"_ostr, u"c7d5ed"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr,
 "val"_ostr, u"70ad47"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:idx", "val", 
u"1");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr",
 "val", u"f6f8fc");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr",
 "val", u"c7d5ed");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:ln/a:solidFill/a:srgbClr",
 "val", u"70ad47");
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:idx"_ostr, 
"val"_ostr, u"2"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:solidFill/a:srgbClr"_ostr,
 "val"_ostr, u"ff0000"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr,
 "val"_ostr, u"000000"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:idx", "val", 
u"2");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:solidFill/a:srgbClr",
 "val", u"ff0000");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr",
 "val", u"000000");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testFdo83058dlblPos)
@@ -175,10 +175,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testFdo83058dlblPos)
     save(u"Office Open XML Text"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[2]/c:dLblPos"_ostr,
 "val"_ostr, u"outEnd"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[3]/c:dLblPos"_ostr,
 "val"_ostr, u"outEnd"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[4]/c:dLblPos"_ostr,
 "val"_ostr, u"outEnd"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[5]/c:dLblPos"_ostr,
 "val"_ostr, u"outEnd"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[2]/c:dLblPos",
 "val", u"outEnd");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[3]/c:dLblPos",
 "val", u"outEnd");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[4]/c:dLblPos",
 "val", u"outEnd");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[5]/c:dLblPos",
 "val", u"outEnd");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAutoTitleDelXLSX)
@@ -187,7 +187,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testAutoTitleDelXLSX)
     save(u"Calc Office Open XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted"_ostr, 
"val"_ostr, u"0"_ustr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", 
u"0");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDispBlanksAsXLSX)
@@ -196,7 +196,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testDispBlanksAsXLSX)
     save(u"Calc Office Open XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs"_ostr, 
"val"_ostr, u"gap"_ustr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", 
u"gap");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMarkerColorXLSX)
@@ -205,7 +205,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMarkerColorXLSX)
     save(u"Calc Office Open XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr"_ostr,
 "val"_ostr, u"92d050"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr",
 "val", u"92d050");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRoundedCornersXLSX)
@@ -214,7 +214,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testRoundedCornersXLSX)
     save(u"Calc Office Open XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, "/c:chartSpace/c:roundedCorners"_ostr, "val"_ostr, 
u"0"_ustr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:roundedCorners", "val", u"0");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAxisNumberFormatXLSX)
@@ -223,12 +223,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testAxisNumberFormatXLSX)
     save(u"Calc Office Open XML"_ustr);
     xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
     CPPUNIT_ASSERT(pXmlDoc);
-    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx"_ostr, 2);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt"_ostr, "formatCode"_ostr, 
u"0.00E+000"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt"_ostr, 
"sourceLinked"_ostr, u"0"_ustr);
+    assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx", 2);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt", "formatCode", 
u"0.00E+000");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt", "sourceLinked", u"0");
 
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt"_ostr, "formatCode"_ostr, 
u"[$$-409]#,##0;\-[$$-409]#,##0"_ustr);
-    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt"_ostr, 
"sourceLinked"_ostr, u"1"_ustr);
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt", "formatCode", 
u"[$$-409]#,##0;\-[$$-409]#,##0");
+    assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt", "sourceLinked", u"1");
 }
 
 CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataPointLabelNumberFormatXLSX)
@@ -241,11 +241,11 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, 
testDataPointLabelNumberFormatXLSX)
         save(u"Calc Office Open XML"_ustr);
         xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr);
         CPPUNIT_ASSERT(pXmlDoc);
-        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt"_ostr, 
"formatCode"_ostr, u"[$-40E]0.00%"_ustr);
-        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt"_ostr, 
"sourceLinked"_ostr, u"0"_ustr);
+        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt", 
"formatCode", u"[$-40E]0.00%");
+        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt", 
"sourceLinked", u"0");
 
-        assertXPath(pXmlDoc, 
"/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt"_ostr,
 "formatCode"_ostr, u"[$-40E]0.00%"_ustr);
-e 
... etc. - the rest is truncated