summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-28 17:56:40 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-29 16:42:33 +0100
commit042033f1e6da22616cb76c8d950c20c9efecbad5 (patch)
tree26b3f1f42d067506f44550b410f3fb9640616a5b /chart2
parentccfd8e9d09f9ac0a0ea92d0f378391006faaf934 (diff)
loplugin:stringviewparam: operator +
Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/qa/extras/PivotChartTest.cxx4
-rw-r--r--chart2/qa/extras/chart2_trendcalculators.cxx2
-rw-r--r--chart2/qa/extras/chart2dump/chart2dump.cxx21
-rw-r--r--chart2/qa/extras/chart2export.cxx304
-rw-r--r--chart2/qa/extras/chart2geometry.cxx28
-rw-r--r--chart2/qa/extras/chart2import.cxx222
-rw-r--r--chart2/qa/extras/charttest.hxx13
-rw-r--r--chart2/qa/extras/xshape/chart2xshape.cxx28
-rw-r--r--chart2/qa/unit/chart2-dialogs-test.cxx2
-rw-r--r--chart2/source/inc/ObjectIdentifier.hxx6
-rw-r--r--chart2/source/tools/ObjectIdentifier.cxx2
11 files changed, 319 insertions, 313 deletions
diff --git a/chart2/qa/extras/PivotChartTest.cxx b/chart2/qa/extras/PivotChartTest.cxx
index 44998835dbcc..cda42a2bd632 100644
--- a/chart2/qa/extras/PivotChartTest.cxx
+++ b/chart2/qa/extras/PivotChartTest.cxx
@@ -316,7 +316,7 @@ void PivotChartTest::testRoundtrip()
std::vector<double> aReference2 { 101879.458079, 178636.929704, 314626.484864 };
- load("/chart2/qa/extras/data/ods/", "PivotChartRoundTrip.ods");
+ load(u"/chart2/qa/extras/data/ods/", "PivotChartRoundTrip.ods");
xChartDoc = getPivotChartDocFromSheet(1, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -371,7 +371,7 @@ void PivotChartTest::testChangePivotTable()
uno::Sequence<uno::Any> xSequence;
Reference<chart2::XChartDocument> xChartDoc;
- load("/chart2/qa/extras/data/ods/", "PivotTableExample.ods");
+ load(u"/chart2/qa/extras/data/ods/", "PivotTableExample.ods");
// Check we have the Pivot Table
OUString sPivotTableName("DataPilot1");
diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx b/chart2/qa/extras/chart2_trendcalculators.cxx
index 42dce791d83b..b8eb367524bb 100644
--- a/chart2/qa/extras/chart2_trendcalculators.cxx
+++ b/chart2/qa/extras/chart2_trendcalculators.cxx
@@ -64,7 +64,7 @@ private:
void Chart2TrendCalculators::setUp()
{
ChartTest::setUp();
- load("/chart2/qa/extras/data/ods/", "trend_calculators.ods");
+ load(u"/chart2/qa/extras/data/ods/", "trend_calculators.ods");
}
void Chart2TrendCalculators::tearDown()
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 77739fb67034..838234f7c78c 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -22,6 +22,7 @@
#include <rtl/ustrbuf.hxx>
#include <fstream>
+#include <string_view>
#if defined(X86)
#define INT_EPS 2.1
@@ -50,7 +51,7 @@
else \
{ \
OString sTestFileName = OUStringToOString(getTestFileName(), RTL_TEXTENCODING_UTF8); \
- CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpected(#aActual), OUString(OUString::number(aActual))); \
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpected(u ## #aActual), OUString(OUString::number(aActual))); \
}
#define CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aActual, EPS_) \
@@ -59,7 +60,7 @@
else \
{ \
OString sTestFileName = OUStringToOString(getTestFileName(), RTL_TEXTENCODING_UTF8); \
- CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpectedDouble(#aActual), aActual, EPS_); \
+ CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpectedDouble(u ## #aActual), aActual, EPS_); \
}
#define CPPUNIT_DUMP_ASSERT_STRINGS_EQUAL(aActual) \
@@ -68,7 +69,7 @@
else \
{ \
OString sTestFileName = OUStringToOString(getTestFileName(), RTL_TEXTENCODING_UTF8); \
- CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpected(#aActual), aActual.trim()); \
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), readExpected(u ## #aActual), aActual.trim()); \
}
#define CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aActual, EPS_) \
@@ -77,7 +78,7 @@
else \
{ \
OUString expectedTransform; \
- if (!readAndCheckTransformation (aActual, #aActual, EPS_, expectedTransform)) \
+ if (!readAndCheckTransformation (aActual, u ## #aActual, EPS_, expectedTransform)) \
{ \
OString sTestFileName = OUStringToOString(getTestFileName(), RTL_TEXTENCODING_UTF8); \
CPPUNIT_ASSERT_EQUAL_MESSAGE(OString("Failing test file is: " + sTestFileName).getStr(), expectedTransform, transformationToOneLineString(aActual)); \
@@ -143,7 +144,7 @@ protected:
CPPUNIT_FAIL("verify method must be overridden");
}
- OUString readExpected(const OUString& sCheck)
+ OUString readExpected(std::u16string_view sCheck)
{
assert(!m_bDumpMode);
assert(m_aReferenceFile.is_open());
@@ -152,7 +153,7 @@ protected:
OString sAssertMessage =
"The reference file does not contain the right content. Maybe it needs an update:"
+ OUStringToOString(m_sTestFileName, RTL_TEXTENCODING_UTF8);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sAssertMessage.getStr(), OUString("// " + sCheck), OUString(sTemp.data(), sTemp.length(), RTL_TEXTENCODING_UTF8));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sAssertMessage.getStr(), OUString(OUString::Concat("// ") + sCheck), OUString(sTemp.data(), sTemp.length(), RTL_TEXTENCODING_UTF8));
getline(m_aReferenceFile, sTemp);
return OUString(sTemp.data(), sTemp.length(), RTL_TEXTENCODING_UTF8);
}
@@ -165,7 +166,7 @@ protected:
m_aDumpFile << sActualValue.trim() << "\n"; // Write out the checked value, will be used as reference later
}
- void readNote(const OUString& sNote)
+ void readNote(std::u16string_view sNote)
{
assert(!m_bDumpMode);
assert(m_aReferenceFile.is_open());
@@ -174,7 +175,7 @@ protected:
OString sAssertMessage =
"The reference file does not contain the right content. Maybe it needs an update:"
+ OUStringToOString(m_sTestFileName, RTL_TEXTENCODING_UTF8);
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sAssertMessage.getStr(), OUString("/// " + sNote), OUString(sTemp.data(), sTemp.length(), RTL_TEXTENCODING_UTF8));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sAssertMessage.getStr(), OUString(OUString::Concat("/// ") + sNote), OUString(sTemp.data(), sTemp.length(), RTL_TEXTENCODING_UTF8));
}
void writeNote(const OUString& sNote)
@@ -184,7 +185,7 @@ protected:
m_aDumpFile << "/// " << sNote << "\n";
}
- double readExpectedDouble(const OUString& sCheck)
+ double readExpectedDouble(std::u16string_view sCheck)
{
OUString sExpected = readExpected(sCheck);
return sExpected.toDouble();
@@ -195,7 +196,7 @@ protected:
writeActual(transformationToOneLineString(rTransform), sCheck);
}
- bool readAndCheckTransformation(const drawing::HomogenMatrix3& rTransform, const OUString& sCheck, const double fEPS, OUString& rExpectedTransform)
+ bool readAndCheckTransformation(const drawing::HomogenMatrix3& rTransform, std::u16string_view sCheck, const double fEPS, OUString& rExpectedTransform)
{
rExpectedTransform = readExpected(sCheck); // Reference transformation string
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index d0cd3be67d66..a702d5113b13 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -580,7 +580,7 @@ void checkTrendlinesInChart(uno::Reference< chart2::XChartDocument > const & xCh
// improve the test
void Chart2ExportTest::testErrorBarXLSX()
{
- load("/chart2/qa/extras/data/ods/", "error_bar.ods");
+ load(u"/chart2/qa/extras/data/ods/", "error_bar.ods");
{
// make sure the ODS import was successful
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
@@ -616,7 +616,7 @@ void Chart2ExportTest::testErrorBarXLSX()
void Chart2ExportTest::testErrorBarPropXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testErrorBarProp.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testErrorBarProp.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -636,7 +636,7 @@ void Chart2ExportTest::testErrorBarPropXLSX()
void Chart2ExportTest::testTrendline()
{
mbSkipValidation = true;
- load("/chart2/qa/extras/data/ods/", "trendline.ods");
+ load(u"/chart2/qa/extras/data/ods/", "trendline.ods");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
reload("calc8");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -644,7 +644,7 @@ void Chart2ExportTest::testTrendline()
void Chart2ExportTest::testTrendlineOOXML()
{
- load("/chart2/qa/extras/data/ods/", "trendline.ods");
+ load(u"/chart2/qa/extras/data/ods/", "trendline.ods");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
reload("Calc Office Open XML");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -653,7 +653,7 @@ void Chart2ExportTest::testTrendlineOOXML()
void Chart2ExportTest::testTrendlineXLS()
{
mbSkipValidation = true;
- load("/chart2/qa/extras/data/ods/", "trendline.ods");
+ load(u"/chart2/qa/extras/data/ods/", "trendline.ods");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
reload("MS Excel 97");
checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
@@ -668,7 +668,7 @@ void Chart2ExportTest::testStockChart()
* an attribute val of index should start from 1 and not from 0.
* Which was problem area.
*/
- load("/chart2/qa/extras/data/docx/", "testStockChart.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testStockChart.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -683,7 +683,7 @@ void Chart2ExportTest::testStockChart()
void Chart2ExportTest::testBarChart()
{
- load("/chart2/qa/extras/data/docx/", "testBarChart.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testBarChart.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -692,7 +692,7 @@ void Chart2ExportTest::testBarChart()
void Chart2ExportTest::testCrosses()
{
- load("/chart2/qa/extras/data/docx/", "Bar_horizontal_cone.docx");
+ load(u"/chart2/qa/extras/data/docx/", "Bar_horizontal_cone.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses", "val", "autoZero");
@@ -700,7 +700,7 @@ void Chart2ExportTest::testCrosses()
void Chart2ExportTest::testScatterChartTextXValues()
{
- load("/chart2/qa/extras/data/docx/", "scatter-chart-text-x-values.docx");
+ load(u"/chart2/qa/extras/data/docx/", "scatter-chart-text-x-values.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -748,7 +748,7 @@ void Chart2ExportTest::testScatterChartTextXValues()
void Chart2ExportTest::testScatterXAxisValues()
{
- load("/chart2/qa/extras/data/odt/", "tdf114657.odt");
+ load(u"/chart2/qa/extras/data/odt/", "tdf114657.odt");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -762,7 +762,7 @@ void Chart2ExportTest::testScatterXAxisValues()
void Chart2ExportTest::testScatterXAxisCategories()
{
- load("/chart2/qa/extras/data/odt/", "tdf131143.odt");
+ load(u"/chart2/qa/extras/data/odt/", "tdf131143.odt");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -773,7 +773,7 @@ void Chart2ExportTest::testScatterXAxisCategories()
void Chart2ExportTest::testChartDataTable()
{
- load("/chart2/qa/extras/data/docx/", "testChartDataTable.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testChartDataTable.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -784,7 +784,7 @@ void Chart2ExportTest::testChartDataTable()
void Chart2ExportTest::testChartExternalData()
{
- load("/chart2/qa/extras/data/docx/", "testMultipleChart.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testMultipleChart.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -799,7 +799,7 @@ void Chart2ExportTest::testEmbeddingsGrabBag()
// after saving file.
// This test case tests whether embeddings files grabbagged properly in correct object.
- load("/chart2/qa/extras/data/docx/", "testMultiplechartembeddings.docx" );
+ load(u"/chart2/qa/extras/data/docx/", "testMultiplechartembeddings.docx" );
uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aGrabBag(0);
@@ -834,7 +834,7 @@ void Chart2ExportTest::testEmbeddingsGrabBag()
void Chart2ExportTest::testAreaChartLoad()
{
- load ("/chart2/qa/extras/data/docx/", "testAreaChartLoad.docx");
+ load (u"/chart2/qa/extras/data/docx/", "testAreaChartLoad.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:showVal", "val", "1");
@@ -853,7 +853,7 @@ void Chart2ExportTest::testUpDownBars()
void Chart2ExportTest::testDoughnutChart()
{
- load("/chart2/qa/extras/data/docx/", "doughnutChart.docx");
+ load(u"/chart2/qa/extras/data/docx/", "doughnutChart.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -862,7 +862,7 @@ void Chart2ExportTest::testDoughnutChart()
void Chart2ExportTest::testDisplayUnits()
{
- load("/chart2/qa/extras/data/docx/", "DisplayUnits.docx");
+ load(u"/chart2/qa/extras/data/docx/", "DisplayUnits.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -880,7 +880,7 @@ void Chart2ExportTest::testDisplayUnits()
void Chart2ExportTest::testFdo74115WallBitmapFill()
{
- load("/chart2/qa/extras/data/docx/", "fdo74115_WallBitmapFill.docx");
+ load(u"/chart2/qa/extras/data/docx/", "fdo74115_WallBitmapFill.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:blipFill");
@@ -888,7 +888,7 @@ void Chart2ExportTest::testFdo74115WallBitmapFill()
void Chart2ExportTest::testPieChartWallLineStyle()
{
- load("/chart2/qa/extras/data/odt/", "testPieChartWallLineStyle.odt");
+ load(u"/chart2/qa/extras/data/odt/", "testPieChartWallLineStyle.odt");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:ln/a:noFill");
@@ -898,7 +898,7 @@ void Chart2ExportTest::testPieChartWallLineStyle()
void Chart2ExportTest::testFdo78290LineChartMarkerX()
{
- load("/chart2/qa/extras/data/docx/", "fdo78290_Line_Chart_Marker_x.docx");
+ load(u"/chart2/qa/extras/data/docx/", "fdo78290_Line_Chart_Marker_x.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val","x");
@@ -909,7 +909,7 @@ void Chart2ExportTest::testFdo78290LineChartMarkerX()
void Chart2ExportTest::testFdo78290ScatterChartMarkerX()
{
- load("/chart2/qa/extras/data/docx/", "fdo78290_Scatter_Chart_Marker_x.docx");
+ load(u"/chart2/qa/extras/data/docx/", "fdo78290_Scatter_Chart_Marker_x.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val","x");
@@ -921,7 +921,7 @@ void Chart2ExportTest::testFdo78290ScatterChartMarkerX()
void Chart2ExportTest::testFdo78290CombinationChartMarkerX()
{
- load("/chart2/qa/extras/data/docx/", "fdo78290_Combination_Chart_Marker_x.docx");
+ load(u"/chart2/qa/extras/data/docx/", "fdo78290_Combination_Chart_Marker_x.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val","x");
@@ -931,7 +931,7 @@ void Chart2ExportTest::testFdo78290CombinationChartMarkerX()
void Chart2ExportTest::testTdf126115IndividualMarker()
{
// Check individual marker properties.
- load("/chart2/qa/extras/data/xlsx/", "tdf126115.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf126115.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// 1. series
@@ -981,7 +981,7 @@ void Chart2ExportTest::testAxisNumberFormatODS()
} aTest;
- load("/chart2/qa/extras/data/ods/", "axis-numformats-linked.ods");
+ load(u"/chart2/qa/extras/data/ods/", "axis-numformats-linked.ods");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
aTest.check(xChartDoc);
@@ -1037,7 +1037,7 @@ void Chart2ExportTest::testAxisNumberFormatXLS()
} aTest;
- load( "/chart2/qa/extras/data/xls/", "axis_sourceformatting.xls" );
+ load( u"/chart2/qa/extras/data/xls/", "axis_sourceformatting.xls" );
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet( 0, mxComponent );
aTest.check( xChartDoc, true, util::NumberFormat::PERCENT );
@@ -1136,7 +1136,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX()
} aTest;
- load("/chart2/qa/extras/data/docx/", "data-label-borders.docx");
+ load(u"/chart2/qa/extras/data/docx/", "data-label-borders.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
@@ -1164,7 +1164,7 @@ void Chart2ExportTest::testDataLabelBordersDOCX()
void Chart2ExportTest::testDataLabel3DChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "3d-bar-label.docx");
+ load(u"/chart2/qa/extras/data/docx/", "3d-bar-label.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1180,7 +1180,7 @@ void Chart2ExportTest::testDataLabel3DChartDOCX()
void Chart2ExportTest::testDataLabelBarChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "bar-chart-labels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "bar-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1195,7 +1195,7 @@ void Chart2ExportTest::testDataLabelBarChartDOCX()
void Chart2ExportTest::testDataLabelClusteredBarChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "clustered-bar-chart-labels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "clustered-bar-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1209,7 +1209,7 @@ void Chart2ExportTest::testDataLabelClusteredBarChartDOCX()
void Chart2ExportTest::testDataLabelRadarChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "radar-chart-labels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "radar-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1224,7 +1224,7 @@ void Chart2ExportTest::testDataLabelRadarChartDOCX()
void Chart2ExportTest::testDataLabelDoughnutChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "doughnut-chart-labels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "doughnut-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1239,7 +1239,7 @@ void Chart2ExportTest::testDataLabelDoughnutChartDOCX()
void Chart2ExportTest::testDataLabelAreaChartDOCX()
{
- load("/chart2/qa/extras/data/docx/", "area-chart-labels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "area-chart-labels.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1258,7 +1258,7 @@ void Chart2ExportTest::testDataLabelDefaultLineChartDOCX()
// label position (2010 does). Make sure its default data label position
// is RIGHT when exporting.
- load("/chart2/qa/extras/data/docx/", "line-chart-label-default-placement.docx");
+ load(u"/chart2/qa/extras/data/docx/", "line-chart-label-default-placement.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1277,7 +1277,7 @@ void Chart2ExportTest::testDataLabelDefaultLineChartDOCX()
void Chart2ExportTest::testIndividualDataLabelProps()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf122915.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf122915.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr", "b", "1");
@@ -1288,7 +1288,7 @@ void Chart2ExportTest::testIndividualDataLabelProps()
void Chart2ExportTest::testTdf108107()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf108107.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf108107.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx", "val", "1");
@@ -1298,7 +1298,7 @@ void Chart2ExportTest::testTdf108107()
void Chart2ExportTest::testTdf114139()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf114139.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf114139.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1310,7 +1310,7 @@ void Chart2ExportTest::testTdf114139()
void Chart2ExportTest::testTdf64224()
{
- load("/chart2/qa/extras/data/ods/", "tdf64224.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf64224.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1321,7 +1321,7 @@ void Chart2ExportTest::testTdf64224()
void Chart2ExportTest::testChartTitlePropertiesColorFillDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testChartTitlePropertiesColorFill.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesColorFill.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000");
@@ -1330,7 +1330,7 @@ void Chart2ExportTest::testChartTitlePropertiesColorFillDOCX()
void Chart2ExportTest::testChartTitlePropertiesGradientFillDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testChartTitlePropertiesGradientFill.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesGradientFill.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "cccccc");
@@ -1340,7 +1340,7 @@ void Chart2ExportTest::testChartTitlePropertiesGradientFillDOCX()
void Chart2ExportTest::testChartTitlePropertiesBitmapFillDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testChartTitlePropertiesBitmapFill.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesBitmapFill.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", "rId1");
@@ -1350,7 +1350,7 @@ void Chart2ExportTest::testChartTitlePropertiesBitmapFillDOCX()
void Chart2ExportTest::testColorGradientWithTransparencyDOCX()
{
// Test color gradient (two color) with gradient transparency
- load("/chart2/qa/extras/data/docx/", "testColorGradientWithTransparency.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testColorGradientWithTransparency.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
// Test the transparency of the first color
@@ -1362,7 +1362,7 @@ void Chart2ExportTest::testColorGradientWithTransparencyDOCX()
void Chart2ExportTest::testColorGradientWithTransparencyODS()
{
// Test color gradient (two color) with simple transparency
- load("/chart2/qa/extras/data/ods/", "testColorGradientWithTransparency.ods");
+ load(u"/chart2/qa/extras/data/ods/", "testColorGradientWithTransparency.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// Test the transparency of the first color
@@ -1374,7 +1374,7 @@ void Chart2ExportTest::testColorGradientWithTransparencyODS()
void Chart2ExportTest::testColorGradientStopXLSX()
{
// Test color gradient (two color) stop of the first color
- load("/chart2/qa/extras/data/xlsx/", "tdf128619.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf128619.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// Test the position of the first color
@@ -1385,7 +1385,7 @@ void Chart2ExportTest::testColorGradientStopXLSX()
void Chart2ExportTest::testRadialColorGradientDOCX()
{
- load("/chart2/qa/extras/data/docx/", "tdf128794.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf128794.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
// Test the gradient style (if there is no 'a:path' attribute, it is a linear gradient)
@@ -1396,7 +1396,7 @@ void Chart2ExportTest::testRadialColorGradientDOCX()
void Chart2ExportTest::testBarChartDataPointPropDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testBarChartDataPointPropDOCX.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testBarChartDataPointPropDOCX.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1414,7 +1414,7 @@ void Chart2ExportTest::testBarChartDataPointPropDOCX()
void Chart2ExportTest::testBarChartRotation()
{
- load ("/chart2/qa/extras/data/docx/", "barChartRotation.docx");
+ load (u"/chart2/qa/extras/data/docx/", "barChartRotation.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1429,7 +1429,7 @@ void Chart2ExportTest::testShapeFollowedByChart()
docPr Id is being repeated, ECMA 20.4.2.5 says that the
docPr Id should be unique, ensuring the same here.
*/
- load("/chart2/qa/extras/data/docx/", "FDO74430.docx");
+ load(u"/chart2/qa/extras/data/docx/", "FDO74430.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/document", "Office Open XML Text" );
CPPUNIT_ASSERT(pXmlDoc);
@@ -1441,7 +1441,7 @@ void Chart2ExportTest::testShapeFollowedByChart()
void Chart2ExportTest::testPieChartDataLabels()
{
- load("/chart2/qa/extras/data/docx/", "PieChartDataLabels.docx");
+ load(u"/chart2/qa/extras/data/docx/", "PieChartDataLabels.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos", "val", "outEnd");
@@ -1449,7 +1449,7 @@ void Chart2ExportTest::testPieChartDataLabels()
void Chart2ExportTest::testSeriesIdxOrder()
{
- load("/chart2/qa/extras/data/docx/", "testSeriesIdxOrder.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testSeriesIdxOrder.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:idx[1]", "val", "1");
@@ -1458,7 +1458,7 @@ void Chart2ExportTest::testSeriesIdxOrder()
void Chart2ExportTest::testScatterPlotLabels()
{
- load("/chart2/qa/extras/data/odt/", "scatter-plot-labels.odt");
+ load(u"/chart2/qa/extras/data/odt/", "scatter-plot-labels.odt");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1490,7 +1490,7 @@ void Chart2ExportTest::testScatterPlotLabels()
void Chart2ExportTest::testErrorBarDataRangeODS()
{
- load("/chart2/qa/extras/data/ods/", "ErrorBarRange.ods");
+ load(u"/chart2/qa/extras/data/ods/", "ErrorBarRange.ods");
reload("calc8");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
@@ -1519,14 +1519,14 @@ void Chart2ExportTest::testErrorBarDataRangeODS()
void Chart2ExportTest::testChartCrash()
{
- load("/chart2/qa/extras/data/docx/", "FDO75975.docx");
+ load(u"/chart2/qa/extras/data/docx/", "FDO75975.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
}
void Chart2ExportTest::testPieChartRotation()
{
- load ("/chart2/qa/extras/data/docx/", "pieChartRotation.docx");
+ load (u"/chart2/qa/extras/data/docx/", "pieChartRotation.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX", "val", "40");
@@ -1539,7 +1539,7 @@ void Chart2ExportTest::testEmbeddingsOleObjectGrabBag()
// after saving file.
// This test case tests whether embeddings files grabbagged properly in correct object.
- load("/chart2/qa/extras/data/docx/", "testchartoleobjectembeddings.docx" );
+ load(u"/chart2/qa/extras/data/docx/", "testchartoleobjectembeddings.docx" );
uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY);
uno::Sequence<beans::PropertyValue> aGrabBag(0);
@@ -1610,7 +1610,7 @@ void checkSheetForGapWidthAndOverlap(uno::Reference< chart2::XChartDocument > co
void Chart2ExportTest::testGapWidthXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "gapWidth.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "gapWidth.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
checkSheetForGapWidthAndOverlap(xChartDoc, 120, -60);
@@ -1629,7 +1629,7 @@ void Chart2ExportTest::testGapWidthXLSX()
void Chart2ExportTest::testSmoothedLines()
{
- load("/chart2/qa/extras/data/ods/", "smoothedLines.ods");
+ load(u"/chart2/qa/extras/data/ods/", "smoothedLines.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:smooth", "val", "0");
@@ -1637,7 +1637,7 @@ void Chart2ExportTest::testSmoothedLines()
void Chart2ExportTest::testLabelStringODS()
{
- load("/chart2/qa/extras/data/ods/", "labelString.ods");
+ load(u"/chart2/qa/extras/data/ods/", "labelString.ods");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
Reference< chart2::data::XDataSequence > xLabelSeq =
@@ -1659,7 +1659,7 @@ void Chart2ExportTest::testLabelStringODS()
void Chart2ExportTest::testFdo83058dlblPos()
{
- load ("/chart2/qa/extras/data/docx/", "fdo83058_dlblPos.docx");
+ load (u"/chart2/qa/extras/data/docx/", "fdo83058_dlblPos.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[2]/c:dLblPos", "val", "outEnd");
@@ -1670,7 +1670,7 @@ void Chart2ExportTest::testFdo83058dlblPos()
void Chart2ExportTest::testAutoTitleDelXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "autotitledel_2007.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "autotitledel_2007.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", "0");
@@ -1678,7 +1678,7 @@ void Chart2ExportTest::testAutoTitleDelXLSX()
void Chart2ExportTest::testDispBlanksAsXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2007.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2007.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", "gap");
@@ -1686,7 +1686,7 @@ void Chart2ExportTest::testDispBlanksAsXLSX()
void Chart2ExportTest::testMarkerColorXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "markerColor.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "markerColor.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", "92d050");
@@ -1694,7 +1694,7 @@ void Chart2ExportTest::testMarkerColorXLSX()
void Chart2ExportTest::testRoundedCornersXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "markerColor.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "markerColor.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:roundedCorners", "val", "0");
@@ -1702,7 +1702,7 @@ void Chart2ExportTest::testRoundedCornersXLSX()
void Chart2ExportTest::testAxisNumberFormatXLSX()
{
- load("/chart2/qa/extras/data/ods/", "axis_number_format.ods");
+ load(u"/chart2/qa/extras/data/ods/", "axis_number_format.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx", 2);
@@ -1715,7 +1715,7 @@ void Chart2ExportTest::testAxisNumberFormatXLSX()
void Chart2ExportTest::testDataPointLabelNumberFormatXLSX()
{
- load("/chart2/qa/extras/data/ods/", "tdf123774.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf123774.ods");
{
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1726,7 +1726,7 @@ void Chart2ExportTest::testDataPointLabelNumberFormatXLSX()
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt", "sourceLinked", "0");
}
- load("/chart2/qa/extras/data/xlsx/", "tdf130986.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf130986.xlsx");
{
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1738,7 +1738,7 @@ void Chart2ExportTest::testDataPointLabelNumberFormatXLSX()
void Chart2ExportTest::testDataLabelDefaultValuesXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "data_label.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "data_label.xlsx");
Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent);
Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0);
Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW);
@@ -1755,7 +1755,7 @@ void Chart2ExportTest::testDataLabelDefaultValuesXLSX()
void Chart2ExportTest::testDataLabelFillColor()
{
- load("/chart2/qa/extras/data/xlsx/", "data_labels_fill_color.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "data_labels_fill_color.xlsx");
Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent);
Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0);
Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW);
@@ -1770,7 +1770,7 @@ void Chart2ExportTest::testDataLabelFillColor()
void Chart2ExportTest::testTitleOverlayXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "chart_title.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "chart_title.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:overlay", "val", "0");
@@ -1778,7 +1778,7 @@ void Chart2ExportTest::testTitleOverlayXLSX()
void Chart2ExportTest::testInvertIfNegativeXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "bar_chart_simple.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "bar_chart_simple.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:invertIfNegative", "val", "0");
@@ -1786,7 +1786,7 @@ void Chart2ExportTest::testInvertIfNegativeXLSX()
void Chart2ExportTest::testBubble3DXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "bubble_chart_simple.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "bubble_chart_simple.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[1]/c:bubble3D", "val", "0");
@@ -1796,7 +1796,7 @@ void Chart2ExportTest::testBubble3DXLSX()
void Chart2ExportTest::testNoMarkerXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "no_marker.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "no_marker.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:marker/c:symbol", "val", "none");
@@ -1806,7 +1806,7 @@ void Chart2ExportTest::testNoMarkerXLSX()
void Chart2ExportTest::testTitleManualLayoutXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "title_manual_layout.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "title_manual_layout.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:layoutTarget", 0);
@@ -1827,7 +1827,7 @@ void Chart2ExportTest::testTitleManualLayoutXLSX()
void Chart2ExportTest::testPlotAreaManualLayoutXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "plot_area_manual_layout.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "plot_area_manual_layout.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1856,7 +1856,7 @@ void Chart2ExportTest::testPlotAreaManualLayoutXLSX()
void Chart2ExportTest::testLegendManualLayoutXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "legend_manual_layout.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "legend_manual_layout.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1888,7 +1888,7 @@ void Chart2ExportTest::testLegendManualLayoutXLSX()
void Chart2ExportTest::testChartSubTitle()
{
- load("/chart2/qa/extras/data/ods/", "testChartSubTitle.ods");
+ load(u"/chart2/qa/extras/data/ods/", "testChartSubTitle.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// test properties of subtitle
@@ -1902,7 +1902,7 @@ void Chart2ExportTest::testChartSubTitle()
void Chart2ExportTest::testChartMainWithSubTitle()
{
- load("/chart2/qa/extras/data/ods/", "testChartMainWithSubTitle.ods");
+ load(u"/chart2/qa/extras/data/ods/", "testChartMainWithSubTitle.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// test properties of title
@@ -1917,7 +1917,7 @@ void Chart2ExportTest::testChartMainWithSubTitle()
void Chart2ExportTest::testAutoTitleDeleted()
{
- load("/chart2/qa/extras/data/xlsx/", "testAutoTitleDeleted.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testAutoTitleDeleted.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", "1");
@@ -1925,7 +1925,7 @@ void Chart2ExportTest::testAutoTitleDeleted()
void Chart2ExportTest::testChartTitlePropertiesColorFillXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesColorFill.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesColorFill.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000");
@@ -1934,7 +1934,7 @@ void Chart2ExportTest::testChartTitlePropertiesColorFillXLSX()
void Chart2ExportTest::testChartTitlePropertiesGradientFillXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesGradientFill.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesGradientFill.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "cccccc");
@@ -1944,7 +1944,7 @@ void Chart2ExportTest::testChartTitlePropertiesGradientFillXLSX()
void Chart2ExportTest::testChartTitlePropertiesBitmapFillXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesBitmapFill.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesBitmapFill.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", "rId1");
@@ -1953,7 +1953,7 @@ void Chart2ExportTest::testChartTitlePropertiesBitmapFillXLSX()
void Chart2ExportTest::testBarChartDataPointPropXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testBarChartDataPointPropXLSX.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testBarChartDataPointPropXLSX.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -1971,7 +1971,7 @@ void Chart2ExportTest::testBarChartDataPointPropXLSX()
void Chart2ExportTest::testDataseriesOverlapStackedChartXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testDataseriesOverlapStackedChart.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testDataseriesOverlapStackedChart.xlsx");
// test the overlap value of a simple Stacked Column Chart
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
@@ -1992,7 +1992,7 @@ void Chart2ExportTest::testDataseriesOverlapStackedChartXLSX()
void Chart2ExportTest::testAxisCharacterPropertiesXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "axis_character_properties.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "axis_character_properties.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2009,7 +2009,7 @@ void Chart2ExportTest::testAxisCharacterPropertiesXLSX()
void Chart2ExportTest::testTitleCharacterPropertiesXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "title_character_properties.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "title_character_properties.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2022,7 +2022,7 @@ void Chart2ExportTest::testTitleCharacterPropertiesXLSX()
void Chart2ExportTest::testPlotVisOnlyXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "hidden_cells.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "hidden_cells.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2031,7 +2031,7 @@ void Chart2ExportTest::testPlotVisOnlyXLSX()
void Chart2ExportTest::testBarChartVaryColorsXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf90876.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf90876.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2040,7 +2040,7 @@ void Chart2ExportTest::testBarChartVaryColorsXLSX()
void Chart2ExportTest::testMultipleAxisXLSX()
{
- load("/chart2/qa/extras/data/ods/", "multiple_axis.ods");
+ load(u"/chart2/qa/extras/data/ods/", "multiple_axis.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2055,7 +2055,7 @@ void Chart2ExportTest::testMultipleAxisXLSX()
void Chart2ExportTest::testSecondaryAxisXLSX()
{
- load("/chart2/qa/extras/data/ods/", "secondary_axis.ods");
+ load(u"/chart2/qa/extras/data/ods/", "secondary_axis.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2071,7 +2071,7 @@ void Chart2ExportTest::testSecondaryAxisXLSX()
void Chart2ExportTest::testSetSeriesToSecondaryAxisXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "add_series_secondary_axis.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "add_series_secondary_axis.xlsx");
Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
// Second series
Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xChartDoc, 1);
@@ -2091,7 +2091,7 @@ void Chart2ExportTest::testSetSeriesToSecondaryAxisXLSX()
void Chart2ExportTest::testCombinedChartSecondaryAxisXLSX()
{
// Original file was created with MS Office
- load("/chart2/qa/extras/data/xlsx/", "combined_chart_secondary_axis.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "combined_chart_secondary_axis.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// Collect barchart axID on secondary Axis
@@ -2110,7 +2110,7 @@ void Chart2ExportTest::testCombinedChartSecondaryAxisXLSX()
void Chart2ExportTest::testCombinedChartSecondaryAxisODS()
{
// Original file was created with LibreOffice
- load("/chart2/qa/extras/data/ods/", "combined_chart_secondary_axis.ods");
+ load(u"/chart2/qa/extras/data/ods/", "combined_chart_secondary_axis.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// Collect barchart axID on secondary Axis
@@ -2132,13 +2132,13 @@ void Chart2ExportTest::testCrossBetweenXLSX()
{
// Original files were created with MS Office
{
- load("/chart2/qa/extras/data/xlsx/", "tdf127777.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf127777.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
}
{
- load("/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
@@ -2148,7 +2148,7 @@ void Chart2ExportTest::testCrossBetweenXLSX()
void Chart2ExportTest::testCrossBetweenWithDeletedAxis()
{
// Original file was created with MS Office (the category axis is deleted in the file)
- load("/chart2/qa/extras/data/xlsx/", "tdf128633.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf128633.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
@@ -2157,7 +2157,7 @@ void Chart2ExportTest::testCrossBetweenWithDeletedAxis()
void Chart2ExportTest::testCrossBetweenODS()
{
// Original file was created with LibreOffice
- load("/chart2/qa/extras/data/ods/", "test_CrossBetween.ods");
+ load(u"/chart2/qa/extras/data/ods/", "test_CrossBetween.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", "between");
@@ -2165,7 +2165,7 @@ void Chart2ExportTest::testCrossBetweenODS()
void Chart2ExportTest::testAxisTitleRotationXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "axis_title_rotation.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "axis_title_rotation.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2174,7 +2174,7 @@ void Chart2ExportTest::testAxisTitleRotationXLSX()
void Chart2ExportTest::testAxisTitlePositionDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testAxisTitlePosition.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testAxisTitlePosition.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2198,14 +2198,14 @@ void Chart2ExportTest::testAxisTitlePositionDOCX()
void Chart2ExportTest::testAxisCrossBetweenDOCX()
{
- load("/chart2/qa/extras/data/odt/", "axis-position.odt");
+ load(u"/chart2/qa/extras/data/odt/", "axis-position.odt");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", "midCat");
}
void Chart2ExportTest::testPieChartDataPointExplosionXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "pie_chart_datapoint_explosion.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "pie_chart_datapoint_explosion.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2214,7 +2214,7 @@ void Chart2ExportTest::testPieChartDataPointExplosionXLSX()
void Chart2ExportTest::testCustomDataLabel()
{
- load("/chart2/qa/extras/data/pptx/", "tdf115107.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf115107.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
// Check the data labels font color for the complete data series
@@ -2312,7 +2312,7 @@ void Chart2ExportTest::testCustomDataLabel()
void Chart2ExportTest::testCustomPositionofDataLabel()
{
- load("/chart2/qa/extras/data/xlsx/", "testCustomPosDataLabels.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testCustomPosDataLabels.xlsx");
{
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2328,7 +2328,7 @@ void Chart2ExportTest::testCustomPositionofDataLabel()
CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.0742140311063737, nY, 1e-7);
}
- load("/chart2/qa/extras/data/docx/", "testTdf108110.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testTdf108110.docx");
{
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2344,7 +2344,7 @@ void Chart2ExportTest::testCustomPositionofDataLabel()
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.172648731408574, nY, 1e-7);
}
- load("/chart2/qa/extras/data/ods/", "tdf136024.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf136024.ods");
{
reload("calc8");
// tdf#136024: test custom position of pie chart data label after an ods export
@@ -2364,7 +2364,7 @@ void Chart2ExportTest::testCustomPositionofDataLabel()
void Chart2ExportTest::testCustomDataLabelMultipleSeries()
{
- load("/chart2/qa/extras/data/pptx/", "tdf115107-2.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf115107-2.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart2", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2421,14 +2421,14 @@ void Chart2ExportTest::testCustomDataLabelMultipleSeries()
void Chart2ExportTest::testLeaderLines()
{
- load("/chart2/qa/extras/data/xlsx/", "testTdf90749.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testTdf90749.xlsx");
{
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines", "val", "1");
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:dLbls/c:extLst/c:ext/c15:showLeaderLines", "val", "0");
}
- load("/chart2/qa/extras/data/docx/", "MSO_Custom_Leader_Line.docx");
+ load(u"/chart2/qa/extras/data/docx/", "MSO_Custom_Leader_Line.docx");
{
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2439,7 +2439,7 @@ void Chart2ExportTest::testLeaderLines()
void Chart2ExportTest::testNumberFormatExportPPTX()
{
- load("/chart2/qa/extras/data/pptx/", "tdf115859.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf115859.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2449,7 +2449,7 @@ void Chart2ExportTest::testNumberFormatExportPPTX()
void Chart2ExportTest::testLabelSeparatorExportDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testLabelSeparator.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testLabelSeparator.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2467,7 +2467,7 @@ void Chart2ExportTest::testLabelSeparatorExportDOCX()
void Chart2ExportTest::testChartTitlePropertiesColorFillPPTX()
{
- load("/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesColorFill.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesColorFill.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000");
@@ -2476,7 +2476,7 @@ void Chart2ExportTest::testChartTitlePropertiesColorFillPPTX()
void Chart2ExportTest::testChartTitlePropertiesGradientFillPPTX()
{
- load("/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesGradientFill.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesGradientFill.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "f6f8fc");
@@ -2486,7 +2486,7 @@ void Chart2ExportTest::testChartTitlePropertiesGradientFillPPTX()
void Chart2ExportTest::testChartTitlePropertiesBitmapFillPPTX()
{
- load("/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesBitmapFill.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesBitmapFill.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", "rId1");
@@ -2495,7 +2495,7 @@ void Chart2ExportTest::testChartTitlePropertiesBitmapFillPPTX()
void Chart2ExportTest::testxAxisLabelsRotation()
{
- load ("/chart2/qa/extras/data/xlsx/", "xAxisLabelsRotation.xlsx");
+ load (u"/chart2/qa/extras/data/xlsx/", "xAxisLabelsRotation.xlsx");
xmlDocUniquePtr pXmlDoc1 = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc1);
@@ -2505,7 +2505,7 @@ void Chart2ExportTest::testxAxisLabelsRotation()
void Chart2ExportTest::testMultipleCategoryAxisLablesXLSX()
{
- load("/chart2/qa/extras/data/ods/", "multilevelcat.ods");
+ load(u"/chart2/qa/extras/data/ods/", "multilevelcat.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// check category axis labels number of first level
@@ -2522,7 +2522,7 @@ void Chart2ExportTest::testMultipleCategoryAxisLablesXLSX()
void Chart2ExportTest::testMultipleCategoryAxisLablesDOCX()
{
- load("/chart2/qa/extras/data/odt/", "multilevelcat.odt");
+ load(u"/chart2/qa/extras/data/odt/", "multilevelcat.odt");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
// check category axis labels number of first level
@@ -2539,7 +2539,7 @@ void Chart2ExportTest::testMultipleCategoryAxisLablesDOCX()
void Chart2ExportTest::testTdf116163()
{
- load("/chart2/qa/extras/data/pptx/", "tdf116163.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf116163.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2548,7 +2548,7 @@ void Chart2ExportTest::testTdf116163()
void Chart2ExportTest::testTdf111824()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf111824.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf111824.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2560,7 +2560,7 @@ void Chart2ExportTest::testTdf111824()
void Chart2ExportTest::test3DAreaChartZAxis()
{
- load("/chart2/qa/extras/data/xlsx/", "test3DAreaChartZAxis.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "test3DAreaChartZAxis.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2572,7 +2572,7 @@ void Chart2ExportTest::test3DAreaChartZAxis()
void Chart2ExportTest::testTdf119029()
{
- load("/chart2/qa/extras/data/odp/", "tdf119029.odp");
+ load(u"/chart2/qa/extras/data/odp/", "tdf119029.odp");
// Only use "chart", without number, because the number depends on the previous tests
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2584,7 +2584,7 @@ void Chart2ExportTest::testTdf119029()
void Chart2ExportTest::testTdf108022()
{
- load("/chart2/qa/extras/data/odt/", "tdf108022.odt");
+ load(u"/chart2/qa/extras/data/odt/", "tdf108022.odt");
reload("Office Open XML Text");
// assert we really have two charts
@@ -2596,7 +2596,7 @@ void Chart2ExportTest::testTdf108022()
void Chart2ExportTest::testTdf121744()
{
- load("/chart2/qa/extras/data/docx/", "tdf121744.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf121744.docx");
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2609,7 +2609,7 @@ void Chart2ExportTest::testTdf121744()
void Chart2ExportTest::testTdf121189()
{
- load("/chart2/qa/extras/data/odp/", "tdf121189.odp");
+ load(u"/chart2/qa/extras/data/odp/", "tdf121189.odp");
reload("Impress Office Open XML");
uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent, uno::UNO_QUERY_THROW);
@@ -2623,7 +2623,7 @@ void Chart2ExportTest::testTdf122031()
{
//Checks pie chart data label format.
- load("/chart2/qa/extras/data/xlsx/", "tdf122031.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf122031.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2635,7 +2635,7 @@ void Chart2ExportTest::testTdf122031()
void Chart2ExportTest::testTdf115012()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf115012.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf115012.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// workaround: use-zero instead of leave-gap to show the original line chart
@@ -2644,7 +2644,7 @@ void Chart2ExportTest::testTdf115012()
void Chart2ExportTest::testTdf134118()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf134118.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf134118.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
// workaround: use leave-gap instead of zero to show the original line chart
@@ -2653,7 +2653,7 @@ void Chart2ExportTest::testTdf134118()
void Chart2ExportTest::testTdf123206_customLabelText()
{
- load("/chart2/qa/extras/data/docx/", "tdf123206.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf123206.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2666,7 +2666,7 @@ void Chart2ExportTest::testTdf123206_customLabelText()
void Chart2ExportTest::testCustomLabelText()
{
- load("/chart2/qa/extras/data/docx/", "testCustomlabeltext.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testCustomlabeltext.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2685,7 +2685,7 @@ void Chart2ExportTest::testCustomLabelText()
void Chart2ExportTest::testDeletedLegendEntries()
{
- load("/chart2/qa/extras/data/xlsx/", "deleted_legend_entry.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "deleted_legend_entry.xlsx");
{
reload("Calc Office Open XML");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -2698,7 +2698,7 @@ void Chart2ExportTest::testDeletedLegendEntries()
CPPUNIT_ASSERT(!bShowLegendEntry);
}
- load("/chart2/qa/extras/data/xlsx/", "deleted_legend_entry2.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "deleted_legend_entry2.xlsx");
{
reload("Calc Office Open XML");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -2723,7 +2723,7 @@ void Chart2ExportTest::testDeletedLegendEntries()
void Chart2ExportTest::testTdf60316()
{
- load("/chart2/qa/extras/data/pptx/", "tdf60316.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf60316.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2734,7 +2734,7 @@ void Chart2ExportTest::testTdf60316()
void Chart2ExportTest::testTdf130225()
{
- load("/chart2/qa/extras/data/docx/", "piechart_deleted_legend_entry.docx");
+ load(u"/chart2/qa/extras/data/docx/", "piechart_deleted_legend_entry.docx");
reload("Office Open XML Text");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2748,7 +2748,7 @@ void Chart2ExportTest::testTdf130225()
void Chart2ExportTest::testTdf59857()
{
- load("/chart2/qa/extras/data/ods/", "tdf59857.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf59857.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2760,7 +2760,7 @@ void Chart2ExportTest::testTdf59857()
void Chart2ExportTest::testTdf126076()
{
- load("/chart2/qa/extras/data/xlsx/", "auto_marker_excel10.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "auto_marker_excel10.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2772,7 +2772,7 @@ void Chart2ExportTest::testTdf126076()
void Chart2ExportTest::testTdf75330()
{
- load("/chart2/qa/extras/data/ods/", "legend_overlay.ods");
+ load(u"/chart2/qa/extras/data/ods/", "legend_overlay.ods");
reload("calc8");
{
uno::Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0, mxComponent);
@@ -2797,7 +2797,7 @@ void Chart2ExportTest::testTdf75330()
void Chart2ExportTest::testTdf127792()
{
- load("/chart2/qa/extras/data/docx/", "MSO_axis_position.docx");
+ load(u"/chart2/qa/extras/data/docx/", "MSO_axis_position.docx");
{
xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1", "Office Open XML Text");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2812,7 +2812,7 @@ void Chart2ExportTest::testTdf127792()
void Chart2ExportTest::testTdf131979()
{
- load("/chart2/qa/extras/data/ods/", "tdf131115.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf131115.ods");
{
reload("calc8");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -2826,7 +2826,7 @@ void Chart2ExportTest::testTdf131979()
CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to false.", !blinknumberformattosource);
}
- load("/chart2/qa/extras/data/ods/", "tdf131979.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf131979.ods");
{
reload("calc8");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -2844,14 +2844,14 @@ void Chart2ExportTest::testTdf131979()
void Chart2ExportTest::testTdf132076()
{
{
- load("/chart2/qa/extras/data/ods/", "tdf132076.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf132076.ods");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt", "formatCode", "dd");
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt", "sourceLinked", "0");
}
{
- load("/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt", "formatCode", "dd");
@@ -2861,7 +2861,7 @@ void Chart2ExportTest::testTdf132076()
void Chart2ExportTest::testTdf125812()
{
- load("/chart2/qa/extras/data/odp/", "ellipticalGradientFill.odp");
+ load(u"/chart2/qa/extras/data/odp/", "ellipticalGradientFill.odp");
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
CPPUNIT_ASSERT(pXmlDoc);
assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path", "path", "circle");
@@ -2873,7 +2873,7 @@ void Chart2ExportTest::testTdf125812()
void Chart2ExportTest::testTdf133190()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2884,7 +2884,7 @@ void Chart2ExportTest::testTdf133190()
void Chart2ExportTest::testTdf133191()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2894,7 +2894,7 @@ void Chart2ExportTest::testTdf133191()
void Chart2ExportTest::testTdf132594()
{
- load("/chart2/qa/extras/data/xlsx/", "chart_pie2007.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "chart_pie2007.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2903,7 +2903,7 @@ void Chart2ExportTest::testTdf132594()
void Chart2ExportTest::testTdf134255()
{
- load("/chart2/qa/extras/data/docx/", "tdf134255.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf134255.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2923,7 +2923,7 @@ void Chart2ExportTest::testTdf134255()
void Chart2ExportTest::testTdf134977()
{
- load("/chart2/qa/extras/data/xlsx/", "custom_data_label.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "custom_data_label.xlsx");
//import test
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
@@ -2945,7 +2945,7 @@ void Chart2ExportTest::testTdf134977()
void Chart2ExportTest::testTdf123647()
{
- load("/chart2/qa/extras/data/xlsx/", "empty_chart.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "empty_chart.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2954,7 +2954,7 @@ void Chart2ExportTest::testTdf123647()
void Chart2ExportTest::testTdf136267()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf136267.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf136267.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2963,7 +2963,7 @@ void Chart2ExportTest::testTdf136267()
void Chart2ExportTest::testDataLabelPlacementPieChart()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf134978.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf134978.xlsx");
reload("calc8");
uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent),
UNO_QUERY_THROW);
@@ -2980,7 +2980,7 @@ void Chart2ExportTest::testDataLabelPlacementPieChart()
void Chart2ExportTest::testTdf137917()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf137917.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf137917.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -2993,7 +2993,7 @@ void Chart2ExportTest::testTdf137917()
void Chart2ExportTest::testTdf138204()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf138204.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf138204.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -3018,7 +3018,7 @@ void Chart2ExportTest::testTdf138204()
void Chart2ExportTest::testTdf138181()
{
- load("/chart2/qa/extras/data/xlsx/", "piechart_deleted_legendentry.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "piechart_deleted_legendentry.xlsx");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
UNO_QUERY_THROW);
Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
@@ -3044,7 +3044,7 @@ void Chart2ExportTest::testTdf138181()
void Chart2ExportTest::testCustomShapeText()
{
- load("/chart2/qa/extras/data/ods/", "tdf72776.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf72776.ods");
reload("calc8");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
UNO_QUERY_THROW);
@@ -3060,7 +3060,7 @@ void Chart2ExportTest::testCustomShapeText()
void Chart2ExportTest::testuserShapesXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf128621.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf128621.xlsx");
reload("Calc Office Open XML");
Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
diff --git a/chart2/qa/extras/chart2geometry.cxx b/chart2/qa/extras/chart2geometry.cxx
index c15f15f66864..4f57654a3587 100644
--- a/chart2/qa/extras/chart2geometry.cxx
+++ b/chart2/qa/extras/chart2geometry.cxx
@@ -181,7 +181,7 @@ static OString OU2O(std::u16string_view sOUSource)
void Chart2GeometryTest::testTdf135184RoundLineCap()
{
// It tests chart area, data series line and regression-curve line.
- load("/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "calc8");
CPPUNIT_ASSERT(pXmlDoc);
@@ -208,7 +208,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap()
void Chart2GeometryTest::testTdf135184RoundLineCap2()
{
// It tests legend, data series sector and title.
- load("/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap2.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap2.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "calc8");
CPPUNIT_ASSERT(pXmlDoc);
@@ -237,7 +237,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap2()
void Chart2GeometryTest::testTdf135184RoundLineCap3()
{
// It tests chart area, data series line and regression-curve line.
- load("/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -254,7 +254,7 @@ void Chart2GeometryTest::testTdf135184RoundLineCap3()
void Chart2GeometryTest::testTdf135184RoundLineCap4()
{
// It tests legend, data series sector and title.
- load("/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap2.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap2.xlsx");
xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
CPPUNIT_ASSERT(pXmlDoc);
@@ -270,7 +270,7 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_export()
{
// chart area with color gradient and solid transparency
// Without the patch the transparency was lost in saved pptx file.
- load("/chart2/qa/extras/data/odp/", "tdf128345_ChartArea_CG_TS.odp");
+ load(u"/chart2/qa/extras/data/odp/", "tdf128345_ChartArea_CG_TS.odp");
// Make sure the chart area has a transparency in gradient stops in saved pptx file.
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
@@ -289,7 +289,7 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import()
// Make sure chart area has transparency when pptx document is opened and resaved as odp.
// As of Aug 2020, the import generates a transparency gradient. When import is changed to
// generate solid transparency, the test needs to be adapted.
- load("/chart2/qa/extras/data/pptx/", "tdf128345_ChartArea_CG_TS.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf128345_ChartArea_CG_TS.pptx");
// Find transparency gradient name
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
@@ -322,7 +322,7 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_export()
{
// chart wall with solid color and transparency gradient
// Without the patch the transparency was lost.
- load("/chart2/qa/extras/data/odp/", "tdf128345_ChartWall_CS_TG.odp");
+ load(u"/chart2/qa/extras/data/odp/", "tdf128345_ChartWall_CS_TG.odp");
// Make sure the chart has a gradient with transparency in gradient stops in saved pptx file.
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
@@ -340,7 +340,7 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import()
{
// This works on the file, which was exported from file tdf128345_ChartWall_CS_TG.odp to pptx.
// Make sure chart wall has transparency when pptx document is resaved as odp.
- load("/chart2/qa/extras/data/pptx/", "tdf128345_ChartWall_CS_TG.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf128345_ChartWall_CS_TG.pptx");
// Find transparency gradient name
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
@@ -371,7 +371,7 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_export()
{
// legend with solid color and transparency gradient
// Without the patch the transparency was lost.
- load("/chart2/qa/extras/data/odp/", "tdf128345_Legend_CS_TG_axial.odp");
+ load(u"/chart2/qa/extras/data/odp/", "tdf128345_Legend_CS_TG_axial.odp");
// Make sure the chart has a gradient with transparency in gradient stops in saved pptx file.
xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML");
@@ -391,7 +391,7 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import()
{
// This works on the file, which was exported from file tdf128345_Legend_CS_TG_axial.odp to pptx.
// Error was, that in case of axial not the middle value was taken but start and end value.
- load("/chart2/qa/extras/data/pptx/", "tdf128345_Legend_CS_TG_axial.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf128345_Legend_CS_TG_axial.pptx");
// Find transparency gradient name
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
@@ -422,7 +422,7 @@ void Chart2GeometryTest::testTdf135366LabelOnSeries()
{
// Error was, that the fill and line properties of a <chart:data-label> were not
// imported at all. Here they should be at the series.
- load("/chart2/qa/extras/data/ods/", "tdf135366_data_label_series.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf135366_data_label_series.ods");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0);
@@ -460,7 +460,7 @@ void Chart2GeometryTest::testTdf135366LabelOnPoint()
{
// Error was, that the fill and line properties of a <chart:data-label> were not
// imported at all. Here they should be at point 2.
- load("/chart2/qa/extras/data/odt/", "tdf135366_data_label_point.odt");
+ load(u"/chart2/qa/extras/data/odt/", "tdf135366_data_label_point.odt");
uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0);
@@ -507,7 +507,7 @@ void Chart2GeometryTest::testTdf135366LabelExport()
// Error was, that line and fill properties were not exported as
// graphic-properties of a <chart:data-label> element, but only
// as loext chart-properties of the <chart:data-point> element.
- load("/chart2/qa/extras/data/odt/", "tdf135366_data_label_export.odt");
+ load(u"/chart2/qa/extras/data/odt/", "tdf135366_data_label_export.odt");
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "writer8");
CPPUNIT_ASSERT(pXmlDoc);
@@ -535,7 +535,7 @@ void Chart2GeometryTest::testTdf135366_CustomLabelText()
SvtSaveOptions aSaveOpt;
const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion(aSaveOpt.GetODFDefaultVersion());
aSaveOpt.SetODFDefaultVersion(SvtSaveOptions::ODFVER_012);
- load("/chart2/qa/extras/data/pptx/", "tdf135366_CustomLabelText.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf135366_CustomLabelText.pptx");
xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8");
CPPUNIT_ASSERT(pXmlDoc);
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx
index 943cbd57ea99..272639ad069c 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -304,7 +304,7 @@ private:
// split method up into smaller chunks for more detailed tests
void Chart2ImportTest::Fdo60083()
{
- load("/chart2/qa/extras/data/ods/", "fdo60083.ods");
+ load(u"/chart2/qa/extras/data/ods/", "fdo60083.ods");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
CPPUNIT_ASSERT(xChartDoc.is());
@@ -353,7 +353,7 @@ void Chart2ImportTest::Fdo60083()
void Chart2ImportTest::testErrorBarRange()
{
- load("/chart2/qa/extras/data/ods/", "error_bar_range.ods");
+ load(u"/chart2/qa/extras/data/ods/", "error_bar_range.ods");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
CPPUNIT_ASSERT(xChartDoc.is());
@@ -382,7 +382,7 @@ void Chart2ImportTest::testErrorBarRange()
void Chart2ImportTest::testErrorBarFormatting()
{
- load("/chart2/qa/extras/data/ods/", "error_bar_properties.ods");
+ load(u"/chart2/qa/extras/data/ods/", "error_bar_properties.ods");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
CPPUNIT_ASSERT(xChartDoc.is());
@@ -423,7 +423,7 @@ void Chart2ImportTest::testSteppedLines()
chart2::CurveStyle_STEP_CENTER_Y
};
- load("/chart2/qa/extras/data/ods/", "stepped_lines.ods");
+ load(u"/chart2/qa/extras/data/ods/", "stepped_lines.ods");
for(sal_Int32 nSheet = 0; nSheet < MAXSHEET; ++nSheet)
{
uno::Reference< chart2::XChartDocument > xChart2Doc = getChartDocFromSheet( nSheet, mxComponent );
@@ -451,7 +451,7 @@ static uno::Sequence < OUString > getChartColumnDescriptions( uno::Reference< ch
void Chart2ImportTest::testODSChartSeries()
{
- load("/chart2/qa/extras/data/ods/", "chart.ods");
+ load(u"/chart2/qa/extras/data/ods/", "chart.ods");
uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
uno::Sequence < OUString > seriesList = getChartColumnDescriptions( xChart1Doc);
CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]);
@@ -462,7 +462,7 @@ void Chart2ImportTest::testODSChartSeries()
void Chart2ImportTest::testXLSXChartSeries()
{
- load("/chart2/qa/extras/data/xlsx/", "chart.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "chart.xlsx");
uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
uno::Sequence < OUString > seriesList = getChartColumnDescriptions(xChart1Doc );
CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]);
@@ -473,7 +473,7 @@ void Chart2ImportTest::testXLSXChartSeries()
void Chart2ImportTest::testXLSChartSeries()
{
- load("/chart2/qa/extras/data/xls/", "chart.xls");
+ load(u"/chart2/qa/extras/data/xls/", "chart.xls");
uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
uno::Sequence < OUString > seriesList = getChartColumnDescriptions(xChart1Doc );
CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]);
@@ -484,7 +484,7 @@ void Chart2ImportTest::testXLSChartSeries()
void Chart2ImportTest::testODTChartSeries()
{
- load("/chart2/qa/extras/data/odt/", "chart.odt");
+ load(u"/chart2/qa/extras/data/odt/", "chart.odt");
uno::Sequence< OUString > seriesList = getWriterChartColumnDescriptions(mxComponent);
CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]);
@@ -494,7 +494,7 @@ void Chart2ImportTest::testODTChartSeries()
void Chart2ImportTest::testDOCChartSeries()
{
- load("/chart2/qa/extras/data/doc/", "chart.doc");
+ load(u"/chart2/qa/extras/data/doc/", "chart.doc");
uno::Sequence< OUString > seriesList = getWriterChartColumnDescriptions(mxComponent);
CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]);
@@ -503,7 +503,7 @@ void Chart2ImportTest::testDOCChartSeries()
void Chart2ImportTest::testDOCXChartSeries()
{
- load("/chart2/qa/extras/data/docx/", "chart.docx");
+ load(u"/chart2/qa/extras/data/docx/", "chart.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -519,7 +519,7 @@ void Chart2ImportTest::testDOCXChartSeries()
void Chart2ImportTest::testDOCXChartEmptySeries()
{
- load("/chart2/qa/extras/data/docx/", "tdf125337.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf125337.docx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -545,7 +545,7 @@ void Chart2ImportTest::testDOCXChartEmptySeries()
void Chart2ImportTest::testDOCXChartValuesSize()
{
- load( "/chart2/qa/extras/data/docx/", "bubblechart.docx" );
+ load( u"/chart2/qa/extras/data/docx/", "bubblechart.docx" );
Reference<chart2::XChartDocument> xChartDoc( getChartDocFromWriter(0), uno::UNO_QUERY );
CPPUNIT_ASSERT( xChartDoc.is() );
@@ -567,7 +567,7 @@ void Chart2ImportTest::testDOCXChartValuesSize()
void Chart2ImportTest::testPPTChartSeries()
{
//test chart series names for ppt
- uno::Sequence < OUString > seriesList = getImpressChartColumnDescriptions("/chart2/qa/extras/data/ppt/", "chart.ppt");
+ uno::Sequence < OUString > seriesList = getImpressChartColumnDescriptions(u"/chart2/qa/extras/data/ppt/", "chart.ppt");
CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]);
@@ -578,7 +578,7 @@ void Chart2ImportTest::testPPTChartSeries()
void Chart2ImportTest::testPPTXChartSeries()
{
//test chart series names for pptx
- load("/chart2/qa/extras/data/pptx/", "chart.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "chart.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -595,7 +595,7 @@ void Chart2ImportTest::testPPTXChartSeries()
void Chart2ImportTest::testPPTXSparseChartSeries()
{
//test chart series sparse data for pptx
- load("/chart2/qa/extras/data/pptx/", "sparse-chart.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "sparse-chart.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -616,7 +616,7 @@ void Chart2ImportTest::testPPTXSparseChartSeries()
void Chart2ImportTest::testPPTXHiddenDataSeries()
{
- load("/chart2/qa/extras/data/pptx/", "stacked-bar-chart-hidden-series.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "stacked-bar-chart-hidden-series.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -655,7 +655,7 @@ void Chart2ImportTest::testPPTXHiddenDataSeries()
void Chart2ImportTest::testPPTXPercentageNumberFormats()
{
- load("/chart2/qa/extras/data/pptx/", "percentage-number-formats.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "percentage-number-formats.pptx");
// 1st chart
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
@@ -720,7 +720,7 @@ void Chart2ImportTest::testPPTXPercentageNumberFormats()
void Chart2ImportTest::testPieChartLabelsNumFormat()
{
- load("/chart2/qa/extras/data/xlsx/", "tdfPieNumFormat.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdfPieNumFormat.xlsx");
uno::Reference< chart::XChartDocument > xChartDoc(getChartCompFromSheet(0, mxComponent), UNO_QUERY_THROW);
CPPUNIT_ASSERT(xChartDoc.is());
// test data point labels format
@@ -732,7 +732,7 @@ void Chart2ImportTest::testPieChartLabelsNumFormat()
void Chart2ImportTest::testPPTXStackedNonStackedYAxis()
{
- load("/chart2/qa/extras/data/pptx/", "stacked-non-stacked-mix-y-axis.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "stacked-non-stacked-mix-y-axis.pptx");
// 1st chart is a normal stacked column.
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
@@ -792,7 +792,7 @@ void Chart2ImportTest::testPPTXStackedNonStackedYAxis()
void Chart2ImportTest::testODPChartSeries()
{
//test chart series names for odp
- uno::Sequence < OUString > seriesList = getImpressChartColumnDescriptions("/chart2/qa/extras/data/odp/", "chart.odp");
+ uno::Sequence < OUString > seriesList = getImpressChartColumnDescriptions(u"/chart2/qa/extras/data/odp/", "chart.odp");
CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]);
CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[2]);
@@ -801,7 +801,7 @@ void Chart2ImportTest::testODPChartSeries()
void Chart2ImportTest::testBnc864396()
{
- uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromImpress("/chart2/qa/extras/data/pptx/", "bnc864396.pptx"), uno::UNO_QUERY_THROW);
+ uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromImpress(u"/chart2/qa/extras/data/pptx/", "bnc864396.pptx"), uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider());
uno::Reference< chart2::XInternalDataProvider > xDataProvider( xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW );
@@ -816,7 +816,7 @@ void Chart2ImportTest::testBnc864396()
void Chart2ImportTest::testBnc889755()
{
- load("/chart2/qa/extras/data/pptx/", "bnc889755.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "bnc889755.pptx");
uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 6), uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider());
@@ -844,7 +844,7 @@ void Chart2ImportTest::testBnc889755()
void Chart2ImportTest::testBnc882383()
{
- load("/chart2/qa/extras/data/pptx/", "bnc882383.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "bnc882383.pptx");
uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY_THROW);
uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
CPPUNIT_ASSERT(xDataSeries.is());
@@ -857,7 +857,7 @@ void Chart2ImportTest::testBnc882383()
void Chart2ImportTest::testTransparancyGradientValue()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf128732.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf128732.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -880,7 +880,7 @@ void Chart2ImportTest::testTransparancyGradientValue()
void Chart2ImportTest::testSimpleStrictXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "strict_chart.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "strict_chart.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
CPPUNIT_ASSERT(xChartDoc.is());
@@ -891,7 +891,7 @@ void Chart2ImportTest::testSimpleStrictXLSX()
void Chart2ImportTest::testDelayedCellImport()
{
- load("/chart2/qa/extras/data/xlsx/", "fdo70609.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "fdo70609.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent );
Reference< chart2::data::XDataSequence > xDataSeq =
getDataSequenceFromDocByRole(xChartDoc, u"values-x");
@@ -902,7 +902,7 @@ void Chart2ImportTest::testDelayedCellImport()
void Chart2ImportTest::testFlatODSStackedColumnChart()
{
- load("/chart2/qa/extras/data/fods/", "stacked-column-chart.fods");
+ load(u"/chart2/qa/extras/data/fods/", "stacked-column-chart.fods");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -919,7 +919,7 @@ void Chart2ImportTest::testFlatODSStackedColumnChart()
void Chart2ImportTest::testFdo78080()
{
- load("/chart2/qa/extras/data/xlsx/", "fdo78080.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "fdo78080.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -930,7 +930,7 @@ void Chart2ImportTest::testFdo78080()
void Chart2ImportTest::testTdf127811()
{
- load("/chart2/qa/extras/data/pptx/", "tdf127811.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf127811.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -949,7 +949,7 @@ void Chart2ImportTest::testTdf127811()
void Chart2ImportTest::testTdf86624()
{
- load("/chart2/qa/extras/data/ods/", "tdf86624.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf86624.ods");
uno::Reference< chart2::XChartDocument > xChart2Doc = getChartDocFromSheet(0, mxComponent);
uno::Reference< chart::XChartDocument > xChartDoc (xChart2Doc, uno::UNO_QUERY);
uno::Reference<drawing::XShape> xLegend = xChartDoc->getLegend();
@@ -960,7 +960,7 @@ void Chart2ImportTest::testTdf86624()
void Chart2ImportTest::testTdf105517()
{
- load("/chart2/qa/extras/data/pptx/", "tdf105517.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf105517.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -988,7 +988,7 @@ void Chart2ImportTest::testTdf105517()
void Chart2ImportTest::testTdf106217()
{
- load("/chart2/qa/extras/data/pptx/", "tdf106217.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf106217.pptx");
uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromDrawImpress(0, 0);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1011,7 +1011,7 @@ void Chart2ImportTest::testTdf106217()
void Chart2ImportTest::testTdf108021()
{
// Tdf108021 : To check TextBreak value is true.
- load("/chart2/qa/extras/data/ods/", "tdf108021.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf108021.ods");
uno::Reference< chart::XDiagram > mxDiagram;
uno::Reference< beans::XPropertySet > xAxisProp;
bool bTextBreak = false;
@@ -1029,7 +1029,7 @@ void Chart2ImportTest::testTdf108021()
void Chart2ImportTest::testTdf100084()
{
// The test file was created with IBM Cognos, make sure there is a diagram.
- load("/chart2/qa/extras/data/xlsx/", "tdf100084.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf100084.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
Reference<beans::XPropertySet> xDiagram(xChartDoc->getFirstDiagram(), UNO_QUERY);
@@ -1038,7 +1038,7 @@ void Chart2ImportTest::testTdf100084()
void Chart2ImportTest::testTdf124817()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf124817.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf124817.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1066,7 +1066,7 @@ void Chart2ImportTest::testTdf124817()
void Chart2ImportTest::testTdf126033()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf126033.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf126033.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1083,7 +1083,7 @@ void Chart2ImportTest::testTdf126033()
void Chart2ImportTest::testTransparentBackground(OUString const & filename)
{
- load("/chart2/qa/extras/data/xlsx/", filename);
+ load(u"/chart2/qa/extras/data/xlsx/", filename);
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1110,7 +1110,7 @@ void Chart2ImportTest::testFdo54361_1()
void Chart2ImportTest::testAutoBackgroundXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "chart-auto-background.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "chart-auto-background.xlsx");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1127,7 +1127,7 @@ void Chart2ImportTest::testAutoBackgroundXLSX()
void Chart2ImportTest::testAutoChartAreaBorderPropXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "chart-area-style-border.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "chart-area-style-border.xlsx");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1147,7 +1147,7 @@ void Chart2ImportTest::testAutoChartAreaBorderPropXLSX()
void Chart2ImportTest::testChartAreaStyleBackgroundXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "chart-area-style-background.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "chart-area-style-background.xlsx");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1164,7 +1164,7 @@ void Chart2ImportTest::testChartAreaStyleBackgroundXLSX()
void Chart2ImportTest::testChartHatchFillXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "chart-hatch-fill.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "chart-hatch-fill.xlsx");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1206,7 +1206,7 @@ void Chart2ImportTest::testChartHatchFillXLSX()
void Chart2ImportTest::testAxisTextRotationXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "axis-label-rotation.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "axis-label-rotation.xlsx");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1244,7 +1244,7 @@ void Chart2ImportTest::testTextCanOverlapXLSX()
void Chart2ImportTest::testTextBreakXLSX()
{
// tdf#122091: To check textbreak value is true in case of 0° degree of Axis label rotation.
- load("/chart2/qa/extras/data/xlsx/", "chart_label_text_break.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "chart_label_text_break.xlsx");
uno::Reference< chart::XDiagram > mxDiagram;
uno::Reference< beans::XPropertySet > xAxisProp;
bool textBreak = false;
@@ -1262,7 +1262,7 @@ void Chart2ImportTest::testTextBreakXLSX()
void Chart2ImportTest::testNumberFormatsXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "number-formats.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "number-formats.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1311,7 +1311,7 @@ void Chart2ImportTest::testNumberFormatsXLSX()
void Chart2ImportTest::testNumberFormatsDOCX()
{
- load("/chart2/qa/extras/data/docx/", "tdf132174.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf132174.docx");
{
uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1332,7 +1332,7 @@ void Chart2ImportTest::testNumberFormatsDOCX()
CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to false.", !bLinkNumberFormatToSource);
}
- load("/chart2/qa/extras/data/docx/", "tdf136650.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf136650.docx");
{
uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1356,7 +1356,7 @@ void Chart2ImportTest::testNumberFormatsDOCX()
void Chart2ImportTest::testPercentageNumberFormatsDOCX()
{
- load("/chart2/qa/extras/data/docx/", "tdf133632.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf133632.docx");
uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1376,7 +1376,7 @@ void Chart2ImportTest::testPercentageNumberFormatsDOCX()
void Chart2ImportTest::testAutoTitleDelDefaultValue2007XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "autotitledel_2007.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "autotitledel_2007.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1388,7 +1388,7 @@ void Chart2ImportTest::testAutoTitleDelDefaultValue2007XLSX()
void Chart2ImportTest::testAutoTitleDelDefaultValue2013XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "autotitledel_2013.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "autotitledel_2013.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1400,7 +1400,7 @@ void Chart2ImportTest::testAutoTitleDelDefaultValue2013XLSX()
void Chart2ImportTest::testDispBlanksAsDefaultValue2007XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2007.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2007.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1414,7 +1414,7 @@ void Chart2ImportTest::testDispBlanksAsDefaultValue2007XLSX()
void Chart2ImportTest::testDispBlanksAsDefaultValue2013XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2013.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2013.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -1428,7 +1428,7 @@ void Chart2ImportTest::testDispBlanksAsDefaultValue2013XLSX()
void Chart2ImportTest::testSmoothDefaultValue2007XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "smoothed_series2007.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "smoothed_series2007.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1446,7 +1446,7 @@ void Chart2ImportTest::testSmoothDefaultValue2007XLSX()
void Chart2ImportTest::testSmoothDefaultValue2013XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "smoothed_series.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "smoothed_series.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1464,7 +1464,7 @@ void Chart2ImportTest::testSmoothDefaultValue2013XLSX()
void Chart2ImportTest::testTrendlineDefaultValue2007XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "trendline2007.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "trendline2007.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1490,7 +1490,7 @@ void Chart2ImportTest::testTrendlineDefaultValue2007XLSX()
void Chart2ImportTest::testTrendlineDefaultValue2013XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "trendline.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "trendline.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1516,7 +1516,7 @@ void Chart2ImportTest::testTrendlineDefaultValue2013XLSX()
void Chart2ImportTest::testVaryColorDefaultValues2007XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "vary_color2007.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "vary_color2007.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1531,7 +1531,7 @@ void Chart2ImportTest::testVaryColorDefaultValues2007XLSX()
void Chart2ImportTest::testVaryColorDefaultValues2013XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "vary_color.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "vary_color.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1546,7 +1546,7 @@ void Chart2ImportTest::testVaryColorDefaultValues2013XLSX()
void Chart2ImportTest::testPlotVisOnlyDefaultValue2013XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "plotVisOnly.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "plotVisOnly.xlsx");
uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
Reference<beans::XPropertySet> xPropSet(xChart1Doc->getDiagram(), uno::UNO_QUERY_THROW);
uno::Any aAny = xPropSet->getPropertyValue("IncludeHiddenCells");
@@ -1558,7 +1558,7 @@ void Chart2ImportTest::testPlotVisOnlyDefaultValue2013XLSX()
void Chart2ImportTest::testRAngAxDefaultValue2013XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "rAngAx.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "rAngAx.xlsx");
uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW);
Reference<beans::XPropertySet> xPropSet(xChart1Doc->getDiagram(), uno::UNO_QUERY_THROW);
uno::Any aAny = xPropSet->getPropertyValue("RightAngledAxes");
@@ -1570,7 +1570,7 @@ void Chart2ImportTest::testRAngAxDefaultValue2013XLSX()
void Chart2ImportTest::testMajorTickMarksDefaultValue2013XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "majorTickMark.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "majorTickMark.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
Reference<chart2::XAxis> xXAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
@@ -1585,7 +1585,7 @@ void Chart2ImportTest::testMajorTickMarksDefaultValue2013XLSX()
void Chart2ImportTest::testMinorTickMarksDefaultValue2013XLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "minorTickMark.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "minorTickMark.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
Reference<chart2::XAxis> xXAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
@@ -1600,7 +1600,7 @@ void Chart2ImportTest::testMinorTickMarksDefaultValue2013XLSX()
void Chart2ImportTest::testAxisTitleDefaultRotationXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "axis_title_default_rotation.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "axis_title_default_rotation.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
Reference<chart2::XAxis> xYAxis = getAxisFromDoc(xChartDoc, 0, 1, 0);
@@ -1617,7 +1617,7 @@ void Chart2ImportTest::testAxisTitleDefaultRotationXLSX()
void Chart2ImportTest::testSecondaryAxisTitleDefaultRotationXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "secondary_axis_title_default_rotation.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "secondary_axis_title_default_rotation.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
Reference<chart2::XAxis> xYAxis = getAxisFromDoc(xChartDoc, 0, 1, 1);
@@ -1634,7 +1634,7 @@ void Chart2ImportTest::testSecondaryAxisTitleDefaultRotationXLSX()
void Chart2ImportTest::testAxisTitleRotationXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "axis_title_rotated.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "axis_title_rotated.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
{
@@ -1666,7 +1666,7 @@ void Chart2ImportTest::testAxisTitleRotationXLSX()
void Chart2ImportTest::testAxisTitlePositionDOCX()
{
- load("/chart2/qa/extras/data/docx/", "testAxisTitlePosition.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testAxisTitlePosition.docx");
uno::Reference< chart::XDiagram > mxDiagram;
uno::Reference< drawing::XShape > xAxisTitle;
uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromWriter(0);
@@ -1698,7 +1698,7 @@ void Chart2ImportTest::testAxisTitlePositionDOCX()
void Chart2ImportTest::testCombinedChartAttachedAxisXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "testCombinedChartAxis.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testCombinedChartAxis.xlsx");
Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
// First series
Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xChartDoc, 0);
@@ -1723,7 +1723,7 @@ void Chart2ImportTest::testCombinedChartAttachedAxisXLSX()
}
void Chart2ImportTest::testInternalDataProvider() {
- uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromImpress("/chart2/qa/extras/data/odp/", "chart.odp"), uno::UNO_QUERY_THROW);
+ uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromImpress(u"/chart2/qa/extras/data/odp/", "chart.odp"), uno::UNO_QUERY_THROW);
const uno::Reference< chart2::data::XDataProvider >& rxDataProvider = xChartDoc->getDataProvider();
// Parse 42 array
@@ -1769,7 +1769,7 @@ void Chart2ImportTest::testInternalDataProvider() {
void Chart2ImportTest::testTdf90510()
{
- load("/chart2/qa/extras/data/xls/", "piechart_outside.xls");
+ load(u"/chart2/qa/extras/data/xls/", "piechart_outside.xls");
uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW );
Reference<beans::XPropertySet> xPropSet( xChart1Doc->getDiagram()->getDataPointProperties( 0, 0 ), uno::UNO_SET_THROW );
uno::Any aAny = xPropSet->getPropertyValue( "LabelPlacement" );
@@ -1781,7 +1781,7 @@ void Chart2ImportTest::testTdf90510()
void Chart2ImportTest::testTdf109858()
{
- load("/chart2/qa/extras/data/xlsx/", "piechart_outside.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "piechart_outside.xlsx");
uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW );
// test data point labels position
@@ -1801,7 +1801,7 @@ void Chart2ImportTest::testTdf109858()
void Chart2ImportTest::testTdf130105()
{
- load("/chart2/qa/extras/data/xlsx/", "barchart_outend.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "barchart_outend.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -1817,13 +1817,13 @@ void Chart2ImportTest::testTdf130105()
void Chart2ImportTest::testTdf111173()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf111173.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf111173.xlsx");
uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW );
}
void Chart2ImportTest::testTdf122226()
{
- load( "/chart2/qa/extras/data/docx/", "testTdf122226.docx" );
+ load( u"/chart2/qa/extras/data/docx/", "testTdf122226.docx" );
uno::Reference< chart2::XChartDocument > xChartDoc ( getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT( xChartDoc.is() );
@@ -1841,7 +1841,7 @@ void Chart2ImportTest::testTdf122226()
void Chart2ImportTest::testTdf115107()
{
- load("/chart2/qa/extras/data/pptx/", "tdf115107.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf115107.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1932,7 +1932,7 @@ void Chart2ImportTest::testTdf115107()
void Chart2ImportTest::testTdf115107_2()
{
- load("/chart2/qa/extras/data/pptx/", "tdf115107-2.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf115107-2.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1987,7 +1987,7 @@ void Chart2ImportTest::testTdf115107_2()
void Chart2ImportTest::testTdf116163()
{
- load("/chart2/qa/extras/data/pptx/", "tdf116163.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf116163.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2052,7 +2052,7 @@ void Chart2ImportTest::testTdf116163()
void Chart2ImportTest::testTdf48041()
{
- load("/chart2/qa/extras/data/pptx/", "tdf48041.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf48041.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2102,7 +2102,7 @@ void Chart2ImportTest::testTdf48041()
void Chart2ImportTest::testTdf121205()
{
- load("/chart2/qa/extras/data/pptx/", "tdf121205.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf121205.pptx");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
uno::Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW);
@@ -2115,7 +2115,7 @@ void Chart2ImportTest::testTdf121205()
void Chart2ImportTest::testTdf114179()
{
- load( "/chart2/qa/extras/data/docx/", "testTdf114179.docx" );
+ load( u"/chart2/qa/extras/data/docx/", "testTdf114179.docx" );
uno::Reference< chart2::XChartDocument > xChartDoc ( getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT( xChartDoc.is() );
css::uno::Reference<chart2::XDiagram> xDiagram;
@@ -2129,7 +2129,7 @@ void Chart2ImportTest::testTdf114179()
void Chart2ImportTest::testTdf124243()
{
- load("/chart2/qa/extras/data/docx/", "tdf124243.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf124243.docx");
uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -2146,7 +2146,7 @@ void Chart2ImportTest::testTdf124243()
void Chart2ImportTest::testTdf127393()
{
- load("/chart2/qa/extras/data/pptx/", "tdf127393.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf127393.pptx");
// 1st chart
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
@@ -2173,7 +2173,7 @@ void Chart2ImportTest::testTdf127393()
void Chart2ImportTest::testTdf128733()
{
- load("/chart2/qa/extras/data/odt/", "tdf128733.odt");
+ load(u"/chart2/qa/extras/data/odt/", "tdf128733.odt");
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2188,7 +2188,7 @@ void Chart2ImportTest::testTdf128733()
void Chart2ImportTest::testTdf128432()
{
- load("/chart2/qa/extras/data/ods/", "tdf128432.ods");
+ load(u"/chart2/qa/extras/data/ods/", "tdf128432.ods");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2203,7 +2203,7 @@ void Chart2ImportTest::testTdf128432()
void Chart2ImportTest::testTdf128627()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf128627.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf128627.xlsx");
// Test ShiftedCategoryPosition for Radar Chart
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -2218,7 +2218,7 @@ void Chart2ImportTest::testTdf128627()
void Chart2ImportTest::testTdf128634()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf128634.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf128634.xlsx");
// Test ShiftedCategoryPosition for 3D Charts
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -2233,7 +2233,7 @@ void Chart2ImportTest::testTdf128634()
void Chart2ImportTest::testTdf130657()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf130657.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf130657.xlsx");
// Test ShiftedCategoryPosition for charts which is not contain a "crossbetween" OOXML tag.
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -2261,7 +2261,7 @@ void checkDataLabelProperties(const Reference<chart2::XDataSeries>& xDataSeries,
void Chart2ImportTest::testDeletedDataLabel()
{
- load("/chart2/qa/extras/data/xlsx/", "deleted_data_labels.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "deleted_data_labels.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW );
Reference<chart2::XDataSeries> xDataSeries0 = getDataSeriesFromDoc(xChartDoc, 0);
CPPUNIT_ASSERT(xDataSeries0.is());
@@ -2277,7 +2277,7 @@ void Chart2ImportTest::testDeletedDataLabel()
void Chart2ImportTest::testDataPointInheritedColorDOCX()
{
- load( "/chart2/qa/extras/data/docx/", "data_point_inherited_color.docx" );
+ load( u"/chart2/qa/extras/data/docx/", "data_point_inherited_color.docx" );
uno::Reference< chart2::XChartDocument > xChartDoc ( getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT( xChartDoc.is() );
css::uno::Reference<chart2::XDiagram> xDiagram(xChartDoc->getFirstDiagram(), UNO_SET_THROW);
@@ -2291,7 +2291,7 @@ void Chart2ImportTest::testDataPointInheritedColorDOCX()
void Chart2ImportTest::testExternalStrRefsXLSX()
{
- load("/chart2/qa/extras/data/xlsx/", "external_str_ref.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "external_str_ref.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW );
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2304,7 +2304,7 @@ void Chart2ImportTest::testExternalStrRefsXLSX()
void Chart2ImportTest::testSourceNumberFormatComplexCategoriesXLS()
{
- load("/chart2/qa/extras/data/xls/", "source_number_format_axis.xls");
+ load(u"/chart2/qa/extras/data/xls/", "source_number_format_axis.xls");
uno::Reference< chart2::XChartDocument > xChartDoc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW );
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2316,7 +2316,7 @@ void Chart2ImportTest::testSourceNumberFormatComplexCategoriesXLS()
void Chart2ImportTest::testSimpleCategoryAxis()
{
- load("/chart2/qa/extras/data/docx/", "testSimpleCategoryAxis.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testSimpleCategoryAxis.docx");
uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2343,7 +2343,7 @@ void Chart2ImportTest::testSimpleCategoryAxis()
void Chart2ImportTest::testMultilevelCategoryAxis()
{
- load("/chart2/qa/extras/data/docx/", "testMultilevelCategoryAxis.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testMultilevelCategoryAxis.docx");
uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2371,7 +2371,7 @@ void Chart2ImportTest::testMultilevelCategoryAxis()
void Chart2ImportTest::testXaxisValues()
{
- load("/chart2/qa/extras/data/docx/", "tdf124083.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf124083.docx");
uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2387,7 +2387,7 @@ void Chart2ImportTest::testXaxisValues()
void Chart2ImportTest::testTdf123504()
{
- load("/chart2/qa/extras/data/ods/", "pie_chart_100_and_0.ods");
+ load(u"/chart2/qa/extras/data/ods/", "pie_chart_100_and_0.ods");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
UNO_QUERY_THROW);
@@ -2419,7 +2419,7 @@ void Chart2ImportTest::testTdf123504()
void Chart2ImportTest::testTdf122765()
{
// The horizontal position of the slices was wrong.
- load("/chart2/qa/extras/data/pptx/", "tdf122765.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf122765.pptx");
Reference<chart::XChartDocument> xChartDoc = getChartDocFromDrawImpress(0, 0);
Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW);
@@ -2442,7 +2442,7 @@ void Chart2ImportTest::testTdf123206CustomLabelField()
// File contains the deprecated "custom-label-field" attribute of the
// "data-point" element. It should be interpreted and stored as a data point
// property.
- uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromImpress("/chart2/qa/extras/data/odp/", "tdf123206.odp"), uno::UNO_QUERY_THROW);
+ uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromImpress(u"/chart2/qa/extras/data/odp/", "tdf123206.odp"), uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0);
@@ -2457,7 +2457,7 @@ void Chart2ImportTest::testTdf123206CustomLabelField()
void Chart2ImportTest::testTdf125444PercentageCustomLabel()
{
- load("/chart2/qa/extras/data/pptx/", "tdf125444.pptx");
+ load(u"/chart2/qa/extras/data/pptx/", "tdf125444.pptx");
// 1st chart
Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY);
@@ -2477,7 +2477,7 @@ void Chart2ImportTest::testTdf125444PercentageCustomLabel()
void Chart2ImportTest::testDataPointLabelCustomPos()
{
// test CustomLabelPosition on Bar chart
- load("/chart2/qa/extras/data/xlsx/", "testDataPointLabelCustomPos.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testDataPointLabelCustomPos.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -2499,7 +2499,7 @@ void Chart2ImportTest::testDataPointLabelCustomPos()
void Chart2ImportTest::testTdf130032()
{
// test CustomLabelPosition on Line chart
- load("/chart2/qa/extras/data/xlsx/", "testTdf130032.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "testTdf130032.xlsx");
uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -2521,7 +2521,7 @@ void Chart2ImportTest::testTdf130032()
void Chart2ImportTest::testTdf134978()
{
// test CustomLabelPosition on Pie chart
- load("/chart2/qa/extras/data/xlsx/", "tdf134978.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf134978.xlsx");
uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -2539,7 +2539,7 @@ void Chart2ImportTest::testTdf134978()
void Chart2ImportTest::testTdf119138MissingAutoTitleDeleted()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf119138-missing-autotitledeleted.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf119138-missing-autotitledeleted.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
@@ -2550,7 +2550,7 @@ void Chart2ImportTest::testTdf119138MissingAutoTitleDeleted()
void Chart2ImportTest::testStockChartShiftedCategoryPosition()
{
- load("/chart2/qa/extras/data/odt/", "stock_chart_LO_6_2.odt");
+ load(u"/chart2/qa/extras/data/odt/", "stock_chart_LO_6_2.odt");
uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2570,7 +2570,7 @@ void Chart2ImportTest::testTdf133376()
if (!IsDefaultDPI())
return;
- load("/chart2/qa/extras/data/xlsx/", "tdf133376.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf133376.xlsx");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
UNO_QUERY_THROW);
@@ -2589,7 +2589,7 @@ void Chart2ImportTest::testTdf133376()
void Chart2ImportTest::testTdf134225()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf134225.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf134225.xlsx");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
UNO_QUERY_THROW);
@@ -2622,7 +2622,7 @@ void Chart2ImportTest::testTdf136105()
if (!IsDefaultDPI())
return;
- load("/chart2/qa/extras/data/xlsx/", "tdf136105.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf136105.xlsx");
// 1st chart with fix inner position and size
{
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
@@ -2661,7 +2661,7 @@ void Chart2ImportTest::testTdf136105()
void Chart2ImportTest::testTdf91250()
{
- load("/chart2/qa/extras/data/docx/", "tdf91250.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf91250.docx");
uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XInternalDataProvider> xInternalProvider(xChartDoc->getDataProvider(), uno::UNO_QUERY);
@@ -2682,7 +2682,7 @@ void Chart2ImportTest::testTdf91250()
void Chart2ImportTest::testTdf134111()
{
// tdf134111 : To check TextBreak value is true
- load("/chart2/qa/extras/data/docx/", "tdf134111.docx");
+ load(u"/chart2/qa/extras/data/docx/", "tdf134111.docx");
uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromWriter(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
uno::Reference< chart::XDiagram > mxDiagram(xChartDoc->getDiagram());
@@ -2698,7 +2698,7 @@ void Chart2ImportTest::testTdf134111()
void Chart2ImportTest::testTdf136752()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf136752.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf136752.xlsx");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
UNO_QUERY_THROW);
@@ -2717,7 +2717,7 @@ void Chart2ImportTest::testTdf136752()
void Chart2ImportTest::testTdf137505()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf137505.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf137505.xlsx");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
UNO_QUERY_THROW);
@@ -2737,7 +2737,7 @@ void Chart2ImportTest::testTdf137505()
void Chart2ImportTest::testTdf137734()
{
- load("/chart2/qa/extras/data/xlsx/", "tdf137734.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "tdf137734.xlsx");
Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
CPPUNIT_ASSERT(xChartDoc.is());
@@ -2764,7 +2764,7 @@ void Chart2ImportTest::testTdf137734()
void Chart2ImportTest::testTdf137874()
{
- load("/chart2/qa/extras/data/xlsx/", "piechart_legend.xlsx");
+ load(u"/chart2/qa/extras/data/xlsx/", "piechart_legend.xlsx");
Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent),
UNO_QUERY_THROW);
Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
@@ -2778,7 +2778,7 @@ void Chart2ImportTest::testTdf137874()
void Chart2ImportTest::testTdfCustomShapePos()
{
- load("/chart2/qa/extras/data/docx/", "testcustomshapepos.docx");
+ load(u"/chart2/qa/extras/data/docx/", "testcustomshapepos.docx");
Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), UNO_QUERY_THROW);
Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW);
Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW);
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index b696231a6c54..eeebd0ea237a 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -54,6 +54,7 @@
#include <iostream>
#include <memory>
+#include <string_view>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XVisualObject.hpp>
@@ -71,13 +72,13 @@ class ChartTest : public test::BootstrapFixture, public unotest::MacrosTest
{
public:
ChartTest():mbSkipValidation(false) {}
- void load( const OUString& rDir, const OUString& rFileName );
+ void load( std::u16string_view rDir, const OUString& rFileName );
std::shared_ptr<utl::TempFile> save( const OUString& rFileName );
std::shared_ptr<utl::TempFile> reload( const OUString& rFileName );
- uno::Sequence < OUString > getImpressChartColumnDescriptions( const OUString& pDir, const char* pName );
+ uno::Sequence < OUString > getImpressChartColumnDescriptions( std::u16string_view pDir, const char* pName );
OUString getFileExtension( const OUString& rFileName );
- uno::Reference< chart::XChartDocument > getChartDocFromImpress( const OUString& pDir, const char* pName );
+ uno::Reference< chart::XChartDocument > getChartDocFromImpress( std::u16string_view pDir, const char* pName );
uno::Reference<chart::XChartDocument> getChartDocFromDrawImpress( sal_Int32 nPage, sal_Int32 nShape );
@@ -101,7 +102,7 @@ OUString ChartTest::getFileExtension( const OUString& aFileName )
return aFileName.copy(nDotLocation+1); // Skip the dot.
}
-void ChartTest::load( const OUString& aDir, const OUString& aName )
+void ChartTest::load( std::u16string_view aDir, const OUString& aName )
{
OUString extension = getFileExtension(aName);
if (extension == "ods" || extension == "xlsx" || extension == "fods")
@@ -476,7 +477,7 @@ std::vector<uno::Sequence<uno::Any> > getDataSeriesLabelsFromChartType( const Re
return aRet;
}
-uno::Reference< chart::XChartDocument > ChartTest::getChartDocFromImpress( const OUString& pDir, const char* pName )
+uno::Reference< chart::XChartDocument > ChartTest::getChartDocFromImpress( std::u16string_view pDir, const char* pName )
{
mxComponent = loadFromDesktop(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), "com.sun.star.comp.Draw.PresentationDocument");
uno::Reference< drawing::XDrawPagesSupplier > xDoc(mxComponent, uno::UNO_QUERY_THROW );
@@ -538,7 +539,7 @@ uno::Reference<chart::XChartDocument> ChartTest::getChartDocFromWriter( sal_Int3
return xChartDoc;
}
-uno::Sequence < OUString > ChartTest::getImpressChartColumnDescriptions( const OUString& pDir, const char* pName )
+uno::Sequence < OUString > ChartTest::getImpressChartColumnDescriptions( std::u16string_view pDir, const char* pName )
{
uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromImpress( pDir, pName );
uno::Reference< chart::XChartDataArray > xChartData ( xChartDoc->getData(), uno::UNO_QUERY_THROW);
diff --git a/chart2/qa/extras/xshape/chart2xshape.cxx b/chart2/qa/extras/xshape/chart2xshape.cxx
index 3acb981cb78d..70b9a80770b4 100644
--- a/chart2/qa/extras/xshape/chart2xshape.cxx
+++ b/chart2/qa/extras/xshape/chart2xshape.cxx
@@ -43,7 +43,7 @@ public:
CPPUNIT_TEST_SUITE_END();
private:
- void compareAgainstReference(const OUString& rReferenceFile, bool bCreateReference = false);
+ void compareAgainstReference(std::u16string_view rReferenceFile, bool bCreateReference = false);
OUString getXShapeDumpString();
xmlDocUniquePtr getXShapeDumpXmlDoc();
};
@@ -76,13 +76,13 @@ xmlDocUniquePtr Chart2XShapeTest::getXShapeDumpXmlDoc()
return xmlDocUniquePtr(xmlParseDoc(reinterpret_cast<const xmlChar*>(aXmlDump.getStr())));
}
-void Chart2XShapeTest::compareAgainstReference(const OUString& rReferenceFile,
+void Chart2XShapeTest::compareAgainstReference(std::u16string_view rReferenceFile,
bool bCreateReference)
{
OUString aDump = getXShapeDumpString();
- OUString aReference
- = m_directories.getPathFromSrc("/chart2/qa/extras/xshape/data/reference/") + rReferenceFile;
+ OUString aReference = m_directories.getPathFromSrc(u"/chart2/qa/extras/xshape/data/reference/")
+ + rReferenceFile;
if (bCreateReference)
{
OString aOFile = OUStringToOString(aReference, RTL_TEXTENCODING_UTF8);
@@ -120,8 +120,8 @@ void Chart2XShapeTest::testPieChartLabels1()
return;
// inside placement for the best fit case
- load("chart2/qa/extras/xshape/data/xlsx/", "tdf90839-1.xlsx");
- compareAgainstReference("tdf90839-1.xml");
+ load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-1.xlsx");
+ compareAgainstReference(u"tdf90839-1.xml");
}
void Chart2XShapeTest::testPieChartLabels2()
@@ -132,8 +132,8 @@ void Chart2XShapeTest::testPieChartLabels2()
return;
// text wrap: wrap all text labels except one
- load("chart2/qa/extras/xshape/data/xlsx/", "tdf90839-2.xlsx");
- compareAgainstReference("tdf90839-2.xml");
+ load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-2.xlsx");
+ compareAgainstReference(u"tdf90839-2.xml");
}
void Chart2XShapeTest::testPieChartLabels3()
@@ -144,8 +144,8 @@ void Chart2XShapeTest::testPieChartLabels3()
return;
// text wrap: wrap no text label except one
- load("chart2/qa/extras/xshape/data/xlsx/", "tdf90839-3.xlsx");
- compareAgainstReference("tdf90839-3.xml");
+ load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-3.xlsx");
+ compareAgainstReference(u"tdf90839-3.xml");
}
void Chart2XShapeTest::testPieChartLabels4()
@@ -156,8 +156,8 @@ void Chart2XShapeTest::testPieChartLabels4()
return;
// data value and percent value are centered horizontally
- load("chart2/qa/extras/xshape/data/ods/", "tdf90839-4.ods");
- compareAgainstReference("tdf90839-4.xml");
+ load(u"chart2/qa/extras/xshape/data/ods/", "tdf90839-4.ods");
+ compareAgainstReference(u"tdf90839-4.xml");
}
void Chart2XShapeTest::testTdf76649TrendLineBug()
@@ -165,7 +165,7 @@ void Chart2XShapeTest::testTdf76649TrendLineBug()
// This bug prevents that the trendline (regression curve) is drawn
// if the first cell is empty. See tdf#76649 for details.
- load("chart2/qa/extras/xshape/data/ods/", "tdf76649_TrendLineBug.ods");
+ load(u"chart2/qa/extras/xshape/data/ods/", "tdf76649_TrendLineBug.ods");
xmlDocUniquePtr pXmlDoc = getXShapeDumpXmlDoc();
@@ -176,7 +176,7 @@ void Chart2XShapeTest::testTdf76649TrendLineBug()
void Chart2XShapeTest::testTdf88154LabelRotatedLayout()
{
- load("chart2/qa/extras/xshape/data/pptx/", "tdf88154_LabelRotatedLayout.pptx");
+ load(u"chart2/qa/extras/xshape/data/pptx/", "tdf88154_LabelRotatedLayout.pptx");
uno::Reference<chart::XChartDocument> xChartDoc = getChartDocFromDrawImpress(0, 6);
uno::Reference<qa::XDumper> xDumper(xChartDoc, UNO_QUERY_THROW);
OUString rDump = xDumper->dump();
diff --git a/chart2/qa/unit/chart2-dialogs-test.cxx b/chart2/qa/unit/chart2-dialogs-test.cxx
index c37fb1e1bbe2..00bb9179dfdf 100644
--- a/chart2/qa/unit/chart2-dialogs-test.cxx
+++ b/chart2/qa/unit/chart2-dialogs-test.cxx
@@ -51,7 +51,7 @@ VclPtr<VclAbstractDialog> Chart2DialogsTest::createDialogByID(sal_uInt32 /*nID*/
void Chart2DialogsTest::openAnyDialog()
{
/// process input file containing the UXMLDescriptions of the dialogs to dump
- processDialogBatchFile("chart2/qa/unit/data/chart2-dialogs-test.txt");
+ processDialogBatchFile(u"chart2/qa/unit/data/chart2-dialogs-test.txt");
}
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2DialogsTest);
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 55f6f58bd343..6f534305359e 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -18,6 +18,10 @@
*/
#pragma once
+#include <sal/config.h>
+
+#include <string_view>
+
#include "TitleHelper.hxx"
#include "charttoolsdllapi.hxx"
@@ -177,7 +181,7 @@ public:
, const OUString& rSeriesParticle
, const OUString& rDragMethodServiceName = OUString()
, const OUString& rDragParameterString = OUString() );
- static OUString createPointCID( const OUString& rPointCID_Stub, sal_Int32 nIndex );
+ static OUString createPointCID( std::u16string_view rPointCID_Stub, sal_Int32 nIndex );
static OUString createDataCurveCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine );
static OUString createDataCurveEquationCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex );
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index c2979f13f5b3..b5faa312d46b 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -1124,7 +1124,7 @@ OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType
, rDragMethodServiceName, rDragParameterString );
}
-OUString ObjectIdentifier::createPointCID( const OUString& rPointCID_Stub, sal_Int32 nIndex )
+OUString ObjectIdentifier::createPointCID( std::u16string_view rPointCID_Stub, sal_Int32 nIndex )
{
return rPointCID_Stub + OUString::number( nIndex );
}