diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-06 18:28:51 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-07 08:46:21 +0200 |
| commit | 1de066d04f73a0e901e875597b8244a3ecdf624c (patch) | |
| tree | 4a69bed8e8d1dd22e9a317f8718940c459373474 /chart2 | |
| parent | 4d97239b7a92c8dc1c1ee9a6474768ed1e744ef5 (diff) | |
loplugin:ostr in chart2
Change-Id: I2985b6793a776639214a25bf9732c000b9026bfc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167236
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Diffstat (limited to 'chart2')
241 files changed, 3867 insertions, 3850 deletions
diff --git a/chart2/qa/extras/PivotChartTest.cxx b/chart2/qa/extras/PivotChartTest.cxx index d6a87ec057a9..fe1ae4437cd9 100644 --- a/chart2/qa/extras/PivotChartTest.cxx +++ b/chart2/qa/extras/PivotChartTest.cxx @@ -35,7 +35,7 @@ class PivotChartTest : public ChartTest { public: PivotChartTest() - : ChartTest("/chart2/qa/extras/data/") + : ChartTest(u"/chart2/qa/extras/data/"_ustr) {} void testRoundtrip(); @@ -72,7 +72,7 @@ void lclModifyOrientation(uno::Reference<sheet::XDataPilotDescriptor> const & xD OUString aName = xNamed->getName(); uno::Reference<beans::XPropertySet> xPropSet(xNamed, UNO_QUERY_THROW); if (aName == sFieldName) - xPropSet->setPropertyValue("Orientation", uno::Any(eOrientation)); + xPropSet->setPropertyValue(u"Orientation"_ustr, uno::Any(eOrientation)); } } @@ -88,7 +88,7 @@ void lclModifyFunction(uno::Reference<sheet::XDataPilotDescriptor> const & xDesc OUString aName = xNamed->getName(); uno::Reference<beans::XPropertySet> xPropSet(xNamed, UNO_QUERY_THROW); if (aName == sFieldName) - xPropSet->setPropertyValue("Function", uno::Any(eFunction)); + xPropSet->setPropertyValue(u"Function"_ustr, uno::Any(eFunction)); } } @@ -107,7 +107,7 @@ void lclModifyLayoutInfo(uno::Reference<sheet::XDataPilotDescriptor> const & xDe { uno::Any aValue; aValue <<= aLayoutInfo; - xPropSet->setPropertyValue("LayoutInfo", aValue); + xPropSet->setPropertyValue(u"LayoutInfo"_ustr, aValue); } } } @@ -127,7 +127,7 @@ void lclModifySubtotals(uno::Reference<sheet::XDataPilotDescriptor> const & xDes { uno::Any aValue; aValue <<= rSubtotalFunctions; - xPropSet->setPropertyValue("Subtotals", aValue); + xPropSet->setPropertyValue(u"Subtotals"_ustr, aValue); } } } @@ -135,13 +135,13 @@ void lclModifySubtotals(uno::Reference<sheet::XDataPilotDescriptor> const & xDes void lclModifyColumnGrandTotal(uno::Reference<sheet::XDataPilotDescriptor> const & xDataPilotDescriptor, bool bTotal) { uno::Reference<beans::XPropertySet> xProperties(xDataPilotDescriptor, uno::UNO_QUERY_THROW); - xProperties->setPropertyValue("ColumnGrand", uno::Any(bTotal)); + xProperties->setPropertyValue(u"ColumnGrand"_ustr, uno::Any(bTotal)); } void lclModifyRowGrandTotal(uno::Reference<sheet::XDataPilotDescriptor> const & xDataPilotDescriptor, bool bTotal) { uno::Reference<beans::XPropertySet> xProperties(xDataPilotDescriptor, uno::UNO_QUERY_THROW); - xProperties->setPropertyValue("RowGrand", uno::Any(bTotal)); + xProperties->setPropertyValue(u"RowGrand"_ustr, uno::Any(bTotal)); } void lclCheckSequence(std::vector<double> const & reference, @@ -192,7 +192,7 @@ uno::Sequence<uno::Reference<chart2::data::XLabeledDataSequence>> lclGetCategories(Reference<chart2::XChartDocument> const & xChartDoc) { uno::Sequence<beans::PropertyValue> aArguments( comphelper::InitPropertySequence( - {{"CellRangeRepresentation", uno::Any(OUString("PT@categories"))}} )); + {{"CellRangeRepresentation", uno::Any(u"PT@categories"_ustr)}} )); uno::Reference<chart2::data::XDataProvider> xDataProvider(xChartDoc->getDataProvider(), uno::UNO_SET_THROW); return xDataProvider->createDataSource(aArguments)->getDataSequences(); @@ -234,22 +234,22 @@ table::CellRangeAddress lclCreateTestData(uno::Reference<sheet::XSpreadsheetDocu CPPUNIT_ASSERT_MESSAGE("no calc document!", xSheetDoc.is()); std::vector<OUString> aHeaders { - "Country", "City", "Type", "Sales T1", "Sales T2", "Sales T3", "Sales T4", "Date" + u"Country"_ustr, u"City"_ustr, u"Type"_ustr, u"Sales T1"_ustr, u"Sales T2"_ustr, u"Sales T3"_ustr, u"Sales T4"_ustr, u"Date"_ustr }; std::vector<std::vector<Value>> aData { - { {"FR"}, {"Paris"}, {"A"}, {123.0}, {223.0}, {323.0}, {423.0}, {"12/14/15"} }, - { {"EN"}, {"London"}, {"A"}, {456.0}, {556.0}, {656.0}, {756.0}, {"12/11/15"} }, - { {"DE"}, {"Berlin"}, {"A"}, {468.0}, {568.0}, {668.0}, {768.0}, {"12/11/15"} }, - { {"FR"}, {"Nantes"}, {"A"}, {694.0}, {794.0}, {894.0}, {994.0}, {"12/11/15"} }, - { {"EN"}, {"Glasgow"}, {"A"}, {298.0}, {398.0}, {498.0}, {598.0}, {"12/11/15"} }, - { {"DE"}, {"Munich"}, {"A"}, {369.0}, {469.0}, {569.0}, {669.0}, {"12/11/15"} }, - { {"FR"}, {"Paris"}, {"B"}, {645.0}, {745.0}, {845.0}, {945.0}, {"12/11/15"} }, - { {"EN"}, {"London"}, {"B"}, {687.0}, {787.0}, {887.0}, {987.0}, {"03/21/17"} }, - { {"DE"}, {"Munich"}, {"B"}, {253.0}, {353.0}, {453.0}, {553.0}, {"12/17/15"} }, - { {"FR"}, {"Nantes"}, {"B"}, {474.0}, {574.0}, {674.0}, {774.0}, {"01/20/16"} }, - { {"EN"}, {"Liverpool"}, {"B"}, {562.0}, {662.0}, {762.0}, {862.0}, {"01/20/16"} }, - { {"DE"}, {"Berlin"}, {"B"}, {648.0}, {748.0}, {848.0}, {948.0}, {"01/20/16"} } + { {u"FR"_ustr}, {u"Paris"_ustr}, {u"A"_ustr}, {123.0}, {223.0}, {323.0}, {423.0}, {u"12/14/15"_ustr} }, + { {u"EN"_ustr}, {u"London"_ustr}, {u"A"_ustr}, {456.0}, {556.0}, {656.0}, {756.0}, {u"12/11/15"_ustr} }, + { {u"DE"_ustr}, {u"Berlin"_ustr}, {u"A"_ustr}, {468.0}, {568.0}, {668.0}, {768.0}, {u"12/11/15"_ustr} }, + { {u"FR"_ustr}, {u"Nantes"_ustr}, {u"A"_ustr}, {694.0}, {794.0}, {894.0}, {994.0}, {u"12/11/15"_ustr} }, + { {u"EN"_ustr}, {u"Glasgow"_ustr}, {u"A"_ustr}, {298.0}, {398.0}, {498.0}, {598.0}, {u"12/11/15"_ustr} }, + { {u"DE"_ustr}, {u"Munich"_ustr}, {u"A"_ustr}, {369.0}, {469.0}, {569.0}, {669.0}, {u"12/11/15"_ustr} }, + { {u"FR"_ustr}, {u"Paris"_ustr}, {u"B"_ustr}, {645.0}, {745.0}, {845.0}, {945.0}, {u"12/11/15"_ustr} }, + { {u"EN"_ustr}, {u"London"_ustr}, {u"B"_ustr}, {687.0}, {787.0}, {887.0}, {987.0}, {u"03/21/17"_ustr} }, + { {u"DE"_ustr}, {u"Munich"_ustr}, {u"B"_ustr}, {253.0}, {353.0}, {453.0}, {553.0}, {u"12/17/15"_ustr} }, + { {u"FR"_ustr}, {u"Nantes"_ustr}, {u"B"_ustr}, {474.0}, {574.0}, {674.0}, {774.0}, {u"01/20/16"_ustr} }, + { {u"EN"_ustr}, {u"Liverpool"_ustr}, {u"B"_ustr}, {562.0}, {662.0}, {762.0}, {862.0}, {u"01/20/16"_ustr} }, + { {u"DE"_ustr}, {u"Berlin"_ustr}, {u"B"_ustr}, {648.0}, {748.0}, {848.0}, {948.0}, {u"01/20/16"_ustr} } }; // Getting spreadsheet @@ -259,7 +259,7 @@ table::CellRangeAddress lclCreateTestData(uno::Reference<sheet::XSpreadsheetDocu CPPUNIT_ASSERT(oIndexAccess->getByIndex(0) >>= xSheet); uno::Reference<sheet::XSpreadsheet> oPivotTableSheet; - xSpreadsheets->insertNewByName("Pivot Table", 1); + xSpreadsheets->insertNewByName(u"Pivot Table"_ustr, 1); CPPUNIT_ASSERT(oIndexAccess->getByIndex(1) >>= oPivotTableSheet); sal_Int32 currentRow = 0; @@ -294,7 +294,7 @@ table::CellRangeAddress lclCreateTestData(uno::Reference<sheet::XSpreadsheetDocu sal_Int32 nDateKey = xNumberFormatTypes->getStandardFormat(util::NumberFormat::DATE, aLocale); uno::Reference<table::XCellRange> xCellRange = xSheet->getCellRangeByPosition(nEndCol, 1, nEndCol, nEndRow); uno::Reference<beans::XPropertySet> xCellProp(xCellRange, UNO_QUERY_THROW); - xCellProp->setPropertyValue("NumberFormat", uno::Any(nDateKey)); + xCellProp->setPropertyValue(u"NumberFormat"_ustr, uno::Any(nDateKey)); table::CellRangeAddress sCellRangeAddress; sCellRangeAddress.Sheet = 0; @@ -328,17 +328,17 @@ void PivotChartTest::testRoundtrip() { xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference1, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Exp."), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"Exp."_ustr, lclGetLabel(xChartDoc, 0)); } { xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 1)->getData(); lclCheckSequence(aReference2, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Rev."), lclGetLabel(xChartDoc, 1)); + CPPUNIT_ASSERT_EQUAL(u"Rev."_ustr, lclGetLabel(xChartDoc, 1)); } // Modify the pivot table { - uno::Reference<sheet::XDataPilotTable> xDataPilotTable = lclGetPivotTableByName(1, "DataPilot1", mxComponent); + uno::Reference<sheet::XDataPilotTable> xDataPilotTable = lclGetPivotTableByName(1, u"DataPilot1"_ustr, mxComponent); uno::Reference<sheet::XDataPilotDescriptor> xDataPilotDescriptor(xDataPilotTable, UNO_QUERY_THROW); lclModifyOrientation(xDataPilotDescriptor, u"Exp.", sheet::DataPilotFieldOrientation_HIDDEN); } @@ -349,10 +349,10 @@ void PivotChartTest::testRoundtrip() { xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference2, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, lclGetLabel(xChartDoc, 0)); } - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); xChartDoc = getPivotChartDocFromSheet(1, mxComponent); CPPUNIT_ASSERT(xChartDoc.is()); @@ -363,7 +363,7 @@ void PivotChartTest::testRoundtrip() { xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference2, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, lclGetLabel(xChartDoc, 0)); } } @@ -375,7 +375,7 @@ void PivotChartTest::testChangePivotTable() loadFromFile(u"ods/PivotTableExample.ods"); // Check we have the Pivot Table - OUString sPivotTableName("DataPilot1"); + OUString sPivotTableName(u"DataPilot1"_ustr); uno::Reference<sheet::XDataPilotTable> xDataPilotTable = lclGetPivotTableByName(1, sPivotTableName, mxComponent); CPPUNIT_ASSERT(xDataPilotTable.is()); @@ -385,7 +385,7 @@ void PivotChartTest::testChangePivotTable() CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); // Create a new pivot chart - xTablePivotCharts->addNewByName("Chart", awt::Rectangle{0, 0, 9000, 9000}, sPivotTableName); + xTablePivotCharts->addNewByName(u"Chart"_ustr, awt::Rectangle{0, 0, 9000, 9000}, sPivotTableName); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); // Get the pivot chart document so we can access its data @@ -402,7 +402,7 @@ void PivotChartTest::testChangePivotTable() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Exp."), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"Exp."_ustr, lclGetLabel(xChartDoc, 0)); } // Check second data series @@ -412,7 +412,7 @@ void PivotChartTest::testChangePivotTable() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 1)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Rev."), lclGetLabel(xChartDoc, 1)); + CPPUNIT_ASSERT_EQUAL(u"Rev."_ustr, lclGetLabel(xChartDoc, 1)); } // Modify the pivot table, move "Group Segment" to Column fields, @@ -436,7 +436,7 @@ void PivotChartTest::testChangePivotTable() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Big"), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"Big"_ustr, lclGetLabel(xChartDoc, 0)); } // Check the second data series @@ -446,7 +446,7 @@ void PivotChartTest::testChangePivotTable() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 1)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Medium"), lclGetLabel(xChartDoc, 1)); + CPPUNIT_ASSERT_EQUAL(u"Medium"_ustr, lclGetLabel(xChartDoc, 1)); } // Check the third data series @@ -456,7 +456,7 @@ void PivotChartTest::testChangePivotTable() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 2)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Small"), lclGetLabel(xChartDoc, 2)); + CPPUNIT_ASSERT_EQUAL(u"Small"_ustr, lclGetLabel(xChartDoc, 2)); } // Remove "Service Month" so row fields are empty - check we handle empty rows @@ -474,27 +474,27 @@ void PivotChartTest::testChangePivotTable() std::vector<double> aReference { 10162.033139 }; xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Big"), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"Big"_ustr, lclGetLabel(xChartDoc, 0)); } // Check the second data series { std::vector<double> aReference { 16614.523063 }; xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 1)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Medium"), lclGetLabel(xChartDoc, 1)); + CPPUNIT_ASSERT_EQUAL(u"Medium"_ustr, lclGetLabel(xChartDoc, 1)); } // Check the third data series { std::vector<double> aReference { 27944.146101 }; xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 2)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Small"), lclGetLabel(xChartDoc, 2)); + CPPUNIT_ASSERT_EQUAL(u"Small"_ustr, lclGetLabel(xChartDoc, 2)); } // Enable column totals and check the data is still unchanged { uno::Reference<beans::XPropertySet> xProperties(xDataPilotTable, uno::UNO_QUERY_THROW); - xProperties->setPropertyValue("ColumnGrand", uno::Any(true)); + xProperties->setPropertyValue(u"ColumnGrand"_ustr, uno::Any(true)); } CPPUNIT_ASSERT_EQUAL(sal_Int32(3), getNumberOfDataSeries(xChartDoc)); @@ -504,21 +504,21 @@ void PivotChartTest::testChangePivotTable() std::vector<double> aReference { 10162.033139 }; xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Big"), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"Big"_ustr, lclGetLabel(xChartDoc, 0)); } // Check the second data series { std::vector<double> aReference { 16614.523063 }; xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 1)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Medium"), lclGetLabel(xChartDoc, 1)); + CPPUNIT_ASSERT_EQUAL(u"Medium"_ustr, lclGetLabel(xChartDoc, 1)); } // Check the third data series { std::vector<double> aReference { 27944.146101 }; xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 2)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Small"), lclGetLabel(xChartDoc, 2)); + CPPUNIT_ASSERT_EQUAL(u"Small"_ustr, lclGetLabel(xChartDoc, 2)); } } @@ -529,11 +529,11 @@ void PivotChartTest::testPivotChartWithOneColumnField() // SETUP DATA and PIVOT TABLE - mxComponent = loadFromDesktop("private:factory/scalc"); + mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr); uno::Reference<sheet::XSpreadsheetDocument> xSheetDoc(mxComponent, uno::UNO_QUERY_THROW); - OUString sPivotTableName("DataPilotTable"); + OUString sPivotTableName(u"DataPilotTable"_ustr); table::CellRangeAddress sCellRangeAddress = lclCreateTestData(xSheetDoc); @@ -564,7 +564,7 @@ void PivotChartTest::testPivotChartWithOneColumnField() CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); // Create a new pivot chart - xTablePivotCharts->addNewByName("PivotChart", awt::Rectangle{ 9000, 9000, 21000, 18000 }, sPivotTableName); + xTablePivotCharts->addNewByName(u"PivotChart"_ustr, awt::Rectangle{ 9000, 9000, 21000, 18000 }, sPivotTableName); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); // Get the pivot chart document so we can access its data @@ -580,7 +580,7 @@ void PivotChartTest::testPivotChartWithOneColumnField() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("DE"), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"DE"_ustr, lclGetLabel(xChartDoc, 0)); } // Check data series 2 @@ -590,7 +590,7 @@ void PivotChartTest::testPivotChartWithOneColumnField() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 1)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("EN"), lclGetLabel(xChartDoc, 1)); + CPPUNIT_ASSERT_EQUAL(u"EN"_ustr, lclGetLabel(xChartDoc, 1)); } // Check data series 3 { @@ -599,7 +599,7 @@ void PivotChartTest::testPivotChartWithOneColumnField() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 2)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("FR"), lclGetLabel(xChartDoc, 2)); + CPPUNIT_ASSERT_EQUAL(u"FR"_ustr, lclGetLabel(xChartDoc, 2)); } } @@ -610,11 +610,11 @@ void PivotChartTest::testPivotChartWithOneRowField() // SETUP DATA and PIVOT TABLE - mxComponent = loadFromDesktop("private:factory/scalc"); + mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr); uno::Reference<sheet::XSpreadsheetDocument> xSheetDoc(mxComponent, uno::UNO_QUERY_THROW); - OUString sPivotTableName("DataPilotTable"); + OUString sPivotTableName(u"DataPilotTable"_ustr); table::CellRangeAddress sCellRangeAddress = lclCreateTestData(xSheetDoc); @@ -645,7 +645,7 @@ void PivotChartTest::testPivotChartWithOneRowField() CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); // Create a new pivot chart - xTablePivotCharts->addNewByName("PivotChart", awt::Rectangle{ 9000, 9000, 21000, 18000 }, sPivotTableName); + xTablePivotCharts->addNewByName(u"PivotChart"_ustr, awt::Rectangle{ 9000, 9000, 21000, 18000 }, sPivotTableName); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); // Get the pivot chart document so we can access its data @@ -661,7 +661,7 @@ void PivotChartTest::testPivotChartWithOneRowField() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, lclGetLabel(xChartDoc, 0)); } } @@ -669,11 +669,11 @@ void PivotChartTest::testPivotTableDataProvider_PivotTableFields() { // SETUP DATA and PIVOT TABLE - mxComponent = loadFromDesktop("private:factory/scalc"); + mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr); uno::Reference<sheet::XSpreadsheetDocument> xSheetDoc(mxComponent, uno::UNO_QUERY_THROW); - OUString sPivotTableName("DataPilotTable"); + OUString sPivotTableName(u"DataPilotTable"_ustr); table::CellRangeAddress sCellRangeAddress = lclCreateTestData(xSheetDoc); @@ -711,7 +711,7 @@ void PivotChartTest::testPivotTableDataProvider_PivotTableFields() CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); // Create a new pivot chart - xTablePivotCharts->addNewByName("PivotChart", awt::Rectangle{ 9000, 9000, 21000, 18000 }, sPivotTableName); + xTablePivotCharts->addNewByName(u"PivotChart"_ustr, awt::Rectangle{ 9000, 9000, 21000, 18000 }, sPivotTableName); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); // Get the pivot chart document so we can access its data @@ -725,20 +725,20 @@ void PivotChartTest::testPivotTableDataProvider_PivotTableFields() aFieldEntries = xPivotTableDataProvider->getColumnFields(); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aFieldEntries.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("Country"), aFieldEntries[0].Name); - CPPUNIT_ASSERT_EQUAL(OUString("Type"), aFieldEntries[1].Name); + CPPUNIT_ASSERT_EQUAL(u"Country"_ustr, aFieldEntries[0].Name); + CPPUNIT_ASSERT_EQUAL(u"Type"_ustr, aFieldEntries[1].Name); aFieldEntries = xPivotTableDataProvider->getRowFields(); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aFieldEntries.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("City"), aFieldEntries[0].Name); - CPPUNIT_ASSERT_EQUAL(OUString("Data"), aFieldEntries[1].Name); + CPPUNIT_ASSERT_EQUAL(u"City"_ustr, aFieldEntries[0].Name); + CPPUNIT_ASSERT_EQUAL(u"Data"_ustr, aFieldEntries[1].Name); aFieldEntries = xPivotTableDataProvider->getDataFields(); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aFieldEntries.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("Sum - Sales T1"), aFieldEntries[0].Name); - CPPUNIT_ASSERT_EQUAL(OUString("Sum - Sales T2"), aFieldEntries[1].Name); + CPPUNIT_ASSERT_EQUAL(u"Sum - Sales T1"_ustr, aFieldEntries[0].Name); + CPPUNIT_ASSERT_EQUAL(u"Sum - Sales T2"_ustr, aFieldEntries[1].Name); // Data to column fields lclModifyOrientation(xDataPilotDescriptor, u"Data", sheet::DataPilotFieldOrientation_COLUMN); @@ -756,31 +756,31 @@ void PivotChartTest::testPivotTableDataProvider_PivotTableFields() aFieldEntries = xPivotTableDataProvider->getColumnFields(); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aFieldEntries.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("Data"), aFieldEntries[0].Name); - CPPUNIT_ASSERT_EQUAL(OUString("Type"), aFieldEntries[1].Name); - CPPUNIT_ASSERT_EQUAL(OUString("Country"), aFieldEntries[2].Name); + CPPUNIT_ASSERT_EQUAL(u"Data"_ustr, aFieldEntries[0].Name); + CPPUNIT_ASSERT_EQUAL(u"Type"_ustr, aFieldEntries[1].Name); + CPPUNIT_ASSERT_EQUAL(u"Country"_ustr, aFieldEntries[2].Name); aFieldEntries = xPivotTableDataProvider->getRowFields(); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), aFieldEntries.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("City"), aFieldEntries[0].Name); + CPPUNIT_ASSERT_EQUAL(u"City"_ustr, aFieldEntries[0].Name); aFieldEntries = xPivotTableDataProvider->getDataFields(); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aFieldEntries.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("Sum - Sales T1"), aFieldEntries[0].Name); - CPPUNIT_ASSERT_EQUAL(OUString("Sum - Sales T2"), aFieldEntries[1].Name); + CPPUNIT_ASSERT_EQUAL(u"Sum - Sales T1"_ustr, aFieldEntries[0].Name); + CPPUNIT_ASSERT_EQUAL(u"Sum - Sales T2"_ustr, aFieldEntries[1].Name); } void PivotChartTest::testPivotChartRowFieldInOutlineMode() { // SETUP DATA and PIVOT TABLE - mxComponent = loadFromDesktop("private:factory/scalc"); + mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr); uno::Reference<sheet::XSpreadsheetDocument> xSheetDoc(mxComponent, uno::UNO_QUERY_THROW); - OUString sPivotTableName("DataPilotTable"); + OUString sPivotTableName(u"DataPilotTable"_ustr); table::CellRangeAddress sCellRangeAddress = lclCreateTestData(xSheetDoc); @@ -812,7 +812,7 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode() CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); // Create a new pivot chart - xTablePivotCharts->addNewByName("PivotChart", awt::Rectangle{ 9000, 9000, 21000, 18000 }, sPivotTableName); + xTablePivotCharts->addNewByName(u"PivotChart"_ustr, awt::Rectangle{ 9000, 9000, 21000, 18000 }, sPivotTableName); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); // Get the pivot chart document so we can access its data @@ -830,13 +830,13 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, lclGetLabel(xChartDoc, 0)); } // Check the categories { - lclCheckCategories({ "DE", "", "EN", "", "", "FR", ""}, + lclCheckCategories({ u"DE"_ustr, u""_ustr, u"EN"_ustr, u""_ustr, u""_ustr, u"FR"_ustr, u""_ustr}, lclGetCategories(xChartDoc)[0]->getValues()); - lclCheckCategories({ "Berlin", "Munich", "Glasgow", "Liverpool", "London", "Nantes", "Paris"}, + lclCheckCategories({ u"Berlin"_ustr, u"Munich"_ustr, u"Glasgow"_ustr, u"Liverpool"_ustr, u"London"_ustr, u"Nantes"_ustr, u"Paris"_ustr}, lclGetCategories(xChartDoc)[1]->getValues()); } @@ -861,13 +861,13 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, lclGetLabel(xChartDoc, 0)); } // Check categories { - lclCheckCategories({ "DE", "", "EN", "", "", "FR", ""}, + lclCheckCategories({ u"DE"_ustr, u""_ustr, u"EN"_ustr, u""_ustr, u""_ustr, u"FR"_ustr, u""_ustr}, lclGetCategories(xChartDoc)[0]->getValues()); - lclCheckCategories({ "Berlin", "Munich", "Glasgow", "Liverpool", "London", "Nantes", "Paris"}, + lclCheckCategories({ u"Berlin"_ustr, u"Munich"_ustr, u"Glasgow"_ustr, u"Liverpool"_ustr, u"London"_ustr, u"Nantes"_ustr, u"Paris"_ustr}, lclGetCategories(xChartDoc)[1]->getValues()); } @@ -890,13 +890,13 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, lclGetLabel(xChartDoc, 0)); } // Check categories { - lclCheckCategories({ "DE", "", "EN", "", "", "FR", ""}, + lclCheckCategories({ u"DE"_ustr, u""_ustr, u"EN"_ustr, u""_ustr, u""_ustr, u"FR"_ustr, u""_ustr}, lclGetCategories(xChartDoc)[0]->getValues()); - lclCheckCategories({ "Berlin", "Munich", "Glasgow", "Liverpool", "London", "Nantes", "Paris"}, + lclCheckCategories({ u"Berlin"_ustr, u"Munich"_ustr, u"Glasgow"_ustr, u"Liverpool"_ustr, u"London"_ustr, u"Nantes"_ustr, u"Paris"_ustr}, lclGetCategories(xChartDoc)[1]->getValues()); } } @@ -905,11 +905,11 @@ void PivotChartTest::testPivotChartWithDateRowField() { // SETUP DATA and PIVOT TABLE - mxComponent = loadFromDesktop("private:factory/scalc"); + mxComponent = loadFromDesktop(u"private:factory/scalc"_ustr); uno::Reference<sheet::XSpreadsheetDocument> xSheetDoc(mxComponent, uno::UNO_QUERY_THROW); - OUString sPivotTableName("DataPilotTable"); + OUString sPivotTableName(u"DataPilotTable"_ustr); table::CellRangeAddress sCellRangeAddress = lclCreateTestData(xSheetDoc); @@ -946,7 +946,7 @@ void PivotChartTest::testPivotChartWithDateRowField() CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndexAccess->getCount()); // Create a new pivot chart - xTablePivotCharts->addNewByName("PivotChart", awt::Rectangle{ 9000, 9000, 21000, 18000 }, sPivotTableName); + xTablePivotCharts->addNewByName(u"PivotChart"_ustr, awt::Rectangle{ 9000, 9000, 21000, 18000 }, sPivotTableName); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); // Get the pivot chart document so we can access its data @@ -955,7 +955,7 @@ void PivotChartTest::testPivotChartWithDateRowField() CPPUNIT_ASSERT(xChartDoc.is()); // Check if Date category is date formatted. - lclCheckCategories( { "12/11/15", "", "", "", "", "", "12/14/15", "12/17/15", "01/20/16", "", "", "03/21/17" }, + lclCheckCategories( { u"12/11/15"_ustr, u""_ustr, u""_ustr, u""_ustr, u""_ustr, u""_ustr, u"12/14/15"_ustr, u"12/17/15"_ustr, u"01/20/16"_ustr, u""_ustr, u""_ustr, u"03/21/17"_ustr }, lclGetCategories( xChartDoc )[0]->getValues() ); } diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx b/chart2/qa/extras/chart2_trendcalculators.cxx index 8639015d6299..60e3dad4e446 100644 --- a/chart2/qa/extras/chart2_trendcalculators.cxx +++ b/chart2/qa/extras/chart2_trendcalculators.cxx @@ -25,7 +25,7 @@ class Chart2TrendCalculators : public ChartTest { public: Chart2TrendCalculators() - : ChartTest("/chart2/qa/extras/data/") + : ChartTest(u"/chart2/qa/extras/data/"_ustr) {} void setUp() override; @@ -117,7 +117,7 @@ void Chart2TrendCalculators::testPotentialRegression1() pxValues[i] = d; pyValues[i] = 2.0 * pow ( d, 3 ); } - checkCalculator( xValues, yValues, "f(x) = 2 x^3"); + checkCalculator( xValues, yValues, u"f(x) = 2 x^3"_ustr); } // test y = A x ^ B @@ -189,7 +189,7 @@ void Chart2TrendCalculators::testExponentialRegression1() pxValues[i] = d; pyValues[i] = 2.0 * exp ( 0.3 * d ); } - checkCalculator( xValues, yValues, "f(x) = 2 exp( 0.3 x )"); + checkCalculator( xValues, yValues, u"f(x) = 2 exp( 0.3 x )"_ustr); } void Chart2TrendCalculators::testExponentialRegression2() diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx index f8cf7ad2d1bd..07d55b30b272 100644 --- a/chart2/qa/extras/chart2dump/chart2dump.cxx +++ b/chart2/qa/extras/chart2dump/chart2dump.cxx @@ -88,7 +88,7 @@ class Chart2DumpTest : public ChartTest { protected: Chart2DumpTest(bool bDumpMode) - : ChartTest("/chart2/qa/extras/chart2dump/data/") + : ChartTest(u"/chart2/qa/extras/chart2dump/data/"_ustr) { m_bDumpMode = bDumpMode; } @@ -262,8 +262,8 @@ DECLARE_DUMP_TEST(ChartDataTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "simple_chart.ods", - "multiple_categories.ods" + u"simple_chart.ods"_ustr, + u"multiple_categories.ods"_ustr }; for (const OUString& aTestFile : aTestFiles) @@ -369,14 +369,14 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "legend_on_right_side.odp", - "legend_on_bottom.odp", - "legend_on_left_side.odp", - "legend_on_top.odp", - "many_legend_entries.odp", - "custom_legend_position.odp", - "multiple_categories.odp", - "minimal_legend_test.odp" + u"legend_on_right_side.odp"_ustr, + u"legend_on_bottom.odp"_ustr, + u"legend_on_left_side.odp"_ustr, + u"legend_on_top.odp"_ustr, + u"many_legend_entries.odp"_ustr, + u"custom_legend_position.odp"_ustr, + u"multiple_categories.odp"_ustr, + u"minimal_legend_test.odp"_ustr }; for (const OUString& aTestFile : aTestFiles) @@ -390,7 +390,7 @@ DECLARE_DUMP_TEST(LegendTest, Chart2DumpTest, false) CPPUNIT_ASSERT(xShapes.is()); // Get legend shape - uno::Reference<drawing::XShape> xLegend = getShapeByName(xShapes, "CID/D=0:Legend="); + uno::Reference<drawing::XShape> xLegend = getShapeByName(xShapes, u"CID/D=0:Legend="_ustr); CPPUNIT_ASSERT(xLegend.is()); /* Check legend position and size @@ -467,10 +467,10 @@ DECLARE_DUMP_TEST(GridTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "vertical_grid.ods", - "horizontal_grid.ods", - "minor_grid.ods", - "formated_grid_line.ods" + u"vertical_grid.ods"_ustr, + u"horizontal_grid.ods"_ustr, + u"minor_grid.ods"_ustr, + u"formated_grid_line.ods"_ustr }; for (const OUString& sTestFile : aTestFiles) @@ -485,10 +485,10 @@ DECLARE_DUMP_TEST(GridTest, Chart2DumpTest, false) const std::vector<OUString> aGridShapeNames = { - "CID/D=0:CS=0:Axis=1,0:Grid=0", // Major vertical grid - "CID/D=0:CS=0:Axis=0,0:Grid=0", // Major horizontal grid - "CID/D=0:CS=0:Axis=1,0:Grid=0:SubGrid=0", // Minor vertical grid - "CID/D=0:CS=0:Axis=0,0:Grid=0:SubGrid=0" // Minor horizontal grid + u"CID/D=0:CS=0:Axis=1,0:Grid=0"_ustr, // Major vertical grid + u"CID/D=0:CS=0:Axis=0,0:Grid=0"_ustr, // Major horizontal grid + u"CID/D=0:CS=0:Axis=1,0:Grid=0:SubGrid=0"_ustr, // Minor vertical grid + u"CID/D=0:CS=0:Axis=0,0:Grid=0:SubGrid=0"_ustr // Minor horizontal grid }; for (const OUString& sGridShapeName : aGridShapeNames) @@ -508,7 +508,7 @@ DECLARE_DUMP_TEST(GridTest, Chart2DumpTest, false) // Check transformation Reference< beans::XPropertySet > xPropSet(xGrid, UNO_QUERY_THROW); drawing::HomogenMatrix3 aGridTransformation; - xPropSet->getPropertyValue("Transformation") >>= aGridTransformation; + xPropSet->getPropertyValue(u"Transformation"_ustr) >>= aGridTransformation; CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aGridTransformation, INT_EPS); // Check line properties @@ -517,18 +517,18 @@ DECLARE_DUMP_TEST(GridTest, Chart2DumpTest, false) Reference< beans::XPropertySet > xGridLinePropSet(xGridLine, UNO_QUERY_THROW); // Line type drawing::LineDash aLineDash; - xGridLinePropSet->getPropertyValue("LineDash") >>= aLineDash; + xGridLinePropSet->getPropertyValue(u"LineDash"_ustr) >>= aLineDash; OUString sGridLineDash = OUString::number(static_cast<sal_Int32>(aLineDash.Style)) + ";" + OUString::number(aLineDash.Dots) + ";" + OUString::number(aLineDash.DotLen) + OUString::number(aLineDash.Dashes) + ";" + OUString::number(aLineDash.DashLen) + ";" + OUString::number(aLineDash.Distance); CPPUNIT_DUMP_ASSERT_STRINGS_EQUAL(sGridLineDash); // Line color util::Color aLineColor = 0; - xGridLinePropSet->getPropertyValue("LineColor") >>= aLineColor; + xGridLinePropSet->getPropertyValue(u"LineColor"_ustr) >>= aLineColor; CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(static_cast<sal_Int32>(aLineColor)); // Line width sal_Int32 nLineWidth = 0; - xGridLinePropSet->getPropertyValue("LineWidth") >>= nLineWidth; + xGridLinePropSet->getPropertyValue(u"LineWidth"_ustr) >>= nLineWidth; CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(nLineWidth); } } @@ -539,10 +539,10 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "default_formated_axis.odp", - "axis_special_positioning.odp", - "formated_axis_lines.odp", - "rotated_axis_labels.odp" + u"default_formated_axis.odp"_ustr, + u"axis_special_positioning.odp"_ustr, + u"formated_axis_lines.odp"_ustr, + u"rotated_axis_labels.odp"_ustr }; for (const OUString& sTestFile : aTestFiles) @@ -557,8 +557,8 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false) const std::vector<OUString> aAxisShapeNames = { - "CID/D=0:CS=0:Axis=0,0", // X Axis - "CID/D=0:CS=0:Axis=1,0", // Y Axis + u"CID/D=0:CS=0:Axis=0,0"_ustr, // X Axis + u"CID/D=0:CS=0:Axis=1,0"_ustr, // Y Axis }; for (const OUString& sAxisShapeName : aAxisShapeNames) @@ -578,7 +578,7 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false) // Check transformation Reference< beans::XPropertySet > xPropSet(xXAxis, UNO_QUERY_THROW); drawing::HomogenMatrix3 aAxisTransformation; - xPropSet->getPropertyValue("Transformation") >>= aAxisTransformation; + xPropSet->getPropertyValue(u"Transformation"_ustr) >>= aAxisTransformation; CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aAxisTransformation, INT_EPS); // Check line properties @@ -589,18 +589,18 @@ DECLARE_DUMP_TEST(AxisGeometryTest, Chart2DumpTest, false) Reference< beans::XPropertySet > xAxisLinePropSet(xAxisLine, UNO_QUERY_THROW); // Line type drawing::LineDash aLineDash; - xAxisLinePropSet->getPropertyValue("LineDash") >>= aLineDash; + xAxisLinePropSet->getPropertyValue(u"LineDash"_ustr) >>= aLineDash; OUString sAxisLineDash = OUString::number(static_cast<sal_Int32>(aLineDash.Style)) + ";" + OUString::number(aLineDash.Dots) + ";" + OUString::number(aLineDash.DotLen) + OUString::number(aLineDash.Dashes) + ";" + OUString::number(aLineDash.DashLen) + ";" + OUString::number(aLineDash.Distance); CPPUNIT_DUMP_ASSERT_STRINGS_EQUAL(sAxisLineDash); // Line color util::Color aAxisLineColor = 0; - xAxisLinePropSet->getPropertyValue("LineColor") >>= aAxisLineColor; + xAxisLinePropSet->getPropertyValue(u"LineColor"_ustr) >>= aAxisLineColor; CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(static_cast<sal_Int32>(aAxisLineColor)); // Line width sal_Int32 nAxisLineWidth = 0; - xAxisLinePropSet->getPropertyValue("LineWidth") >>= nAxisLineWidth; + xAxisLinePropSet->getPropertyValue(u"LineWidth"_ustr) >>= nAxisLineWidth; CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(nAxisLineWidth); } } @@ -610,12 +610,12 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "default_formated_axis.odp", - "rotated_axis_labels.odp", - "formated_axis_labels.odp", - "percent_stacked_column_chart.odp", - "tdf118150.xlsx", - "date-categories.pptx", + u"default_formated_axis.odp"_ustr, + u"rotated_axis_labels.odp"_ustr, + u"formated_axis_labels.odp"_ustr, + u"percent_stacked_column_chart.odp"_ustr, + u"tdf118150.xlsx"_ustr, + u"date-categories.pptx"_ustr, }; for (const OUString& sTestFile : aTestFiles) @@ -630,8 +630,8 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false) const std::vector<OUString> aAxisShapeNames = { - "CID/D=0:CS=0:Axis=0,0", // X Axis - "CID/D=0:CS=0:Axis=1,0", // Y Axis + u"CID/D=0:CS=0:Axis=0,0"_ustr, // X Axis + u"CID/D=0:CS=0:Axis=1,0"_ustr, // Y Axis }; for (const OUString& sAxisShapeName : aAxisShapeNames) @@ -678,10 +678,10 @@ DECLARE_DUMP_TEST(AxisLabelTest, Chart2DumpTest, false) // Check font color and height util::Color aLabelFontColor = 0; - xPropSet->getPropertyValue("CharColor") >>= aLabelFontColor; + xPropSet->getPropertyValue(u"CharColor"_ustr) >>= aLabelFontColor; CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(static_cast<sal_Int32>(aLabelFontColor)); float fLabelFontHeight = 0.0f; - xPropSet->getPropertyValue("CharHeight") >>= fLabelFontHeight; + xPropSet->getPropertyValue(u"CharHeight"_ustr) >>= fLabelFontHeight; CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(fLabelFontHeight, 1E-12); } } @@ -692,13 +692,13 @@ DECLARE_DUMP_TEST(ColumnBarChartTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "normal_column_chart.ods", - "stacked_column_chart.ods", - "percent_stacked_column_chart.ods", - "column_chart_small_spacing.ods", - "normal_bar_chart.ods", - "stacked_bar_chart.ods", - "percent_stacked_bar_chart.ods", + u"normal_column_chart.ods"_ustr, + u"stacked_column_chart.ods"_ustr, + u"percent_stacked_column_chart.ods"_ustr, + u"column_chart_small_spacing.ods"_ustr, + u"normal_bar_chart.ods"_ustr, + u"stacked_bar_chart.ods"_ustr, + u"percent_stacked_bar_chart.ods"_ustr, }; for (const OUString& sTestFile : aTestFiles) @@ -755,7 +755,7 @@ DECLARE_DUMP_TEST(ColumnBarChartTest, Chart2DumpTest, false) // Check transformation Reference< beans::XPropertySet > xPropSet(xColumnOrBar, UNO_QUERY_THROW); drawing::HomogenMatrix3 aColumnOrBarTransformation; - xPropSet->getPropertyValue("Transformation") >>= aColumnOrBarTransformation; + xPropSet->getPropertyValue(u"Transformation"_ustr) >>= aColumnOrBarTransformation; CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aColumnOrBarTransformation, INT_EPS); } } @@ -766,9 +766,9 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "chartwall_auto_adjust_with_titles.ods", - "chartwall_auto_adjust_without_titles.ods", - "chartwall_custom_positioning.ods" + u"chartwall_auto_adjust_with_titles.ods"_ustr, + u"chartwall_auto_adjust_without_titles.ods"_ustr, + u"chartwall_custom_positioning.ods"_ustr }; for (const OUString& sTestFile : aTestFiles) @@ -781,7 +781,7 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false) uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xShapes.is()); - uno::Reference<drawing::XShape> xChartWall = getShapeByName(xShapes, "CID/DiagramWall="); + uno::Reference<drawing::XShape> xChartWall = getShapeByName(xShapes, u"CID/DiagramWall="_ustr); CPPUNIT_ASSERT(xChartWall.is()); // Check position and size @@ -809,18 +809,18 @@ DECLARE_DUMP_TEST(ChartWallTest, Chart2DumpTest, false) // Check line properties // Line type drawing::LineDash aLineDash; - xPropSet->getPropertyValue("LineDash") >>= aLineDash; + xPropSet->getPropertyValue(u"LineDash"_ustr) >>= aLineDash; OUString sChartWallLineDash = OUString::number(static_cast<sal_Int32>(aLineDash.Style)) + ";" + OUString::number(aLineDash.Dots) + ";" + OUString::number(aLineDash.DotLen) + OUString::number(aLineDash.Dashes) + ";" + OUString::number(aLineDash.DashLen) + ";" + OUString::number(aLineDash.Distance); CPPUNIT_DUMP_ASSERT_STRINGS_EQUAL(sChartWallLineDash); // Line color util::Color aChartWallLineColor = 0; - xPropSet->getPropertyValue("LineColor") >>= aChartWallLineColor; + xPropSet->getPropertyValue(u"LineColor"_ustr) >>= aChartWallLineColor; CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(static_cast<sal_Int32>(aChartWallLineColor)); // Line width sal_Int32 nChartWallLineWidth = 0; - xPropSet->getPropertyValue("LineWidth") >>= nChartWallLineWidth; + xPropSet->getPropertyValue(u"LineWidth"_ustr) >>= nChartWallLineWidth; CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(nChartWallLineWidth); } } @@ -829,11 +829,11 @@ DECLARE_DUMP_TEST(PieChartTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "normal_pie_chart.ods", - "rotated_pie_chart.ods", - "exploded_pie_chart.ods", - "donut_chart.ods", - "pie_chart_many_slices.ods", + u"normal_pie_chart.ods"_ustr, + u"rotated_pie_chart.ods"_ustr, + u"exploded_pie_chart.ods"_ustr, + u"donut_chart.ods"_ustr, + u"pie_chart_many_slices.ods"_ustr, }; for (const OUString& sTestFile : aTestFiles) @@ -885,7 +885,7 @@ DECLARE_DUMP_TEST(PieChartTest, Chart2DumpTest, false) // Check transformation Reference< beans::XPropertySet > xPropSet(xSlice, UNO_QUERY_THROW); drawing::HomogenMatrix3 aSliceTransformation; - xPropSet->getPropertyValue("Transformation") >>= aSliceTransformation; + xPropSet->getPropertyValue(u"Transformation"_ustr) >>= aSliceTransformation; CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aSliceTransformation, INT_EPS); // Check slice fill style and color @@ -904,9 +904,9 @@ DECLARE_DUMP_TEST(AreaChartTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "normal_area_chart.ods", - "stacked_area_chart.ods", - "percent_stacked_area_chart.ods" + u"normal_area_chart.ods"_ustr, + u"stacked_area_chart.ods"_ustr, + u"percent_stacked_area_chart.ods"_ustr }; for (const OUString& sTestFile : aTestFiles) @@ -949,7 +949,7 @@ DECLARE_DUMP_TEST(AreaChartTest, Chart2DumpTest, false) // Check transformation Reference< beans::XPropertySet > xPropSet(xArea, UNO_QUERY_THROW); drawing::HomogenMatrix3 aAreaTransformation; - xPropSet->getPropertyValue("Transformation") >>= aAreaTransformation; + xPropSet->getPropertyValue(u"Transformation"_ustr) >>= aAreaTransformation; CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aAreaTransformation, INT_EPS); // Check area fill style and color @@ -968,18 +968,18 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest, false) { const std::vector<OUString> aTestFiles = { - "normal_line_chart_lines_only.ods", - "normal_line_chart_points_only.ods", - "normal_line_chart_lines_and_points.ods", - "stacked_line_chart_lines_only.ods", - "stacked_line_chart_points_only.ods", - "stacked_line_chart_lines_and_points.ods", - "percent_stacked_line_chart_lines_only.ods", - "percent_stacked_line_chart_points_only.ods", - "percent_stacked_line_chart_lines_and_points.ods", - "scatter_chart_points_only.ods", - "scatter_chart_lines_only.ods", - "scatter_chart_lines_and_points.ods", + u"normal_line_chart_lines_only.ods"_ustr, + u"normal_line_chart_points_only.ods"_ustr, + u"normal_line_chart_lines_and_points.ods"_ustr, + u"stacked_line_chart_lines_only.ods"_ustr, + u"stacked_line_chart_points_only.ods"_ustr, + u"stacked_line_chart_lines_and_points.ods"_ustr, + u"percent_stacked_line_chart_lines_only.ods"_ustr, + u"percent_stacked_line_chart_points_only.ods"_ustr, + u"percent_stacked_line_chart_lines_and_points.ods"_ustr, + u"scatter_chart_points_only.ods"_ustr, + u"scatter_chart_lines_only.ods"_ustr, + u"scatter_chart_lines_and_points.ods"_ustr, }; for (const OUString& sTestFile : aTestFiles) @@ -1016,7 +1016,7 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest, false) xPropSet->getPropertyValue(UNO_NAME_LINESTYLE) >>= aSeriesLineStyle; if (aSeriesLineStyle != drawing::LineStyle_NONE) { - CPPUNIT_DUMP_ASSERT_NOTE("Lines are displayed"); + CPPUNIT_DUMP_ASSERT_NOTE(u"Lines are displayed"_ustr); CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(static_cast<sal_Int32>(aSeriesLineStyle)); // Check line shape geometry @@ -1028,14 +1028,14 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest, false) CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aLineSize.Width, INT_EPS); CPPUNIT_ASSERT(xPropSet.is()); drawing::HomogenMatrix3 aLineTransformation; - xPropSet->getPropertyValue("Transformation") >>= aLineTransformation; + xPropSet->getPropertyValue(u"Transformation"_ustr) >>= aLineTransformation; CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aLineTransformation, INT_EPS); } // Check points of series if (xIndexAccess->getCount() >= 2) { - CPPUNIT_DUMP_ASSERT_NOTE("Points are displayed"); + CPPUNIT_DUMP_ASSERT_NOTE(u"Points are displayed"_ustr); uno::Reference<container::XIndexAccess> xPointsOfSeries(xIndexAccess->getByIndex(1), UNO_QUERY_THROW); sal_Int32 nPointCountInSeries = xPointsOfSeries->getCount(); CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(nPointCountInSeries); @@ -1058,7 +1058,7 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest, false) // Check transformation Reference< beans::XPropertySet > xPointPropSet(XPoint, UNO_QUERY_THROW); drawing::HomogenMatrix3 aPointTransformation; - xPointPropSet->getPropertyValue("Transformation") >>= aPointTransformation; + xPointPropSet->getPropertyValue(u"Transformation"_ustr) >>= aPointTransformation; CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aPointTransformation, INT_EPS); // Check fill style and color @@ -1076,7 +1076,7 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest, false) DECLARE_DUMP_TEST( PivotChartDataButtonTest, Chart2DumpTest, false ) { - setTestFileName( "pivotchart_data_button.ods" ); + setTestFileName( u"pivotchart_data_button.ods"_ustr ); loadFromFile(getTestFileName()); // Check that we have pivot chart in the document @@ -1095,7 +1095,7 @@ DECLARE_DUMP_TEST( PivotChartDataButtonTest, Chart2DumpTest, false ) CPPUNIT_ASSERT( xShapes.is() ); // Get the shape that represents the "Data" button. - uno::Reference<drawing::XShape> xButton = getShapeByName( xShapes, "FieldButton.Row.8", + uno::Reference<drawing::XShape> xButton = getShapeByName( xShapes, u"FieldButton.Row.8"_ustr, []( const uno::Reference<drawing::XShape>& xShapeNode ) { return xShapeNode->getShapeType() == "com.sun.star.drawing.TextShape"; @@ -1103,7 +1103,7 @@ DECLARE_DUMP_TEST( PivotChartDataButtonTest, Chart2DumpTest, false ) CPPUNIT_ASSERT_MESSAGE( "Cannot find Data button shape", xButton.is() ); // Make sure that there is no arrow shape with the Data button - uno::Reference<drawing::XShape> xArrow = getShapeByName( xShapes, "FieldButton.Row.8", + uno::Reference<drawing::XShape> xArrow = getShapeByName( xShapes, u"FieldButton.Row.8"_ustr, []( const uno::Reference<drawing::XShape>& xShapeNode ) { return xShapeNode->getShapeType() == "com.sun.star.drawing.PolyPolygonShape"; diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 3f5866e8c49c..1c4977f5d38b 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -25,7 +25,7 @@ using beans::XPropertySet; class Chart2ExportTest : public ChartTest { public: - Chart2ExportTest() : ChartTest("/chart2/qa/extras/data/") {} + Chart2ExportTest() : ChartTest(u"/chart2/qa/extras/data/"_ustr) {} }; namespace { @@ -34,17 +34,17 @@ void testErrorBar( Reference< XPropertySet > const & xErrorBar ) { sal_Int32 nErrorBarStyle; CPPUNIT_ASSERT( - xErrorBar->getPropertyValue("ErrorBarStyle") >>= nErrorBarStyle); + xErrorBar->getPropertyValue(u"ErrorBarStyle"_ustr) >>= nErrorBarStyle); CPPUNIT_ASSERT_EQUAL(chart::ErrorBarStyle::RELATIVE, nErrorBarStyle); bool bShowPositive = bool(), bShowNegative = bool(); CPPUNIT_ASSERT( - xErrorBar->getPropertyValue("ShowPositiveError") >>= bShowPositive); + xErrorBar->getPropertyValue(u"ShowPositiveError"_ustr) >>= bShowPositive); CPPUNIT_ASSERT(bShowPositive); CPPUNIT_ASSERT( - xErrorBar->getPropertyValue("ShowNegativeError") >>= bShowNegative); + xErrorBar->getPropertyValue(u"ShowNegativeError"_ustr) >>= bShowNegative); CPPUNIT_ASSERT(bShowNegative); double nVal = 0.0; - CPPUNIT_ASSERT(xErrorBar->getPropertyValue("PositiveError") >>= nVal); + CPPUNIT_ASSERT(xErrorBar->getPropertyValue(u"PositiveError"_ustr) >>= nVal); CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0, nVal, 1e-10); } @@ -58,21 +58,21 @@ void checkCommonTrendline( CPPUNIT_ASSERT(xProperties.is()); double aExtrapolateForward = 0.0; - CPPUNIT_ASSERT(xProperties->getPropertyValue("ExtrapolateForward") >>= aExtrapolateForward); + CPPUNIT_ASSERT(xProperties->getPropertyValue(u"ExtrapolateForward"_ustr) >>= aExtrapolateForward); CPPUNIT_ASSERT_EQUAL(aExpectedExtrapolateForward, aExtrapolateForward); double aExtrapolateBackward = 0.0; - CPPUNIT_ASSERT(xProperties->getPropertyValue("ExtrapolateBackward") >>= aExtrapolateBackward); + CPPUNIT_ASSERT(xProperties->getPropertyValue(u"ExtrapolateBackward"_ustr) >>= aExtrapolateBackward); CPPUNIT_ASSERT_EQUAL(aExpectedExtrapolateBackward, aExtrapolateBackward); bool bForceIntercept = false; - CPPUNIT_ASSERT(xProperties->getPropertyValue("ForceIntercept") >>= bForceIntercept); + CPPUNIT_ASSERT(xProperties->getPropertyValue(u"ForceIntercept"_ustr) >>= bForceIntercept); CPPUNIT_ASSERT_EQUAL(aExpectedForceIntercept, bForceIntercept); if (bForceIntercept) { double aInterceptValue = 0.0; - CPPUNIT_ASSERT(xProperties->getPropertyValue("InterceptValue") >>= aInterceptValue); + CPPUNIT_ASSERT(xProperties->getPropertyValue(u"InterceptValue"_ustr) >>= aInterceptValue); CPPUNIT_ASSERT_EQUAL(aExpectedInterceptValue, aInterceptValue); } @@ -80,15 +80,15 @@ void checkCommonTrendline( CPPUNIT_ASSERT(xEquationProperties.is()); bool bShowEquation = false; - CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowEquation") >>= bShowEquation); + CPPUNIT_ASSERT(xEquationProperties->getPropertyValue(u"ShowEquation"_ustr) >>= bShowEquation); CPPUNIT_ASSERT_EQUAL(aExpectedShowEquation, bShowEquation); bool bShowCorrelationCoefficient = false; - CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowCorrelationCoefficient") >>= bShowCorrelationCoefficient); + CPPUNIT_ASSERT(xEquationProperties->getPropertyValue(u"ShowCorrelationCoefficient"_ustr) >>= bShowCorrelationCoefficient); CPPUNIT_ASSERT_EQUAL(aExpectedR2, bShowCorrelationCoefficient); bool bMayHaveR2 = false; - CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("MayHaveCorrelationCoefficient") >>= bMayHaveR2); + CPPUNIT_ASSERT(xEquationProperties->getPropertyValue(u"MayHaveCorrelationCoefficient"_ustr) >>= bMayHaveR2); CPPUNIT_ASSERT_EQUAL(aExpectedMayHaveR2, bMayHaveR2); } @@ -101,7 +101,7 @@ void checkNameAndType(Reference<XPropertySet> const & xProperties, const OUStrin CPPUNIT_ASSERT_EQUAL(aExpectedServiceName, aServiceName); OUString aCurveName; - CPPUNIT_ASSERT(xProperties->getPropertyValue("CurveName") >>= aCurveName); + CPPUNIT_ASSERT(xProperties->getPropertyValue(u"CurveName"_ustr) >>= aCurveName); CPPUNIT_ASSERT_EQUAL(aExpectedName, aCurveName); } @@ -113,7 +113,7 @@ void checkLinearTrendline( Reference<XPropertySet> xProperties( xCurve , uno::UNO_QUERY ); CPPUNIT_ASSERT(xProperties.is()); - checkNameAndType(xProperties, aExpectedName, "com.sun.star.chart2.LinearRegressionCurve"); + checkNameAndType(xProperties, aExpectedName, u"com.sun.star.chart2.LinearRegressionCurve"_ustr); checkCommonTrendline( xCurve, @@ -131,10 +131,10 @@ void checkPolynomialTrendline( Reference<XPropertySet> xProperties( xCurve , uno::UNO_QUERY ); CPPUNIT_ASSERT(xProperties.is()); - checkNameAndType(xProperties, aExpectedName, "com.sun.star.chart2.PolynomialRegressionCurve"); + checkNameAndType(xProperties, aExpectedName, u"com.sun.star.chart2.PolynomialRegressionCurve"_ustr); sal_Int32 aDegree = 2; - CPPUNIT_ASSERT(xProperties->getPropertyValue("PolynomialDegree") >>= aDegree); + CPPUNIT_ASSERT(xProperties->getPropertyValue(u"PolynomialDegree"_ustr) >>= aDegree); CPPUNIT_ASSERT_EQUAL(aExpectedDegree, aDegree); checkCommonTrendline( @@ -150,10 +150,10 @@ void checkMovingAverageTrendline( Reference<XPropertySet> xProperties( xCurve , uno::UNO_QUERY ); CPPUNIT_ASSERT(xProperties.is()); - checkNameAndType(xProperties, aExpectedName, "com.sun.star.chart2.MovingAverageRegressionCurve"); + checkNameAndType(xProperties, aExpectedName, u"com.sun.star.chart2.MovingAverageRegressionCurve"_ustr); sal_Int32 aPeriod = 2; - CPPUNIT_ASSERT(xProperties->getPropertyValue("MovingAveragePeriod") >>= aPeriod); + CPPUNIT_ASSERT(xProperties->getPropertyValue(u"MovingAveragePeriod"_ustr) >>= aPeriod); CPPUNIT_ASSERT_EQUAL(aExpectedPeriod, aPeriod); checkCommonTrendline( @@ -180,15 +180,15 @@ void checkTrendlinesInChart(uno::Reference< chart2::XChartDocument > const & xCh xCurve = xRegressionCurveSequence[0]; CPPUNIT_ASSERT(xCurve.is()); - checkPolynomialTrendline(xCurve, "col2_poly", 3, 0.1, -0.1, -1.0); + checkPolynomialTrendline(xCurve, u"col2_poly"_ustr, 3, 0.1, -0.1, -1.0); xCurve = xRegressionCurveSequence[1]; CPPUNIT_ASSERT(xCurve.is()); - checkLinearTrendline(xCurve, "col2_linear", -0.5, -0.5, 0.0); + checkLinearTrendline(xCurve, u"col2_linear"_ustr, -0.5, -0.5, 0.0); xCurve = xRegressionCurveSequence[2]; CPPUNIT_ASSERT(xCurve.is()); - checkMovingAverageTrendline(xCurve, "col2_moving_avg", 3); + checkMovingAverageTrendline(xCurve, u"col2_moving_avg"_ustr, 3); } } @@ -213,7 +213,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarXLSX) testErrorBar(xErrorBarYProps); } - saveAndReload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); { uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); CPPUNIT_ASSERT(xChartDoc.is()); @@ -233,19 +233,19 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarPropXLSX) { loadFromFile(u"xlsx/testErrorBarProp.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // test y error bars property - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:errDir"_ostr, "val"_ostr, "y"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln"_ostr, "w"_ostr, "12600"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:errDir"_ostr, "val"_ostr, u"y"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln"_ostr, "w"_ostr, u"12600"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"ff0000"_ustr); // test x error bars property - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:errDir"_ostr, "val"_ostr, "x"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln"_ostr, "w"_ostr, "9360"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "595959"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:errDir"_ostr, "val"_ostr, u"x"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln"_ostr, "w"_ostr, u"9360"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"595959"_ustr); } // This method tests the preservation of properties for trendlines / regression curves @@ -257,7 +257,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendline) skipValidation(); loadFromFile(u"ods/trendline.ods"); checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); } @@ -265,7 +265,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineOOXML) { loadFromFile(u"ods/trendline.ods"); checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); - saveAndReload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); } @@ -273,14 +273,14 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineXLS) { loadFromFile(u"ods/trendline.ods"); checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); - saveAndReload("MS Excel 97"); + saveAndReload(u"MS Excel 97"_ustr); checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testMovingAverage) { loadFromFile(u"ods/moving-type.ods"); - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent); CPPUNIT_ASSERT(xChartDoc.is()); @@ -301,7 +301,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testMovingAverage) CPPUNIT_ASSERT(xProperties.is()); sal_Int32 nMovingAverageType = 0; - xProperties->getPropertyValue("MovingAverageType") >>= nMovingAverageType; + xProperties->getPropertyValue(u"MovingAverageType"_ustr) >>= nMovingAverageType; CPPUNIT_ASSERT_EQUAL(chart2::MovingAverageType::Central, nMovingAverageType); } @@ -316,26 +316,26 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testStockChart) */ loadFromFile(u"docx/testStockChart.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:idx"_ostr, "val"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:order"_ostr, "val"_ostr, "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:idx"_ostr, "val"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:order"_ostr, "val"_ostr, u"1"_ustr); assertXPathContent( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v"_ostr, - "Open"); + u"Open"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChart) { loadFromFile(u"docx/testBarChart.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:barDir"_ostr, "val"_ostr, "col"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:barDir"_ostr, "val"_ostr, u"col"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testCrosses) @@ -343,19 +343,19 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testCrosses) // test crosses val="autoZero" with DOCX { loadFromFile(u"docx/Bar_horizontal_cone.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses"_ostr, "val"_ostr, "autoZero"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses"_ostr, "val"_ostr, u"autoZero"_ustr); } // tdf#142351: test crossesAt val="-50" with XLSX { loadFromFile(u"xlsx/tdf142351.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crossesAt"_ostr, "val"_ostr, "-50"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crossesAt"_ostr, "val"_ostr, u"-50"_ustr); } } @@ -372,9 +372,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterChartTextXValues) // Make sure we have exactly 3 data series. std::vector<uno::Sequence<uno::Any> > aLabels = getDataSeriesLabelsFromChartType(xCT); CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size()); - CPPUNIT_ASSERT_EQUAL(OUString("Series 1"), aLabels[0][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("Series 2"), aLabels[1][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("Series 3"), aLabels[2][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"Series 1"_ustr, aLabels[0][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"Series 2"_ustr, aLabels[1][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"Series 3"_ustr, aLabels[2][0].get<OUString>()); std::vector<std::vector<double> > aYValues = getDataSeriesYValuesFromChartType(xCT); CPPUNIT_ASSERT_EQUAL(size_t(3), aYValues.size()); @@ -401,58 +401,58 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterChartTextXValues) CPPUNIT_ASSERT_EQUAL(5.0, aYValues[2][3]); // Test the export. - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal[1]/c:numRef[1]/c:numCache[1]/c:pt[1]/c:v[1]"_ostr, "1"); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal[1]/c:numRef[1]/c:numCache[1]/c:pt[1]/c:v[1]"_ostr, u"1"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterXAxisValues) { loadFromFile(u"odt/tdf114657.odt"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:ptCount"_ostr, "val"_ostr, "5"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[1]/c:v"_ostr, "15"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[2]/c:v"_ostr, "11"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[3]/c:v"_ostr, "20"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[4]/c:v"_ostr, "16"); + assertXPath(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:ptCount"_ostr, "val"_ostr, u"5"_ustr); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[1]/c:v"_ostr, u"15"_ustr); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[2]/c:v"_ostr, u"11"_ustr); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[3]/c:v"_ostr, u"20"_ustr); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[4]/c:v"_ostr, u"16"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterXAxisCategories) { loadFromFile(u"odt/tdf131143.odt"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:ptCount"_ostr, "val"_ostr, "4"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[1]/c:v"_ostr, "Row 1"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[2]/c:v"_ostr, "Row 2"); + assertXPath(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:ptCount"_ostr, "val"_ostr, u"4"_ustr); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[1]/c:v"_ostr, u"Row 1"_ustr); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[2]/c:v"_ostr, u"Row 2"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartDataTable) { loadFromFile(u"docx/testChartDataTable.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showHorzBorder"_ostr, "val"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showVertBorder"_ostr, "val"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showOutline"_ostr, "val"_ostr, "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showHorzBorder"_ostr, "val"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showVertBorder"_ostr, "val"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showOutline"_ostr, "val"_ostr, u"1"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartExternalData) { loadFromFile(u"docx/testMultipleChart.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:externalData"_ostr); } @@ -467,7 +467,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testEmbeddingsGrabBag) uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aGrabBag(0); - xTextDocumentPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag; + xTextDocumentPropertySet->getPropertyValue(u"InteropGrabBag"_ustr) >>= aGrabBag; CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty bool bEmbeddings = false; const char* const testEmbeddedFileNames[] {"word/embeddings/Microsoft_Excel_Worksheet3.xlsx", @@ -503,18 +503,18 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAreaChartLoad) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:showVal"_ostr, "val"_ostr, "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:showVal"_ostr, "val"_ostr, u"1"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLbl"_ostr, 0); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testUpDownBars) { loadFromFile(u"docx/UpDownBars.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:upDownBars"_ostr, 0); } @@ -522,8 +522,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testUpDownBars) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDoughnutChart) { loadFromFile(u"docx/doughnutChart.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:doughnutChart"_ostr); @@ -532,40 +532,40 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDoughnutChart) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieOfPieChart) { loadFromFile(u"xlsx/pieOfPieChart.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart"_ostr); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:ofPieType[1]"_ostr, "val"_ostr, "pie"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:ofPieType[1]"_ostr, "val"_ostr, u"pie"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarOfPieChart) { loadFromFile(u"xlsx/barOfPieChart.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart"_ostr); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:ofPieType[1]"_ostr, "val"_ostr, "bar"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:ofPieType[1]"_ostr, "val"_ostr, u"bar"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDisplayUnits) { loadFromFile(u"docx/DisplayUnits.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:dispUnits/c:builtInUnit"_ostr, "val"_ostr, "billions"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:dispUnits/c:builtInUnit"_ostr, "val"_ostr, u"billions"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallGradientFill) { loadFromFile(u"docx/fdo74115_WallGradientFill.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill"_ostr); @@ -574,8 +574,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallGradientFill) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallBitmapFill) { loadFromFile(u"docx/fdo74115_WallBitmapFill.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:blipFill"_ostr); } @@ -587,8 +587,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartWallLineStyle) // FIXME: validation error in OOXML export: Errors: 9 skipValidation(); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:ln/a:noFill"_ostr); } @@ -598,11 +598,11 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartWallLineStyle) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290LineChartMarkerX) { loadFromFile(u"docx/fdo78290_Line_Chart_Marker_x.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]"_ostr,"val"_ostr,"x"); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]"_ostr,"val"_ostr,"7"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]"_ostr,"val"_ostr,u"x"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]"_ostr,"val"_ostr,u"7"_ustr); } // We can also use the built in marker 'x' in scatter chart, hence writing the test case for the same. @@ -610,11 +610,11 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290LineChartMarkerX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290ScatterChartMarkerX) { loadFromFile(u"docx/fdo78290_Scatter_Chart_Marker_x.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]"_ostr,"val"_ostr,"x"); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:size[1]"_ostr,"val"_ostr,"7"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]"_ostr,"val"_ostr,u"x"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:size[1]"_ostr,"val"_ostr,u"7"_ustr); } // Also in a combination of charts like a column chart and line chart, we can use the built in marker 'x' @@ -623,28 +623,28 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290ScatterChartMarkerX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290CombinationChartMarkerX) { loadFromFile(u"docx/fdo78290_Combination_Chart_Marker_x.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]"_ostr,"val"_ostr,"x"); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]"_ostr,"val"_ostr,"7"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]"_ostr,"val"_ostr,u"x"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]"_ostr,"val"_ostr,u"7"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTdf126115IndividualMarker) { // Check individual marker properties. loadFromFile(u"xlsx/tdf126115.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // 1. series - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:symbol"_ostr, "val"_ostr, "square"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:size"_ostr, "val"_ostr, "8"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:symbol"_ostr, "val"_ostr, u"square"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:size"_ostr, "val"_ostr, u"8"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"ff0000"_ustr); // 2. series - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:symbol"_ostr, "val"_ostr, "x"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:size"_ostr, "val"_ostr, "15"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "7030a0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:symbol"_ostr, "val"_ostr, u"x"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:size"_ostr, "val"_ostr, u"15"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"7030a0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatODS) @@ -656,7 +656,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatODS) Reference<chart2::XAxis> xAxisX = getAxisFromDoc(xChartDoc, 0, 0, 0); Reference<chart2::XTitled> xTitle(xAxisX, UNO_QUERY_THROW); OUString aTitleText = getTitleString(xTitle); - CPPUNIT_ASSERT_EQUAL(OUString("Linked To Source"), aTitleText); + CPPUNIT_ASSERT_EQUAL(u"Linked To Source"_ustr, aTitleText); sal_Int32 nNumFmt = getNumberFormatFromAxis(xAxisX); sal_Int16 nType = getNumberFormatType(xChartDoc, nNumFmt); @@ -664,13 +664,13 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatODS) bool bNumFmtLinked = false; Reference<beans::XPropertySet> xPS(xAxisX, uno::UNO_QUERY_THROW); - xPS->getPropertyValue("LinkNumberFormatToSource") >>= bNumFmtLinked; + xPS->getPropertyValue(u"LinkNumberFormatToSource"_ustr) >>= bNumFmtLinked; CPPUNIT_ASSERT_MESSAGE("X axis should have its number format linked to source.", bNumFmtLinked); Reference<chart2::XAxis> xAxisY = getAxisFromDoc(xChartDoc, 0, 1, 0); xTitle.set(xAxisY, UNO_QUERY_THROW); aTitleText = getTitleString(xTitle); - CPPUNIT_ASSERT_EQUAL(OUString("Not Linked"), aTitleText); + CPPUNIT_ASSERT_EQUAL(u"Not Linked"_ustr, aTitleText); nNumFmt = getNumberFormatFromAxis(xAxisY); nType = getNumberFormatType(xChartDoc, nNumFmt); @@ -678,7 +678,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatODS) bNumFmtLinked = true; xPS.set(xAxisY, uno::UNO_QUERY_THROW); - xPS->getPropertyValue("LinkNumberFormatToSource") >>= bNumFmtLinked; + xPS->getPropertyValue(u"LinkNumberFormatToSource"_ustr) >>= bNumFmtLinked; CPPUNIT_ASSERT_MESSAGE("Y axis should not have its number format linked to source.", !bNumFmtLinked); } @@ -690,7 +690,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatODS) aTest.check(xChartDoc); // Reload the document and make sure everything remains intact. - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); xChartDoc = getChartDocFromSheet(0, mxComponent); aTest.check(xChartDoc); } @@ -704,7 +704,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatXLS) Reference<chart2::XAxis> xAxisY = getAxisFromDoc( xChartDoc, 0, 1, 0 ); bool bNumFmtLinked = false; Reference<beans::XPropertySet> xPS( xAxisY, uno::UNO_QUERY_THROW ); - xPS->getPropertyValue( "LinkNumberFormatToSource" ) >>= bNumFmtLinked; + xPS->getPropertyValue( u"LinkNumberFormatToSource"_ustr ) >>= bNumFmtLinked; if ( bNumFmtLinkedActual ) CPPUNIT_ASSERT_MESSAGE( "Y axis should have its number format linked to source.", bNumFmtLinked ); @@ -726,12 +726,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatXLS) Reference<chart2::XAxis> xAxisY = getAxisFromDoc( xChartDoc, 0, 1, 0 ); Reference<beans::XPropertySet> xPS( xAxisY, uno::UNO_QUERY_THROW ); Any aAny( false ); - xPS->setPropertyValue( "LinkNumberFormatToSource", aAny ); + xPS->setPropertyValue( u"LinkNumberFormatToSource"_ustr, aAny ); Reference<util::XNumberFormatsSupplier> xNFS( xChartDoc, uno::UNO_QUERY_THROW ); Reference<util::XNumberFormats> xNumberFormats = xNFS->getNumberFormats(); CPPUNIT_ASSERT( xNumberFormats.is() ); - lang::Locale aLocale{ "en", "US", "" }; + lang::Locale aLocale{ u"en"_ustr, u"US"_ustr, u""_ustr }; Sequence<sal_Int32> aNumFmts = xNumberFormats->queryKeys( nNumFmtTypeFlag, aLocale, false ); CPPUNIT_ASSERT( aNumFmts.hasElements() ); aAny <<= aNumFmts[0]; @@ -747,7 +747,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatXLS) aTest.change( xChartDoc, util::NumberFormat::NUMBER ); // Write the document(xls) with changes made close it, load it and check if changes are intact - saveAndReload( "MS Excel 97" ); + saveAndReload( u"MS Excel 97"_ustr ); xChartDoc = getChartDocFromSheet( 0, mxComponent ); aTest.check( xChartDoc, false, util::NumberFormat::NUMBER ); } @@ -779,7 +779,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBordersDOCX) CPPUNIT_ASSERT(xPropSet.is()); Sequence<sal_Int32> aIndices; - xPropSet->getPropertyValue("AttributedDataPoints") >>= aIndices; + xPropSet->getPropertyValue(u"AttributedDataPoints"_ustr) >>= aIndices; /* CPPUNIT_ASSERT_EQUAL_MESSAGE("There should be 2 data points with local properties.", sal_Int32(2), aIndices.getLength()); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aIndices[0]); @@ -846,8 +846,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBordersDOCX) // "Automatic" chart background fill in docx should be loaded as solid white. Reference<beans::XPropertySet> xPropSet = xChartDoc->getPageBackground(); CPPUNIT_ASSERT(xPropSet.is()); - drawing::FillStyle eStyle = xPropSet->getPropertyValue("FillStyle").get<drawing::FillStyle>(); - sal_Int32 nColor = xPropSet->getPropertyValue("FillColor").get<sal_Int32>(); + drawing::FillStyle eStyle = xPropSet->getPropertyValue(u"FillStyle"_ustr).get<drawing::FillStyle>(); + sal_Int32 nColor = xPropSet->getPropertyValue(u"FillColor"_ustr).get<sal_Int32>(); CPPUNIT_ASSERT_EQUAL_MESSAGE("'Automatic' chart background fill in docx should be loaded as solid fill.", drawing::FillStyle_SOLID, eStyle); CPPUNIT_ASSERT_EQUAL_MESSAGE("'Automatic' chart background fill in docx should be loaded as solid white.", @@ -860,7 +860,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBordersDOCX) // FIXME: validation error in OOXML export: Errors: 3 skipValidation(); - saveAndReload("Office Open XML Text"); + saveAndReload(u"Office Open XML Text"_ustr); xChartDoc.set(getChartDocFromWriter(0), uno::UNO_QUERY); aTest.checkObject1(xChartDoc); @@ -878,8 +878,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabel3DChartDOCX) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // We must not export label position attributes for 3D bar charts. The @@ -895,13 +895,13 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBarChartDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLblPos"_ostr, "val"_ostr, "ctr"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:dLblPos"_ostr, "val"_ostr, "inEnd"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:dLblPos"_ostr, "val"_ostr, "inBase"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLblPos"_ostr, "val"_ostr, u"ctr"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:dLblPos"_ostr, "val"_ostr, u"inEnd"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:dLblPos"_ostr, "val"_ostr, u"inBase"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelClusteredBarChartDOCX) @@ -914,12 +914,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelClusteredBarChartDOCX) // FIXME: validation error in OOXML export: Errors: 9 skipValidation(); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // This was "t", should be one of the allowed values. - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLbl[2]/c:dLblPos"_ostr, "val"_ostr, "outEnd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLbl[2]/c:dLblPos"_ostr, "val"_ostr, u"outEnd"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelRadarChartDOCX) @@ -929,8 +929,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelRadarChartDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // We must not export label position attributes for radar charts. @@ -948,8 +948,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelDoughnutChartDOCX) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // We must not export label position attributes for doughnut charts. @@ -967,8 +967,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelAreaChartDOCX) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // We must not export label position attributes for area charts. @@ -987,14 +987,14 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelDefaultLineChartDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - saveAndReload("Office Open XML Text"); + saveAndReload(u"Office Open XML Text"_ustr); xChartDoc.set(getChartDocFromWriter(0), uno::UNO_QUERY); Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); Reference<beans::XPropertySet> xPropSet(xDataSeries, uno::UNO_QUERY); CPPUNIT_ASSERT(xPropSet.is()); sal_Int32 nLabelPlacement = -1; - if (xPropSet->getPropertyValue("LabelPlacement") >>= nLabelPlacement) + if (xPropSet->getPropertyValue(u"LabelPlacement"_ustr) >>= nLabelPlacement) // This option may not be set. Check its value only when it's set. CPPUNIT_ASSERT_EQUAL_MESSAGE("Line chart's default label placement should be 'right'.", chart::DataLabelPlacement::RIGHT, nLabelPlacement ); } @@ -1006,24 +1006,24 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testIndividualDataLabelProps) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, "1600"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "ff0000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr/a:latin"_ostr, "typeface"_ostr, "Times New Roman"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, u"1600"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"ff0000"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr/a:latin"_ostr, "typeface"_ostr, u"Times New Roman"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChartRotation) { loadFromFile(u"docx/barChartRotation.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX"_ostr, "val"_ostr, "30"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY"_ostr, "val"_ostr, "50"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX"_ostr, "val"_ostr, u"30"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY"_ostr, "val"_ostr, u"50"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testShapeFollowedByChart) @@ -1038,8 +1038,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testShapeFollowedByChart) // FIXME: validation error in OOXML export: Errors: 5 skipValidation(); - save("Office Open XML Text" ); - xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml"); + save(u"Office Open XML Text"_ustr ); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/document.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); OUString aValueOfFirstDocPR = getXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r[1]/w:drawing[1]/wp:inline[1]/wp:docPr[1]"_ostr, "id"_ostr); @@ -1055,20 +1055,20 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartDataLabels) // FIXME: validation error in OOXML export: Errors: 19 skipValidation(); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos"_ostr, "val"_ostr, "outEnd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos"_ostr, "val"_ostr, u"outEnd"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSeriesIdxOrder) { loadFromFile(u"docx/testSeriesIdxOrder.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:idx[1]"_ostr, "val"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:order[1]"_ostr, "val"_ostr, "1"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:idx[1]"_ostr, "val"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:order[1]"_ostr, "val"_ostr, u"1"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterPlotLabels) @@ -1083,12 +1083,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterPlotLabels) // Make sure the original chart has 'a', 'b', 'c' as its data labels. std::vector<uno::Sequence<uno::Any> > aLabels = getDataSeriesLabelsFromChartType(xCT); CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size()); - CPPUNIT_ASSERT_EQUAL(OUString("a"), aLabels[0][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("b"), aLabels[1][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("c"), aLabels[2][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"a"_ustr, aLabels[0][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"b"_ustr, aLabels[1][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"c"_ustr, aLabels[2][0].get<OUString>()); // Reload the doc and check again. The labels should not change. - saveAndReload("writer8"); + saveAndReload(u"writer8"_ustr); xChartDoc.set(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1098,15 +1098,15 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterPlotLabels) aLabels = getDataSeriesLabelsFromChartType(xCT); CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size()); - CPPUNIT_ASSERT_EQUAL(OUString("a"), aLabels[0][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("b"), aLabels[1][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("c"), aLabels[2][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"a"_ustr, aLabels[0][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"b"_ustr, aLabels[1][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"c"_ustr, aLabels[2][0].get<OUString>()); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarDataRangeODS) { loadFromFile(u"ods/ErrorBarRange.ods"); - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1119,23 +1119,23 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarDataRangeODS) // test that y error bars are there Reference< beans::XPropertySet > xErrorBarYProps; xPropSet->getPropertyValue(CHART_UNONAME_ERRORBAR_Y) >>= xErrorBarYProps; - uno::Any aAny = xErrorBarYProps->getPropertyValue("ErrorBarRangePositive"); + uno::Any aAny = xErrorBarYProps->getPropertyValue(u"ErrorBarRangePositive"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); OUString aPosRange; aAny >>= aPosRange; - CPPUNIT_ASSERT_EQUAL(OUString("$Sheet1.$B$1:$B$3"), aPosRange); + CPPUNIT_ASSERT_EQUAL(u"$Sheet1.$B$1:$B$3"_ustr, aPosRange); - aAny = xErrorBarYProps->getPropertyValue("ErrorBarRangeNegative"); + aAny = xErrorBarYProps->getPropertyValue(u"ErrorBarRangeNegative"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); OUString aNegRange; aAny >>= aNegRange; - CPPUNIT_ASSERT_EQUAL(OUString("$Sheet1.$C$1:$C$3"), aNegRange); + CPPUNIT_ASSERT_EQUAL(u"$Sheet1.$C$1:$C$3"_ustr, aNegRange); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_barOfPie) { loadFromFile(u"ods/tdf50934_barOfPie.ods"); - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1151,7 +1151,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_barOfPie) CPPUNIT_ASSERT(xDia.is()); uno::Reference< beans::XPropertySet > xDiaProp( xDia, uno::UNO_QUERY ); CPPUNIT_ASSERT(xDiaProp.is()); - uno::Any aAny = xDiaProp->getPropertyValue("SubPieType"); + uno::Any aAny = xDiaProp->getPropertyValue(u"SubPieType"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); chart2::PieChartSubType subPieType; aAny >>= subPieType; @@ -1161,7 +1161,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_barOfPie) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_pieOfPie) { loadFromFile(u"ods/tdf50934_pieOfPie.ods"); - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1177,7 +1177,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_pieOfPie) CPPUNIT_ASSERT(xDia.is()); uno::Reference< beans::XPropertySet > xDiaProp( xDia, uno::UNO_QUERY ); CPPUNIT_ASSERT(xDiaProp.is()); - uno::Any aAny = xDiaProp->getPropertyValue("SubPieType"); + uno::Any aAny = xDiaProp->getPropertyValue(u"SubPieType"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); chart2::PieChartSubType subPieType; aAny >>= subPieType; @@ -1187,19 +1187,19 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_pieOfPie) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartCrash) { loadFromFile(u"docx/FDO75975.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartRotation) { loadFromFile(u"docx/pieChartRotation.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX"_ostr, "val"_ostr, "40"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY"_ostr, "val"_ostr, "30"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX"_ostr, "val"_ostr, u"40"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY"_ostr, "val"_ostr, u"30"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testEmbeddingsOleObjectGrabBag) @@ -1212,7 +1212,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testEmbeddingsOleObjectGrabBag) uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aGrabBag(0); - xTextDocumentPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag; + xTextDocumentPropertySet->getPropertyValue(u"InteropGrabBag"_ustr) >>= aGrabBag; CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty bool bEmbeddings = false; const char* const testEmbeddedFileNames[] = {"word/embeddings/oleObject1.bin"}; @@ -1243,7 +1243,7 @@ namespace { void checkGapWidth(Reference<beans::XPropertySet> const & xPropSet, sal_Int32 nValue) { - uno::Any aAny = xPropSet->getPropertyValue("GapwidthSequence"); + uno::Any aAny = xPropSet->getPropertyValue(u"GapwidthSequence"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); uno::Sequence< sal_Int32 > aSequence; aAny >>= aSequence; @@ -1253,7 +1253,7 @@ void checkGapWidth(Reference<beans::XPropertySet> const & xPropSet, sal_Int32 nV void checkOverlap(Reference<beans::XPropertySet> const & xPropSet, sal_Int32 nValue) { - uno::Any aAny = xPropSet->getPropertyValue("OverlapSequence"); + uno::Any aAny = xPropSet->getPropertyValue(u"OverlapSequence"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); uno::Sequence< sal_Int32 > aSequence; aAny >>= aSequence; @@ -1287,7 +1287,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testGapWidthXLSX) xChartDoc = getChartDocFromSheet( 1, mxComponent ); checkSheetForGapWidthAndOverlap(xChartDoc, 50, 30); - saveAndReload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); xChartDoc = getChartDocFromSheet( 0, mxComponent ); checkSheetForGapWidthAndOverlap(xChartDoc, 120, -60); @@ -1299,10 +1299,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testGapWidthXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSmoothedLines) { loadFromFile(u"ods/smoothedLines.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:smooth"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:smooth"_ostr, "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testLabelStringODS) @@ -1315,16 +1315,16 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testLabelStringODS) CPPUNIT_ASSERT(xLabelSeq.is()); OUString aLabelString = xLabelSeq->getSourceRangeRepresentation(); - CPPUNIT_ASSERT_EQUAL(OUString("\"LabelName\""), aLabelString); + CPPUNIT_ASSERT_EQUAL(u"\"LabelName\""_ustr, aLabelString); - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); xChartDoc = getChartDocFromSheet( 0, mxComponent ); xLabelSeq = getLabelDataSequenceFromDoc(xChartDoc); CPPUNIT_ASSERT(xLabelSeq.is()); aLabelString = xLabelSeq->getSourceRangeRepresentation(); - CPPUNIT_ASSERT_EQUAL(OUString("\"LabelName\""), aLabelString); + CPPUNIT_ASSERT_EQUAL(u"\"LabelName\""_ustr, aLabelString); } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/chart2export2.cxx b/chart2/qa/extras/chart2export2.cxx index f5378dc9444c..7d81dbb6f6a7 100644 --- a/chart2/qa/extras/chart2export2.cxx +++ b/chart2/qa/extras/chart2export2.cxx @@ -24,7 +24,7 @@ class Chart2ExportTest2 : public ChartTest { public: Chart2ExportTest2() - : ChartTest("/chart2/qa/extras/data/") + : ChartTest(u"/chart2/qa/extras/data/"_ustr) { } }; @@ -40,10 +40,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testSetSeriesToSecondaryAxisXLSX) Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW); sal_Int32 AxisIndex = 1; // Attach the second series to the secondary axis. (The third series is already attached.) - xPropSet->setPropertyValue("AttachedAxisIndex", uno::Any(AxisIndex)); + xPropSet->setPropertyValue(u"AttachedAxisIndex"_ustr, uno::Any(AxisIndex)); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Check there are only two <lineChart> tag in the XML, one for the primary and one for the secondary axis. assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart"_ostr, 2); @@ -53,8 +53,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCombinedChartSecondaryAxisXLSX) { // Original file was created with MS Office loadFromFile(u"xlsx/combined_chart_secondary_axis.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Collect barchart axID on secondary Axis OUString XValueIdOfBarchart = getXPath( @@ -81,8 +81,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCombinedChartSecondaryAxisODS) { // Original file was created with LibreOffice loadFromFile(u"ods/combined_chart_secondary_axis.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Collect barchart axID on secondary Axis OUString XValueIdOfBarchart = getXPath( @@ -115,19 +115,19 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenXLSX) // Original files were created with MS Office { loadFromFile(u"xlsx/tdf127777.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr, - "val"_ostr, "between"); + "val"_ostr, u"between"_ustr); } { loadFromFile(u"xlsx/tdf132076.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr, - "val"_ostr, "between"); + "val"_ostr, u"between"_ustr); } } @@ -135,41 +135,41 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenWithDeletedAxis) { // Original file was created with MS Office (the category axis is deleted in the file) loadFromFile(u"xlsx/tdf128633.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr, "val"_ostr, - "between"); + u"between"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenODS) { // Original file was created with LibreOffice loadFromFile(u"ods/test_CrossBetween.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr, "val"_ostr, - "between"); + u"between"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisTitleRotationXLSX) { loadFromFile(u"xlsx/axis_title_rotation.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:tx/c:rich/a:bodyPr"_ostr, - "rot"_ostr, "0"); + "rot"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisTitlePositionDOCX) { loadFromFile(u"docx/testAxisTitlePosition.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // test X Axis title position @@ -209,20 +209,20 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisCrossBetweenDOCX) // FIXME: validation error in OOXML export: Errors: 3 skipValidation(); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); - assertXPath(pXmlDoc, "(//c:crossBetween)[1]"_ostr, "val"_ostr, "midCat"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); + assertXPath(pXmlDoc, "(//c:crossBetween)[1]"_ostr, "val"_ostr, u"midCat"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testPieChartDataPointExplosionXLSX) { loadFromFile(u"xlsx/pie_chart_datapoint_explosion.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dPt/c:explosion"_ostr, - "val"_ostr, "28"); + "val"_ostr, u"28"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabel) @@ -242,42 +242,42 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabel) // 1 xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), aFields.getLength()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[0]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("90.0 = "), aFields[0]->getString()); - aFields[0]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[0]->getPropertyValue("CharColor") >>= nFontColor; + CPPUNIT_ASSERT_EQUAL(u"90.0 = "_ustr, aFields[0]->getString()); + aFields[0]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[0]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; CPPUNIT_ASSERT_EQUAL(static_cast<float>(18), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xed7d31), nFontColor); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_VALUE, aFields[1]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("90"), aFields[1]->getString()); - CPPUNIT_ASSERT_EQUAL(OUString("{0C576297-5A9F-4B4E-A675-B6BA406B7D87}"), aFields[1]->getGuid()); + CPPUNIT_ASSERT_EQUAL(u"90"_ustr, aFields[1]->getString()); + CPPUNIT_ASSERT_EQUAL(u"{0C576297-5A9F-4B4E-A675-B6BA406B7D87}"_ustr, aFields[1]->getGuid()); // 2 xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(8), aFields.getLength()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[0]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("Text"), aFields[0]->getString()); + CPPUNIT_ASSERT_EQUAL(u"Text"_ustr, aFields[0]->getString()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[1]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString(" : "), aFields[1]->getString()); + CPPUNIT_ASSERT_EQUAL(u" : "_ustr, aFields[1]->getString()); CPPUNIT_ASSERT_EQUAL( chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CATEGORYNAME, aFields[2]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("B"), aFields[2]->getString()); - CPPUNIT_ASSERT_EQUAL(OUString("{0CCAAACD-B393-42CE-8DBD-82F9F9ADC852}"), aFields[2]->getGuid()); - aFields[2]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[2]->getPropertyValue("CharColor") >>= nFontColor; + CPPUNIT_ASSERT_EQUAL(u"B"_ustr, aFields[2]->getString()); + CPPUNIT_ASSERT_EQUAL(u"{0CCAAACD-B393-42CE-8DBD-82F9F9ADC852}"_ustr, aFields[2]->getGuid()); + aFields[2]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[2]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; CPPUNIT_ASSERT_EQUAL(static_cast<float>(16), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xed7d31), nFontColor); @@ -287,13 +287,13 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabel) CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[4]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("Multi"), aFields[4]->getString()); + CPPUNIT_ASSERT_EQUAL(u"Multi"_ustr, aFields[4]->getString()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[5]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("line"), aFields[5]->getString()); - aFields[5]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[5]->getPropertyValue("CharColor") >>= nFontColor; + CPPUNIT_ASSERT_EQUAL(u"line"_ustr, aFields[5]->getString()); + aFields[5]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[5]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; CPPUNIT_ASSERT_EQUAL(static_cast<float>(11.97), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xbf9000), nFontColor); @@ -303,28 +303,28 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabel) CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[7]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("Abc"), aFields[7]->getString()); - aFields[7]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[7]->getPropertyValue("CharColor") >>= nFontColor; - aFields[7]->getPropertyValue("CharUnderline") >>= nCharUnderline; + CPPUNIT_ASSERT_EQUAL(u"Abc"_ustr, aFields[7]->getString()); + aFields[7]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[7]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; + aFields[7]->getPropertyValue(u"CharUnderline"_ustr) >>= nCharUnderline; CPPUNIT_ASSERT_EQUAL(static_cast<float>(12), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xa9d18e), nFontColor); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nCharUnderline); // 3 xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aFields.getLength()); CPPUNIT_ASSERT_EQUAL( chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_SERIESNAME, aFields[0]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("DATA"), aFields[0]->getString()); - CPPUNIT_ASSERT_EQUAL(OUString("{C8F3EB90-8960-4F9A-A3AD-B4FAC4FE4566}"), aFields[0]->getGuid()); + CPPUNIT_ASSERT_EQUAL(u"DATA"_ustr, aFields[0]->getString()); + CPPUNIT_ASSERT_EQUAL(u"{C8F3EB90-8960-4F9A-A3AD-B4FAC4FE4566}"_ustr, aFields[0]->getGuid()); // 4 xPropertySet.set(xDataSeries->getDataPointByIndex(3), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), aFields.getLength()); CPPUNIT_ASSERT_EQUAL( @@ -334,16 +334,16 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabel) CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[1]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString(" <CELLREF"), aFields[1]->getString()); + CPPUNIT_ASSERT_EQUAL(u" <CELLREF"_ustr, aFields[1]->getString()); - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Check the data labels font color for the complete data series assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:txPr/a:p/a:pPr/" "a:defRPr/a:solidFill/a:srgbClr"_ostr, - "val"_ostr, "404040"); + "val"_ostr, u"404040"_ustr); } /// Test for tdf#94235 @@ -352,28 +352,28 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataSeriesName) // ODF { loadFromFile(u"ods/ser_labels.ods"); - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); uno::Reference<beans::XPropertySet> xPropertySet; chart2::DataPointLabel aDataPointLabel; xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("Label") >>= aDataPointLabel; + xPropertySet->getPropertyValue(u"Label"_ustr) >>= aDataPointLabel; CPPUNIT_ASSERT_EQUAL(sal_True, aDataPointLabel.ShowSeriesName); } // OOXML { loadFromFile(u"xlsx/ser_labels.xlsx"); - saveAndReload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); uno::Reference<beans::XPropertySet> xPropertySet; chart2::DataPointLabel aDataPointLabel; xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("Label") >>= aDataPointLabel; + xPropertySet->getPropertyValue(u"Label"_ustr) >>= aDataPointLabel; CPPUNIT_ASSERT_EQUAL(sal_True, aDataPointLabel.ShowSeriesName); } } @@ -385,15 +385,15 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomPositionofDataLabel) loadFromFile(u"xlsx/testCustomPosDataLabels.xlsx"); { - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // test custom position of data label (xlsx) assertXPath( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx"_ostr, - "val"_ostr, "2"); + "val"_ostr, u"2"_ustr); OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/" "c:dLbl[1]/c:layout/c:manualLayout/c:x"_ostr, @@ -411,15 +411,15 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomPositionofDataLabel) loadFromFile(u"docx/testTdf108110.docx"); { - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // test custom position of data label (docx) assertXPath( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[2]/c:idx"_ostr, - "val"_ostr, "2"); + "val"_ostr, u"2"_ustr); OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/" "c:dLbl[2]/c:layout/c:manualLayout/c:x"_ostr, @@ -437,7 +437,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomPositionofDataLabel) loadFromFile(u"ods/tdf136024.ods"); { - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); // tdf#136024: test custom position of pie chart data label after an ods export Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc.is()); @@ -448,7 +448,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomPositionofDataLabel) uno::UNO_SET_THROW); chart2::RelativePosition aCustomLabelPosition; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("CustomLabelPosition") + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"CustomLabelPosition"_ustr) >>= aCustomLabelPosition); CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.0961935120945059, aCustomLabelPosition.Primary, 1e-5); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.209578842093566, aCustomLabelPosition.Secondary, 1e-5); @@ -471,50 +471,50 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabelMultipleSeries) // First series xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), aFields.getLength()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_VALUE, aFields[0]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("4.3"), aFields[0]->getString()); - aFields[0]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[0]->getPropertyValue("CharColor") >>= nFontColor; + CPPUNIT_ASSERT_EQUAL(u"4.3"_ustr, aFields[0]->getString()); + aFields[0]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[0]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; CPPUNIT_ASSERT_EQUAL(static_cast<float>(18), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xc00000), nFontColor); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[1]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString(" "), aFields[1]->getString()); + CPPUNIT_ASSERT_EQUAL(u" "_ustr, aFields[1]->getString()); CPPUNIT_ASSERT_EQUAL( chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_SERIESNAME, aFields[2]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("Bars"), aFields[2]->getString()); + CPPUNIT_ASSERT_EQUAL(u"Bars"_ustr, aFields[2]->getString()); // Second series xDataSeries = getDataSeriesFromDoc(xChartDoc, 0, 1); CPPUNIT_ASSERT(xDataSeries.is()); xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), aFields.getLength()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_VALUE, aFields[0]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("2"), aFields[0]->getString()); - aFields[0]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[0]->getPropertyValue("CharColor") >>= nFontColor; + CPPUNIT_ASSERT_EQUAL(u"2"_ustr, aFields[0]->getString()); + aFields[0]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[0]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; CPPUNIT_ASSERT_EQUAL(static_cast<float>(18), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xffd966), nFontColor); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[1]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString(" "), aFields[1]->getString()); + CPPUNIT_ASSERT_EQUAL(u" "_ustr, aFields[1]->getString()); CPPUNIT_ASSERT_EQUAL( chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_SERIESNAME, aFields[2]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("Line"), aFields[2]->getString()); + CPPUNIT_ASSERT_EQUAL(u"Line"_ustr, aFields[2]->getString()); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLeaderLines) @@ -524,42 +524,42 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLeaderLines) loadFromFile(u"xlsx/testTdf90749.xlsx"); { - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:dLbls/c:extLst/c:ext/" "c15:showLeaderLines"_ostr, - "val"_ostr, "1"); + "val"_ostr, u"1"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:dLbls/c:extLst/c:ext/" "c15:showLeaderLines"_ostr, - "val"_ostr, "0"); + "val"_ostr, u"0"_ustr); } loadFromFile(u"docx/MSO_Custom_Leader_Line.docx"); { - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // tdf#134571: Check the leader line is switch off. assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:extLst/c:ext/" "c15:showLeaderLines"_ostr, - "val"_ostr, "0"); + "val"_ostr, u"0"_ustr); } } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testNumberFormatExportPPTX) { loadFromFile(u"pptx/tdf115859.pptx"); - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:numFmt"_ostr, - "formatCode"_ostr, "#,##0.00,\\K"); + "formatCode"_ostr, u"#,##0.00,\\K"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:numFmt"_ostr, - "sourceLinked"_ostr, "0"); + "sourceLinked"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLabelSeparatorExportDOCX) @@ -569,157 +569,157 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLabelSeparatorExportDOCX) Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // The text separator should be a new line assertXPathContent( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:separator"_ostr, - "\n"); + u"\n"_ustr); // The text separator should be a comma assertXPathContent( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:separator"_ostr, - ", "); + u", "_ustr); // The text separator should be a semicolon assertXPathContent( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:separator"_ostr, - "; "); + u"; "_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesColorFillPPTX) { loadFromFile(u"pptx/testChartTitlePropertiesColorFill.pptx"); - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr"_ostr, - "val"_ostr, "ff0000"); + "val"_ostr, u"ff0000"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesGradientFillPPTX) { loadFromFile(u"pptx/testChartTitlePropertiesGradientFill.pptx"); - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr, - "val"_ostr, "f6f8fc"); + "val"_ostr, u"f6f8fc"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr, - "val"_ostr, "c7d5ed"); + "val"_ostr, u"c7d5ed"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesBitmapFillPPTX) { loadFromFile(u"pptx/testChartTitlePropertiesBitmapFill.pptx"); - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip"_ostr, - "embed"_ostr, "rId1"); + "embed"_ostr, u"rId1"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testxAxisLabelsRotation) { loadFromFile(u"xlsx/xAxisLabelsRotation.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc1 = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc1 = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc1); // Chart1 xAxis labels should be 45 degree assertXPath(pXmlDoc1, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:bodyPr"_ostr, - "rot"_ostr, "2700000"); + "rot"_ostr, u"2700000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesXLSX) { loadFromFile(u"ods/multilevelcat.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // check category axis labels number of first level assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:multiLvlStrRef/" "c:multiLvlStrCache/c:ptCount"_ostr, - "val"_ostr, "6"); + "val"_ostr, u"6"_ustr); // check category axis labels text of first level assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[1]/c:v"_ostr, - "Categoria 1"); + u"Categoria 1"_ustr); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[6]/c:v"_ostr, - "Categoria 6"); + u"Categoria 6"_ustr); // check category axis labels text of second level assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[1]/c:v"_ostr, - "2011"); + u"2011"_ustr); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[3]/c:v"_ostr, - "2013"); + u"2013"_ustr); // check the 'noMultiLvlLbl' tag - ChartExport.cxx:2950 FIXME: seems not support, so check the default noMultiLvlLbl value. assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:noMultiLvlLbl"_ostr, - "val"_ostr, "0"); + "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesDOCX) { loadFromFile(u"odt/multilevelcat.odt"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // check category axis labels number of first level assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:multiLvlStrRef/" "c:multiLvlStrCache/c:ptCount"_ostr, - "val"_ostr, "4"); + "val"_ostr, u"4"_ustr); // check category axis labels text of first level assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[1]/c:v"_ostr, - "Categoria 1"); + u"Categoria 1"_ustr); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[4]/c:v"_ostr, - "Categoria 4"); + u"Categoria 4"_ustr); // check category axis labels text of second level assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[1]/c:v"_ostr, - "2011"); + u"2011"_ustr); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[2]/c:v"_ostr, - "2012"); + u"2012"_ustr); // check the 'noMultiLvlLbl' tag - ChartExport.cxx:2950 FIXME: seems not support, so check the default noMultiLvlLbl value. assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:noMultiLvlLbl"_ostr, - "val"_ostr, "0"); + "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf116163) { loadFromFile(u"pptx/tdf116163.pptx"); - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:bodyPr"_ostr, - "rot"_ostr, "-5400000"); + "rot"_ostr, u"-5400000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf111824) { loadFromFile(u"xlsx/tdf111824.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Collect 3D barchart Z axID @@ -733,8 +733,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf111824) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, test3DAreaChartZAxis) { loadFromFile(u"xlsx/test3DAreaChartZAxis.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Collect 3D area chart Z axID @@ -749,19 +749,19 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf119029) { loadFromFile(u"odp/tdf119029.odp"); // Only use "chart", without number, because the number depends on the previous tests - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:txPr/a:bodyPr"_ostr, - "rot"_ostr, "-5400000"); + "rot"_ostr, u"-5400000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf108022) { loadFromFile(u"odt/tdf108022.odt"); - saveAndReload("Office Open XML Text"); + saveAndReload(u"Office Open XML Text"_ustr); // assert we really have two charts Reference<chart2::XChartDocument> xChartDoc1(getChartDocFromWriter(0), uno::UNO_QUERY); @@ -773,8 +773,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf108022) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121744) { loadFromFile(u"docx/tdf121744.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); OUString XValueId = getXPath( @@ -791,14 +791,14 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121744) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121189) { loadFromFile(u"odp/tdf121189.odp"); - saveAndReload("Impress Office Open XML"); + saveAndReload(u"Impress Office Open XML"_ustr); uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference<drawing::XDrawPage> xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xPage->getCount()); uno::Reference<drawing::XShape> xShape(xPage->getByIndex(0), uno::UNO_QUERY_THROW); - CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.OLE2Shape"), xShape->getShapeType()); + CPPUNIT_ASSERT_EQUAL(u"com.sun.star.drawing.OLE2Shape"_ustr, xShape->getShapeType()); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf122031) @@ -809,31 +809,31 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf122031) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt"_ostr, - "formatCode"_ostr, "0.000%"); + "formatCode"_ostr, u"0.000%"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt"_ostr, - "formatCode"_ostr, "0.000%"); + "formatCode"_ostr, u"0.000%"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[2]/c:numFmt"_ostr, - "formatCode"_ostr, "0.000%"); + "formatCode"_ostr, u"0.000%"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[3]/c:numFmt"_ostr, - "formatCode"_ostr, "0.000%"); + "formatCode"_ostr, u"0.000%"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf115012) { loadFromFile(u"xlsx/tdf115012.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // workaround: use-zero instead of leave-gap to show the original line chart - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs"_ostr, "val"_ostr, "zero"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs"_ostr, "val"_ostr, u"zero"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134118) @@ -843,11 +843,11 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134118) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // workaround: use leave-gap instead of zero to show the original line chart - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs"_ostr, "val"_ostr, "gap"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs"_ostr, "val"_ostr, u"gap"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123206_customLabelText) @@ -860,14 +860,14 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123206_customLabelText) // FIXME: validation error in OOXML export: Errors: 2 skipValidation(); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[2]/c:tx/" "c:rich/a:p/a:r/a:t"_ostr, - "kiscica"); + u"kiscica"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomLabelText) @@ -880,60 +880,62 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomLabelText) // FIXME: validation error in OOXML export: Errors: 3 skipValidation(); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[1]/c:idx"_ostr, - "val"_ostr, "2"); + "val"_ostr, u"2"_ustr); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[1]/c:tx/" "c:rich/a:p/a:r[1]/a:t"_ostr, - "3.5"); + u"3.5"_ustr); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[1]/c:tx/" "c:rich/a:p/a:r[3]/a:t"_ostr, - "CustomLabel 1"); + u"CustomLabel 1"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[2]/c:idx"_ostr, - "val"_ostr, "3"); + "val"_ostr, u"3"_ustr); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[2]/c:tx/" "c:rich/a:p/a:r[1]/a:t"_ostr, - "4.5"); + u"4.5"_ustr); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[2]/c:tx/" "c:rich/a:p/a:r[3]/a:t"_ostr, - "CustomLabel 2"); + u"CustomLabel 2"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDeletedLegendEntries) { loadFromFile(u"xlsx/deleted_legend_entry.xlsx"); { - saveAndReload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 1)); CPPUNIT_ASSERT(xDataSeries.is()); Reference<beans::XPropertySet> xPropertySet(xDataSeries, uno::UNO_QUERY_THROW); bool bShowLegendEntry = true; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("ShowLegendEntry") >>= bShowLegendEntry); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"ShowLegendEntry"_ustr) + >>= bShowLegendEntry); CPPUNIT_ASSERT(!bShowLegendEntry); } loadFromFile(u"xlsx/deleted_legend_entry2.xlsx"); { - saveAndReload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); Reference<beans::XPropertySet> xPropertySet(xDataSeries, uno::UNO_QUERY_THROW); bool bShowLegendEntry = true; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("ShowLegendEntry") >>= bShowLegendEntry); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"ShowLegendEntry"_ustr) + >>= bShowLegendEntry); CPPUNIT_ASSERT(!bShowLegendEntry); Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(1, mxComponent); @@ -942,7 +944,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDeletedLegendEntries) CPPUNIT_ASSERT(xDataSeries2.is()); Reference<beans::XPropertySet> xPropertySet2(xDataSeries2, uno::UNO_QUERY_THROW); Sequence<sal_Int32> deletedLegendEntriesSeq; - CPPUNIT_ASSERT(xPropertySet2->getPropertyValue("DeletedLegendEntries") + CPPUNIT_ASSERT(xPropertySet2->getPropertyValue(u"DeletedLegendEntries"_ustr) >>= deletedLegendEntriesSeq); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), deletedLegendEntriesSeq[0]); } @@ -951,8 +953,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDeletedLegendEntries) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf60316) { loadFromFile(u"pptx/tdf60316.pptx"); - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Without the fix in place, the shape would have had a solidFill background @@ -963,14 +965,14 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf60316) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf130225) { loadFromFile(u"docx/piechart_deleted_legend_entry.docx"); - saveAndReload("Office Open XML Text"); + saveAndReload(u"Office Open XML Text"_ustr); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); Reference<beans::XPropertySet> xPropertySet(xDataSeries, uno::UNO_QUERY_THROW); Sequence<sal_Int32> deletedLegendEntriesSeq; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("DeletedLegendEntries") + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"DeletedLegendEntries"_ustr) >>= deletedLegendEntriesSeq); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), deletedLegendEntriesSeq[0]); } @@ -978,23 +980,23 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf130225) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf59857) { loadFromFile(u"ods/tdf59857.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:floor/c:spPr/a:ln/a:noFill"_ostr, 1); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:floor/c:spPr/a:solidFill/a:srgbClr"_ostr, - "val"_ostr, "cccccc"); + "val"_ostr, u"cccccc"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:backWall/c:spPr/a:ln/a:noFill"_ostr, 0); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:backWall/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, - "val"_ostr, "b3b3b3"); + "val"_ostr, u"b3b3b3"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf126076) { loadFromFile(u"xlsx/auto_marker_excel10.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // This was 12: all series exported with square markers @@ -1009,24 +1011,24 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf126076) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf75330) { loadFromFile(u"ods/legend_overlay.ods"); - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); { uno::Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0, mxComponent); uno::Reference<chart::XChartDocument> xChartDoc(xChart2Doc, uno::UNO_QUERY); uno::Reference<drawing::XShape> xLegend = xChartDoc->getLegend(); Reference<beans::XPropertySet> xPropertySet(xLegend, uno::UNO_QUERY_THROW); bool bOverlay = false; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("Overlay") >>= bOverlay); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Overlay"_ustr) >>= bOverlay); CPPUNIT_ASSERT(bOverlay); } - saveAndReload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); { uno::Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0, mxComponent); uno::Reference<chart::XChartDocument> xChartDoc(xChart2Doc, uno::UNO_QUERY); uno::Reference<drawing::XShape> xLegend = xChartDoc->getLegend(); Reference<beans::XPropertySet> xPropertySet(xLegend, uno::UNO_QUERY_THROW); bool bOverlay = false; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("Overlay") >>= bOverlay); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Overlay"_ustr) >>= bOverlay); CPPUNIT_ASSERT(bOverlay); } } @@ -1034,23 +1036,23 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf75330) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf127792) { loadFromFile(u"docx/MSO_axis_position.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr, "val"_ostr, - "between"); + u"between"_ustr); - pXmlDoc = parseExport("word/charts/chart2.xml"); + pXmlDoc = parseExport(u"word/charts/chart2.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween"_ostr, "val"_ostr, - "midCat"); + u"midCat"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf131979) { loadFromFile(u"ods/tdf131115.ods"); { - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); @@ -1066,7 +1068,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf131979) loadFromFile(u"ods/tdf131979.ods"); { - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); @@ -1088,46 +1090,46 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132076) { loadFromFile(u"ods/tdf132076.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt"_ostr, - "formatCode"_ostr, "dd"); + "formatCode"_ostr, u"dd"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt"_ostr, - "sourceLinked"_ostr, "0"); + "sourceLinked"_ostr, u"0"_ustr); } { loadFromFile(u"xlsx/tdf132076.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt"_ostr, - "formatCode"_ostr, "dd"); + "formatCode"_ostr, u"dd"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt"_ostr, - "sourceLinked"_ostr, "0"); + "sourceLinked"_ostr, u"0"_ustr); } } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf125812) { loadFromFile(u"odp/ellipticalGradientFill.odp"); - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path"_ostr, - "path"_ostr, "circle"); + "path"_ostr, u"circle"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect"_ostr, - "l"_ostr, "50000"); + "l"_ostr, u"50000"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect"_ostr, - "t"_ostr, "49000"); + "t"_ostr, u"49000"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect"_ostr, - "r"_ostr, "50000"); + "r"_ostr, u"50000"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect"_ostr, - "b"_ostr, "51000"); + "b"_ostr, u"51000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133190) @@ -1137,19 +1139,19 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133190) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Test word wrap of data point label assertXPath( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:bodyPr"_ostr, - "wrap"_ostr, "none"); + "wrap"_ostr, u"none"_ustr); assertXPath( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[2]/c:txPr/a:bodyPr"_ostr, - "wrap"_ostr, "square"); + "wrap"_ostr, u"square"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133191) @@ -1159,22 +1161,22 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133191) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Test rotation of data point label assertXPath( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[3]/c:txPr/a:bodyPr"_ostr, - "rot"_ostr, "-4500000"); + "rot"_ostr, u"-4500000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132594) { loadFromFile(u"xlsx/chart_pie2007.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:cat"_ostr, 1); @@ -1191,20 +1193,20 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134255) CPPUNIT_ASSERT(xDataSeries.is()); Reference<beans::XPropertySet> xPropSet(xDataSeries, UNO_QUERY_THROW); bool bWrap = false; - CPPUNIT_ASSERT((xPropSet->getPropertyValue("TextWordWrap") >>= bWrap)); + CPPUNIT_ASSERT((xPropSet->getPropertyValue(u"TextWordWrap"_ustr) >>= bWrap)); CPPUNIT_ASSERT(bWrap); // FIXME: validation error in OOXML export: Errors: 11 skipValidation(); // export test - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:txPr/a:bodyPr"_ostr, - "wrap"_ostr, "square"); + "wrap"_ostr, u"square"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134977) @@ -1220,28 +1222,28 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134977) uno::UNO_SET_THROW); uno::Sequence<uno::Reference<chart2::XDataPointCustomLabelField>> aFields; float nFontSize; - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; - aFields[0]->getPropertyValue("CharHeight") >>= nFontSize; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; + aFields[0]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; CPPUNIT_ASSERT_EQUAL(static_cast<float>(9), nFontSize); // FIXME: validation error in OOXML export: Errors: 2 skipValidation(); //export test - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:tx/c:rich/a:p/" "a:r/a:rPr"_ostr, - "sz"_ostr, "900"); + "sz"_ostr, u"900"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123647) { loadFromFile(u"xlsx/empty_chart.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart"_ostr, 1); @@ -1254,26 +1256,26 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf136267) // FIXME: validation error in OOXML export: Errors: 2 skipValidation(); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPathContent( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:cat/c:strRef/c:strCache/c:pt/c:v"_ostr, - "John"); + u"John"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataLabelPlacementPieChart) { loadFromFile(u"xlsx/tdf134978.xlsx"); - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0, mxComponent), UNO_QUERY_THROW); // test the placement of the manually positioned label Reference<beans::XPropertySet> xDataPointPropSet( xChartDoc->getDiagram()->getDataPointProperties(2, 0), uno::UNO_SET_THROW); - uno::Any aAny = xDataPointPropSet->getPropertyValue("LabelPlacement"); + uno::Any aAny = xDataPointPropSet->getPropertyValue(u"LabelPlacement"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); sal_Int32 nLabelPlacement = 0; CPPUNIT_ASSERT(aAny >>= nLabelPlacement); @@ -1287,20 +1289,20 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf137917) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:baseTimeUnit"_ostr, - "val"_ostr, "days"); + "val"_ostr, u"days"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:majorUnit"_ostr, "val"_ostr, - "1"); + u"1"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:majorTimeUnit"_ostr, - "val"_ostr, "months"); + "val"_ostr, u"months"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:minorUnit"_ostr, "val"_ostr, - "7"); + u"7"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:minorTimeUnit"_ostr, - "val"_ostr, "days"); + "val"_ostr, u"days"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204) @@ -1326,8 +1328,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204) 0, // nSeriesIdx 1, // nNumFields chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CELLRANGE, - "Munka1!$F$9", // aCellRange - "67,5%", // aString + u"Munka1!$F$9"_ustr, // aCellRange + u"67,5%"_ustr, // aString }, { @@ -1335,8 +1337,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204) 1, // nSeriesIdx 1, // nNumFields chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CELLRANGE, - "Munka1!$G$9", // aCellRange - "32,3%", // aString + u"Munka1!$G$9"_ustr, // aCellRange + u"32,3%"_ustr, // aString }, }; @@ -1349,7 +1351,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204) uno::Reference<beans::XPropertySet> xPropertySet; uno::Sequence<uno::Reference<chart2::XDataPointCustomLabelField>> aFields; xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(aTestEntry.nNumFields, aFields.getLength()); CPPUNIT_ASSERT_EQUAL(aTestEntry.eFieldType, aFields[0]->getFieldType()); @@ -1360,20 +1362,20 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204) // FIXME: validation error in OOXML export: Errors: 2 skipValidation(); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Check the first data label field type assertXPath( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLbl/c:tx/c:rich/a:p/a:fld"_ostr, - "type"_ostr, "CELLRANGE"); + "type"_ostr, u"CELLRANGE"_ustr); assertXPath( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:dLbl/c:tx/c:rich/a:p/a:fld"_ostr, - "type"_ostr, "CELLRANGE"); + "type"_ostr, u"CELLRANGE"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138181) @@ -1387,25 +1389,25 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138181) Reference<drawing::XShape> xLegendEntry1, xLegendEntry2, xLegendEntry3; // first legend entry is visible - xLegendEntry1 - = getShapeByName(xShapes, "CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0:LegendEntry=0"); + xLegendEntry1 = getShapeByName( + xShapes, u"CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0:LegendEntry=0"_ustr); CPPUNIT_ASSERT(xLegendEntry1.is()); // second legend entry is not visible - xLegendEntry2 - = getShapeByName(xShapes, "CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1:LegendEntry=0"); + xLegendEntry2 = getShapeByName( + xShapes, u"CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1:LegendEntry=0"_ustr); CPPUNIT_ASSERT(!xLegendEntry2.is()); // third legend entry is visible - xLegendEntry3 - = getShapeByName(xShapes, "CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2:LegendEntry=0"); + xLegendEntry3 = getShapeByName( + xShapes, u"CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2:LegendEntry=0"_ustr); CPPUNIT_ASSERT(xLegendEntry3.is()); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomShapeText) { loadFromFile(u"ods/tdf72776.ods"); - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW); // test that the text of custom shape exists inside the chart @@ -1421,7 +1423,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomShapeText) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesXLSX) { loadFromFile(u"xlsx/tdf128621.xlsx"); - saveAndReload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1449,7 +1451,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesDOCX) { loadFromFile(u"docx/tdf143130.docx"); - saveAndReload("Office Open XML Text"); + saveAndReload(u"Office Open XML Text"_ustr); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1477,7 +1479,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesDOCX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testGraphicBlipXLSX) { loadFromFile(u"xlsx/tdf143127.xlsx"); - saveAndReload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1492,7 +1494,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testGraphicBlipXLSX) Reference<XPropertySet> xShapeProps(xCustomShape, UNO_QUERY); uno::Reference<graphic::XGraphic> xGraphic; - CPPUNIT_ASSERT(xShapeProps->getPropertyValue("Graphic") >>= xGraphic); + CPPUNIT_ASSERT(xShapeProps->getPropertyValue(u"Graphic"_ustr) >>= xGraphic); Graphic aGraphic(xGraphic); GfxLink aLink = aGraphic.GetGfxLink(); @@ -1505,17 +1507,17 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testGraphicBlipXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testNameRangeXLSX) { loadFromFile(u"xlsx/chart_with_name_range.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // test the syntax of local range name on the local sheet. assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:cat/c:strRef/c:f"_ostr, - "Sheet1!local_name_range"); + u"Sheet1!local_name_range"_ustr); // test the syntax of a global range name. assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:val/c:numRef/c:f"_ostr, - "[0]!series1"); + u"[0]!series1"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942) @@ -1529,12 +1531,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942) CPPUNIT_ASSERT(xDataSeries.is()); constexpr size_t nLabels = 4; - OUString aCellRange = "Sheet1!$A$2:$A$5"; + OUString aCellRange = u"Sheet1!$A$2:$A$5"_ustr; OUString aLabels[nLabels] = { - "Test1", - "Test2", - "Tes3", - "Test4", + u"Test1"_ustr, + u"Test2"_ustr, + u"Tes3"_ustr, + u"Test4"_ustr, }; uno::Reference<beans::XPropertySet> xPropertySet; @@ -1542,7 +1544,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942) for (size_t i = 0; i < nLabels; ++i) { xPropertySet.set(xDataSeries->getDataPointByIndex(i), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aFields.getLength()); CPPUNIT_ASSERT_EQUAL( chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CELLRANGE, @@ -1554,17 +1556,17 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942) // FIXME: validation error in OOXML export: Errors: 4 skipValidation(); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/c:ext"_ostr, - "uri"_ostr, "{02D57815-91ED-43cb-92C2-25804820EDAC}"); + "uri"_ostr, u"{02D57815-91ED-43cb-92C2-25804820EDAC}"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/c:ext/" "c15:datalabelsRange/c15:dlblRangeCache/c:ptCount"_ostr, - "val"_ostr, "4"); + "val"_ostr, u"4"_ustr); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/c:ext/" "c15:datalabelsRange/c15:f"_ostr, @@ -1574,11 +1576,11 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942) assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dLbls/c:dLbl[" + OString::number(i + 1) + "]/c:tx/c:rich/a:p/a:fld", - "type"_ostr, "CELLRANGE"); + "type"_ostr, u"CELLRANGE"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dLbls/c:dLbl[" + OString::number(i + 1) + "]/c:extLst/c:ext/c15:showDataLabelsRange", - "val"_ostr, "1"); + "val"_ostr, u"1"_ustr); // Check if the actual label is stored under c15:datalabelsRange assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/" @@ -1595,8 +1597,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDateCategoriesPPTX) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Impress Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); constexpr size_t nCats = 16; @@ -1609,7 +1611,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDateCategoriesPPTX) assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:numRef/" "c:numCache/c:formatCode"_ostr, - "mmm\\-yy"); + u"mmm\\-yy"_ustr); assertXPath( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:numRef/c:numCache/c:ptCount"_ostr, @@ -1643,19 +1645,19 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataTableImportExport) uno::Reference<beans::XPropertySet> xPropertySet(xDataTable, uno::UNO_QUERY); CPPUNIT_ASSERT(xPropertySet.is()); bool bHBorder; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("HBorder") >>= bHBorder); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"HBorder"_ustr) >>= bHBorder); CPPUNIT_ASSERT_EQUAL(true, bHBorder); bool bVBorder; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("VBorder") >>= bVBorder); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"VBorder"_ustr) >>= bVBorder); CPPUNIT_ASSERT_EQUAL(true, bVBorder); bool bOutline; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("Outline") >>= bOutline); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Outline"_ustr) >>= bOutline); CPPUNIT_ASSERT_EQUAL(false, bOutline); bool bKeys; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("Keys") >>= bKeys); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Keys"_ustr) >>= bKeys); CPPUNIT_ASSERT_EQUAL(false, bKeys); } - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); { uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1666,16 +1668,16 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataTableImportExport) uno::Reference<beans::XPropertySet> xPropertySet(xDataTable, uno::UNO_QUERY); CPPUNIT_ASSERT(xPropertySet.is()); bool bHBorder; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("HBorder") >>= bHBorder); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"HBorder"_ustr) >>= bHBorder); CPPUNIT_ASSERT_EQUAL(true, bHBorder); bool bVBorder; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("VBorder") >>= bVBorder); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"VBorder"_ustr) >>= bVBorder); CPPUNIT_ASSERT_EQUAL(true, bVBorder); bool bOutline; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("Outline") >>= bOutline); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Outline"_ustr) >>= bOutline); CPPUNIT_ASSERT_EQUAL(false, bOutline); bool bKeys; - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("Keys") >>= bKeys); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Keys"_ustr) >>= bKeys); CPPUNIT_ASSERT_EQUAL(false, bKeys); } } diff --git a/chart2/qa/extras/chart2export3.cxx b/chart2/qa/extras/chart2export3.cxx index df70cd603d89..48e1b0720718 100644 --- a/chart2/qa/extras/chart2export3.cxx +++ b/chart2/qa/extras/chart2export3.cxx @@ -20,7 +20,7 @@ using beans::XPropertySet; class Chart2ExportTest3 : public ChartTest { public: - Chart2ExportTest3() : ChartTest("/chart2/qa/extras/data/") {} + Chart2ExportTest3() : ChartTest(u"/chart2/qa/extras/data/"_ustr) {} }; CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf108107) @@ -30,19 +30,19 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf108107) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx"_ostr, "val"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, "2000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx"_ostr, "val"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, u"2000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf114139) { loadFromFile(u"xlsx/tdf114139.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart"_ostr, 1); @@ -54,8 +54,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf114139) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf64224) { loadFromFile(u"ods/tdf64224.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); //no fill @@ -66,31 +66,31 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf64224) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesColorFillDOCX) { loadFromFile(u"docx/testChartTitlePropertiesColorFill.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"ff0000"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesGradientFillDOCX) { loadFromFile(u"docx/testChartTitlePropertiesGradientFill.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr, "val"_ostr, "cccccc"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr, "val"_ostr, "666666"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr, "val"_ostr, u"cccccc"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr, "val"_ostr, u"666666"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesBitmapFillDOCX) { loadFromFile(u"docx/testChartTitlePropertiesBitmapFill.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip"_ostr, "embed"_ostr, "rId1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip"_ostr, "embed"_ostr, u"rId1"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1); } @@ -99,70 +99,70 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientWithTransparencyDOCX) { // Test color gradient (two color) with gradient transparency loadFromFile(u"docx/testColorGradientWithTransparency.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Test the transparency of the first color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr/a:alpha"_ostr, "val"_ostr, "60000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr/a:alpha"_ostr, "val"_ostr, u"60000"_ustr); // Test the transparency of the second color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha"_ostr, "val"_ostr, "90000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha"_ostr, "val"_ostr, u"90000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientWithTransparencyODS) { // Test color gradient (two color) with simple transparency loadFromFile(u"ods/testColorGradientWithTransparency.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Test the transparency of the first color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr/a:alpha"_ostr, "val"_ostr, "60000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr/a:alpha"_ostr, "val"_ostr, u"60000"_ustr); // Test the transparency of the second color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha"_ostr, "val"_ostr, "60000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha"_ostr, "val"_ostr, u"60000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientStopXLSX) { // Test color gradient (two color) stop of the first color loadFromFile(u"xlsx/tdf128619.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Test the position of the first color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]"_ostr, "pos"_ostr, "45000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]"_ostr, "pos"_ostr, u"45000"_ustr); // Test the position of the second color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]"_ostr, "pos"_ostr, "100000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]"_ostr, "pos"_ostr, u"100000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRadialColorGradientDOCX) { loadFromFile(u"docx/tdf128794.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Test the gradient style (if there is no 'a:path' attribute, it is a linear gradient) assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path"_ostr, 0); // Test the linear gradient angle - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:lin"_ostr, "ang"_ostr, "13500000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:lin"_ostr, "ang"_ostr, u"13500000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartDataPointPropDOCX) { loadFromFile(u"docx/testBarChartDataPointPropDOCX.docx"); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors"_ostr, "val"_ostr, u"0"_ustr); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:idx"_ostr, "val"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr, "val"_ostr, "f6f8fc"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr, "val"_ostr, "c7d5ed"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "70ad47"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:idx"_ostr, "val"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr, "val"_ostr, u"f6f8fc"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr, "val"_ostr, u"c7d5ed"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"70ad47"_ustr); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:idx"_ostr, "val"_ostr, "2"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "ff0000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "000000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:idx"_ostr, "val"_ostr, u"2"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"ff0000"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"000000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testFdo83058dlblPos) @@ -172,63 +172,63 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testFdo83058dlblPos) // FIXME: validation error in OOXML export: Errors: 1 skipValidation(); - save("Office Open XML Text"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1.xml"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[2]/c:dLblPos"_ostr, "val"_ostr, "outEnd"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[3]/c:dLblPos"_ostr, "val"_ostr, "outEnd"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[4]/c:dLblPos"_ostr, "val"_ostr, "outEnd"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[5]/c:dLblPos"_ostr, "val"_ostr, "outEnd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[2]/c:dLblPos"_ostr, "val"_ostr, u"outEnd"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[3]/c:dLblPos"_ostr, "val"_ostr, u"outEnd"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[4]/c:dLblPos"_ostr, "val"_ostr, u"outEnd"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[5]/c:dLblPos"_ostr, "val"_ostr, u"outEnd"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAutoTitleDelXLSX) { loadFromFile(u"xlsx/autotitledel_2007.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted"_ostr, "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDispBlanksAsXLSX) { loadFromFile(u"xlsx/dispBlanksAs_2007.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs"_ostr, "val"_ostr, "gap"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs"_ostr, "val"_ostr, u"gap"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMarkerColorXLSX) { loadFromFile(u"xlsx/markerColor.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "92d050"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"92d050"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRoundedCornersXLSX) { loadFromFile(u"xlsx/markerColor.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:roundedCorners"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:roundedCorners"_ostr, "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAxisNumberFormatXLSX) { loadFromFile(u"ods/axis_number_format.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx"_ostr, 2); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt"_ostr, "formatCode"_ostr, "0.00E+000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt"_ostr, "sourceLinked"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt"_ostr, "formatCode"_ostr, u"0.00E+000"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt"_ostr, "sourceLinked"_ostr, u"0"_ustr); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt"_ostr, "formatCode"_ostr, "[$$-409]#,##0;\\-[$$-409]#,##0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt"_ostr, "sourceLinked"_ostr, "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt"_ostr, "formatCode"_ostr, u"[$$-409]#,##0;\\-[$$-409]#,##0"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt"_ostr, "sourceLinked"_ostr, u"1"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataPointLabelNumberFormatXLSX) @@ -238,24 +238,24 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataPointLabelNumberFormatXLSX) loadFromFile(u"ods/tdf123774.ods"); { - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt"_ostr, "formatCode"_ostr, "[$-40E]0.00%"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt"_ostr, "sourceLinked"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt"_ostr, "formatCode"_ostr, u"[$-40E]0.00%"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt"_ostr, "sourceLinked"_ostr, u"0"_ustr); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt"_ostr, "formatCode"_ostr, "[$-40E]0.00%"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt"_ostr, "sourceLinked"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt"_ostr, "formatCode"_ostr, u"[$-40E]0.00%"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt"_ostr, "sourceLinked"_ostr, u"0"_ustr); } loadFromFile(u"xlsx/tdf130986.xlsx"); { - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:idx"_ostr, "val"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:numFmt"_ostr, "formatCode"_ostr, "0.00E+00"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:numFmt"_ostr, "sourceLinked"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:idx"_ostr, "val"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:numFmt"_ostr, "formatCode"_ostr, u"0.00E+00"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:numFmt"_ostr, "sourceLinked"_ostr, u"0"_ustr); } } @@ -265,16 +265,16 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelDefaultValuesXLSX) Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent); Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0); Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("Label"); + uno::Any aAny = xPropSet->getPropertyValue(u"Label"_ustr); chart2::DataPointLabel aLabel; CPPUNIT_ASSERT(aAny >>= aLabel); CPPUNIT_ASSERT(aLabel.ShowNumber); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:showVal"_ostr, "val"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLblPos"_ostr, "val"_ostr, "outEnd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:showVal"_ostr, "val"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLblPos"_ostr, "val"_ostr, u"outEnd"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelFillColor) @@ -283,65 +283,65 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelFillColor) Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent); Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0); Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("LabelFillColor"); + uno::Any aAny = xPropSet->getPropertyValue(u"LabelFillColor"_ustr); sal_Int32 nLabelFillColor; CPPUNIT_ASSERT(aAny >>= nLabelFillColor); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "F79646"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"F79646"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleOverlayXLSX) { loadFromFile(u"xlsx/chart_title.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:overlay"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:overlay"_ostr, "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testInvertIfNegativeXLSX) { loadFromFile(u"xlsx/bar_chart_simple.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:invertIfNegative"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:invertIfNegative"_ostr, "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBubble3DXLSX) { loadFromFile(u"xlsx/bubble_chart_simple.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[1]/c:bubble3D"_ostr, "val"_ostr, "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[2]/c:bubble3D"_ostr, "val"_ostr, "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[3]/c:bubble3D"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[1]/c:bubble3D"_ostr, "val"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[2]/c:bubble3D"_ostr, "val"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[3]/c:bubble3D"_ostr, "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testNoMarkerXLSX) { loadFromFile(u"xlsx/no_marker.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:marker/c:symbol"_ostr, "val"_ostr, "none"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:marker/c:symbol"_ostr, "val"_ostr, "none"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:marker"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:marker/c:symbol"_ostr, "val"_ostr, u"none"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:marker/c:symbol"_ostr, "val"_ostr, u"none"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:marker"_ostr, "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleManualLayoutXLSX) { loadFromFile(u"xlsx/title_manual_layout.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:layoutTarget"_ostr, 0); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:xMode"_ostr, "val"_ostr, "edge"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:yMode"_ostr, "val"_ostr, "edge"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:xMode"_ostr, "val"_ostr, u"edge"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:yMode"_ostr, "val"_ostr, u"edge"_ustr); OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:x"_ostr, "val"_ostr); double nX = aXVal.toDouble(); @@ -354,19 +354,19 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleManualLayoutXLSX) CPPUNIT_ASSERT(nY < 1); CPPUNIT_ASSERT(nX != nY); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:bodyPr"_ostr, "rot"_ostr, "1200000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:bodyPr"_ostr, "rot"_ostr, u"1200000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotAreaManualLayoutXLSX) { loadFromFile(u"xlsx/plot_area_manual_layout.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:layoutTarget"_ostr, "val"_ostr, "inner"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:xMode"_ostr, "val"_ostr, "edge"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:yMode"_ostr, "val"_ostr, "edge"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:layoutTarget"_ostr, "val"_ostr, u"inner"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:xMode"_ostr, "val"_ostr, u"edge"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:yMode"_ostr, "val"_ostr, u"edge"_ustr); OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:x"_ostr, "val"_ostr); double nX = aXVal.toDouble(); @@ -394,13 +394,13 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotAreaManualLayoutXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testLegendManualLayoutXLSX) { loadFromFile(u"xlsx/legend_manual_layout.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:layoutTarget"_ostr, 0); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:xMode"_ostr, "val"_ostr, "edge"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:yMode"_ostr, "val"_ostr, "edge"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:xMode"_ostr, "val"_ostr, u"edge"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:yMode"_ostr, "val"_ostr, u"edge"_ustr); OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:x"_ostr, "val"_ostr); double nX = aXVal.toDouble(); @@ -425,117 +425,117 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testLegendManualLayoutXLSX) CPPUNIT_ASSERT(nH != nW); // Make sure that default text font size is preserved after export - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, "900"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, u"900"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartSubTitle) { loadFromFile(u"ods/testChartSubTitle.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // test properties of subtitle // paragraph props - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, "1100"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, u"1100"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, u"1"_ustr); // run props - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr"_ostr, "sz"_ostr, "1100"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr"_ostr, "b"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "00a933"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr/a:latin"_ostr, "typeface"_ostr, "Times New Roman"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr"_ostr, "sz"_ostr, u"1100"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr"_ostr, "b"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"00a933"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr/a:latin"_ostr, "typeface"_ostr, u"Times New Roman"_ustr); // text - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:t"_ostr, "It is a Subtitle"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:t"_ostr, u"It is a Subtitle"_ustr); // shape props - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "b2b2b2"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"b2b2b2"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartMainWithSubTitle) { loadFromFile(u"ods/testChartMainWithSubTitle.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // test properties of title // paragraph props - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:pPr/a:defRPr"_ostr, "sz"_ostr, "1300"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:pPr/a:defRPr"_ostr, "b"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:pPr/a:defRPr"_ostr, "sz"_ostr, u"1300"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:pPr/a:defRPr"_ostr, "b"_ostr, u"0"_ustr); // run props - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr"_ostr, "sz"_ostr, "1300"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr"_ostr, "b"_ostr, "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr"_ostr, "i"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "f10d0c"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr/a:latin"_ostr, "typeface"_ostr, "Arial"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr"_ostr, "sz"_ostr, u"1300"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr"_ostr, "b"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr"_ostr, "i"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"f10d0c"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr/a:latin"_ostr, "typeface"_ostr, u"Arial"_ustr); // text - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:t"_ostr, "It is a Maintitle"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r/a:t"_ostr, "It is a Subtitle"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:t"_ostr, u"It is a Maintitle"_ustr); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r/a:t"_ostr, u"It is a Subtitle"_ustr); // shape props - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "81d41a"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"81d41a"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAutoTitleDeleted) { loadFromFile(u"xlsx/testAutoTitleDeleted.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted"_ostr, "val"_ostr, "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted"_ostr, "val"_ostr, u"1"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesColorFillXLSX) { loadFromFile(u"xlsx/testChartTitlePropertiesColorFill.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"ff0000"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesGradientFillXLSX) { loadFromFile(u"xlsx/testChartTitlePropertiesGradientFill.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr, "val"_ostr, "cccccc"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr, "val"_ostr, "666666"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr, "val"_ostr, u"cccccc"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr, "val"_ostr, u"666666"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesBitmapFillXLSX) { loadFromFile(u"xlsx/testChartTitlePropertiesBitmapFill.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip"_ostr, "embed"_ostr, "rId1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip"_ostr, "embed"_ostr, u"rId1"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill"_ostr, 1); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartDataPointPropXLSX) { loadFromFile(u"xlsx/testBarChartDataPointPropXLSX.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors"_ostr, "val"_ostr, u"0"_ustr); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:idx"_ostr, "val"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "ff0000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "000000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:idx"_ostr, "val"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"ff0000"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"000000"_ustr); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:idx"_ostr, "val"_ostr, "2"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr, "val"_ostr, "f6f8fc"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr, "val"_ostr, "c7d5ed"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "70ad47"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:idx"_ostr, "val"_ostr, u"2"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr"_ostr, "val"_ostr, u"f6f8fc"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr"_ostr, "val"_ostr, u"c7d5ed"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"70ad47"_ustr); } namespace { void checkGapWidth(Reference<beans::XPropertySet> const & xPropSet, sal_Int32 nValue) { - uno::Any aAny = xPropSet->getPropertyValue("GapwidthSequence"); + uno::Any aAny = xPropSet->getPropertyValue(u"GapwidthSequence"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); uno::Sequence< sal_Int32 > aSequence; aAny >>= aSequence; @@ -545,7 +545,7 @@ void checkGapWidth(Reference<beans::XPropertySet> const & xPropSet, sal_Int32 nV void checkOverlap(Reference<beans::XPropertySet> const & xPropSet, sal_Int32 nValue) { - uno::Any aAny = xPropSet->getPropertyValue("OverlapSequence"); + uno::Any aAny = xPropSet->getPropertyValue(u"OverlapSequence"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); uno::Sequence< sal_Int32 > aSequence; aAny >>= aSequence; @@ -581,7 +581,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataseriesOverlapStackedChartXLSX) xChartDoc = getChartDocFromSheet( 1, mxComponent ); checkSheetForGapWidthAndOverlap(xChartDoc, 100, 35); - saveAndReload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); xChartDoc = getChartDocFromSheet( 0, mxComponent ); checkSheetForGapWidthAndOverlap(xChartDoc, 100, 100); @@ -593,63 +593,63 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataseriesOverlapStackedChartXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAxisCharacterPropertiesXLSX) { loadFromFile(u"xlsx/axis_character_properties.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, "1000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "i"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "u"_ostr, "sng"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, u"1000"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "i"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "u"_ostr, u"sng"_ustr); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, "900"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "strike"_ostr, "sngStrike"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, u"900"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr"_ostr, "strike"_ostr, u"sngStrike"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"ff0000"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleCharacterPropertiesXLSX) { loadFromFile(u"xlsx/title_character_properties.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, "1300"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr"_ostr, "sz"_ostr, u"1300"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr"_ostr, "b"_ostr, u"0"_ustr); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr"_ostr, "sz"_ostr, "2400"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr"_ostr, "b"_ostr, "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr"_ostr, "sz"_ostr, u"2400"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr"_ostr, "b"_ostr, u"1"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotVisOnlyXLSX) { loadFromFile(u"xlsx/hidden_cells.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotVisOnly"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotVisOnly"_ostr, "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartVaryColorsXLSX) { loadFromFile(u"xlsx/tdf90876.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors"_ostr, "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf96161) { loadFromFile(u"ods/tdf96161.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:varyColors"_ostr, "val"_ostr, "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:varyColors"_ostr, "val"_ostr, u"0"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTableOnPage3) @@ -659,24 +659,24 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTableOnPage3) // FIXME: validation error in OOXML export: Errors: 2 skipValidation(); - saveAndReload("Office Open XML Text"); + saveAndReload(u"Office Open XML Text"_ustr); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); uno::Reference< chart::XChartDataArray > xDataArray(xChartDoc->getDataProvider(), UNO_QUERY_THROW); Sequence<OUString> aColumnDesc = xDataArray->getColumnDescriptions(); CPPUNIT_ASSERT_EQUAL_MESSAGE("There must be 4 columns and descriptions", static_cast<sal_Int32>(4), aColumnDesc.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("If oversubscription relative to allowance increases at the same average rate B15-B17"), aColumnDesc[0]); - CPPUNIT_ASSERT_EQUAL(OUString("Known requirements"), aColumnDesc[1]); - CPPUNIT_ASSERT_EQUAL(OUString("Allowance"), aColumnDesc[2]); - CPPUNIT_ASSERT_EQUAL(OUString("If oversubscription relative to allowance holds steady at average oversubscription level B15-B17"), aColumnDesc[3]); + CPPUNIT_ASSERT_EQUAL(u"If oversubscription relative to allowance increases at the same average rate B15-B17"_ustr, aColumnDesc[0]); + CPPUNIT_ASSERT_EQUAL(u"Known requirements"_ustr, aColumnDesc[1]); + CPPUNIT_ASSERT_EQUAL(u"Allowance"_ustr, aColumnDesc[2]); + CPPUNIT_ASSERT_EQUAL(u"If oversubscription relative to allowance holds steady at average oversubscription level B15-B17"_ustr, aColumnDesc[3]); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, tdf137691) { // given a doc where the banana negative data formats as ($123) and the pineapple data as $(123) loadFromFile(u"pptx/tdf137691_dataTable.pptx"); - saveAndReload("Impress MS PowerPoint 2007 XML"); + saveAndReload(u"Impress MS PowerPoint 2007 XML"_ustr); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); @@ -696,8 +696,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, tdf137691) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMultipleAxisXLSX) { loadFromFile(u"ods/multiple_axis.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart"_ostr, 2); @@ -712,25 +712,25 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMultipleAxisXLSX) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testSecondaryAxisXLSX) { loadFromFile(u"ods/secondary_axis.ods"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart"_ostr, 2); // test there is just those series in the first <lineChart> tag which are attached to the primary axis assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart[1]/c:ser"_ostr, 2); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart[1]/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v"_ostr, "b"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart[1]/c:ser[2]/c:tx/c:strRef/c:strCache/c:pt/c:v"_ostr, "c"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart[1]/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v"_ostr, u"b"_ustr); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart[1]/c:ser[2]/c:tx/c:strRef/c:strCache/c:pt/c:v"_ostr, u"c"_ustr); // test there is just those series in the second <lineChart> tag which are attached to the secondary axis assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart[2]/c:ser"_ostr, 1); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart[2]/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v"_ostr, "a"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart[2]/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v"_ostr, u"a"_ustr); } CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartSecondaryAxisXLSX) { loadFromFile(u"xlsx/testSecondaryAxis.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Collect barchart axID on primary Axis OUString XValueIdOf1Barchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart[1]/c:axId[1]"_ostr, "val"_ostr); @@ -761,7 +761,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf148142) xAxis->setScaleData(aScaleData); // Check the X axis position after export. - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc2.is()); Reference<chart2::XAxis> xAxis2 = getAxisFromDoc(xChartDoc2, 0, 0, 0); @@ -773,58 +773,58 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf148142) CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testFormattedChartTitles) { loadFromFile(u"xlsx/tdf39052.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Check run level properties [1] - first paragraph - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:rPr"_ostr, "b"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:rPr"_ostr, "sz"_ostr, "1400"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "ff0000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:rPr/a:latin"_ostr, "typeface"_ostr, "Aptos Narrow"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:t"_ostr, "This"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:rPr"_ostr, "b"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:rPr"_ostr, "sz"_ostr, u"1400"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"ff0000"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:rPr/a:latin"_ostr, "typeface"_ostr, u"Aptos Narrow"_ustr); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:t"_ostr, u"This"_ustr); // Check run level properties [2] - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[2]/a:rPr"_ostr, "b"_ostr, "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[2]/a:rPr"_ostr, "sz"_ostr, "1400"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[2]/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "595959"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[2]/a:t"_ostr, " is"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[2]/a:rPr"_ostr, "b"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[2]/a:rPr"_ostr, "sz"_ostr, u"1400"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[2]/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"595959"_ustr); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[2]/a:t"_ostr, u" is"_ustr); // Check run level properties [3] - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[3]/a:rPr"_ostr, "b"_ostr, "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[3]/a:rPr"_ostr, "sz"_ostr, "1400"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[3]/a:rPr"_ostr, "baseline"_ostr, "30000"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[3]/a:t"_ostr, "3"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[3]/a:rPr"_ostr, "b"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[3]/a:rPr"_ostr, "sz"_ostr, u"1400"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[3]/a:rPr"_ostr, "baseline"_ostr, u"30000"_ustr); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[3]/a:t"_ostr, u"3"_ustr); // Check run level properties [4] - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[4]/a:rPr"_ostr, "b"_ostr, "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[4]/a:rPr"_ostr, "sz"_ostr, "1400"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[4]/a:t"_ostr, " a "); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[4]/a:rPr"_ostr, "b"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[4]/a:rPr"_ostr, "sz"_ostr, u"1400"_ustr); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[4]/a:t"_ostr, u" a "_ustr); // Check run level properties [5] - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr"_ostr, "b"_ostr, "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr"_ostr, "i"_ostr, "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr"_ostr, "sz"_ostr, "2000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr"_ostr, "u"_ostr, "sng"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "4ea72e"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr"_ostr, "b"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr"_ostr, "i"_ostr, u"1"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr"_ostr, "sz"_ostr, u"2000"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr"_ostr, "u"_ostr, u"sng"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"4ea72e"_ustr); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr/a:uFillTx"_ostr, 1); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:t"_ostr, "custom"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:t"_ostr, u"custom"_ustr); // Check run level properties [6] - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[6]/a:rPr"_ostr, "b"_ostr, "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[6]/a:rPr"_ostr, "sz"_ostr, "1400"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[6]/a:t"_ostr, " erte1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[6]/a:rPr"_ostr, "b"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[6]/a:rPr"_ostr, "sz"_ostr, u"1400"_ustr); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[6]/a:t"_ostr, u" erte1"_ustr); // Check run level properties [1] - second paragraph - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:rPr"_ostr, "b"_ostr, "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:rPr"_ostr, "sz"_ostr, "1400"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, "595959"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:rPr/a:latin"_ostr, "typeface"_ostr, "Aptos Narrow"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:t"_ostr, "2dfgd ch"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:rPr"_ostr, "b"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:rPr"_ostr, "sz"_ostr, u"1400"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:rPr/a:solidFill/a:srgbClr"_ostr, "val"_ostr, u"595959"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:rPr/a:latin"_ostr, "typeface"_ostr, u"Aptos Narrow"_ustr); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:t"_ostr, u"2dfgd ch"_ustr); // Check run level properties [2] - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[2]/a:rPr"_ostr, "b"_ostr, "1"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[2]/a:t"_ostr, "ar"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[2]/a:rPr"_ostr, "b"_ostr, u"1"_ustr); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[2]/a:t"_ostr, u"ar"_ustr); // Check run level properties [3] - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[3]/a:rPr"_ostr, "b"_ostr, "0");; - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[3]/a:t"_ostr, "t "); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[3]/a:rPr"_ostr, "b"_ostr, u"0"_ustr);; + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[3]/a:t"_ostr, u"t "_ustr); // Check run level properties [4] - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[4]/a:rPr"_ostr, "b"_ostr, "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[4]/a:rPr"_ostr, "strike"_ostr, "sngStrike"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[4]/a:t"_ostr, "title"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[4]/a:rPr"_ostr, "b"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[4]/a:rPr"_ostr, "strike"_ostr, u"sngStrike"_ustr); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[4]/a:t"_ostr, u"title"_ustr); } namespace { @@ -832,90 +832,90 @@ namespace { void checkCharacterProps(Reference<beans::XPropertySet> const & xTitleProp) { Sequence< uno::Reference< chart2::XFormattedString > > xFormattedSubTitle; - CPPUNIT_ASSERT(xTitleProp->getPropertyValue("FormattedStrings") >>= xFormattedSubTitle); + CPPUNIT_ASSERT(xTitleProp->getPropertyValue(u"FormattedStrings"_ustr) >>= xFormattedSubTitle); CPPUNIT_ASSERT_EQUAL(sal_Int32(10), xFormattedSubTitle.getLength()); // check texts - std::vector<OUString> aValues = { "This", " is", "3", " a ", "custom", " erte1\n", "2dfgd ch", "ar", "t ", "title" }; + std::vector<OUString> aValues = { u"This"_ustr, u" is"_ustr, u"3"_ustr, u" a "_ustr, u"custom"_ustr, u" erte1\n"_ustr, u"2dfgd ch"_ustr, u"ar"_ustr, u"t "_ustr, u"title"_ustr }; for (sal_Int32 i = 0; i < xFormattedSubTitle.getLength(); i++) { const OUString aText = xFormattedSubTitle[i]->getString(); CPPUNIT_ASSERT_EQUAL(aValues[i], aText); Reference< beans::XPropertySet > xRunPropSet(xFormattedSubTitle[i], uno::UNO_QUERY); // common props - uno::Any aAny = xRunPropSet->getPropertyValue("CharFontName"); - CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Aptos Narrow")), aAny); + uno::Any aAny = xRunPropSet->getPropertyValue(u"CharFontName"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(u"Aptos Narrow"_ustr), aAny); // unique props if (aText == aValues[0]) { - aAny = xRunPropSet->getPropertyValue("CharWeight"); + aAny = xRunPropSet->getPropertyValue(u"CharWeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::BOLD), aAny); - aAny = xRunPropSet->getPropertyValue("CharHeight"); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(14.0f), aAny); - aAny = xRunPropSet->getPropertyValue("CharColor"); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0xff0000)), aAny); - aAny = xRunPropSet->getPropertyValue("CharEscapement"); + aAny = xRunPropSet->getPropertyValue(u"CharEscapement"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(short(0)), aAny); - aAny = xRunPropSet->getPropertyValue("CharEscapementHeight"); + aAny = xRunPropSet->getPropertyValue(u"CharEscapementHeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(short(100)), aAny); } else if (aText == aValues[1] || aText == aValues[3] || aText == aValues[5] || aText == aValues[6] || aText == aValues[8]) { - aAny = xRunPropSet->getPropertyValue("CharWeight"); + aAny = xRunPropSet->getPropertyValue(u"CharWeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::NORMAL), aAny); - aAny = xRunPropSet->getPropertyValue("CharHeight"); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(14.0f), aAny); - aAny = xRunPropSet->getPropertyValue("CharColor"); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0x595959)), aAny); } else if (aText == aValues[2]) { - aAny = xRunPropSet->getPropertyValue("CharWeight"); + aAny = xRunPropSet->getPropertyValue(u"CharWeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::NORMAL), aAny); - aAny = xRunPropSet->getPropertyValue("CharHeight"); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(14.0f), aAny); - aAny = xRunPropSet->getPropertyValue("CharColor"); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0x595959)), aAny); - aAny = xRunPropSet->getPropertyValue("CharEscapement"); + aAny = xRunPropSet->getPropertyValue(u"CharEscapement"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(short(30)), aAny); - aAny = xRunPropSet->getPropertyValue("CharEscapementHeight"); + aAny = xRunPropSet->getPropertyValue(u"CharEscapementHeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(short(58)), aAny); } else if (aText == aValues[4]) { - aAny = xRunPropSet->getPropertyValue("CharWeight"); + aAny = xRunPropSet->getPropertyValue(u"CharWeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::NORMAL), aAny); - aAny = xRunPropSet->getPropertyValue("CharHeight"); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(20.0f), aAny); - aAny = xRunPropSet->getPropertyValue("CharColor"); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0x4ea72e)), aAny); - aAny = xRunPropSet->getPropertyValue("CharPosture"); + aAny = xRunPropSet->getPropertyValue(u"CharPosture"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontSlant_ITALIC), aAny); - aAny = xRunPropSet->getPropertyValue("CharUnderline"); + aAny = xRunPropSet->getPropertyValue(u"CharUnderline"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontUnderline::SINGLE), aAny); } else if (aText == aValues[7]) { - aAny = xRunPropSet->getPropertyValue("CharWeight"); + aAny = xRunPropSet->getPropertyValue(u"CharWeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::BOLD), aAny); - aAny = xRunPropSet->getPropertyValue("CharHeight"); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(14.0f), aAny); - aAny = xRunPropSet->getPropertyValue("CharColor"); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0x595959)), aAny); - aAny = xRunPropSet->getPropertyValue("CharPosture"); + aAny = xRunPropSet->getPropertyValue(u"CharPosture"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontSlant_NONE), aAny); } else // aText == aValues[9] { - aAny = xRunPropSet->getPropertyValue("CharWeight"); + aAny = xRunPropSet->getPropertyValue(u"CharWeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::NORMAL), aAny); - aAny = xRunPropSet->getPropertyValue("CharHeight"); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(14.0f), aAny); - aAny = xRunPropSet->getPropertyValue("CharColor"); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0x595959)), aAny); - aAny = xRunPropSet->getPropertyValue("CharPosture"); + aAny = xRunPropSet->getPropertyValue(u"CharPosture"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontSlant_ITALIC), aAny); - aAny = xRunPropSet->getPropertyValue("CharOverline"); + aAny = xRunPropSet->getPropertyValue(u"CharOverline"_ustr); CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontUnderline::NONE), aAny); } } @@ -928,7 +928,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testODSFormattedChartTitles) // The document contains a line chart with "Between tick marks" X axis position. loadFromFile(u"ods/tdf39052.ods"); // Check formatted strings after export. - saveAndReload("calc8"); + saveAndReload(u"calc8"_ustr); Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChart2Doc.is()); diff --git a/chart2/qa/extras/chart2geometry.cxx b/chart2/qa/extras/chart2geometry.cxx index c554fc950c61..7c07fd32bf4a 100644 --- a/chart2/qa/extras/chart2geometry.cxx +++ b/chart2/qa/extras/chart2geometry.cxx @@ -25,7 +25,7 @@ class Chart2GeometryTest : public ChartTest { public: Chart2GeometryTest() - : ChartTest("/chart2/qa/extras/data/") + : ChartTest(u"/chart2/qa/extras/data/"_ustr) { } // Mostly tests for line and fill properties @@ -74,8 +74,8 @@ void Chart2GeometryTest::testTdf135184RoundLineCap() { // It tests chart area, data series line and regression-curve line. loadFromFile(u"xlsx/tdf135184RoundLineCap.xlsx"); - save("calc8"); - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml"); + save(u"calc8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); static constexpr OString sStyleStart("/office:document-content/office:automatic-styles"_ostr); @@ -103,8 +103,8 @@ void Chart2GeometryTest::testTdf135184RoundLineCap2() { // It tests legend, data series sector and title. loadFromFile(u"xlsx/tdf135184RoundLineCap2.xlsx"); - save("calc8"); - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml"); + save(u"calc8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); static constexpr OString sStyleStart("/office:document-content/office:automatic-styles"_ostr); @@ -134,34 +134,34 @@ void Chart2GeometryTest::testTdf135184RoundLineCap3() { // It tests chart area, data series line and regression-curve line. loadFromFile(u"xlsx/tdf135184RoundLineCap.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); static constexpr OString sDash("/c:spPr/a:ln/a:prstDash"_ostr); // chart area - assertXPath(pXmlDoc, "/c:chartSpace" + sDash, "val"_ostr, "dashDot"); + assertXPath(pXmlDoc, "/c:chartSpace" + sDash, "val"_ostr, u"dashDot"_ustr); // data series line static constexpr OString sStart("/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser"_ostr); - assertXPath(pXmlDoc, sStart + sDash, "val"_ostr, "dash"); + assertXPath(pXmlDoc, sStart + sDash, "val"_ostr, u"dash"_ustr); // regression-curve (trendline) - assertXPath(pXmlDoc, sStart + "/c:trendline" + sDash, "val"_ostr, "sysDot"); + assertXPath(pXmlDoc, sStart + "/c:trendline" + sDash, "val"_ostr, u"sysDot"_ustr); } void Chart2GeometryTest::testTdf135184RoundLineCap4() { // It tests legend, data series sector and title. loadFromFile(u"xlsx/tdf135184RoundLineCap2.xlsx"); - save("Calc Office Open XML"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart1.xml"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); static constexpr OString sChartStart("/c:chartSpace/c:chart"_ostr); static constexpr OString sDash("/c:spPr/a:ln/a:prstDash"_ostr); - assertXPath(pXmlDoc, sChartStart + "/c:legend" + sDash, "val"_ostr, "sysDot"); + assertXPath(pXmlDoc, sChartStart + "/c:legend" + sDash, "val"_ostr, u"sysDot"_ustr); const OString sSeries(sChartStart + "/c:plotArea/c:pieChart/c:ser/c:dPt[3]"); - assertXPath(pXmlDoc, sSeries + sDash, "val"_ostr, "dash"); - assertXPath(pXmlDoc, sChartStart + "/c:title" + sDash, "val"_ostr, "dashDot"); + assertXPath(pXmlDoc, sSeries + sDash, "val"_ostr, u"dash"_ustr); + assertXPath(pXmlDoc, sChartStart + "/c:title" + sDash, "val"_ostr, u"dashDot"_ustr); } void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_export() @@ -177,14 +177,16 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_export() // ODF im/export for MCGR is integrated // Make sure the chart area has a transparency in gradient stops in saved pptx file. - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); OString sPathStart("//c:chartSpace/c:spPr/a:gradFill"_ostr); assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs", 2); - assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]/a:srgbClr/a:alpha", "val"_ostr, "30000"); - assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val"_ostr, "30000"); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]/a:srgbClr/a:alpha", "val"_ostr, + u"30000"_ustr); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val"_ostr, + u"30000"_ustr); } void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import() @@ -203,8 +205,8 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import() loadFromFile(u"pptx/tdf128345_ChartArea_CG_TS.pptx"); // Find transparency gradient name - save("impress8"); - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml"); + save(u"impress8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); const OUString sOUChartStyleName = getXPathContent( pXmlDoc, @@ -218,8 +220,8 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import() = getXPathContent(pXmlDoc, sStylePath + "/style:graphic-properties/@draw:opacity-name"); // Verify the content of the opacity definition - save("impress8"); - xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml"); + save(u"impress8"_ustr); + xmlDocUniquePtr pXmlDoc2 = parseExport(u"Object 1/styles.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc2); const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'"); const OString sStart("//office:document-styles/office:styles/draw:opacity[" + sAttribute); @@ -238,14 +240,14 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_export() loadFromFile(u"odp/tdf128345_ChartWall_CS_TG.odp"); // Make sure the chart has a gradient with transparency in gradient stops in saved pptx file. - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); OString sPathStart("//c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill"_ostr); assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs", 2); //linear // MS Office has opacity, so 100% transparency is val="0" - assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]/a:srgbClr/a:alpha", "val"_ostr, "0"); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]/a:srgbClr/a:alpha", "val"_ostr, u"0"_ustr); // no element for 0% transparent assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", 0); } @@ -257,8 +259,8 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import() loadFromFile(u"pptx/tdf128345_ChartWall_CS_TG.pptx"); // Find transparency gradient name - save("impress8"); - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml"); + save(u"impress8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); const OUString sOUChartStyleName = getXPathContent(pXmlDoc, "//office:document-content/office:body/office:chart/chart:chart/" @@ -272,8 +274,8 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import() = getXPathContent(pXmlDoc, sStylePath + "/style:graphic-properties/@draw:opacity-name"); // Verify content of the opacity definition - save("impress8"); - xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml"); + save(u"impress8"_ustr); + xmlDocUniquePtr pXmlDoc2 = parseExport(u"Object 1/styles.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc2); const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'"); const OString sStart("//office:document-styles/office:styles/draw:opacity[" + sAttribute); @@ -290,8 +292,8 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_export() loadFromFile(u"odp/tdf128345_Legend_CS_TG_axial.odp"); // Make sure the chart has a gradient with transparency in gradient stops in saved pptx file. - save("Impress MS PowerPoint 2007 XML"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1.xml"); + save(u"Impress MS PowerPoint 2007 XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"ppt/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); OString sPathStart("//c:chartSpace/c:chart/c:legend/c:spPr/a:gradFill"_ostr); @@ -301,15 +303,15 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_export() // MCGR: start entry, no transparence, pos zero assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]/a:srgbClr/a:alpha", 0); - assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]", "pos"_ostr, "0"); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]", "pos"_ostr, u"0"_ustr); // MCGR: middle entry, 100% transparence, pos 0.5 - assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val"_ostr, "0"); - assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]", "pos"_ostr, "50000"); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val"_ostr, u"0"_ustr); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]", "pos"_ostr, u"50000"_ustr); // MCGR: end entry, no transparence, pos 1.0 assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[3]/a:srgbClr/a:alpha", 0); - assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[3]", "pos"_ostr, "100000"); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[3]", "pos"_ostr, u"100000"_ustr); } void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import() @@ -319,8 +321,8 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import() loadFromFile(u"pptx/tdf128345_Legend_CS_TG_axial.pptx"); // Find transparency gradient name - save("impress8"); - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml"); + save(u"impress8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); const OUString sOUChartStyleName = getXPathContent(pXmlDoc, "//office:document-content/office:body/office:chart/chart:chart/" @@ -334,8 +336,8 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import() = getXPathContent(pXmlDoc, sStylePath + "/style:graphic-properties/@draw:opacity-name"); // Verify content of the opacity definition - save("impress8"); - xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml"); + save(u"impress8"_ustr); + xmlDocUniquePtr pXmlDoc2 = parseExport(u"Object 1/styles.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc2); const OString sAttribute("@draw:name='" + OU2O(sOUOpacityName) + "'"); const OString sStart("//office:document-styles/office:styles/draw:opacity[" + sAttribute); @@ -357,29 +359,29 @@ void Chart2GeometryTest::testTdf135366LabelOnSeries() Reference<beans::XPropertySet> xPropSet(xDataSeries, UNO_QUERY_THROW); uno::Any aAny; - aAny = xPropSet->getPropertyValue("LabelBorderStyle"); + aAny = xPropSet->getPropertyValue(u"LabelBorderStyle"_ustr); drawing::LineStyle eLineStyle; CPPUNIT_ASSERT_MESSAGE("No LabelBorderStyle set.", aAny >>= eLineStyle); CPPUNIT_ASSERT_EQUAL_MESSAGE("solid line expected", drawing::LineStyle_SOLID, eLineStyle); sal_Int32 nBorderWidth; sal_Int32 nExpectedWidth = 95; - xPropSet->getPropertyValue("LabelBorderWidth") >>= nBorderWidth; + xPropSet->getPropertyValue(u"LabelBorderWidth"_ustr) >>= nBorderWidth; CPPUNIT_ASSERT_EQUAL_MESSAGE("LabelBorderWidth", nExpectedWidth, nBorderWidth); sal_Int32 nLineColor; sal_Int32 nExpectedLineColor = 255; - xPropSet->getPropertyValue("LabelBorderColor") >>= nLineColor; + xPropSet->getPropertyValue(u"LabelBorderColor"_ustr) >>= nLineColor; CPPUNIT_ASSERT_EQUAL_MESSAGE("line color blue, 255=#0000FF", nExpectedLineColor, nLineColor); - aAny = xPropSet->getPropertyValue("LabelFillStyle"); + aAny = xPropSet->getPropertyValue(u"LabelFillStyle"_ustr); drawing::FillStyle eFillStyle; CPPUNIT_ASSERT_MESSAGE("No LabelFillStyle set", aAny >>= eFillStyle); CPPUNIT_ASSERT_EQUAL_MESSAGE("solid fill expected", drawing::FillStyle_SOLID, eFillStyle); sal_Int32 nFillColor; sal_Int32 nExpectedFillColor = 65280; - xPropSet->getPropertyValue("LabelFillColor") >>= nFillColor; + xPropSet->getPropertyValue(u"LabelFillColor"_ustr) >>= nFillColor; CPPUNIT_ASSERT_EQUAL_MESSAGE("fill color green, 65280=#00FF00", nExpectedFillColor, nFillColor); } @@ -396,35 +398,35 @@ void Chart2GeometryTest::testTdf135366LabelOnPoint() uno::UNO_SET_THROW); uno::Any aAny; - aAny = xPropSet->getPropertyValue("LabelBorderStyle"); + aAny = xPropSet->getPropertyValue(u"LabelBorderStyle"_ustr); drawing::LineStyle eLineStyle; CPPUNIT_ASSERT_MESSAGE("No LabelBorderStyle set.", aAny >>= eLineStyle); CPPUNIT_ASSERT_EQUAL_MESSAGE("solid line expected", drawing::LineStyle_SOLID, eLineStyle); sal_Int32 nBorderWidth; sal_Int32 nExpectedWidth = 381; - xPropSet->getPropertyValue("LabelBorderWidth") >>= nBorderWidth; + xPropSet->getPropertyValue(u"LabelBorderWidth"_ustr) >>= nBorderWidth; CPPUNIT_ASSERT_EQUAL_MESSAGE("LabelBorderWidth", nExpectedWidth, nBorderWidth); sal_Int32 nLineTransparency; sal_Int32 nExpectedTransparency = 30; - xPropSet->getPropertyValue("LabelBorderTransparency") >>= nLineTransparency; + xPropSet->getPropertyValue(u"LabelBorderTransparency"_ustr) >>= nLineTransparency; CPPUNIT_ASSERT_EQUAL_MESSAGE("line transparency", nExpectedTransparency, nLineTransparency); sal_Int32 nLineColor; sal_Int32 nExpectedLineColor = 10206041; - xPropSet->getPropertyValue("LabelBorderColor") >>= nLineColor; + xPropSet->getPropertyValue(u"LabelBorderColor"_ustr) >>= nLineColor; CPPUNIT_ASSERT_EQUAL_MESSAGE("line color greenish, 10206041=#9BBB59", nExpectedLineColor, nLineColor); - aAny = xPropSet->getPropertyValue("LabelFillStyle"); + aAny = xPropSet->getPropertyValue(u"LabelFillStyle"_ustr); drawing::FillStyle eFillStyle; CPPUNIT_ASSERT_MESSAGE("No LabelFillStyle set", aAny >>= eFillStyle); CPPUNIT_ASSERT_EQUAL_MESSAGE("solid fill expected", drawing::FillStyle_SOLID, eFillStyle); sal_Int32 nFillColor; sal_Int32 nExpectedFillColor = 14277081; - xPropSet->getPropertyValue("LabelFillColor") >>= nFillColor; + xPropSet->getPropertyValue(u"LabelFillColor"_ustr) >>= nFillColor; CPPUNIT_ASSERT_EQUAL_MESSAGE("fill color gray, 14277081=#d9d9d9", nExpectedFillColor, nFillColor); } @@ -439,8 +441,8 @@ void Chart2GeometryTest::testTdf135366LabelExport() // FIXME: Error: unexpected attribute "loext:label-stroke-color" skipValidation(); - save("writer8"); - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml"); + save(u"writer8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Find label style @@ -467,8 +469,8 @@ void Chart2GeometryTest::testTdf135366_CustomLabelText() const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion(GetODFDefaultVersion()); SetODFDefaultVersion(SvtSaveOptions::ODFVER_012); loadFromFile(u"pptx/tdf135366_CustomLabelText.pptx"); - save("impress8"); - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml"); + save(u"impress8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Find custom text. As of version 7.0 it is in a <text:span> element. @@ -479,7 +481,7 @@ void Chart2GeometryTest::testTdf135366_CustomLabelText() // Verify text content const OUString sOUTextContent = getXPathContent(pXmlDoc, sCustomTextPath); - CPPUNIT_ASSERT_EQUAL(OUString("Custom"), sOUTextContent); + CPPUNIT_ASSERT_EQUAL(u"Custom"_ustr, sOUTextContent); SetODFDefaultVersion(nCurrentODFVersion); } diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 02c00daed941..2f8777f66a29 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -42,7 +42,7 @@ namespace class Chart2ImportTest : public ChartTest { public: - Chart2ImportTest() : ChartTest("/chart2/qa/extras/data/") {} + Chart2ImportTest() : ChartTest(u"/chart2/qa/extras/data/"_ustr) {} protected: void testTransparentBackground(std::u16string_view filename); @@ -50,7 +50,7 @@ protected: OUString getShapeDump(css::uno::Reference<css::chart::XChartDocument> const& doc) { - return css::uno::Reference<css::qa::XDumper>(doc, css::uno::UNO_QUERY_THROW)->dump("shapes"); + return css::uno::Reference<css::qa::XDumper>(doc, css::uno::UNO_QUERY_THROW)->dump(u"shapes"_ustr); } // error bar import @@ -73,7 +73,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo60083) { sal_Int32 nErrorBarStyle; CPPUNIT_ASSERT( - xErrorBarYProps->getPropertyValue("ErrorBarStyle") + xErrorBarYProps->getPropertyValue(u"ErrorBarStyle"_ustr) >>= nErrorBarStyle); CPPUNIT_ASSERT_EQUAL( chart::ErrorBarStyle::RELATIVE, @@ -81,20 +81,20 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo60083) double nVal = 0.0; CPPUNIT_ASSERT( - xErrorBarYProps->getPropertyValue("PositiveError") >>= nVal); + xErrorBarYProps->getPropertyValue(u"PositiveError"_ustr) >>= nVal); CPPUNIT_ASSERT_DOUBLES_EQUAL(5.0, nVal, 1e-8); CPPUNIT_ASSERT( - xErrorBarYProps->getPropertyValue("NegativeError") >>= nVal); + xErrorBarYProps->getPropertyValue(u"NegativeError"_ustr) >>= nVal); CPPUNIT_ASSERT_DOUBLES_EQUAL(5.0, nVal, 1e-8); bool bVal; CPPUNIT_ASSERT( - xErrorBarYProps->getPropertyValue("ShowPositiveError") >>= bVal); + xErrorBarYProps->getPropertyValue(u"ShowPositiveError"_ustr) >>= bVal); CPPUNIT_ASSERT_EQUAL(true, bVal); CPPUNIT_ASSERT( - xErrorBarYProps->getPropertyValue("ShowNegativeError") >>= bVal); + xErrorBarYProps->getPropertyValue(u"ShowNegativeError"_ustr) >>= bVal); CPPUNIT_ASSERT_EQUAL(true, bVal); } @@ -122,15 +122,15 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testErrorBarRange) sal_Int32 nErrorBarStyle; CPPUNIT_ASSERT( - xErrorBarYProps->getPropertyValue("ErrorBarStyle") + xErrorBarYProps->getPropertyValue(u"ErrorBarStyle"_ustr) >>= nErrorBarStyle); CPPUNIT_ASSERT_EQUAL( chart::ErrorBarStyle::FROM_DATA, nErrorBarStyle); OUString aRangePos; - CPPUNIT_ASSERT(xErrorBarYProps->getPropertyValue("ErrorBarRangePositive") >>= aRangePos); - CPPUNIT_ASSERT_EQUAL(OUString("$Sheet1.$C$2:$C$4"), aRangePos); + CPPUNIT_ASSERT(xErrorBarYProps->getPropertyValue(u"ErrorBarRangePositive"_ustr) >>= aRangePos); + CPPUNIT_ASSERT_EQUAL(u"$Sheet1.$C$2:$C$4"_ustr, aRangePos); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testErrorBarFormatting) @@ -150,7 +150,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testErrorBarFormatting) CPPUNIT_ASSERT(xErrorBarYProps.is()); util::Color aColor(0); - xErrorBarYProps->getPropertyValue("LineColor") >>= aColor; + xErrorBarYProps->getPropertyValue(u"LineColor"_ustr) >>= aColor; sal_uInt32 nColorValue = aColor; CPPUNIT_ASSERT_EQUAL(sal_uInt32(0xff3333), nColorValue); } @@ -189,7 +189,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSteppedLines) CPPUNIT_ASSERT(xPropSet.is()); chart2::CurveStyle eCurveStyle; - xPropSet->getPropertyValue("CurveStyle") >>= eCurveStyle; + xPropSet->getPropertyValue(u"CurveStyle"_ustr) >>= eCurveStyle; CPPUNIT_ASSERT_EQUAL(eCurveStyle, curveStyle[nSheet]); } } @@ -207,9 +207,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODSChartSeries) loadFromFile(u"ods/chart.ods"); uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW); uno::Sequence < OUString > seriesList = getChartColumnDescriptions( xChart1Doc); - CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]); - CPPUNIT_ASSERT_EQUAL(OUString("Col2"), seriesList[1]); - CPPUNIT_ASSERT_EQUAL(OUString("Col 33"), seriesList[2]); + CPPUNIT_ASSERT_EQUAL(u"Col 1"_ustr, seriesList[0]); + CPPUNIT_ASSERT_EQUAL(u"Col2"_ustr, seriesList[1]); + CPPUNIT_ASSERT_EQUAL(u"Col 33"_ustr, seriesList[2]); } @@ -218,9 +218,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSXChartSeries) loadFromFile(u"xlsx/chart.xlsx"); uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW); uno::Sequence < OUString > seriesList = getChartColumnDescriptions(xChart1Doc ); - CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]); - CPPUNIT_ASSERT_EQUAL(OUString("Col2"), seriesList[1]); - CPPUNIT_ASSERT_EQUAL(OUString("Col 33"), seriesList[2]); + CPPUNIT_ASSERT_EQUAL(u"Col 1"_ustr, seriesList[0]); + CPPUNIT_ASSERT_EQUAL(u"Col2"_ustr, seriesList[1]); + CPPUNIT_ASSERT_EQUAL(u"Col 33"_ustr, seriesList[2]); } @@ -229,9 +229,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSChartSeries) loadFromFile(u"xls/chart.xls"); uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW); uno::Sequence < OUString > seriesList = getChartColumnDescriptions(xChart1Doc ); - CPPUNIT_ASSERT_EQUAL(OUString("Col 1"), seriesList[0]); - CPPUNIT_ASSERT_EQUAL(OUString("Col 2"), seriesList[1]); - CPPUNIT_ASSERT_EQUAL(OUString("Col 3"), seriesList[2]); + CPPUNIT_ASSERT_EQUAL(u"Col 1"_ustr, seriesList[0]); + CPPUNIT_ASSERT_EQUAL(u"Col 2"_ustr, seriesList[1]); + CPPUNIT_ASSERT_EQUAL(u"Col 3"_ustr, seriesList[2]); } @@ -239,9 +239,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODTChartSeries) { loadFromFile(u"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]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[2]); + CPPUNIT_ASSERT_EQUAL(u"Column 1"_ustr, seriesList[0]); + CPPUNIT_ASSERT_EQUAL(u"Column 2"_ustr, seriesList[1]); + CPPUNIT_ASSERT_EQUAL(u"Column 3"_ustr, seriesList[2]); } @@ -249,9 +249,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCChartSeries) { loadFromFile(u"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]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[2]); + CPPUNIT_ASSERT_EQUAL(u"Column 1"_ustr, seriesList[0]); + CPPUNIT_ASSERT_EQUAL(u"Column 2"_ustr, seriesList[1]); + CPPUNIT_ASSERT_EQUAL(u"Column 3"_ustr, seriesList[2]); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCXChartSeries) @@ -265,9 +265,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCXChartSeries) std::vector<uno::Sequence<uno::Any> > aLabels = getDataSeriesLabelsFromChartType(xCT); CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size()); - CPPUNIT_ASSERT_EQUAL(OUString("Series 1"), aLabels[0][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("Series 2"), aLabels[1][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("Series 3"), aLabels[2][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"Series 1"_ustr, aLabels[0][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"Series 2"_ustr, aLabels[1][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"Series 3"_ustr, aLabels[2][0].get<OUString>()); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCXChartEmptySeries) @@ -281,9 +281,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCXChartEmptySeries) std::vector<uno::Sequence<uno::Any> > aLabels = getDataSeriesLabelsFromChartType(xCT); CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size()); - CPPUNIT_ASSERT_EQUAL(OUString("1. dataseries"), aLabels[0][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("2. dataseries"), aLabels[1][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), aLabels[2][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"1. dataseries"_ustr, aLabels[0][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"2. dataseries"_ustr, aLabels[1][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"Column 3"_ustr, aLabels[2][0].get<OUString>()); //test chart series sparse data for docx std::vector<std::vector<double> > aValues = getDataSeriesYValuesFromChartType(xCT); @@ -353,9 +353,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTChartSeries) loadFromFile(u"ppt/chart.ppt"); uno::Sequence < OUString > seriesList = getImpressChartColumnDescriptions(0, 0); - CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[2]); + CPPUNIT_ASSERT_EQUAL(u"Column 1"_ustr, seriesList[0]); + CPPUNIT_ASSERT_EQUAL(u"Column 2"_ustr, seriesList[1]); + CPPUNIT_ASSERT_EQUAL(u"Column 3"_ustr, seriesList[2]); } @@ -371,9 +371,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXChartSeries) std::vector<uno::Sequence<uno::Any> > aLabels = getDataSeriesLabelsFromChartType(xCT); CPPUNIT_ASSERT_EQUAL(size_t(3), aLabels.size()); - CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), aLabels[0][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), aLabels[1][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), aLabels[2][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"Column 1"_ustr, aLabels[0][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"Column 2"_ustr, aLabels[1][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"Column 3"_ustr, aLabels[2][0].get<OUString>()); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXSparseChartSeries) @@ -412,7 +412,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXHiddenDataSeries) // "Automatic" chart background fill in pptx should be loaded as no fill. Reference<beans::XPropertySet> xPropSet = xChartDoc->getPageBackground(); CPPUNIT_ASSERT(xPropSet.is()); - drawing::FillStyle eStyle = xPropSet->getPropertyValue("FillStyle").get<drawing::FillStyle>(); + drawing::FillStyle eStyle = xPropSet->getPropertyValue(u"FillStyle"_ustr).get<drawing::FillStyle>(); CPPUNIT_ASSERT_EQUAL_MESSAGE("'Automatic' chart background fill in pptx should be loaded as no fill (transparent).", drawing::FillStyle_NONE, eStyle); @@ -422,7 +422,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXHiddenDataSeries) // There should be only one data series present. std::vector<uno::Sequence<uno::Any> > aLabels = getDataSeriesLabelsFromChartType(xCT); CPPUNIT_ASSERT_EQUAL(size_t(1), aLabels.size()); - CPPUNIT_ASSERT_EQUAL(OUString("Series 3"), aLabels[0][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"Series 3"_ustr, aLabels[0][0].get<OUString>()); // Test the internal data. CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider()); @@ -436,10 +436,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXHiddenDataSeries) // Get the category labels. Sequence<Sequence<OUString> > aCategories = xDescAccess->getComplexRowDescriptions(); CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aCategories.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("Category 1"), aCategories[0][0]); - CPPUNIT_ASSERT_EQUAL(OUString("Category 2"), aCategories[1][0]); - CPPUNIT_ASSERT_EQUAL(OUString("Category 3"), aCategories[2][0]); - CPPUNIT_ASSERT_EQUAL(OUString("Category 4"), aCategories[3][0]); + CPPUNIT_ASSERT_EQUAL(u"Category 1"_ustr, aCategories[0][0]); + CPPUNIT_ASSERT_EQUAL(u"Category 2"_ustr, aCategories[1][0]); + CPPUNIT_ASSERT_EQUAL(u"Category 3"_ustr, aCategories[2][0]); + CPPUNIT_ASSERT_EQUAL(u"Category 4"_ustr, aCategories[3][0]); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXPercentageNumberFormats) @@ -455,35 +455,35 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXPercentageNumberFormats) uno::Reference<beans::XPropertySet> xPropertySet; chart2::DataPointLabel aLabel; sal_Int32 nNumberFormat; - const sal_Int32 nPercentFormatSimple = getNumberFormat(xChartDoc, "0%"); - const sal_Int32 nPercentFormatDecimal = getNumberFormat(xChartDoc, "0.00%"); + const sal_Int32 nPercentFormatSimple = getNumberFormat(xChartDoc, u"0%"_ustr); + const sal_Int32 nPercentFormatDecimal = getNumberFormat(xChartDoc, u"0.00%"_ustr); xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("Label") >>= aLabel; + xPropertySet->getPropertyValue(u"Label"_ustr) >>= aLabel; CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumber); CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent); - xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat; + xPropertySet->getPropertyValue(u"PercentageNumberFormat"_ustr) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(nPercentFormatSimple, nNumberFormat); xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("Label") >>= aLabel; + xPropertySet->getPropertyValue(u"Label"_ustr) >>= aLabel; CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumber); CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent); - xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat; + xPropertySet->getPropertyValue(u"PercentageNumberFormat"_ustr) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(nPercentFormatDecimal, nNumberFormat); xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("Label") >>= aLabel; + xPropertySet->getPropertyValue(u"Label"_ustr) >>= aLabel; CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumber); CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent); - xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat; + xPropertySet->getPropertyValue(u"PercentageNumberFormat"_ustr) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(nPercentFormatSimple, nNumberFormat); xPropertySet.set(xDataSeries->getDataPointByIndex(3), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("Label") >>= aLabel; + xPropertySet->getPropertyValue(u"Label"_ustr) >>= aLabel; CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumber); CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent); - xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat; + xPropertySet->getPropertyValue(u"PercentageNumberFormat"_ustr) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(nPercentFormatDecimal, nNumberFormat); // 2nd chart @@ -501,7 +501,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXPercentageNumberFormats) // FIXME: This should be in fact "0.00%". // see TODO in oox/source/drawingml/chart/modelbase.cxx - const sal_Int32 nPercentFormatDecimalShort = getNumberFormat(xChartDoc, "0.0%"); + const sal_Int32 nPercentFormatDecimalShort = getNumberFormat(xChartDoc, u"0.0%"_ustr); nNumberFormat = getNumberFormatFromAxis(xYAxis); CPPUNIT_ASSERT_EQUAL(nPercentFormatDecimalShort, nNumberFormat); sal_Int16 nType = getNumberFormatType(xChartDoc, nNumberFormat); @@ -516,7 +516,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPieChartLabelsNumFormat) // test data point labels format Reference<beans::XPropertySet> xDataPointPropSet(xChartDoc->getDiagram()->getDataPointProperties(0, 0), uno::UNO_SET_THROW); chart2::DataPointLabel aLabel; - xDataPointPropSet->getPropertyValue("Label") >>= aLabel; + xDataPointPropSet->getPropertyValue(u"Label"_ustr) >>= aLabel; CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumber); } @@ -530,7 +530,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXStackedNonStackedYAxis) Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW); OUString aTitle = getTitleString(xTitled); - CPPUNIT_ASSERT_EQUAL(OUString("Stacked"), aTitle); + CPPUNIT_ASSERT_EQUAL(u"Stacked"_ustr, aTitle); // Get the Y-axis. Reference<chart2::XAxis> xYAxis = getAxisFromDoc(xChartDoc, 0, 1, 0); @@ -547,7 +547,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXStackedNonStackedYAxis) xTitled.set(xChartDoc, uno::UNO_QUERY_THROW); aTitle = getTitleString(xTitled); - CPPUNIT_ASSERT_EQUAL(OUString("100% Stacked"), aTitle); + CPPUNIT_ASSERT_EQUAL(u"100% Stacked"_ustr, aTitle); // Get the Y-axis. xYAxis = getAxisFromDoc(xChartDoc, 0, 1, 0); @@ -566,7 +566,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXStackedNonStackedYAxis) xTitled.set(xChartDoc, uno::UNO_QUERY_THROW); aTitle = getTitleString(xTitled); - CPPUNIT_ASSERT_EQUAL(OUString("Stacked column mixed with 100% stacked area"), aTitle); + CPPUNIT_ASSERT_EQUAL(u"Stacked column mixed with 100% stacked area"_ustr, aTitle); // Get the Y-axis. xYAxis = getAxisFromDoc(xChartDoc, 0, 1, 0); @@ -584,9 +584,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODPChartSeries) //test chart series names for odp loadFromFile(u"odp/chart.odp"); uno::Sequence < OUString > seriesList = getImpressChartColumnDescriptions(0, 0); - CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[2]); + CPPUNIT_ASSERT_EQUAL(u"Column 1"_ustr, seriesList[0]); + CPPUNIT_ASSERT_EQUAL(u"Column 2"_ustr, seriesList[1]); + CPPUNIT_ASSERT_EQUAL(u"Column 3"_ustr, seriesList[2]); } @@ -618,10 +618,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc889755) CPPUNIT_ASSERT_EQUAL(nNumCategories, aDateSeq.getLength()); const OUString aExpectedDateCategories[nNumCategories] = { - "Oct-12", "Nov-12", "Dec-12", "Jan-13", - "Feb-13", "Mar-13", "Apr-13", "May-13", - "Jun-13", "Jul-13", "Aug-13", "Sep-13", - "Oct-13", "Nov-13", "Dec-13", "Jan-14", + u"Oct-12"_ustr, u"Nov-12"_ustr, u"Dec-12"_ustr, u"Jan-13"_ustr, + u"Feb-13"_ustr, u"Mar-13"_ustr, u"Apr-13"_ustr, u"May-13"_ustr, + u"Jun-13"_ustr, u"Jul-13"_ustr, u"Aug-13"_ustr, u"Sep-13"_ustr, + u"Oct-13"_ustr, u"Nov-13"_ustr, u"Dec-13"_ustr, u"Jan-14"_ustr, }; for (size_t nIdx = 0; nIdx < nNumCategories; ++nIdx) @@ -635,7 +635,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc889755) // MCGR: Use the whole completely imported transparency gradient to check for correctness uno::Reference<beans::XPropertySet> xShapeProps(xPage->getByIndex(4), uno::UNO_QUERY_THROW); awt::Gradient2 aTransparence; - xShapeProps->getPropertyValue("FillTransparenceGradient") >>= aTransparence; + xShapeProps->getPropertyValue(u"FillTransparenceGradient"_ustr) >>= aTransparence; const basegfx::BColorStops aColorStops = model::gradient::getColorStopsFromUno(aTransparence.ColorStops); CPPUNIT_ASSERT_EQUAL(size_t(3), aColorStops.size()); @@ -656,7 +656,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc882383) uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); OUString sGradientName; - xPropertySet->getPropertyValue("GradientName") >>= sGradientName; + xPropertySet->getPropertyValue(u"GradientName"_ustr) >>= sGradientName; CPPUNIT_ASSERT(!sGradientName.isEmpty()); } @@ -670,13 +670,13 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTransparencyGradientValue) uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); OUString sTranspGradientName; - xPropertySet->getPropertyValue("FillTransparenceGradientName") >>= sTranspGradientName; + xPropertySet->getPropertyValue(u"FillTransparenceGradientName"_ustr) >>= sTranspGradientName; CPPUNIT_ASSERT(!sTranspGradientName.isEmpty()); awt::Gradient2 aTransparenceGradient; uno::Reference< lang::XMultiServiceFactory > xFact(xChartDoc, uno::UNO_QUERY); CPPUNIT_ASSERT(xFact.is()); - uno::Reference< container::XNameAccess > xTransparenceGradient(xFact->createInstance("com.sun.star.drawing.TransparencyGradientTable"), uno::UNO_QUERY); + uno::Reference< container::XNameAccess > xTransparenceGradient(xFact->createInstance(u"com.sun.star.drawing.TransparencyGradientTable"_ustr), uno::UNO_QUERY); uno::Any rTransparenceValue = xTransparenceGradient->getByName(sTranspGradientName); CPPUNIT_ASSERT(rTransparenceValue >>= aTransparenceGradient); const basegfx::BColorStops aColorStops = model::gradient::getColorStopsFromUno(aTransparenceGradient.ColorStops); @@ -709,7 +709,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDelayedCellImport) getDataSequenceFromDocByRole(xChartDoc, u"values-x"); OUString aRange = xDataSeq->getSourceRangeRepresentation(); - CPPUNIT_ASSERT_EQUAL(OUString("$Sheet2.$C$5:$C$9"), aRange); + CPPUNIT_ASSERT_EQUAL(u"$Sheet2.$C$5:$C$9"_ustr, aRange); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFlatODSStackedColumnChart) @@ -755,8 +755,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf127811) // Without the fix in place, this test would have failed with // - Expected: 1. first // - Actual : 2. second - CPPUNIT_ASSERT_EQUAL(OUString("1. first"), aLabels[0][0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("2. second"), aLabels[1][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"1. first"_ustr, aLabels[0][0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"2. second"_ustr, aLabels[1][0].get<OUString>()); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf86624) @@ -787,14 +787,14 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf105517) CPPUNIT_ASSERT(xPropSet1.is()); tools::Long lineColor; - xPropSet1->getPropertyValue("Color") >>= lineColor; + xPropSet1->getPropertyValue(u"Color"_ustr) >>= lineColor; // incorrect line color was 0x4a7ebb due to not handling themeOverride CPPUNIT_ASSERT_EQUAL(tools::Long(0xeaa700), lineColor); Reference<beans::XPropertySet> xPropSet2(xDSContainer->getDataSeries()[1], uno::UNO_QUERY); CPPUNIT_ASSERT(xPropSet2.is()); - xPropSet2->getPropertyValue("Color") >>= lineColor; + xPropSet2->getPropertyValue(u"Color"_ustr) >>= lineColor; // incorrect line color was 0x98b855 CPPUNIT_ASSERT_EQUAL(tools::Long(0x1e69a8), lineColor); } @@ -811,7 +811,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf106217) CPPUNIT_ASSERT(xCircle.is()); uno::Reference<container::XNamed> xNamedShape(xCircle, uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("Oval 1"), xNamedShape->getName()); + CPPUNIT_ASSERT_EQUAL(u"Oval 1"_ustr, xNamedShape->getName()); awt::Point aPosition = xCircle->getPosition(); CPPUNIT_ASSERT_EQUAL(sal_Int32(6870), aPosition.X); @@ -834,7 +834,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf108021) uno::Reference< chart::XAxisXSupplier > xAxisXSupp( mxDiagram, uno::UNO_QUERY ); CPPUNIT_ASSERT(xAxisXSupp.is()); xAxisProp = xAxisXSupp->getXAxis(); - xAxisProp->getPropertyValue("TextBreak") >>= bTextBreak; + xAxisProp->getPropertyValue(u"TextBreak"_ustr) >>= bTextBreak; // Expected value of 'TextBreak' is true CPPUNIT_ASSERT(bTextBreak); } @@ -862,21 +862,21 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf124817) xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xDataSeries.is()); uno::Reference<beans::XPropertySet> xPropSet_0(xDataSeries, uno::UNO_QUERY_THROW); - CPPUNIT_ASSERT((xPropSet_0->getPropertyValue("Symbol") >>= aSymblProp)); + CPPUNIT_ASSERT((xPropSet_0->getPropertyValue(u"Symbol"_ustr) >>= aSymblProp)); CPPUNIT_ASSERT_EQUAL(chart2::SymbolStyle_NONE, aSymblProp.Style); // Check the symbol of data series 2 (marker style square) xDataSeries = getDataSeriesFromDoc(xChartDoc, 1); CPPUNIT_ASSERT(xDataSeries.is()); uno::Reference<beans::XPropertySet> xPropSet_1(xDataSeries, uno::UNO_QUERY_THROW); - CPPUNIT_ASSERT((xPropSet_1->getPropertyValue("Symbol") >>= aSymblProp)); + CPPUNIT_ASSERT((xPropSet_1->getPropertyValue(u"Symbol"_ustr) >>= aSymblProp)); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0xED7D31), aSymblProp.FillColor); // Check the symbol of data series 3 (marker style diagonal cross) xDataSeries = getDataSeriesFromDoc(xChartDoc, 2); CPPUNIT_ASSERT(xDataSeries.is()); uno::Reference<beans::XPropertySet> xPropSet_2(xDataSeries, uno::UNO_QUERY_THROW); - CPPUNIT_ASSERT((xPropSet_2->getPropertyValue("Symbol") >>= aSymblProp)); + CPPUNIT_ASSERT((xPropSet_2->getPropertyValue(u"Symbol"_ustr) >>= aSymblProp)); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0xFF0000), aSymblProp.BorderColor); } @@ -891,7 +891,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf126033) uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - CPPUNIT_ASSERT(xPropertySet->getPropertyValue("Symbol") >>= aSymblProp); + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Symbol"_ustr) >>= aSymblProp); CPPUNIT_ASSERT_EQUAL(chart2::SymbolStyle_NONE, aSymblProp.Style); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(176), aSymblProp.Size.Width); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(176), aSymblProp.Size.Height); @@ -910,7 +910,7 @@ void Chart2ImportTest::testTransparentBackground(std::u16string_view filename) CPPUNIT_ASSERT_MESSAGE("failed to get Area", xPropSet.is()); css::drawing::FillStyle aStyle; - xPropSet -> getPropertyValue("FillStyle") >>= aStyle; + xPropSet -> getPropertyValue(u"FillStyle"_ustr) >>= aStyle; CPPUNIT_ASSERT_EQUAL_MESSAGE("Background needs to be with solid fill style", css::drawing::FillStyle_SOLID, aStyle); } @@ -934,8 +934,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoBackgroundXLSX) // "Automatic" chart background fill in xlsx should be loaded as solid white. Reference<beans::XPropertySet> xPropSet = xChartDoc->getPageBackground(); CPPUNIT_ASSERT(xPropSet.is()); - drawing::FillStyle eStyle = xPropSet->getPropertyValue("FillStyle").get<drawing::FillStyle>(); - sal_Int32 nColor = xPropSet->getPropertyValue("FillColor").get<sal_Int32>(); + drawing::FillStyle eStyle = xPropSet->getPropertyValue(u"FillStyle"_ustr).get<drawing::FillStyle>(); + sal_Int32 nColor = xPropSet->getPropertyValue(u"FillColor"_ustr).get<sal_Int32>(); CPPUNIT_ASSERT_EQUAL_MESSAGE("'Automatic' chart background fill in xlsx should be loaded as solid fill.", drawing::FillStyle_SOLID, eStyle); CPPUNIT_ASSERT_EQUAL_MESSAGE("'Automatic' chart background fill in xlsx should be loaded as solid white.", @@ -951,9 +951,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoChartAreaBorderPropXLSX) // Test "Automatic" chartarea border style/color/width. Reference<beans::XPropertySet> xPropSet = xChartDoc->getPageBackground(); CPPUNIT_ASSERT(xPropSet.is()); - drawing::LineStyle eStyle = xPropSet->getPropertyValue("LineStyle").get<drawing::LineStyle>(); - sal_Int32 nColor = xPropSet->getPropertyValue("LineColor").get<sal_Int32>(); - sal_Int32 nWidth = xPropSet->getPropertyValue("LineWidth").get<sal_Int32>(); + drawing::LineStyle eStyle = xPropSet->getPropertyValue(u"LineStyle"_ustr).get<drawing::LineStyle>(); + sal_Int32 nColor = xPropSet->getPropertyValue(u"LineColor"_ustr).get<sal_Int32>(); + sal_Int32 nWidth = xPropSet->getPropertyValue(u"LineWidth"_ustr).get<sal_Int32>(); CPPUNIT_ASSERT_EQUAL_MESSAGE("'Automatic' chartarea border should be loaded as solid style.", drawing::LineStyle_SOLID, eStyle); CPPUNIT_ASSERT_EQUAL_MESSAGE("'Automatic' chartarea border color should be loaded as light gray.", @@ -971,7 +971,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoChartAreaBorderPropPPTX) // Test "Automatic" chartarea border style/color/width. Reference<beans::XPropertySet> xPropSet = xChartDoc->getPageBackground(); CPPUNIT_ASSERT(xPropSet.is()); - drawing::LineStyle eStyle = xPropSet->getPropertyValue("LineStyle").get<drawing::LineStyle>(); + drawing::LineStyle eStyle = xPropSet->getPropertyValue(u"LineStyle"_ustr).get<drawing::LineStyle>(); CPPUNIT_ASSERT_EQUAL_MESSAGE("'Automatic' chartarea border should be loaded as none style for pptx.", drawing::LineStyle_NONE, eStyle); } @@ -985,8 +985,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testChartAreaStyleBackgroundXLSX) // "Automatic" chart background fill in xlsx should be loaded as solid white. Reference<beans::XPropertySet> xPropSet = xChartDoc->getPageBackground(); CPPUNIT_ASSERT(xPropSet.is()); - drawing::FillStyle eStyle = xPropSet->getPropertyValue("FillStyle").get<drawing::FillStyle>(); - sal_Int32 nColor = xPropSet->getPropertyValue("FillColor").get<sal_Int32>(); + drawing::FillStyle eStyle = xPropSet->getPropertyValue(u"FillStyle"_ustr).get<drawing::FillStyle>(); + sal_Int32 nColor = xPropSet->getPropertyValue(u"FillColor"_ustr).get<sal_Int32>(); CPPUNIT_ASSERT_EQUAL_MESSAGE("'Automatic' chart background fill in xlsx should be loaded as solid fill.", drawing::FillStyle_SOLID, eStyle); CPPUNIT_ASSERT_EQUAL_MESSAGE("'Automatic' chart background fill in xlsx should be loaded as solid white.", @@ -1002,18 +1002,18 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testChartHatchFillXLSX) // Check the chart background FillStyle is HATCH Reference<beans::XPropertySet> xPropSet = xChartDoc->getPageBackground(); CPPUNIT_ASSERT(xPropSet.is()); - drawing::FillStyle eStyle = xPropSet->getPropertyValue("FillStyle").get<drawing::FillStyle>(); + drawing::FillStyle eStyle = xPropSet->getPropertyValue(u"FillStyle"_ustr).get<drawing::FillStyle>(); CPPUNIT_ASSERT_EQUAL_MESSAGE("Chart background fill in this xlsx should be loaded as hatch fill.", drawing::FillStyle_HATCH, eStyle); // Check the FillBackground of chart background bool bBackgroundFill = false; - xPropSet->getPropertyValue("FillBackground") >>= bBackgroundFill; + xPropSet->getPropertyValue(u"FillBackground"_ustr) >>= bBackgroundFill; CPPUNIT_ASSERT(bBackgroundFill); Color nBackgroundColor; - xPropSet->getPropertyValue("FillColor") >>= nBackgroundColor; + xPropSet->getPropertyValue(u"FillColor"_ustr) >>= nBackgroundColor; CPPUNIT_ASSERT_EQUAL(COL_WHITE, nBackgroundColor); // Check the datapoint has HatchName value @@ -1022,16 +1022,16 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testChartHatchFillXLSX) uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(1), uno::UNO_SET_THROW); OUString sHatchName; - xPropertySet->getPropertyValue("HatchName") >>= sHatchName; + xPropertySet->getPropertyValue(u"HatchName"_ustr) >>= sHatchName; CPPUNIT_ASSERT(!sHatchName.isEmpty()); // Check the FillBackground of datapoint bool bBackgroundFillofDatapoint = false; - xPropertySet->getPropertyValue("FillBackground") >>= bBackgroundFillofDatapoint; + xPropertySet->getPropertyValue(u"FillBackground"_ustr) >>= bBackgroundFillofDatapoint; CPPUNIT_ASSERT(bBackgroundFillofDatapoint); sal_Int32 nBackgroundColorofDatapoint; - xPropertySet->getPropertyValue("FillColor") >>= nBackgroundColorofDatapoint; + xPropertySet->getPropertyValue(u"FillColor"_ustr) >>= nBackgroundColorofDatapoint; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0x00B050), nBackgroundColorofDatapoint); } @@ -1046,7 +1046,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAxisTextRotationXLSX) Reference<beans::XPropertySet> xPS(xYAxis, uno::UNO_QUERY_THROW); double nRotation = 0; - bool bSuccess = xPS->getPropertyValue("TextRotation") >>= nRotation; + bool bSuccess = xPS->getPropertyValue(u"TextRotation"_ustr) >>= nRotation; CPPUNIT_ASSERT(bSuccess); CPPUNIT_ASSERT_DOUBLES_EQUAL(90, nRotation, 1e-10); @@ -1065,7 +1065,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTextCanOverlapXLSX) uno::Reference< chart::XAxisXSupplier > xAxisXSupp( mxDiagram, uno::UNO_QUERY ); CPPUNIT_ASSERT(xAxisXSupp.is()); xAxisProp = xAxisXSupp->getXAxis(); - xAxisProp->getPropertyValue("TextCanOverlap") >>= bTextCanOverlap; + xAxisProp->getPropertyValue(u"TextCanOverlap"_ustr) >>= bTextCanOverlap; CPPUNIT_ASSERT(!bTextCanOverlap); } @@ -1083,7 +1083,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTextBreakXLSX) uno::Reference< chart::XAxisXSupplier > xAxisXSupp( mxDiagram, uno::UNO_QUERY ); CPPUNIT_ASSERT(xAxisXSupp.is()); xAxisProp = xAxisXSupp->getXAxis(); - xAxisProp->getPropertyValue("TextBreak") >>= textBreak; + xAxisProp->getPropertyValue(u"TextBreak"_ustr) >>= textBreak; // Expected value of 'TextBreak' is true CPPUNIT_ASSERT(textBreak); } @@ -1101,39 +1101,39 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testNumberFormatsXLSX) sal_Int32 nNumberFormat; bool bLinkNumberFormatToSource = false; const sal_Int32 nChartDataNumberFormat = getNumberFormat( - xChartDoc, "_(\"$\"* #,##0_);_(\"$\"* \\(#,##0\\);_(\"$\"* \"-\"??_);_(@_)"); + xChartDoc, u"_(\"$\"* #,##0_);_(\"$\"* \\(#,##0\\);_(\"$\"* \"-\"??_);_(@_)"_ustr); xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("Label") >>= aLabel; + xPropertySet->getPropertyValue(u"Label"_ustr) >>= aLabel; CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumber); CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent); xPropertySet->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(nChartDataNumberFormat, nNumberFormat); - bool bSuccess = xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat; + bool bSuccess = xPropertySet->getPropertyValue(u"PercentageNumberFormat"_ustr) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(false, bSuccess); bSuccess = xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource; CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess); CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bLinkNumberFormatToSource); xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("Label") >>= aLabel; + xPropertySet->getPropertyValue(u"Label"_ustr) >>= aLabel; CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumber); CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumberInPercent); xPropertySet->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(nChartDataNumberFormat, nNumberFormat); - bSuccess = xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat; + bSuccess = xPropertySet->getPropertyValue(u"PercentageNumberFormat"_ustr) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(false, bSuccess); bSuccess = xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource; CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess); CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bLinkNumberFormatToSource); xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("Label") >>= aLabel; + xPropertySet->getPropertyValue(u"Label"_ustr) >>= aLabel; CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumber); CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent); xPropertySet->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(nChartDataNumberFormat, nNumberFormat); - bSuccess = xPropertySet->getPropertyValue("PercentageNumberFormat") >>= nNumberFormat; + bSuccess = xPropertySet->getPropertyValue(u"PercentageNumberFormat"_ustr) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(false, bSuccess); bSuccess = xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource; CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bSuccess); @@ -1154,7 +1154,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testNumberFormatsDOCX) sal_Int32 nNumberFormat; bool bLinkNumberFormatToSource = true; - const sal_Int32 nChartDataNumberFormat = getNumberFormat(xChartDoc, "0%"); + const sal_Int32 nChartDataNumberFormat = getNumberFormat(xChartDoc, u"0%"_ustr); xPropertySet->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(nChartDataNumberFormat, nNumberFormat); xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource; @@ -1175,7 +1175,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testNumberFormatsDOCX) sal_Int32 nNumberFormat; bool bLinkNumberFormatToSource = true; - const sal_Int32 nChartDataNumberFormat = getNumberFormat(xChartDoc, "0%"); + const sal_Int32 nChartDataNumberFormat = getNumberFormat(xChartDoc, u"0%"_ustr); xPropertySet->getPropertyValue(CHART_UNONAME_NUMFMT) >>= nNumberFormat; CPPUNIT_ASSERT_EQUAL(nChartDataNumberFormat, nNumberFormat); xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource; @@ -1198,7 +1198,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPercentageNumberFormatsDOCX) bool bLinkNumberFormatToSource = false; chart2::DataPointLabel aLabel; - xPropertySet->getPropertyValue("Label") >>= aLabel; + xPropertySet->getPropertyValue(u"Label"_ustr) >>= aLabel; CPPUNIT_ASSERT_EQUAL(sal_False, aLabel.ShowNumber); CPPUNIT_ASSERT_EQUAL(sal_True, aLabel.ShowNumberInPercent); bool bSuccess = xPropertySet->getPropertyValue(CHART_UNONAME_LINK_TO_SRC_NUMFMT) >>= bLinkNumberFormatToSource; @@ -1240,7 +1240,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDispBlanksAsDefaultValue2007XLSX) Reference<beans::XPropertySet> xDiagram(xChartDoc->getFirstDiagram(), UNO_QUERY); CPPUNIT_ASSERT(xDiagram.is()); - uno::Any aAny = xDiagram->getPropertyValue("MissingValueTreatment"); + uno::Any aAny = xDiagram->getPropertyValue(u"MissingValueTreatment"_ustr); sal_Int32 nMissingValueTreatment = -2; CPPUNIT_ASSERT(aAny >>= nMissingValueTreatment); CPPUNIT_ASSERT_EQUAL(chart::MissingValueTreatment::LEAVE_GAP, nMissingValueTreatment); @@ -1254,7 +1254,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDispBlanksAsDefaultValue2013XLSX) Reference<beans::XPropertySet> xDiagram(xChartDoc->getFirstDiagram(), UNO_QUERY); CPPUNIT_ASSERT(xDiagram.is()); - uno::Any aAny = xDiagram->getPropertyValue("MissingValueTreatment"); + uno::Any aAny = xDiagram->getPropertyValue(u"MissingValueTreatment"_ustr); sal_Int32 nMissingValueTreatment = -2; CPPUNIT_ASSERT(aAny >>= nMissingValueTreatment); CPPUNIT_ASSERT_EQUAL(chart::MissingValueTreatment::USE_ZERO, nMissingValueTreatment); @@ -1274,7 +1274,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSmoothDefaultValue2007XLSX) CPPUNIT_ASSERT(xPropSet.is()); chart2::CurveStyle eCurveStyle; - xPropSet->getPropertyValue("CurveStyle") >>= eCurveStyle; + xPropSet->getPropertyValue(u"CurveStyle"_ustr) >>= eCurveStyle; CPPUNIT_ASSERT_EQUAL(chart2::CurveStyle_LINES, eCurveStyle); } @@ -1292,7 +1292,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSmoothDefaultValue2013XLSX) CPPUNIT_ASSERT(xPropSet.is()); chart2::CurveStyle eCurveStyle; - xPropSet->getPropertyValue("CurveStyle") >>= eCurveStyle; + xPropSet->getPropertyValue(u"CurveStyle"_ustr) >>= eCurveStyle; CPPUNIT_ASSERT(eCurveStyle != chart2::CurveStyle_LINES); } @@ -1311,12 +1311,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTrendlineDefaultValue2007XLSX) Reference<chart2::XRegressionCurve> xCurve = xRegressionCurveSequence[0]; Reference<beans::XPropertySet> xPropSet(xCurve->getEquationProperties(), uno::UNO_SET_THROW); - uno::Any aAny = xPropSet->getPropertyValue("ShowEquation"); + uno::Any aAny = xPropSet->getPropertyValue(u"ShowEquation"_ustr); bool bShowEquation = true; CPPUNIT_ASSERT(aAny >>= bShowEquation); CPPUNIT_ASSERT(!bShowEquation); - aAny = xPropSet->getPropertyValue("ShowCorrelationCoefficient"); + aAny = xPropSet->getPropertyValue(u"ShowCorrelationCoefficient"_ustr); bool bShowCorrelation = true; CPPUNIT_ASSERT(aAny >>= bShowCorrelation); CPPUNIT_ASSERT(!bShowCorrelation); @@ -1337,12 +1337,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTrendlineDefaultValue2013XLSX) Reference<chart2::XRegressionCurve> xCurve = xRegressionCurveSequence[0]; Reference<beans::XPropertySet> xPropSet(xCurve->getEquationProperties(), uno::UNO_SET_THROW); - uno::Any aAny = xPropSet->getPropertyValue("ShowEquation"); + uno::Any aAny = xPropSet->getPropertyValue(u"ShowEquation"_ustr); bool bShowEquation = false; CPPUNIT_ASSERT(aAny >>= bShowEquation); CPPUNIT_ASSERT(bShowEquation); - aAny = xPropSet->getPropertyValue("ShowCorrelationCoefficient"); + aAny = xPropSet->getPropertyValue(u"ShowCorrelationCoefficient"_ustr); bool bShowCorrelation = false; CPPUNIT_ASSERT(aAny >>= bShowCorrelation); CPPUNIT_ASSERT(bShowCorrelation); @@ -1357,7 +1357,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testVaryColorDefaultValues2007XLSX) Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xDataSeries.is()); Reference<beans::XPropertySet> xPropSet(xDataSeries, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("VaryColorsByPoint"); + uno::Any aAny = xPropSet->getPropertyValue(u"VaryColorsByPoint"_ustr); bool bVaryColor = true; CPPUNIT_ASSERT(aAny >>= bVaryColor); CPPUNIT_ASSERT(!bVaryColor); @@ -1372,7 +1372,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testVaryColorDefaultValues2013XLSX) Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xDataSeries.is()); Reference<beans::XPropertySet> xPropSet(xDataSeries, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("VaryColorsByPoint"); + uno::Any aAny = xPropSet->getPropertyValue(u"VaryColorsByPoint"_ustr); bool bVaryColor = false; CPPUNIT_ASSERT(aAny >>= bVaryColor); CPPUNIT_ASSERT(!bVaryColor); @@ -1383,7 +1383,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPlotVisOnlyDefaultValue2013XLSX) loadFromFile(u"xlsx/plotVisOnly.xlsx"); uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW); Reference<beans::XPropertySet> xPropSet(xChart1Doc->getDiagram(), uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("IncludeHiddenCells"); + uno::Any aAny = xPropSet->getPropertyValue(u"IncludeHiddenCells"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); bool bShowHiddenValues = true; CPPUNIT_ASSERT(aAny >>= bShowHiddenValues); @@ -1395,7 +1395,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testRAngAxDefaultValue2013XLSX) loadFromFile(u"xlsx/rAngAx.xlsx"); uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW); Reference<beans::XPropertySet> xPropSet(xChart1Doc->getDiagram(), uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("RightAngledAxes"); + uno::Any aAny = xPropSet->getPropertyValue(u"RightAngledAxes"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); bool bRightAngleAxes = false; CPPUNIT_ASSERT(aAny >>= bRightAngleAxes); @@ -1410,7 +1410,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testMajorTickMarksDefaultValue2013XLSX) Reference<chart2::XAxis> xXAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); CPPUNIT_ASSERT(xXAxis.is()); Reference<beans::XPropertySet> xPropSet(xXAxis, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("MajorTickmarks"); + uno::Any aAny = xPropSet->getPropertyValue(u"MajorTickmarks"_ustr); sal_Int32 nMajorTickmarks = chart2::TickmarkStyle::NONE; CPPUNIT_ASSERT(aAny.hasValue()); CPPUNIT_ASSERT(aAny >>= nMajorTickmarks); @@ -1425,7 +1425,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testMinorTickMarksDefaultValue2013XLSX) Reference<chart2::XAxis> xXAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); CPPUNIT_ASSERT(xXAxis.is()); Reference<beans::XPropertySet> xPropSet(xXAxis, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("MinorTickmarks"); + uno::Any aAny = xPropSet->getPropertyValue(u"MinorTickmarks"_ustr); sal_Int32 nMajorTickmarks = chart2::TickmarkStyle::NONE; CPPUNIT_ASSERT(aAny.hasValue()); CPPUNIT_ASSERT(aAny >>= nMajorTickmarks); @@ -1443,7 +1443,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAxisTitleDefaultRotationXLSX) Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); CPPUNIT_ASSERT(xTitle.is()); Reference<beans::XPropertySet> xPropSet(xTitle, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("TextRotation"); + uno::Any aAny = xPropSet->getPropertyValue(u"TextRotation"_ustr); double nRotation = 0; CPPUNIT_ASSERT(aAny >>= nRotation); CPPUNIT_ASSERT_EQUAL(90.0, nRotation); @@ -1460,7 +1460,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSecondaryAxisTitleDefaultRotationXLSX Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); CPPUNIT_ASSERT(xTitle.is()); Reference<beans::XPropertySet> xPropSet(xTitle, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("TextRotation"); + uno::Any aAny = xPropSet->getPropertyValue(u"TextRotation"_ustr); double nRotation = 0; CPPUNIT_ASSERT(aAny >>= nRotation); CPPUNIT_ASSERT_EQUAL(90.0, nRotation); @@ -1478,7 +1478,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAxisTitleRotationXLSX) Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); CPPUNIT_ASSERT(xTitle.is()); Reference<beans::XPropertySet> xPropSet(xTitle, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("TextRotation"); + uno::Any aAny = xPropSet->getPropertyValue(u"TextRotation"_ustr); double nRotation = 0; CPPUNIT_ASSERT(aAny >>= nRotation); CPPUNIT_ASSERT_EQUAL(340.0, nRotation); @@ -1490,7 +1490,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAxisTitleRotationXLSX) Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); CPPUNIT_ASSERT(xTitle.is()); Reference<beans::XPropertySet> xPropSet(xTitle, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("TextRotation"); + uno::Any aAny = xPropSet->getPropertyValue(u"TextRotation"_ustr); double nRotation = 0; CPPUNIT_ASSERT(aAny >>= nRotation); CPPUNIT_ASSERT_EQUAL(270.0, nRotation); @@ -1541,7 +1541,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testCombinedChartAttachedAxisXLSX) Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW); sal_Int32 nAxisIndex = -1; // First series (column chart) should be attached to secondary axis! - uno::Any aAny = xPropSet->getPropertyValue("AttachedAxisIndex"); + uno::Any aAny = xPropSet->getPropertyValue(u"AttachedAxisIndex"_ustr); CPPUNIT_ASSERT(aAny >>= nAxisIndex); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), nAxisIndex); @@ -1551,7 +1551,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testCombinedChartAttachedAxisXLSX) xPropSet.set(xSeries, uno::UNO_QUERY_THROW); // Second series (line chart) should be attached to primary axis! - aAny = xPropSet->getPropertyValue("AttachedAxisIndex"); + aAny = xPropSet->getPropertyValue(u"AttachedAxisIndex"_ustr); CPPUNIT_ASSERT(aAny >>= nAxisIndex); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nAxisIndex); } @@ -1566,7 +1566,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf140489MultiSeriesChartAxisXLSX) Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW); sal_Int32 nAxisIndex = -1; - uno::Any aAny = xPropSet->getPropertyValue("AttachedAxisIndex"); + uno::Any aAny = xPropSet->getPropertyValue(u"AttachedAxisIndex"_ustr); CPPUNIT_ASSERT(aAny >>= nAxisIndex); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nAxisIndex); @@ -1575,7 +1575,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf140489MultiSeriesChartAxisXLSX) CPPUNIT_ASSERT(xSeries.is()); xPropSet.set(xSeries, uno::UNO_QUERY_THROW); - aAny = xPropSet->getPropertyValue("AttachedAxisIndex"); + aAny = xPropSet->getPropertyValue(u"AttachedAxisIndex"_ustr); CPPUNIT_ASSERT(aAny >>= nAxisIndex); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nAxisIndex); @@ -1584,7 +1584,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf140489MultiSeriesChartAxisXLSX) CPPUNIT_ASSERT(xSeries.is()); xPropSet.set(xSeries, uno::UNO_QUERY_THROW); - aAny = xPropSet->getPropertyValue("AttachedAxisIndex"); + aAny = xPropSet->getPropertyValue(u"AttachedAxisIndex"_ustr); CPPUNIT_ASSERT(aAny >>= nAxisIndex); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), nAxisIndex); } @@ -1596,7 +1596,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testInternalDataProvider) const uno::Reference< chart2::data::XDataProvider >& rxDataProvider = xChartDoc->getDataProvider(); // Parse 42 array - Reference<chart2::data::XDataSequence> xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{42;42;42;42}", ""); + Reference<chart2::data::XDataSequence> xDataSeq = rxDataProvider->createDataSequenceByValueArray(u"values-y"_ustr, u"{42;42;42;42}"_ustr, u""_ustr); Sequence<Any> xSequence = xDataSeq->getData(); CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[0]); CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[1]); @@ -1604,7 +1604,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testInternalDataProvider) CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[3]); // Parse empty first and last - xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{\"\";42;42;\"\"}", ""); + xDataSeq = rxDataProvider->createDataSequenceByValueArray(u"values-y"_ustr, u"{\"\";42;42;\"\"}"_ustr, u""_ustr); xSequence = xDataSeq->getData(); CPPUNIT_ASSERT( std::isnan( *static_cast<const double*>(xSequence[0].getValue()))); CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[1]); @@ -1612,7 +1612,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testInternalDataProvider) CPPUNIT_ASSERT( std::isnan( *static_cast<const double*>(xSequence[3].getValue()))); // Parse empty middle - xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{42;\"\";\"\";42}", ""); + xDataSeq = rxDataProvider->createDataSequenceByValueArray(u"values-y"_ustr, u"{42;\"\";\"\";42}"_ustr, u""_ustr); xSequence = xDataSeq->getData(); CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[0]); CPPUNIT_ASSERT( std::isnan( *static_cast<const double*>(xSequence[1].getValue())) ); @@ -1620,7 +1620,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testInternalDataProvider) CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[3]); // Parse mixed types, numeric only role - xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{42;\"hello\";0;\"world\"}", ""); + xDataSeq = rxDataProvider->createDataSequenceByValueArray(u"values-y"_ustr, u"{42;\"hello\";0;\"world\"}"_ustr, u""_ustr); xSequence = xDataSeq->getData(); CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(42)), xSequence[0]); CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(0)), xSequence[1]); @@ -1628,12 +1628,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testInternalDataProvider) CPPUNIT_ASSERT_EQUAL(uno::Any(sal_Int32(0)), xSequence[3]); // Parse mixed types, mixed role - xDataSeq = rxDataProvider->createDataSequenceByValueArray("categories", "{42;\"hello\";0;\"world\"}", ""); + xDataSeq = rxDataProvider->createDataSequenceByValueArray(u"categories"_ustr, u"{42;\"hello\";0;\"world\"}"_ustr, u""_ustr); xSequence = xDataSeq->getData(); - CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Row 1 42")), xSequence[0]); - CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Row 2 hello")), xSequence[1]); - CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Row 3 0")), xSequence[2]); - CPPUNIT_ASSERT_EQUAL(uno::Any(OUString("Row 4 world")), xSequence[3]); + CPPUNIT_ASSERT_EQUAL(uno::Any(u"Row 1 42"_ustr), xSequence[0]); + CPPUNIT_ASSERT_EQUAL(uno::Any(u"Row 2 hello"_ustr), xSequence[1]); + CPPUNIT_ASSERT_EQUAL(uno::Any(u"Row 3 0"_ustr), xSequence[2]); + CPPUNIT_ASSERT_EQUAL(uno::Any(u"Row 4 world"_ustr), xSequence[3]); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf90510) @@ -1642,7 +1642,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf90510) loadFromFile(u"xls/piechart_outside.xls"); uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW ); Reference<beans::XPropertySet> xPropSet( xChart1Doc->getDiagram()->getDataPointProperties( 0, 0 ), uno::UNO_SET_THROW ); - uno::Any aAny = xPropSet->getPropertyValue( "LabelPlacement" ); + uno::Any aAny = xPropSet->getPropertyValue( u"LabelPlacement"_ustr ); CPPUNIT_ASSERT( aAny.hasValue() ); sal_Int32 nLabelPlacement = 0; CPPUNIT_ASSERT( aAny >>= nLabelPlacement ); @@ -1657,7 +1657,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf109858) // test data point labels position Reference<beans::XPropertySet> xDataPointPropSet( xChart1Doc->getDiagram()->getDataPointProperties( 0, 0 ), uno::UNO_SET_THROW ); - uno::Any aAny = xDataPointPropSet->getPropertyValue( "LabelPlacement" ); + uno::Any aAny = xDataPointPropSet->getPropertyValue( u"LabelPlacement"_ustr ); CPPUNIT_ASSERT( aAny.hasValue() ); sal_Int32 nLabelPlacement = 0; CPPUNIT_ASSERT( aAny >>= nLabelPlacement ); @@ -1665,7 +1665,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf109858) // test data series label position Reference<beans::XPropertySet> xSeriesPropSet(xChart1Doc->getDiagram()->getDataRowProperties(0), uno::UNO_SET_THROW); - aAny = xSeriesPropSet->getPropertyValue( "LabelPlacement" ); + aAny = xSeriesPropSet->getPropertyValue( u"LabelPlacement"_ustr ); CPPUNIT_ASSERT( aAny >>= nLabelPlacement ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Data series labels should be placed outside", chart::DataLabelPlacement::OUTSIDE, nLabelPlacement ); } @@ -1679,7 +1679,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf130105) CPPUNIT_ASSERT(xDataSeries.is()); uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - uno::Any aAny = xPropertySet->getPropertyValue("LabelPlacement"); + uno::Any aAny = xPropertySet->getPropertyValue(u"LabelPlacement"_ustr); CPPUNIT_ASSERT(aAny.hasValue()); sal_Int32 nLabelPlacement = 0; CPPUNIT_ASSERT(aAny >>= nLabelPlacement); @@ -1703,11 +1703,11 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf122226) uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); CPPUNIT_ASSERT(xPropertySet.is()); - uno::Any aAny = xPropertySet->getPropertyValue( "LabelSeparator" ); + uno::Any aAny = xPropertySet->getPropertyValue( u"LabelSeparator"_ustr ); CPPUNIT_ASSERT( aAny.hasValue() ); OUString nLabelSeparator; CPPUNIT_ASSERT( aAny >>= nLabelSeparator ); - CPPUNIT_ASSERT_EQUAL_MESSAGE( "Data labels should be separated into new lines", OUString("\n"), nLabelSeparator ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Data labels should be separated into new lines", u"\n"_ustr, nLabelSeparator ); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf115107) @@ -1728,78 +1728,78 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf115107) // 1 xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), aFields.getLength()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[0]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("90.0 = "), aFields[0]->getString()); - aFields[0]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[0]->getPropertyValue("CharColor") >>= nFontColor; + CPPUNIT_ASSERT_EQUAL(u"90.0 = "_ustr, aFields[0]->getString()); + aFields[0]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[0]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; CPPUNIT_ASSERT_EQUAL(static_cast<float>(18), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xed7d31), nFontColor); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_VALUE, aFields[1]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("90"), aFields[1]->getString()); + CPPUNIT_ASSERT_EQUAL(u"90"_ustr, aFields[1]->getString()); // 2 xPropertySet.set(xDataSeries->getDataPointByIndex(1), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(8), aFields.getLength()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[0]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("Text"), aFields[0]->getString()); + CPPUNIT_ASSERT_EQUAL(u"Text"_ustr, aFields[0]->getString()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[1]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString(" : "), aFields[1]->getString()); + CPPUNIT_ASSERT_EQUAL(u" : "_ustr, aFields[1]->getString()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CATEGORYNAME, aFields[2]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("B"), aFields[2]->getString()); - aFields[2]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[2]->getPropertyValue("CharColor") >>= nFontColor; + CPPUNIT_ASSERT_EQUAL(u"B"_ustr, aFields[2]->getString()); + aFields[2]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[2]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; CPPUNIT_ASSERT_EQUAL(static_cast<float>(16), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xed7d31), nFontColor); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_NEWLINE, aFields[3]->getFieldType()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[4]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("Multi"), aFields[4]->getString()); + CPPUNIT_ASSERT_EQUAL(u"Multi"_ustr, aFields[4]->getString()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[5]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("line"), aFields[5]->getString()); - aFields[5]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[5]->getPropertyValue("CharColor") >>= nFontColor; + CPPUNIT_ASSERT_EQUAL(u"line"_ustr, aFields[5]->getString()); + aFields[5]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[5]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; CPPUNIT_ASSERT_EQUAL(static_cast<float>(11.97), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xbf9000), nFontColor); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_NEWLINE, aFields[6]->getFieldType()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[7]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("Abc"), aFields[7]->getString()); - aFields[7]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[7]->getPropertyValue("CharColor") >>= nFontColor; - aFields[7]->getPropertyValue("CharUnderline") >>= nCharUnderline; + CPPUNIT_ASSERT_EQUAL(u"Abc"_ustr, aFields[7]->getString()); + aFields[7]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[7]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; + aFields[7]->getPropertyValue(u"CharUnderline"_ustr) >>= nCharUnderline; CPPUNIT_ASSERT_EQUAL(static_cast<float>(12), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xa9d18e), nFontColor); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), nCharUnderline); // 3 xPropertySet.set(xDataSeries->getDataPointByIndex(2), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aFields.getLength()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_SERIESNAME, aFields[0]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("DATA"), aFields[0]->getString()); + CPPUNIT_ASSERT_EQUAL(u"DATA"_ustr, aFields[0]->getString()); // 4 xPropertySet.set(xDataSeries->getDataPointByIndex(3), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), aFields.getLength()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CELLREF, aFields[0]->getFieldType()); //CPPUNIT_ASSERT_EQUAL(OUString("70"), aFields[0]->getString()); TODO: Not implemented yet CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[1]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString(" <CELLREF"), aFields[1]->getString()); + CPPUNIT_ASSERT_EQUAL(u" <CELLREF"_ustr, aFields[1]->getString()); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf115107_2) @@ -1819,42 +1819,42 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf115107_2) // First series xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), aFields.getLength()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_VALUE, aFields[0]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("4.3"), aFields[0]->getString()); - aFields[0]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[0]->getPropertyValue("CharColor") >>= nFontColor; + CPPUNIT_ASSERT_EQUAL(u"4.3"_ustr, aFields[0]->getString()); + aFields[0]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[0]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; CPPUNIT_ASSERT_EQUAL(static_cast<float>(18), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xc00000), nFontColor); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[1]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString(" "), aFields[1]->getString()); + CPPUNIT_ASSERT_EQUAL(u" "_ustr, aFields[1]->getString()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_SERIESNAME, aFields[2]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("Bars"), aFields[2]->getString()); + CPPUNIT_ASSERT_EQUAL(u"Bars"_ustr, aFields[2]->getString()); // Second series xDataSeries = getDataSeriesFromDoc(xChartDoc, 0, 1); CPPUNIT_ASSERT(xDataSeries.is()); xPropertySet.set(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), aFields.getLength()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_VALUE, aFields[0]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("2"), aFields[0]->getString()); - aFields[0]->getPropertyValue("CharHeight") >>= nFontSize; - aFields[0]->getPropertyValue("CharColor") >>= nFontColor; + CPPUNIT_ASSERT_EQUAL(u"2"_ustr, aFields[0]->getString()); + aFields[0]->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize; + aFields[0]->getPropertyValue(u"CharColor"_ustr) >>= nFontColor; CPPUNIT_ASSERT_EQUAL(static_cast<float>(18), nFontSize); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int64>(0xffd966), nFontColor); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT, aFields[1]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString(" "), aFields[1]->getString()); + CPPUNIT_ASSERT_EQUAL(u" "_ustr, aFields[1]->getString()); CPPUNIT_ASSERT_EQUAL(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_SERIESNAME, aFields[2]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(OUString("Line"), aFields[2]->getString()); + CPPUNIT_ASSERT_EQUAL(u"Line"_ustr, aFields[2]->getString()); } @@ -1885,10 +1885,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf116163) ::std::copy(aTextData.begin(), aTextData.end(), ::std::back_inserter(aCategories)); - CPPUNIT_ASSERT_EQUAL(OUString("Aaaa"), aCategories[0]); - CPPUNIT_ASSERT_EQUAL(OUString("Bbbbbbb"), aCategories[1]); - CPPUNIT_ASSERT_EQUAL(OUString("Ccc"), aCategories[2]); - CPPUNIT_ASSERT_EQUAL(OUString("Ddddddddddddd"), aCategories[3]); + CPPUNIT_ASSERT_EQUAL(u"Aaaa"_ustr, aCategories[0]); + CPPUNIT_ASSERT_EQUAL(u"Bbbbbbb"_ustr, aCategories[1]); + CPPUNIT_ASSERT_EQUAL(u"Ccc"_ustr, aCategories[2]); + CPPUNIT_ASSERT_EQUAL(u"Ddddddddddddd"_ustr, aCategories[3]); // Check visible text @@ -1897,7 +1897,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf116163) uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xShapes.is()); - uno::Reference<drawing::XShape> xXAxis = getShapeByName(xShapes, "CID/D=0:CS=0:Axis=0,0", + uno::Reference<drawing::XShape> xXAxis = getShapeByName(xShapes, u"CID/D=0:CS=0:Axis=0,0"_ustr, // Axis occurs twice in chart xshape representation so need to get the one related to labels [](const uno::Reference<drawing::XShape>& rXShape) -> bool { @@ -1913,14 +1913,14 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf116163) // Check text uno::Reference<text::XTextRange> xLabel0(xIndexAccess->getByIndex(0), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("Aaaa"), xLabel0->getString()); + CPPUNIT_ASSERT_EQUAL(u"Aaaa"_ustr, xLabel0->getString()); uno::Reference<text::XTextRange> xLabel1(xIndexAccess->getByIndex(1), uno::UNO_QUERY); // If there is space for 3 chars only then don't show "..." - CPPUNIT_ASSERT_EQUAL(OUString("Bbb"), xLabel1->getString()); + CPPUNIT_ASSERT_EQUAL(u"Bbb"_ustr, xLabel1->getString()); uno::Reference<text::XTextRange> xLabel2(xIndexAccess->getByIndex(2), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("Ccc"), xLabel2->getString()); + CPPUNIT_ASSERT_EQUAL(u"Ccc"_ustr, xLabel2->getString()); uno::Reference<text::XTextRange> xLabel3(xIndexAccess->getByIndex(3), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("Dddd..."), xLabel3->getString()); + CPPUNIT_ASSERT_EQUAL(u"Dddd..."_ustr, xLabel3->getString()); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf48041) @@ -1942,7 +1942,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf48041) uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xShapes.is()); - uno::Reference<drawing::XShape> xYAxisShape = getShapeByName(xShapes, "CID/D=0:CS=0:Axis=1,0", // Y Axis + uno::Reference<drawing::XShape> xYAxisShape = getShapeByName(xShapes, u"CID/D=0:CS=0:Axis=1,0"_ustr, // Y Axis // Axis occurs twice in chart xshape representation so need to get the one related to labels [](const uno::Reference<drawing::XShape>& rXShape) -> bool { @@ -1960,17 +1960,17 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf48041) // Check text uno::Reference<text::XTextRange> xLabel0(xIndexAccess->getByIndex(0), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("0"), xLabel0->getString()); + CPPUNIT_ASSERT_EQUAL(u"0"_ustr, xLabel0->getString()); uno::Reference<text::XTextRange> xLabel1(xIndexAccess->getByIndex(1), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("1"), xLabel1->getString()); + CPPUNIT_ASSERT_EQUAL(u"1"_ustr, xLabel1->getString()); uno::Reference<text::XTextRange> xLabel2(xIndexAccess->getByIndex(2), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("2"), xLabel2->getString()); + CPPUNIT_ASSERT_EQUAL(u"2"_ustr, xLabel2->getString()); uno::Reference<text::XTextRange> xLabel3(xIndexAccess->getByIndex(3), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("3"), xLabel3->getString()); + CPPUNIT_ASSERT_EQUAL(u"3"_ustr, xLabel3->getString()); uno::Reference<text::XTextRange> xLabel4(xIndexAccess->getByIndex(4), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("4"), xLabel4->getString()); + CPPUNIT_ASSERT_EQUAL(u"4"_ustr, xLabel4->getString()); uno::Reference<text::XTextRange> xLabel5(xIndexAccess->getByIndex(5), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("5"), xLabel5->getString()); + CPPUNIT_ASSERT_EQUAL(u"5"_ustr, xLabel5->getString()); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf121205) @@ -1983,7 +1983,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf121205) OUString aTitle = getTitleString(xTitled); // We expect title split in 3 lines - CPPUNIT_ASSERT_EQUAL(OUString("Firstline\nSecondline\nThirdline"), aTitle); + CPPUNIT_ASSERT_EQUAL(u"Firstline\nSecondline\nThirdline"_ustr, aTitle); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf146487) @@ -2005,7 +2005,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf146487) OString aPath("//XShape[@text='Green; $7,654,321 ']"_ostr); assertXPath(pXmlDoc, aPath, 1); // Expected - 1 line tall(371), not 4 lines(1481). - CPPUNIT_ASSERT_EQUAL(OUString("371"), getXPath(pXmlDoc, aPath, "sizeY"_ostr)); + CPPUNIT_ASSERT_EQUAL(u"371"_ustr, getXPath(pXmlDoc, aPath, "sizeY"_ostr)); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf146756) @@ -2023,7 +2023,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf146756) OString aPath("//XShape[@text='New service request and approval; 18%']"_ostr); assertXPath(pXmlDoc, aPath, 1); // Expected something like 4 lines tall(1697), not 11 lines(3817). - CPPUNIT_ASSERT_EQUAL(OUString("1697"), getXPath(pXmlDoc, aPath, "sizeY"_ostr)); + CPPUNIT_ASSERT_EQUAL(u"1697"_ustr, getXPath(pXmlDoc, aPath, "sizeY"_ostr)); // Expected some reasonable maximum text length for the label like 2350, not 881. sal_Int32 nTextLength = getXPath(pXmlDoc, aPath, "textMaximumFrameWidth"_ostr).toInt32(); CPPUNIT_ASSERT_EQUAL(sal_Int32(2350), nTextLength); @@ -2065,7 +2065,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFixedSizeBarChartVeryLongLabel) ::std::back_inserter(aCategories)); // Check that we have a very very long label text - CPPUNIT_ASSERT_EQUAL(OUString("Very very very very very very very very very very very loooooooooooong label"), aCategories[0]); + CPPUNIT_ASSERT_EQUAL(u"Very very very very very very very very very very very loooooooooooong label"_ustr, aCategories[0]); // Check visible text uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); @@ -2073,7 +2073,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFixedSizeBarChartVeryLongLabel) uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xShapes.is()); - uno::Reference<drawing::XShape> xXAxis = getShapeByName(xShapes, "CID/D=0:CS=0:Axis=0,0", + uno::Reference<drawing::XShape> xXAxis = getShapeByName(xShapes, u"CID/D=0:CS=0:Axis=0,0"_ustr, // Axis occurs twice in chart xshape representation so need to get the one related to labels [](const uno::Reference<drawing::XShape>& rXShape) -> bool { @@ -2094,7 +2094,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFixedSizeBarChartVeryLongLabel) CPPUNIT_ASSERT_LESSEQUAL(sal_Int32(32), aLabelString.getLength()); CPPUNIT_ASSERT(aLabelString.endsWith(u"...")); - uno::Reference<drawing::XShape> xChartWall = getShapeByName(xShapes, "CID/DiagramWall="); + uno::Reference<drawing::XShape> xChartWall = getShapeByName(xShapes, u"CID/DiagramWall="_ustr); CPPUNIT_ASSERT(xChartWall.is()); // The text shape width should be smaller than the chart wall @@ -2136,7 +2136,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutomaticSizeBarChartVeryLongLabel) ::std::back_inserter(aCategories)); // Check that we have a very very long label text - CPPUNIT_ASSERT_EQUAL(OUString("Very very very very very very very very very very very loooooooooooong label"), aCategories[0]); + CPPUNIT_ASSERT_EQUAL(u"Very very very very very very very very very very very loooooooooooong label"_ustr, aCategories[0]); // Check visible text uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); @@ -2144,7 +2144,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutomaticSizeBarChartVeryLongLabel) uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xShapes.is()); - uno::Reference<drawing::XShape> xXAxis = getShapeByName(xShapes, "CID/D=0:CS=0:Axis=0,0", + uno::Reference<drawing::XShape> xXAxis = getShapeByName(xShapes, u"CID/D=0:CS=0:Axis=0,0"_ustr, // Axis occurs twice in chart xshape representation so need to get the one related to labels [](const uno::Reference<drawing::XShape>& rXShape) -> bool { @@ -2160,9 +2160,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutomaticSizeBarChartVeryLongLabel) // Check text is unmodified uno::Reference<text::XTextRange> xLabel(xIndexAccess->getByIndex(0), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("Very very very very very very very very very very very loooooooooooong label"), xLabel->getString()); + CPPUNIT_ASSERT_EQUAL(u"Very very very very very very very very very very very loooooooooooong label"_ustr, xLabel->getString()); - uno::Reference<drawing::XShape> xChartWall = getShapeByName(xShapes, "CID/DiagramWall="); + uno::Reference<drawing::XShape> xChartWall = getShapeByName(xShapes, u"CID/DiagramWall="_ustr); CPPUNIT_ASSERT(xChartWall.is()); // The text shape width should be smaller than the chart wall @@ -2206,7 +2206,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPieChartPlotAreaMarginWithAutomaticLa loadFromFile(u"pptx/PieChartWithAutomaticLayout_SizeAndPosition.pptx"); - OUString aCheckShapeName = "CID/D=0:CS=0:CT=0:Series=0"; + OUString aCheckShapeName = u"CID/D=0:CS=0:CT=0:Series=0"_ustr; // Chart Wuse case Width == Height { // Load chart Chart_2_2 - 2cm x 2cm - diff --git a/chart2/qa/extras/chart2import2.cxx b/chart2/qa/extras/chart2import2.cxx index dc9a2cddae46..75adcd12c105 100644 --- a/chart2/qa/extras/chart2import2.cxx +++ b/chart2/qa/extras/chart2import2.cxx @@ -23,7 +23,7 @@ class Chart2ImportTest2 : public ChartTest { public: Chart2ImportTest2() - : ChartTest("/chart2/qa/extras/data/") + : ChartTest(u"/chart2/qa/extras/data/"_ustr) { } }; @@ -54,7 +54,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf124243) Reference<beans::XPropertySet> xPS(xAxis, uno::UNO_QUERY_THROW); bool bShow = true; // test X Axis is not visible. - bool bSuccess = xPS->getPropertyValue("Show") >>= bShow; + bool bSuccess = xPS->getPropertyValue(u"Show"_ustr) >>= bShow; CPPUNIT_ASSERT(bSuccess); CPPUNIT_ASSERT(!bShow); } @@ -169,7 +169,7 @@ void checkDataLabelProperties(const Reference<chart2::XDataSeries>& xDataSeries, uno::Reference<beans::XPropertySet> xPropertySet( xDataSeries->getDataPointByIndex(nDataPointIndex), uno::UNO_SET_THROW); chart2::DataPointLabel aLabel; - xPropertySet->getPropertyValue("Label") >>= aLabel; + xPropertySet->getPropertyValue(u"Label"_ustr) >>= aLabel; CPPUNIT_ASSERT_EQUAL(bValueVisible, static_cast<bool>(aLabel.ShowNumber)); CPPUNIT_ASSERT_EQUAL(false, static_cast<bool>(aLabel.ShowNumberInPercent)); } @@ -203,7 +203,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testDataPointInheritedColorDOCX) uno::Reference<beans::XPropertySet> xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW); CPPUNIT_ASSERT(xPropertySet.is()); - sal_Int32 nColor = xPropertySet->getPropertyValue("FillColor").get<sal_Int32>(); + sal_Int32 nColor = xPropertySet->getPropertyValue(u"FillColor"_ustr).get<sal_Int32>(); CPPUNIT_ASSERT_EQUAL(sal_Int32(16776960), nColor); } @@ -217,8 +217,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testExternalStrRefsXLSX) Reference<chart2::XAxis> xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); chart2::ScaleData aScaleData = xAxis->getScaleData(); css::uno::Sequence<css::uno::Any> aValues = aScaleData.Categories->getValues()->getData(); - CPPUNIT_ASSERT_EQUAL(OUString("test1"), aValues[0].get<OUString>()); - CPPUNIT_ASSERT_EQUAL(OUString("test2"), aValues[1].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"test1"_ustr, aValues[0].get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"test2"_ustr, aValues[1].get<OUString>()); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testSourceNumberFormatComplexCategoriesXLS) @@ -281,14 +281,14 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testMultilevelCategoryAxis) // Get the complex category labels. Sequence<Sequence<OUString>> aCategories = xDescAccess->getComplexRowDescriptions(); CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aCategories.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("2011"), aCategories[0][0]); - CPPUNIT_ASSERT_EQUAL(OUString(""), aCategories[1][0]); - CPPUNIT_ASSERT_EQUAL(OUString("2012"), aCategories[2][0]); - CPPUNIT_ASSERT_EQUAL(OUString(""), aCategories[3][0]); - CPPUNIT_ASSERT_EQUAL(OUString("Categoria 1"), aCategories[0][1]); - CPPUNIT_ASSERT_EQUAL(OUString("Categoria 2"), aCategories[1][1]); - CPPUNIT_ASSERT_EQUAL(OUString("Categoria 3"), aCategories[2][1]); - CPPUNIT_ASSERT_EQUAL(OUString("Categoria 4"), aCategories[3][1]); + CPPUNIT_ASSERT_EQUAL(u"2011"_ustr, aCategories[0][0]); + CPPUNIT_ASSERT_EQUAL(u""_ustr, aCategories[1][0]); + CPPUNIT_ASSERT_EQUAL(u"2012"_ustr, aCategories[2][0]); + CPPUNIT_ASSERT_EQUAL(u""_ustr, aCategories[3][0]); + CPPUNIT_ASSERT_EQUAL(u"Categoria 1"_ustr, aCategories[0][1]); + CPPUNIT_ASSERT_EQUAL(u"Categoria 2"_ustr, aCategories[1][1]); + CPPUNIT_ASSERT_EQUAL(u"Categoria 3"_ustr, aCategories[2][1]); + CPPUNIT_ASSERT_EQUAL(u"Categoria 4"_ustr, aCategories[3][1]); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testXaxisValues) @@ -322,8 +322,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf123504) Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); - Reference<drawing::XShape> xSeriesSlices(getShapeByName(xShapes, "CID/D=0:CS=0:CT=0:Series=0"), - UNO_SET_THROW); + Reference<drawing::XShape> xSeriesSlices( + getShapeByName(xShapes, u"CID/D=0:CS=0:CT=0:Series=0"_ustr), UNO_SET_THROW); Reference<container::XIndexAccess> xIndexAccess(xSeriesSlices, UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); @@ -347,8 +347,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf122765) Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); - Reference<drawing::XShape> xSeriesSlices(getShapeByName(xShapes, "CID/D=0:CS=0:CT=0:Series=0"), - UNO_SET_THROW); + Reference<drawing::XShape> xSeriesSlices( + getShapeByName(xShapes, u"CID/D=0:CS=0:CT=0:Series=0"_ustr), UNO_SET_THROW); Reference<container::XIndexAccess> xIndexAccess(xSeriesSlices, UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(sal_Int32(9), xIndexAccess->getCount()); @@ -374,9 +374,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf123206CustomLabelField) CPPUNIT_ASSERT(xDataSeries.is()); Reference<beans::XPropertySet> xDp = xDataSeries->getDataPointByIndex(1); Sequence<Reference<chart2::XDataPointCustomLabelField>> aLabelFields; - CPPUNIT_ASSERT(xDp->getPropertyValue("CustomLabelFields") >>= aLabelFields); + CPPUNIT_ASSERT(xDp->getPropertyValue(u"CustomLabelFields"_ustr) >>= aLabelFields); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aLabelFields.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("Kiskacsa"), aLabelFields[0]->getString()); + CPPUNIT_ASSERT_EQUAL(u"Kiskacsa"_ustr, aLabelFields[0]->getString()); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf125444PercentageCustomLabel) @@ -391,7 +391,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf125444PercentageCustomLabel) CPPUNIT_ASSERT(xDataSeries.is()); Reference<beans::XPropertySet> xDp = xDataSeries->getDataPointByIndex(1); Sequence<Reference<chart2::XDataPointCustomLabelField>> aLabelFields; - CPPUNIT_ASSERT(xDp->getPropertyValue("CustomLabelFields") >>= aLabelFields); + CPPUNIT_ASSERT(xDp->getPropertyValue(u"CustomLabelFields"_ustr) >>= aLabelFields); // There are three label field: a value label, a newline and a percentage label. We want // to assert the latter. CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(3), aLabelFields.getLength()); @@ -413,12 +413,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testDataPointLabelCustomPos) CPPUNIT_ASSERT(xPropertySet.is()); chart2::RelativePosition aCustomLabelPosition; - xPropertySet->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition; + xPropertySet->getPropertyValue(u"CustomLabelPosition"_ustr) >>= aCustomLabelPosition; CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.14621409921671025, aCustomLabelPosition.Primary, 1e-7); CPPUNIT_ASSERT_DOUBLES_EQUAL(-5.2887961029923464E-2, aCustomLabelPosition.Secondary, 1e-7); sal_Int32 aPlacement; - xPropertySet->getPropertyValue("LabelPlacement") >>= aPlacement; + xPropertySet->getPropertyValue(u"LabelPlacement"_ustr) >>= aPlacement; CPPUNIT_ASSERT_EQUAL(chart::DataLabelPlacement::OUTSIDE, aPlacement); } @@ -436,12 +436,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf130032) CPPUNIT_ASSERT(xPropertySet.is()); chart2::RelativePosition aCustomLabelPosition; - xPropertySet->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition; + xPropertySet->getPropertyValue(u"CustomLabelPosition"_ustr) >>= aCustomLabelPosition; CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.0438333333333334, aCustomLabelPosition.Primary, 1e-7); CPPUNIT_ASSERT_DOUBLES_EQUAL(0.086794050743657, aCustomLabelPosition.Secondary, 1e-7); sal_Int32 aPlacement; - xPropertySet->getPropertyValue("LabelPlacement") >>= aPlacement; + xPropertySet->getPropertyValue(u"LabelPlacement"_ustr) >>= aPlacement; CPPUNIT_ASSERT_EQUAL(chart::DataLabelPlacement::RIGHT, aPlacement); } @@ -459,7 +459,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf134978) CPPUNIT_ASSERT(xPropertySet.is()); chart2::RelativePosition aCustomLabelPosition; - xPropertySet->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition; + xPropertySet->getPropertyValue(u"CustomLabelPosition"_ustr) >>= aCustomLabelPosition; CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.040273622047244093, aCustomLabelPosition.Primary, 1e-7); CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.25635352872557599, aCustomLabelPosition.Secondary, 1e-7); } @@ -507,7 +507,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf133376) Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); Reference<drawing::XShape> xDataPointLabel( getShapeByName(xShapes, - "CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2"), + u"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2"_ustr), UNO_SET_THROW); CPPUNIT_ASSERT(xDataPointLabel.is()); @@ -528,13 +528,13 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf134225) Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); Reference<drawing::XShape> xDataPointLabel1( getShapeByName(xShapes, - "CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"), + u"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"_ustr), UNO_SET_THROW); CPPUNIT_ASSERT(xDataPointLabel1.is()); Reference<drawing::XShape> xDataPointLabel2( getShapeByName(xShapes, - "CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1"), + u"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1"_ustr), UNO_SET_THROW); CPPUNIT_ASSERT(xDataPointLabel2.is()); @@ -566,8 +566,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf136105) Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); Reference<drawing::XShape> xDataPointLabel( - getShapeByName(xShapes, - "CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"), + getShapeByName( + xShapes, u"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"_ustr), UNO_SET_THROW); CPPUNIT_ASSERT(xDataPointLabel.is()); @@ -585,8 +585,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf136105) Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); Reference<drawing::XShape> xDataPointLabel( - getShapeByName(xShapes, - "CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"), + getShapeByName( + xShapes, u"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"_ustr), UNO_SET_THROW); CPPUNIT_ASSERT(xDataPointLabel.is()); @@ -612,10 +612,10 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf91250) // Get the category labels. Sequence<OUString> aCategories = xDescAccess->getRowDescriptions(); CPPUNIT_ASSERT_EQUAL(sal_Int32(4), aCategories.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("12.3254"), aCategories[0]); - CPPUNIT_ASSERT_EQUAL(OUString("11.62315"), aCategories[1]); - CPPUNIT_ASSERT_EQUAL(OUString("9.26"), aCategories[2]); - CPPUNIT_ASSERT_EQUAL(OUString("8.657"), aCategories[3]); + CPPUNIT_ASSERT_EQUAL(u"12.3254"_ustr, aCategories[0]); + CPPUNIT_ASSERT_EQUAL(u"11.62315"_ustr, aCategories[1]); + CPPUNIT_ASSERT_EQUAL(u"9.26"_ustr, aCategories[2]); + CPPUNIT_ASSERT_EQUAL(u"8.657"_ustr, aCategories[3]); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf134111) @@ -630,7 +630,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf134111) CPPUNIT_ASSERT(xAxisXSupp.is()); uno::Reference<beans::XPropertySet> xAxisProp(xAxisXSupp->getXAxis()); bool bTextBreak = false; - xAxisProp->getPropertyValue("TextBreak") >>= bTextBreak; + xAxisProp->getPropertyValue(u"TextBreak"_ustr) >>= bTextBreak; // Expected value of 'TextBreak' is true CPPUNIT_ASSERT(bTextBreak); } @@ -646,7 +646,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf136752) Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); Reference<drawing::XShape> xDataPointLabel( getShapeByName(xShapes, - "CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"), + u"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"_ustr), UNO_SET_THROW); CPPUNIT_ASSERT(xDataPointLabel.is()); @@ -672,7 +672,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf137505) Reference<text::XTextCursor> xAt = xRange->createTextCursor(); Reference<beans::XPropertySet> xProps(xAt, UNO_QUERY); // check the text size of custom shape, inside the chart. - CPPUNIT_ASSERT(xProps->getPropertyValue("CharHeight") >>= nFontSize); + CPPUNIT_ASSERT(xProps->getPropertyValue(u"CharHeight"_ustr) >>= nFontSize); CPPUNIT_ASSERT_EQUAL(float(12), nFontSize); } @@ -685,7 +685,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf137734) Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xDataSeries.is()); Reference<beans::XPropertySet> xPropSet(xDataSeries, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("VaryColorsByPoint"); + uno::Any aAny = xPropSet->getPropertyValue(u"VaryColorsByPoint"_ustr); bool bVaryColor = true; CPPUNIT_ASSERT(aAny >>= bVaryColor); CPPUNIT_ASSERT(!bVaryColor); @@ -697,7 +697,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf137734) Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); CPPUNIT_ASSERT(xTitle.is()); Reference<beans::XPropertySet> xTitlePropSet(xTitle, uno::UNO_QUERY_THROW); - uno::Any aAny2 = xTitlePropSet->getPropertyValue("TextRotation"); + uno::Any aAny2 = xTitlePropSet->getPropertyValue(u"TextRotation"_ustr); double nRotation = -1; CPPUNIT_ASSERT(aAny2 >>= nRotation); CPPUNIT_ASSERT_EQUAL(0.0, nRotation); @@ -712,8 +712,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf137874) Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); Reference<drawing::XShape> xLegendEntry; - xLegendEntry - = getShapeByName(xShapes, "CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0:LegendEntry=0"); + xLegendEntry = getShapeByName( + xShapes, u"CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0:LegendEntry=0"_ustr); CPPUNIT_ASSERT(xLegendEntry.is()); } @@ -782,7 +782,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf121281) Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); Reference<drawing::XShape> xDataPointLabel( getShapeByName(xShapes, - "CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"), + u"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"_ustr), UNO_SET_THROW); CPPUNIT_ASSERT(xDataPointLabel.is()); @@ -806,9 +806,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf139658) // Get the category labels. Sequence<OUString> aCategories = xDescAccess->getRowDescriptions(); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aCategories.getLength()); - CPPUNIT_ASSERT_EQUAL(OUString("category1"), aCategories[0]); - CPPUNIT_ASSERT_EQUAL(OUString("\"category2\""), aCategories[1]); - CPPUNIT_ASSERT_EQUAL(OUString("category\"3"), aCategories[2]); + CPPUNIT_ASSERT_EQUAL(u"category1"_ustr, aCategories[0]); + CPPUNIT_ASSERT_EQUAL(u"\"category2\""_ustr, aCategories[1]); + CPPUNIT_ASSERT_EQUAL(u"category\"3"_ustr, aCategories[2]); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf146066) @@ -822,7 +822,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf146066) CPPUNIT_ASSERT(xShapes.is()); uno::Reference<drawing::XShape> xYAxisShape = getShapeByName( - xShapes, "CID/D=0:CS=0:Axis=1,0", // Y Axis + xShapes, u"CID/D=0:CS=0:Axis=1,0"_ustr, // Y Axis // Axis occurs twice in chart xshape representation so need to get the one related to labels [](const uno::Reference<drawing::XShape>& rXShape) -> bool { uno::Reference<drawing::XShapes> xAxisShapes(rXShape, uno::UNO_QUERY); @@ -840,21 +840,21 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf146066) // Check text uno::Reference<text::XTextRange> xLabel0(xIndexAccess->getByIndex(0), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("0"), xLabel0->getString()); + CPPUNIT_ASSERT_EQUAL(u"0"_ustr, xLabel0->getString()); uno::Reference<text::XTextRange> xLabel1(xIndexAccess->getByIndex(1), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("5"), xLabel1->getString()); + CPPUNIT_ASSERT_EQUAL(u"5"_ustr, xLabel1->getString()); uno::Reference<text::XTextRange> xLabel2(xIndexAccess->getByIndex(2), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("10"), xLabel2->getString()); + CPPUNIT_ASSERT_EQUAL(u"10"_ustr, xLabel2->getString()); uno::Reference<text::XTextRange> xLabel3(xIndexAccess->getByIndex(3), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("15"), xLabel3->getString()); + CPPUNIT_ASSERT_EQUAL(u"15"_ustr, xLabel3->getString()); uno::Reference<text::XTextRange> xLabel4(xIndexAccess->getByIndex(4), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("20"), xLabel4->getString()); + CPPUNIT_ASSERT_EQUAL(u"20"_ustr, xLabel4->getString()); uno::Reference<text::XTextRange> xLabel5(xIndexAccess->getByIndex(5), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("25"), xLabel5->getString()); + CPPUNIT_ASSERT_EQUAL(u"25"_ustr, xLabel5->getString()); uno::Reference<text::XTextRange> xLabel6(xIndexAccess->getByIndex(6), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("30"), xLabel6->getString()); + CPPUNIT_ASSERT_EQUAL(u"30"_ustr, xLabel6->getString()); uno::Reference<text::XTextRange> xLabel7(xIndexAccess->getByIndex(7), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(OUString("35"), xLabel7->getString()); + CPPUNIT_ASSERT_EQUAL(u"35"_ustr, xLabel7->getString()); } CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf150434) @@ -865,7 +865,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf150434) Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); - Reference<drawing::XShape> xLegend = getShapeByName(xShapes, "CID/D=0:Legend="); + Reference<drawing::XShape> xLegend = getShapeByName(xShapes, u"CID/D=0:Legend="_ustr); CPPUNIT_ASSERT(xLegend.is()); awt::Point aPosition = xLegend->getPosition(); @@ -883,7 +883,8 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testChartDataTableWithMultipleLegendEntr Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); - Reference<drawing::XShape> xDataTableShape = getShapeByName(xShapes, "CID/D=0:DataTable="); + Reference<drawing::XShape> xDataTableShape + = getShapeByName(xShapes, u"CID/D=0:DataTable="_ustr); CPPUNIT_ASSERT(xDataTableShape.is()); } diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index db416affaa9f..53f068601885 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -279,7 +279,7 @@ Reference< chart2::data::XDataSequence > getDataSequenceFromDocByRole( if(!xProps.is()) continue; - OUString aRoleName = xProps->getPropertyValue("Role").get<OUString>(); + OUString aRoleName = xProps->getPropertyValue(u"Role"_ustr).get<OUString>(); if(aRoleName == rRole) return xLabelSeq; @@ -296,7 +296,7 @@ uno::Sequence < OUString > getWriterChartColumnDescriptions( Reference< lang::XC CPPUNIT_ASSERT( xShape.is() ); uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY); uno::Reference< chart2::XChartDocument > xChartDoc; - xChartDoc.set( xPropertySet->getPropertyValue( "Model" ), uno::UNO_QUERY ); + xChartDoc.set( xPropertySet->getPropertyValue( u"Model"_ustr ), uno::UNO_QUERY ); CPPUNIT_ASSERT( xChartDoc.is() ); CPPUNIT_ASSERT( xChartDoc->getDataProvider().is() ); uno::Reference< chart2::XAnyDescriptionAccess > xAnyDescriptionAccess ( xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW ); @@ -325,7 +325,7 @@ std::vector<std::vector<double> > getDataSeriesYValuesFromChartType( const Refer continue; OUString aRoleName; - xPropSet->getPropertyValue("Role") >>= aRoleName; + xPropSet->getPropertyValue(u"Role"_ustr) >>= aRoleName; if (aRoleName == "values-y") { const uno::Sequence<uno::Any> aData = xValues->getData(); @@ -370,7 +370,7 @@ std::vector<uno::Sequence<uno::Any> > getDataSeriesLabelsFromChartType( const Re continue; OUString aRoleName; - xPropSet->getPropertyValue("Role") >>= aRoleName; + xPropSet->getPropertyValue(u"Role"_ustr) >>= aRoleName; if (aRoleName == aLabelRole) { Reference<chart2::data::XLabeledDataSequence> xLabel = lds; @@ -403,7 +403,7 @@ uno::Reference<chart::XChartDocument> ChartTest::getChartDocFromDrawImpress( return xEmpty; uno::Reference<frame::XModel> xDocModel; - xShapeProps->getPropertyValue("Model") >>= xDocModel; + xShapeProps->getPropertyValue(u"Model"_ustr) >>= xDocModel; if (!xDocModel.is()) return xEmpty; @@ -437,7 +437,7 @@ uno::Reference<chart::XChartDocument> ChartTest::getChartDocFromDrawImpressNamed continue; uno::Reference<frame::XModel> xDocModel; - xShapeProps->getPropertyValue("Model") >>= xDocModel; + xShapeProps->getPropertyValue(u"Model"_ustr) >>= xDocModel; if (!xDocModel.is()) continue; @@ -460,7 +460,7 @@ uno::Reference<chart::XChartDocument> ChartTest::getChartDocFromWriter( sal_Int3 CPPUNIT_ASSERT(xShapeProps.is()); Reference<frame::XModel> xDocModel; - xShapeProps->getPropertyValue("Model") >>= xDocModel; + xShapeProps->getPropertyValue(u"Model"_ustr) >>= xDocModel; CPPUNIT_ASSERT(xDocModel.is()); uno::Reference<chart::XChartDocument> xChartDoc(xDocModel, uno::UNO_QUERY); @@ -517,7 +517,7 @@ sal_Int16 getNumberFormatType( const Reference<chart2::XChartDocument>& xChartDo CPPUNIT_ASSERT(xNumPS.is()); sal_Int16 nType = util::NumberFormat::UNDEFINED; - xNumPS->getPropertyValue("Type") >>= nType; + xNumPS->getPropertyValue(u"Type"_ustr) >>= nType; return nType; } @@ -568,7 +568,7 @@ awt::Size ChartTest::getSize(css::uno::Reference<chart2::XDiagram> xDiagram, con { Reference< beans::XPropertySet > xProp(xDiagram, uno::UNO_QUERY); chart2::RelativeSize aRelativeSize; - xProp->getPropertyValue( "RelativeSize" ) >>= aRelativeSize; + xProp->getPropertyValue( u"RelativeSize"_ustr ) >>= aRelativeSize; double fX = aRelativeSize.Primary * rPageSize.Width; double fY = aRelativeSize.Secondary * rPageSize.Height; awt::Size aSize; diff --git a/chart2/qa/extras/uichart.cxx b/chart2/qa/extras/uichart.cxx index 50d6c9a27495..2728bb289830 100644 --- a/chart2/qa/extras/uichart.cxx +++ b/chart2/qa/extras/uichart.cxx @@ -17,7 +17,7 @@ class Chart2UiChartTest : public ChartTest { public: Chart2UiChartTest() - : ChartTest("/chart2/qa/extras/data/") + : ChartTest(u"/chart2/qa/extras/data/"_ustr) { } @@ -43,16 +43,16 @@ void Chart2UiChartTest::testCopyPasteToNewSheet(uno::Reference<chart::XChartDocu Sequence<Sequence<double>> aExpectedData = xChartData->getData(); uno::Sequence<beans::PropertyValue> aPropertyValues = { - comphelper::makePropertyValue("ToObject", aObjectName), + comphelper::makePropertyValue(u"ToObject"_ustr, aObjectName), }; - dispatchCommand(mxComponent, ".uno:GoToObject", aPropertyValues); + dispatchCommand(mxComponent, u".uno:GoToObject"_ustr, aPropertyValues); - dispatchCommand(mxComponent, ".uno:Copy", {}); + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); // create a new document - load("private:factory/scalc"); + load(u"private:factory/scalc"_ustr); - dispatchCommand(mxComponent, ".uno:Paste", {}); + dispatchCommand(mxComponent, u".uno:Paste"_ustr, {}); uno::Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc2.is()); @@ -123,15 +123,15 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf99969) Sequence<Sequence<double>> aExpectedData = xChartData->getData(); - dispatchCommand(mxComponent, ".uno:GoToCell", - { comphelper::makePropertyValue("ToPoint", uno::Any(OUString("C2:L25"))) }); + dispatchCommand(mxComponent, u".uno:GoToCell"_ustr, + { comphelper::makePropertyValue(u"ToPoint"_ustr, uno::Any(u"C2:L25"_ustr)) }); - dispatchCommand(mxComponent, ".uno:Copy", {}); + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); // create a new document - load("private:factory/scalc"); + load(u"private:factory/scalc"_ustr); - dispatchCommand(mxComponent, ".uno:Paste", {}); + dispatchCommand(mxComponent, u".uno:Paste"_ustr, {}); uno::Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(0, mxComponent); CPPUNIT_ASSERT(xChartDoc2.is()); @@ -188,7 +188,7 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf120348) // - Expected: 0 // - Actual : 3.33625955201419 // - Incorrect value in Col: 2 Row: 51 - testCopyPasteToNewSheet(xChartDoc, "Object 2", 4, 158); + testCopyPasteToNewSheet(xChartDoc, u"Object 2"_ustr, 4, 158); } CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf151091) @@ -208,16 +208,16 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf151091) CPPUNIT_ASSERT_EQUAL(aExpected[i], aSeriesList[i]); uno::Sequence<beans::PropertyValue> aPropertyValues = { - comphelper::makePropertyValue("ToObject", OUString("Object 1")), + comphelper::makePropertyValue(u"ToObject"_ustr, u"Object 1"_ustr), }; - dispatchCommand(mxComponent, ".uno:GoToObject", aPropertyValues); + dispatchCommand(mxComponent, u".uno:GoToObject"_ustr, aPropertyValues); - dispatchCommand(mxComponent, ".uno:Copy", {}); + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); // create a new writer document - load("private:factory/swriter"); + load(u"private:factory/swriter"_ustr); - dispatchCommand(mxComponent, ".uno:Paste", {}); + dispatchCommand(mxComponent, u".uno:Paste"_ustr, {}); aSeriesList = getWriterChartColumnDescriptions(mxComponent); @@ -235,7 +235,7 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf107097) loadFromFile(u"ods/tdf107097.ods"); uno::Reference<chart::XChartDocument> xChartDoc(getPivotChartDocFromSheet(1, mxComponent), uno::UNO_QUERY_THROW); - testCopyPasteToNewSheet(xChartDoc, "Object 1", 4, 12); + testCopyPasteToNewSheet(xChartDoc, u"Object 1"_ustr, 4, 12); } CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf136011) @@ -243,7 +243,7 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf136011) loadFromFile(u"ods/tdf136011.ods"); uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0, mxComponent), uno::UNO_QUERY_THROW); - testCopyPasteToNewSheet(xChartDoc, "Object 1", 3, 9); + testCopyPasteToNewSheet(xChartDoc, u"Object 1"_ustr, 3, 9); loadFromFile(u"ods/tdf136011.ods"); uno::Reference<chart::XChartDocument> xChartDoc2(getChartCompFromSheet(0, 1, mxComponent), @@ -253,7 +253,7 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf136011) // - Expected: Test 1 1 // - Actual : Test 1 // - Incorrect description in row: 0 - testCopyPasteToNewSheet(xChartDoc2, "Object 2", 3, 9); + testCopyPasteToNewSheet(xChartDoc2, u"Object 2"_ustr, 3, 9); } CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf62057) @@ -266,7 +266,7 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf62057) // - Expected: 2 // - Actual : 7 // - Incorrect number of columns in destination file - testCopyPasteToNewSheet(xChartDoc, "Object 1", 2, 6); + testCopyPasteToNewSheet(xChartDoc, u"Object 1"_ustr, 2, 6); } CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf98690) @@ -281,16 +281,16 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf98690) CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(6), aSeriesList.getLength()); uno::Sequence<beans::PropertyValue> aPropertyValues = { - comphelper::makePropertyValue("ToObject", OUString("Chart 2")), + comphelper::makePropertyValue(u"ToObject"_ustr, u"Chart 2"_ustr), }; - dispatchCommand(mxComponent, ".uno:GoToObject", aPropertyValues); + dispatchCommand(mxComponent, u".uno:GoToObject"_ustr, aPropertyValues); - dispatchCommand(mxComponent, ".uno:Copy", {}); + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); // create a new document - load("private:factory/scalc"); + load(u"private:factory/scalc"_ustr); - dispatchCommand(mxComponent, ".uno:Paste", {}); + dispatchCommand(mxComponent, u".uno:Paste"_ustr, {}); uno::Reference<chart::XChartDocument> xChartDoc2(getChartCompFromSheet(0, 0, mxComponent), uno::UNO_QUERY_THROW); @@ -326,10 +326,10 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf101894) // Create a copy of the sheet and move to the end uno::Sequence<beans::PropertyValue> aArgs( - comphelper::InitPropertySequence({ { "DocName", uno::Any(OUString("tdf101894")) }, + comphelper::InitPropertySequence({ { "DocName", uno::Any(u"tdf101894"_ustr) }, { "Index", uno::Any(sal_uInt16(32767)) }, { "Copy", uno::Any(true) } })); - dispatchCommand(mxComponent, ".uno:Move", aArgs); + dispatchCommand(mxComponent, u".uno:Move"_ustr, aArgs); uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference<container::XIndexAccess> xIA(xDoc->getSheets(), UNO_QUERY_THROW); @@ -404,18 +404,18 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testCopyPasteChartWithDotInSheetName) Sequence<Sequence<double>> aExpectedData = xChartData->getData(); - dispatchCommand(mxComponent, ".uno:SelectAll", {}); - dispatchCommand(mxComponent, ".uno:Copy", {}); + dispatchCommand(mxComponent, u".uno:SelectAll"_ustr, {}); + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence( - { { "Name", uno::Any(OUString("NewTab")) }, { "Index", uno::Any(sal_uInt16(2)) } })); - dispatchCommand(mxComponent, ".uno:Insert", aArgs); + { { "Name", uno::Any(u"NewTab"_ustr) }, { "Index", uno::Any(sal_uInt16(2)) } })); + dispatchCommand(mxComponent, u".uno:Insert"_ustr, aArgs); uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference<container::XIndexAccess> xIA(xDoc->getSheets(), UNO_QUERY_THROW); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), xIA->getCount()); - dispatchCommand(mxComponent, ".uno:Paste", {}); + dispatchCommand(mxComponent, u".uno:Paste"_ustr, {}); for (sal_Int32 sheetIndex = 0; sheetIndex < 2; ++sheetIndex) { @@ -487,7 +487,7 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf158223) // Remove last sheet uno::Sequence<beans::PropertyValue> aArgs( comphelper::InitPropertySequence({ { "Index", uno::Any(sal_uInt16(3)) } })); - dispatchCommand(mxComponent, ".uno:Remove", aArgs); + dispatchCommand(mxComponent, u".uno:Remove"_ustr, aArgs); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), xIA->getCount()); @@ -558,10 +558,10 @@ CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf153706) // Without the fix, this would fail with // - Expected: values-x // - Actual : values-y - CPPUNIT_ASSERT_EQUAL(u"values-x"_ustr, propX->getPropertyValue("Role").get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"values-x"_ustr, propX->getPropertyValue(u"Role"_ustr).get<OUString>()); auto propY(sequences[1]->getValues().queryThrow<beans::XPropertySet>()); - CPPUNIT_ASSERT_EQUAL(u"values-y"_ustr, propY->getPropertyValue("Role").get<OUString>()); + CPPUNIT_ASSERT_EQUAL(u"values-y"_ustr, propY->getPropertyValue(u"Role"_ustr).get<OUString>()); } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/xshape/chart2xshape.cxx b/chart2/qa/extras/xshape/chart2xshape.cxx index b968a29c8940..35e048e50101 100644 --- a/chart2/qa/extras/xshape/chart2xshape.cxx +++ b/chart2/qa/extras/xshape/chart2xshape.cxx @@ -22,7 +22,7 @@ class Chart2XShapeTest : public ChartTest { public: Chart2XShapeTest() - : ChartTest("/chart2/qa/extras/xshape/data/") + : ChartTest(u"/chart2/qa/extras/xshape/data/"_ustr) { } @@ -65,7 +65,8 @@ namespace { OUString getShapeDump(css::uno::Reference<css::chart::XChartDocument> const& doc) { - return css::uno::Reference<css::qa::XDumper>(doc, css::uno::UNO_QUERY_THROW)->dump("shapes"); + return css::uno::Reference<css::qa::XDumper>(doc, css::uno::UNO_QUERY_THROW) + ->dump(u"shapes"_ustr); } bool checkDumpAgainstFile(std::u16string_view rDump, std::u16string_view aFilePath, diff --git a/chart2/qa/unit/common_functor_test.cxx b/chart2/qa/unit/common_functor_test.cxx index a744945e6663..05e62490848d 100644 --- a/chart2/qa/unit/common_functor_test.cxx +++ b/chart2/qa/unit/common_functor_test.cxx @@ -50,13 +50,13 @@ void CommonFunctorsTest::testAnyToString() std::transform(aInput.begin(), aInput.end(), std::back_inserter(aOutput), chart::CommonFunctors::ToString()); - CPPUNIT_ASSERT_EQUAL(OUString("2"), aOutput[0]); - CPPUNIT_ASSERT_EQUAL(OUString("10"), aOutput[1]); - CPPUNIT_ASSERT_EQUAL(OUString("12"), aOutput[2]); - CPPUNIT_ASSERT_EQUAL(OUString("15"), aOutput[3]); - CPPUNIT_ASSERT_EQUAL(OUString("25.234"), aOutput[4]); - CPPUNIT_ASSERT_EQUAL(OUString("123.456"), aOutput[5]); - CPPUNIT_ASSERT_EQUAL(OUString("0.12345"), aOutput[6]); + CPPUNIT_ASSERT_EQUAL(u"2"_ustr, aOutput[0]); + CPPUNIT_ASSERT_EQUAL(u"10"_ustr, aOutput[1]); + CPPUNIT_ASSERT_EQUAL(u"12"_ustr, aOutput[2]); + CPPUNIT_ASSERT_EQUAL(u"15"_ustr, aOutput[3]); + CPPUNIT_ASSERT_EQUAL(u"25.234"_ustr, aOutput[4]); + CPPUNIT_ASSERT_EQUAL(u"123.456"_ustr, aOutput[5]); + CPPUNIT_ASSERT_EQUAL(u"0.12345"_ustr, aOutput[6]); } void CommonFunctorsTest::testDoubleToString() @@ -67,13 +67,13 @@ void CommonFunctorsTest::testDoubleToString() std::transform(aInput.begin(), aInput.end(), std::back_inserter(aOutput), chart::CommonFunctors::ToString()); - CPPUNIT_ASSERT_EQUAL(OUString("2"), aOutput[0]); - CPPUNIT_ASSERT_EQUAL(OUString("10"), aOutput[1]); - CPPUNIT_ASSERT_EQUAL(OUString("12"), aOutput[2]); - CPPUNIT_ASSERT_EQUAL(OUString("15"), aOutput[3]); - CPPUNIT_ASSERT_EQUAL(OUString("25.234"), aOutput[4]); - CPPUNIT_ASSERT_EQUAL(OUString("123.456"), aOutput[5]); - CPPUNIT_ASSERT_EQUAL(OUString("0.12345"), aOutput[6]); + CPPUNIT_ASSERT_EQUAL(u"2"_ustr, aOutput[0]); + CPPUNIT_ASSERT_EQUAL(u"10"_ustr, aOutput[1]); + CPPUNIT_ASSERT_EQUAL(u"12"_ustr, aOutput[2]); + CPPUNIT_ASSERT_EQUAL(u"15"_ustr, aOutput[3]); + CPPUNIT_ASSERT_EQUAL(u"25.234"_ustr, aOutput[4]); + CPPUNIT_ASSERT_EQUAL(u"123.456"_ustr, aOutput[5]); + CPPUNIT_ASSERT_EQUAL(u"0.12345"_ustr, aOutput[6]); } CPPUNIT_TEST_SUITE_REGISTRATION(CommonFunctorsTest); diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index e1f583a578ee..a823cf25c003 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -94,7 +94,7 @@ bool AccessibleBase::CheckDisposeState( bool bThrowException /* default: true */ if( bThrowException && m_bIsDisposed ) { - throw lang::DisposedException("component has state DEFUNC", + throw lang::DisposedException(u"component has state DEFUNC"_ustr, static_cast< uno::XWeak * >( const_cast< AccessibleBase * >( this ))); } return m_bIsDisposed; @@ -789,7 +789,7 @@ Color AccessibleBase::getColor( eColorType eColType ) // ________ AccessibleBase::XServiceInfo ________ OUString SAL_CALL AccessibleBase::getImplementationName() { - return "AccessibleBase"; + return u"AccessibleBase"_ustr; } sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName ) @@ -800,8 +800,8 @@ sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() { return { - "com.sun.star.accessibility.Accessible", - "com.sun.star.accessibility.AccessibleContext" + u"com.sun.star.accessibility.Accessible"_ustr, + u"com.sun.star.accessibility.AccessibleContext"_ustr }; } diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index d3b98c102f76..ddc727277978 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -122,7 +122,7 @@ sal_Int64 AccessibleChartElement::ImplGetAccessibleChildCount() const // ________ XServiceInfo ________ OUString SAL_CALL AccessibleChartElement::getImplementationName() { - return "AccessibleChartElement"; + return u"AccessibleChartElement"_ustr; } // ________ AccessibleChartElement::XAccessibleContext (override) ________ diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index 771698a84010..f0ebacf77a86 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -74,7 +74,7 @@ AccessibleChartShape::~AccessibleChartShape() // ________ XServiceInfo ________ OUString AccessibleChartShape::getImplementationName() { - return "AccessibleChartShape"; + return u"AccessibleChartShape"_ustr; } // ________ XAccessibleContext ________ diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 8f01816a6504..fe83052f472b 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -266,7 +266,7 @@ void AccessibleChartView::initialize( ChartController& rNewChartController, { AccessibleElementInfo aAccInfo; - aAccInfo.m_aOID = ObjectIdentifier("ROOT"); + aAccInfo.m_aOID = ObjectIdentifier(u"ROOT"_ustr); aAccInfo.m_xChartDocument = m_xChartModel; aAccInfo.m_xChartController = m_xChartController; aAccInfo.m_xView = m_xChartView; @@ -361,7 +361,7 @@ void AccessibleChartView::initialize() { AccessibleElementInfo aAccInfo; - aAccInfo.m_aOID = ObjectIdentifier("ROOT"); + aAccInfo.m_aOID = ObjectIdentifier(u"ROOT"_ustr); aAccInfo.m_xChartDocument = m_xChartModel; aAccInfo.m_xChartController = m_xChartController; aAccInfo.m_xView = m_xChartView; diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 995a0f92cf4d..11884859927a 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -70,7 +70,7 @@ void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AreaWrapper::getShapeType() { - return "com.sun.star.chart.ChartArea"; + return u"com.sun.star.chart.ChartArea"_ustr; } // ____ XComponent ____ @@ -128,14 +128,14 @@ std::vector< std::unique_ptr<WrappedProperty> > AreaWrapper::createWrappedProper { std::vector< std::unique_ptr<WrappedProperty> > aWrappedProperties; - aWrappedProperties.emplace_back( new WrappedDirectStateProperty("LineStyle","LineStyle") ); + aWrappedProperties.emplace_back( new WrappedDirectStateProperty(u"LineStyle"_ustr,u"LineStyle"_ustr) ); return aWrappedProperties; } OUString SAL_CALL AreaWrapper::getImplementationName() { - return "com.sun.star.comp.chart.Area"; + return u"com.sun.star.comp.chart.Area"_ustr; } sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName ) @@ -146,10 +146,10 @@ sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames() { return { - "com.sun.star.xml.UserDefinedAttributesSupplier", - "com.sun.star.beans.PropertySet", - "com.sun.star.drawing.FillProperties", - "com.sun.star.drawing.LineProperties" }; + u"com.sun.star.xml.UserDefinedAttributesSupplier"_ustr, + u"com.sun.star.beans.PropertySet"_ustr, + u"com.sun.star.drawing.FillProperties"_ustr, + u"com.sun.star.drawing.LineProperties"_ustr }; } } // namespace chart::wrapper diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index ea50320e506e..3376282d6ffc 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -473,7 +473,7 @@ void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AxisWrapper::getShapeType() { - return "com.sun.star.chart.ChartAxis"; + return u"com.sun.star.chart.ChartAxis"_ustr; } // ____ XNumberFormatsSupplier ____ @@ -546,8 +546,8 @@ void AxisWrapper::updateReferenceSize() Reference< beans::XPropertySet > xProp( getAxis(), uno::UNO_QUERY ); if( xProp.is() ) { - if( xProp->getPropertyValue("ReferencePageSize").hasValue() ) - xProp->setPropertyValue("ReferencePageSize", uno::Any( + if( xProp->getPropertyValue(u"ReferencePageSize"_ustr).hasValue() ) + xProp->setPropertyValue(u"ReferencePageSize"_ustr, uno::Any( m_spChart2ModelContact->GetPageSize() )); } } @@ -556,7 +556,7 @@ Any AxisWrapper::getReferenceSize() Any aRet; Reference< beans::XPropertySet > xProp( getAxis(), uno::UNO_QUERY ); if( xProp.is() ) - aRet = xProp->getPropertyValue("ReferencePageSize"); + aRet = xProp->getPropertyValue(u"ReferencePageSize"_ustr); return aRet; } awt::Size AxisWrapper::getCurrentSizeForReference() @@ -579,7 +579,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis() { xAxis = AxisHelper::createAxis( nDimensionIndex, bMainAxis, xDiagram, m_spChart2ModelContact->m_xContext ); if( xAxis.is() ) - xAxis->setPropertyValue("Show", uno::Any( false ) ); + xAxis->setPropertyValue(u"Show"_ustr, uno::Any( false ) ); } } catch( const uno::Exception & ) @@ -605,19 +605,19 @@ std::vector< std::unique_ptr<WrappedProperty> > AxisWrapper::createWrappedProper std::vector< std::unique_ptr<WrappedProperty> > aWrappedProperties; aWrappedProperties.emplace_back( new WrappedTextRotationProperty() ); - aWrappedProperties.emplace_back( new WrappedProperty("Marks","MajorTickmarks") ); - aWrappedProperties.emplace_back( new WrappedProperty("HelpMarks","MinorTickmarks") ); - aWrappedProperties.emplace_back( new WrappedProperty("TextCanOverlap","TextOverlap") ); - aWrappedProperties.emplace_back( new WrappedProperty("ArrangeOrder","ArrangeOrder") ); - aWrappedProperties.emplace_back( new WrappedProperty("Visible","Show") ); - aWrappedProperties.emplace_back( new WrappedDirectStateProperty("DisplayLabels","DisplayLabels") ); - aWrappedProperties.emplace_back( new WrappedDirectStateProperty("TryStaggeringFirst","TryStaggeringFirst") ); - aWrappedProperties.emplace_back( new WrappedDirectStateProperty("TextBreak","TextBreak") ); + aWrappedProperties.emplace_back( new WrappedProperty(u"Marks"_ustr,u"MajorTickmarks"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"HelpMarks"_ustr,u"MinorTickmarks"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"TextCanOverlap"_ustr,u"TextOverlap"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"ArrangeOrder"_ustr,u"ArrangeOrder"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"Visible"_ustr,u"Show"_ustr) ); + aWrappedProperties.emplace_back( new WrappedDirectStateProperty(u"DisplayLabels"_ustr,u"DisplayLabels"_ustr) ); + aWrappedProperties.emplace_back( new WrappedDirectStateProperty(u"TryStaggeringFirst"_ustr,u"TryStaggeringFirst"_ustr) ); + aWrappedProperties.emplace_back( new WrappedDirectStateProperty(u"TextBreak"_ustr,u"TextBreak"_ustr) ); aWrappedProperties.emplace_back( new WrappedNumberFormatProperty(m_spChart2ModelContact) ); aWrappedProperties.emplace_back( new WrappedLinkNumberFormatProperty ); - aWrappedProperties.emplace_back( new WrappedProperty("StackedText","StackCharacters") ); - aWrappedProperties.emplace_back( new WrappedDirectStateProperty("CrossoverPosition","CrossoverPosition") ); - aWrappedProperties.emplace_back( new WrappedDirectStateProperty("MajorOrigin","MajorOrigin") ); + aWrappedProperties.emplace_back( new WrappedProperty(u"StackedText"_ustr,u"StackCharacters"_ustr) ); + aWrappedProperties.emplace_back( new WrappedDirectStateProperty(u"CrossoverPosition"_ustr,u"CrossoverPosition"_ustr) ); + aWrappedProperties.emplace_back( new WrappedDirectStateProperty(u"MajorOrigin"_ustr,u"MajorOrigin"_ustr) ); { WrappedGapwidthProperty* pWrappedGapwidthProperty( new WrappedGapwidthProperty( m_spChart2ModelContact ) ); WrappedBarOverlapProperty* pWrappedBarOverlapProperty( new WrappedBarOverlapProperty( m_spChart2ModelContact ) ); @@ -643,7 +643,7 @@ std::vector< std::unique_ptr<WrappedProperty> > AxisWrapper::createWrappedProper OUString SAL_CALL AxisWrapper::getImplementationName() { - return "com.sun.star.comp.chart.Axis"; + return u"com.sun.star.comp.chart.Axis"_ustr; } sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName ) @@ -654,9 +654,9 @@ sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames() { return { - "com.sun.star.chart.ChartAxis", - "com.sun.star.xml.UserDefinedAttributesSupplier", - "com.sun.star.style.CharacterProperties" + u"com.sun.star.chart.ChartAxis"_ustr, + u"com.sun.star.xml.UserDefinedAttributesSupplier"_ustr, + u"com.sun.star.style.CharacterProperties"_ustr }; } diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index ba286cc62623..771ca721b781 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -64,11 +64,11 @@ void Chart2ModelContact::setDocumentModel( ChartModel* pChartModel ) if( !pChartModel ) return; - m_aTableMap["LineDashName"].set(pChartModel->createInstance("com.sun.star.drawing.DashTable"), uno::UNO_QUERY); - m_aTableMap["FillGradientName"].set(pChartModel->createInstance("com.sun.star.drawing.GradientTable"), uno::UNO_QUERY); - m_aTableMap["FillHatchName"].set(pChartModel->createInstance("com.sun.star.drawing.HatchTable"), uno::UNO_QUERY); - m_aTableMap["FillBitmapName"].set(pChartModel->createInstance("com.sun.star.drawing.BitmapTable"), uno::UNO_QUERY); - m_aTableMap["FillTransparenceGradientName"].set(pChartModel->createInstance("com.sun.star.drawing.TransparencyGradientTable"), uno::UNO_QUERY); + m_aTableMap[u"LineDashName"_ustr].set(pChartModel->createInstance(u"com.sun.star.drawing.DashTable"_ustr), uno::UNO_QUERY); + m_aTableMap[u"FillGradientName"_ustr].set(pChartModel->createInstance(u"com.sun.star.drawing.GradientTable"_ustr), uno::UNO_QUERY); + m_aTableMap[u"FillHatchName"_ustr].set(pChartModel->createInstance(u"com.sun.star.drawing.HatchTable"_ustr), uno::UNO_QUERY); + m_aTableMap[u"FillBitmapName"_ustr].set(pChartModel->createInstance(u"com.sun.star.drawing.BitmapTable"_ustr), uno::UNO_QUERY); + m_aTableMap[u"FillTransparenceGradientName"_ustr].set(pChartModel->createInstance(u"com.sun.star.drawing.TransparencyGradientTable"_ustr), uno::UNO_QUERY); } void Chart2ModelContact::clear() @@ -198,7 +198,7 @@ awt::Rectangle Chart2ModelContact::GetDiagramRectangleIncludingAxes() const { ExplicitValueProvider* pProvider( getExplicitValueProvider() ); if( pProvider ) - aRect = pProvider->getRectangleOfObject("PlotAreaIncludingAxes"); + aRect = pProvider->getRectangleOfObject(u"PlotAreaIncludingAxes"_ustr); } return aRect; } diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 7988ef90df94..92cfdccb62bd 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -627,9 +627,9 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) uno::Reference< beans::XPropertySet > xDiaProp( xOldDoc->getDiagram(), uno::UNO_QUERY ); if( xDiaProp.is()) { - xDiaProp->getPropertyValue("Stacked") >>= bStacked; - xDiaProp->getPropertyValue("Percent") >>= bPercent; - xDiaProp->getPropertyValue("Deep") >>= bDeep; + xDiaProp->getPropertyValue(u"Stacked"_ustr) >>= bStacked; + xDiaProp->getPropertyValue(u"Percent"_ustr) >>= bPercent; + xDiaProp->getPropertyValue(u"Deep"_ustr) >>= bDeep; } //detect arguments for the new data source @@ -687,7 +687,7 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) OUString SAL_CALL ChartDataWrapper::getImplementationName() { - return "com.sun.star.comp.chart.ChartData"; + return u"com.sun.star.comp.chart.ChartData"_ustr; } sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceName ) @@ -698,8 +698,8 @@ sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceNam css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNames() { return { - "com.sun.star.chart.ChartDataArray", - "com.sun.star.chart.ChartData" + u"com.sun.star.chart.ChartDataArray"_ustr, + u"com.sun.star.chart.ChartData"_ustr }; } diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 51c803a1db0c..7c832ed0d781 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -261,7 +261,7 @@ private: //member } WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty("DataSourceLabelsInFirstRow",OUString()) + : WrappedProperty(u"DataSourceLabelsInFirstRow"_ustr,OUString()) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { m_aOuterValue = WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( nullptr ); @@ -271,7 +271,7 @@ void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOu { bool bLabelsInFirstRow = true; if( ! (rOuterValue >>= bLabelsInFirstRow) ) - throw lang::IllegalArgumentException("Property DataSourceLabelsInFirstRow requires value of type boolean", nullptr, 0 ); + throw lang::IllegalArgumentException(u"Property DataSourceLabelsInFirstRow requires value of type boolean"_ustr, nullptr, 0 ); m_aOuterValue = rOuterValue; bool bNewValue = bLabelsInFirstRow; @@ -351,7 +351,7 @@ private: //member } WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColumnProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty("DataSourceLabelsInFirstColumn",OUString()) + : WrappedProperty(u"DataSourceLabelsInFirstColumn"_ustr,OUString()) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { m_aOuterValue = WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( nullptr ); @@ -361,7 +361,7 @@ void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& { bool bLabelsInFirstRow = true; if( ! (rOuterValue >>= bLabelsInFirstRow) ) - throw lang::IllegalArgumentException("Property DataSourceLabelsInFirstRow requires value of type boolean", nullptr, 0 ); + throw lang::IllegalArgumentException(u"Property DataSourceLabelsInFirstRow requires value of type boolean"_ustr, nullptr, 0 ); m_aOuterValue = rOuterValue; bool bNewValue = bLabelsInFirstRow; @@ -440,7 +440,7 @@ private: //member } WrappedHasLegendProperty::WrappedHasLegendProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty("HasLegend",OUString()) + : WrappedProperty(u"HasLegend"_ustr,OUString()) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { } @@ -449,7 +449,7 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) - throw lang::IllegalArgumentException("Property HasLegend requires value of type boolean", nullptr, 0 ); + throw lang::IllegalArgumentException(u"Property HasLegend requires value of type boolean"_ustr, nullptr, 0 ); try { @@ -457,10 +457,10 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R if(xLegend.is()) { bool bOldValue = true; - Any aAOld = xLegend->getPropertyValue("Show"); + Any aAOld = xLegend->getPropertyValue(u"Show"_ustr); aAOld >>= bOldValue; if( bOldValue != bNewValue ) - xLegend->setPropertyValue("Show", uno::Any( bNewValue )); + xLegend->setPropertyValue(u"Show"_ustr, uno::Any( bNewValue )); } } catch (const uno::Exception&) @@ -477,7 +477,7 @@ Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropert rtl::Reference< Legend > xLegend = LegendHelper::getLegend( *m_spChart2ModelContact->getDocumentModel() ); if( xLegend.is()) - aRet = xLegend->getPropertyValue("Show"); + aRet = xLegend->getPropertyValue(u"Show"_ustr); else aRet <<= false; } @@ -516,7 +516,7 @@ private: //member } WrappedHasMainTitleProperty::WrappedHasMainTitleProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty("HasMainTitle",OUString()) + : WrappedProperty(u"HasMainTitle"_ustr,OUString()) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { } @@ -525,12 +525,12 @@ void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, cons { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) - throw lang::IllegalArgumentException("Property HasMainTitle requires value of type boolean", nullptr, 0 ); + throw lang::IllegalArgumentException(u"Property HasMainTitle requires value of type boolean"_ustr, nullptr, 0 ); try { if( bNewValue ) - TitleHelper::createTitle( TitleHelper::MAIN_TITLE, "main-title", m_spChart2ModelContact->getDocumentModel(), m_spChart2ModelContact->m_xContext ); + TitleHelper::createTitle( TitleHelper::MAIN_TITLE, u"main-title"_ustr, m_spChart2ModelContact->getDocumentModel(), m_spChart2ModelContact->m_xContext ); else TitleHelper::removeTitle( TitleHelper::MAIN_TITLE, m_spChart2ModelContact->getDocumentModel() ); } @@ -582,7 +582,7 @@ private: //member } WrappedHasSubTitleProperty::WrappedHasSubTitleProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty("HasSubTitle",OUString()) + : WrappedProperty(u"HasSubTitle"_ustr,OUString()) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { } @@ -591,12 +591,12 @@ void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) - throw lang::IllegalArgumentException("Property HasSubTitle requires value of type boolean", nullptr, 0 ); + throw lang::IllegalArgumentException(u"Property HasSubTitle requires value of type boolean"_ustr, nullptr, 0 ); try { if( bNewValue ) - TitleHelper::createTitle( TitleHelper::SUB_TITLE, "", m_spChart2ModelContact->getDocumentModel(), m_spChart2ModelContact->m_xContext ); + TitleHelper::createTitle( TitleHelper::SUB_TITLE, u""_ustr, m_spChart2ModelContact->getDocumentModel(), m_spChart2ModelContact->m_xContext ); else TitleHelper::removeTitle( TitleHelper::SUB_TITLE, m_spChart2ModelContact->getDocumentModel() ); } @@ -1070,7 +1070,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( if( xChartTypeManager.is()) { xTemplate = - xChartTypeManager->createTemplate("com.sun.star.chart2.template.Area"); + xChartTypeManager->createTemplate(u"com.sun.star.chart2.template.Area"_ustr); bCreateDiagram = true; } break; @@ -1080,7 +1080,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( // this is for bar and column (the latter is the default if // no "Vertical=false" property was set) xTemplate = - xChartTypeManager->createTemplate("com.sun.star.chart2.template.Column"); + xChartTypeManager->createTemplate(u"com.sun.star.chart2.template.Column"_ustr); bCreateDiagram = true; } break; @@ -1088,7 +1088,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( if( xChartTypeManager.is()) { xTemplate = - xChartTypeManager->createTemplate("com.sun.star.chart2.template.Donut"); + xChartTypeManager->createTemplate(u"com.sun.star.chart2.template.Donut"_ustr); bCreateDiagram = true; } break; @@ -1096,7 +1096,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( if( xChartTypeManager.is()) { xTemplate = - xChartTypeManager->createTemplate("com.sun.star.chart2.template.Line"); + xChartTypeManager->createTemplate(u"com.sun.star.chart2.template.Line"_ustr); bCreateDiagram = true; } break; @@ -1104,7 +1104,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( if( xChartTypeManager.is()) { xTemplate = - xChartTypeManager->createTemplate("com.sun.star.chart2.template.Net"); + xChartTypeManager->createTemplate(u"com.sun.star.chart2.template.Net"_ustr); bCreateDiagram = true; } break; @@ -1112,7 +1112,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( if( xChartTypeManager.is()) { xTemplate = - xChartTypeManager->createTemplate("com.sun.star.chart2.template.FilledNet"); + xChartTypeManager->createTemplate(u"com.sun.star.chart2.template.FilledNet"_ustr); bCreateDiagram = true; } break; @@ -1120,7 +1120,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( if( xChartTypeManager.is()) { xTemplate = - xChartTypeManager->createTemplate("com.sun.star.chart2.template.Pie"); + xChartTypeManager->createTemplate(u"com.sun.star.chart2.template.Pie"_ustr); bCreateDiagram = true; } break; @@ -1128,7 +1128,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( if( xChartTypeManager.is()) { xTemplate = - xChartTypeManager->createTemplate("com.sun.star.chart2.template.StockLowHighClose"); + xChartTypeManager->createTemplate(u"com.sun.star.chart2.template.StockLowHighClose"_ustr); bCreateDiagram = true; } break; @@ -1136,7 +1136,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( if( xChartTypeManager.is()) { xTemplate = - xChartTypeManager->createTemplate("com.sun.star.chart2.template.ScatterLineSymbol"); + xChartTypeManager->createTemplate(u"com.sun.star.chart2.template.ScatterLineSymbol"_ustr); bCreateDiagram = true; } break; @@ -1145,7 +1145,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( if( xChartTypeManager.is()) { xTemplate = - xChartTypeManager->createTemplate("com.sun.star.chart2.template.Bubble"); + xChartTypeManager->createTemplate(u"com.sun.star.chart2.template.Bubble"_ustr); bCreateDiagram = true; } break; @@ -1312,7 +1312,7 @@ void SAL_CALL ChartDocumentWrapper::setDelegator( if( m_bIsDisposed ) { if( rDelegator.is() ) - throw lang::DisposedException("ChartDocumentWrapper is disposed", + throw lang::DisposedException(u"ChartDocumentWrapper is disposed"_ustr, static_cast< ::cppu::OWeakObject* >( this )); return; } @@ -1400,9 +1400,9 @@ std::vector< std::unique_ptr<WrappedProperty> > ChartDocumentWrapper::createWrap aWrappedProperties.emplace_back( new WrappedBaseDiagramProperty( *this ) ); aWrappedProperties.emplace_back( new WrappedAdditionalShapesProperty( *this ) ); aWrappedProperties.emplace_back( new WrappedRefreshAddInAllowedProperty( *this ) ); - aWrappedProperties.emplace_back( new WrappedIgnoreProperty("NullDate",Any() ) ); // i99104 - aWrappedProperties.emplace_back( new WrappedIgnoreProperty("EnableComplexChartTypes", uno::Any(true) ) ); - aWrappedProperties.emplace_back( new WrappedIgnoreProperty("EnableDataTableDialog", uno::Any(true) ) ); + aWrappedProperties.emplace_back( new WrappedIgnoreProperty(u"NullDate"_ustr,Any() ) ); // i99104 + aWrappedProperties.emplace_back( new WrappedIgnoreProperty(u"EnableComplexChartTypes"_ustr, uno::Any(true) ) ); + aWrappedProperties.emplace_back( new WrappedIgnoreProperty(u"EnableDataTableDialog"_ustr, uno::Any(true) ) ); return aWrappedProperties; } @@ -1420,10 +1420,10 @@ sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString& rServic css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServiceNames() { return { - "com.sun.star.chart.ChartDocument", + u"com.sun.star.chart.ChartDocument"_ustr, CHART_CHARTAPIWRAPPER_SERVICE_NAME, - "com.sun.star.xml.UserDefinedAttributesSupplier", - "com.sun.star.beans.PropertySet" + u"com.sun.star.xml.UserDefinedAttributesSupplier"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index ac9a53ce331f..c102a706af08 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -279,7 +279,7 @@ protected: WrappedAttachedAxisProperty::WrappedAttachedAxisProperty( const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ) - : WrappedProperty("Axis",OUString()) + : WrappedProperty(u"Axis"_ustr,OUString()) , m_spChart2ModelContact( spChart2ModelContact ) { } @@ -310,7 +310,7 @@ void WrappedAttachedAxisProperty::setPropertyValue( const Any& rOuterValue, cons sal_Int32 nChartAxisAssign = css::chart::ChartAxisAssign::PRIMARY_Y; if( ! (rOuterValue >>= nChartAxisAssign) ) - throw lang::IllegalArgumentException("Property Axis requires value of type sal_Int32", nullptr, 0 ); + throw lang::IllegalArgumentException(u"Property Axis requires value of type sal_Int32"_ustr, nullptr, 0 ); bool bNewAttachedToMainAxis = nChartAxisAssign == css::chart::ChartAxisAssign::PRIMARY_Y; bool bOldAttachedToMainAxis = ::chart::DiagramHelper::isSeriesAttachedToMainAxis( xDataSeries ); @@ -334,7 +334,7 @@ protected: }; WrappedSegmentOffsetProperty::WrappedSegmentOffsetProperty() : - WrappedProperty("SegmentOffset","Offset") + WrappedProperty(u"SegmentOffset"_ustr,u"Offset"_ustr) {} Any WrappedSegmentOffsetProperty::convertInnerToOuterValue( const Any& rInnerValue ) const @@ -379,7 +379,7 @@ protected: WrappedLineColorProperty::WrappedLineColorProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper ) - : WrappedSeriesAreaOrLineProperty("LineColor","BorderColor","Color", pDataSeriesPointWrapper ) + : WrappedSeriesAreaOrLineProperty(u"LineColor"_ustr,u"BorderColor"_ustr,u"Color"_ustr, pDataSeriesPointWrapper ) , m_pDataSeriesPointWrapper( pDataSeriesPointWrapper ) , m_aDefaultValue(uno::Any(sal_Int32( 0x0099ccff ))) // blue 8 { @@ -420,7 +420,7 @@ protected: WrappedLineStyleProperty::WrappedLineStyleProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper ) - : WrappedSeriesAreaOrLineProperty("LineStyle","BorderStyle", "LineStyle", pDataSeriesPointWrapper ) + : WrappedSeriesAreaOrLineProperty(u"LineStyle"_ustr,u"BorderStyle"_ustr, u"LineStyle"_ustr, pDataSeriesPointWrapper ) , m_pDataSeriesPointWrapper( pDataSeriesPointWrapper ) { } @@ -475,7 +475,7 @@ void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any if( !m_xDataSeries.is() ) throw uno::Exception( - "DataSeries index invalid", static_cast< ::cppu::OWeakObject * >( this )); + u"DataSeries index invalid"_ustr, static_cast< ::cppu::OWeakObject * >( this )); //todo: check upper border of point index @@ -576,8 +576,8 @@ void DataSeriesPointWrapper::updateReferenceSize() Reference< beans::XPropertySet > xProp = getInnerPropertySet(); if( xProp.is() ) { - if( xProp->getPropertyValue("ReferencePageSize").hasValue() ) - xProp->setPropertyValue("ReferencePageSize", uno::Any( + if( xProp->getPropertyValue(u"ReferencePageSize"_ustr).hasValue() ) + xProp->setPropertyValue(u"ReferencePageSize"_ustr, uno::Any( m_spChart2ModelContact->GetPageSize() )); } } @@ -586,7 +586,7 @@ Any DataSeriesPointWrapper::getReferenceSize() Any aRet; Reference< beans::XPropertySet > xProp = getInnerPropertySet(); if( xProp.is() ) - aRet = xProp->getPropertyValue("ReferencePageSize"); + aRet = xProp->getPropertyValue(u"ReferencePageSize"_ustr); return aRet; } awt::Size DataSeriesPointWrapper::getCurrentSizeForReference() @@ -604,7 +604,7 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU { if (rPropertyName == "SymbolBitmap" || rPropertyName == "SymbolBitmapURL") { - uno::Any aAny = WrappedPropertySet::getPropertyValue("SymbolType"); + uno::Any aAny = WrappedPropertySet::getPropertyValue(u"SymbolType"_ustr); sal_Int32 nVal = css::chart::ChartSymbolType::NONE; if (aAny >>= nVal) { @@ -735,38 +735,38 @@ std::vector< std::unique_ptr<WrappedProperty> > DataSeriesPointWrapper::createWr //add unnamed line properties (different inner names here) - aWrappedProperties.emplace_back( new WrappedProperty("FillColor","Color") ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillColor"_ustr,u"Color"_ustr) ); aWrappedProperties.emplace_back( new WrappedLineStyleProperty( this ) ); aWrappedProperties.emplace_back( new WrappedLineColorProperty( this ) ); - aWrappedProperties.emplace_back( new WrappedSeriesAreaOrLineProperty("LineDashName","BorderDashName","LineDashName", this ) ); - aWrappedProperties.emplace_back( new WrappedSeriesAreaOrLineProperty("LineTransparence","BorderTransparency","Transparency", this ) ); - aWrappedProperties.emplace_back( new WrappedSeriesAreaOrLineProperty("LineWidth","BorderWidth","LineWidth", this ) ); - aWrappedProperties.emplace_back( new WrappedSeriesAreaOrLineProperty("LineCap","LineCap","LineCap", this ) ); - aWrappedProperties.emplace_back( new WrappedProperty("FillStyle","FillStyle" ) ); - aWrappedProperties.emplace_back( new WrappedProperty("FillTransparence","Transparency") ); - - aWrappedProperties.emplace_back( new WrappedIgnoreProperty("LineJoint", uno::Any( drawing::LineJoint_ROUND ) ) ); - aWrappedProperties.emplace_back( new WrappedProperty("FillTransparenceGradientName","TransparencyGradientName") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillGradientName","GradientName") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillGradientStepCount","GradientStepCount") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillHatchName","HatchName") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillBitmapName","FillBitmapName") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillBackground","FillBackground") ); + aWrappedProperties.emplace_back( new WrappedSeriesAreaOrLineProperty(u"LineDashName"_ustr,u"BorderDashName"_ustr,u"LineDashName"_ustr, this ) ); + aWrappedProperties.emplace_back( new WrappedSeriesAreaOrLineProperty(u"LineTransparence"_ustr,u"BorderTransparency"_ustr,u"Transparency"_ustr, this ) ); + aWrappedProperties.emplace_back( new WrappedSeriesAreaOrLineProperty(u"LineWidth"_ustr,u"BorderWidth"_ustr,u"LineWidth"_ustr, this ) ); + aWrappedProperties.emplace_back( new WrappedSeriesAreaOrLineProperty(u"LineCap"_ustr,u"LineCap"_ustr,u"LineCap"_ustr, this ) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillStyle"_ustr,u"FillStyle"_ustr ) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillTransparence"_ustr,u"Transparency"_ustr) ); + + aWrappedProperties.emplace_back( new WrappedIgnoreProperty(u"LineJoint"_ustr, uno::Any( drawing::LineJoint_ROUND ) ) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillTransparenceGradientName"_ustr,u"TransparencyGradientName"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillGradientName"_ustr,u"GradientName"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillGradientStepCount"_ustr,u"GradientStepCount"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillHatchName"_ustr,u"HatchName"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillBitmapName"_ustr,u"FillBitmapName"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillBackground"_ustr,u"FillBackground"_ustr) ); //bitmap properties - aWrappedProperties.emplace_back( new WrappedProperty("FillBitmapMode","FillBitmapMode") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillBitmapSizeX","FillBitmapSizeX") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillBitmapSizeY","FillBitmapSizeY") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillBitmapLogicalSize","FillBitmapLogicalSize") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillBitmapOffsetX","FillBitmapOffsetX") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillBitmapOffsetY","FillBitmapOffsetY") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillBitmapRectanglePoint","FillBitmapRectanglePoint") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillBitmapPositionOffsetX","FillBitmapPositionOffsetX") ); - aWrappedProperties.emplace_back( new WrappedProperty("FillBitmapPositionOffsetY","FillBitmapPositionOffsetY") ); - - aWrappedProperties.emplace_back( new WrappedProperty("SolidType","Geometry3D") ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillBitmapMode"_ustr,u"FillBitmapMode"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillBitmapSizeX"_ustr,u"FillBitmapSizeX"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillBitmapSizeY"_ustr,u"FillBitmapSizeY"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillBitmapLogicalSize"_ustr,u"FillBitmapLogicalSize"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillBitmapOffsetX"_ustr,u"FillBitmapOffsetX"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillBitmapOffsetY"_ustr,u"FillBitmapOffsetY"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillBitmapRectanglePoint"_ustr,u"FillBitmapRectanglePoint"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillBitmapPositionOffsetX"_ustr,u"FillBitmapPositionOffsetX"_ustr) ); + aWrappedProperties.emplace_back( new WrappedProperty(u"FillBitmapPositionOffsetY"_ustr,u"FillBitmapPositionOffsetY"_ustr) ); + + aWrappedProperties.emplace_back( new WrappedProperty(u"SolidType"_ustr,u"Geometry3D"_ustr) ); aWrappedProperties.emplace_back( new WrappedSegmentOffsetProperty() ); - aWrappedProperties.emplace_back( new WrappedProperty("D3DPercentDiagonal","PercentDiagonal") ); + aWrappedProperties.emplace_back( new WrappedProperty(u"D3DPercentDiagonal"_ustr,u"PercentDiagonal"_ustr) ); aWrappedProperties.emplace_back( new WrappedTextRotationProperty() ); @@ -778,11 +778,11 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert if(rPropertyName == "Lines") { if( ! (rValue >>= m_bLinesAllowed) ) - throw lang::IllegalArgumentException("Property Lines requires value of type sal_Bool", nullptr, 0 ); + throw lang::IllegalArgumentException(u"Property Lines requires value of type sal_Bool"_ustr, nullptr, 0 ); } sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); - static const sal_Int32 nErrorCategoryHandle = getInfoHelper().getHandleByName("ErrorCategory"); + static const sal_Int32 nErrorCategoryHandle = getInfoHelper().getHandleByName(u"ErrorCategory"_ustr); if( nErrorCategoryHandle == nHandle ) { css::chart::ChartErrorCategory aNewValue = css::chart::ChartErrorCategory_NONE; @@ -792,16 +792,16 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert switch(aNewValue) { case css::chart::ChartErrorCategory_CONSTANT_VALUE: - aHigh = getPropertyValue("ConstantErrorHigh"); - aLow = getPropertyValue("ConstantErrorLow"); + aHigh = getPropertyValue(u"ConstantErrorHigh"_ustr); + aLow = getPropertyValue(u"ConstantErrorLow"_ustr); bSetHighAndLowValues = true; break; case css::chart::ChartErrorCategory_PERCENT: - aHigh = aLow = getPropertyValue("PercentageError"); + aHigh = aLow = getPropertyValue(u"PercentageError"_ustr); bSetHighAndLowValues = true; break; case css::chart::ChartErrorCategory_ERROR_MARGIN: - aHigh = aLow = getPropertyValue("ErrorMargin"); + aHigh = aLow = getPropertyValue(u"ErrorMargin"_ustr); bSetHighAndLowValues = true; break; default: @@ -815,14 +815,14 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert switch(aNewValue) { case css::chart::ChartErrorCategory_CONSTANT_VALUE: - setPropertyValue("ConstantErrorHigh",aHigh); - setPropertyValue("ConstantErrorLow",aLow); + setPropertyValue(u"ConstantErrorHigh"_ustr,aHigh); + setPropertyValue(u"ConstantErrorLow"_ustr,aLow); break; case css::chart::ChartErrorCategory_PERCENT: - setPropertyValue("PercentageError",aHigh); + setPropertyValue(u"PercentageError"_ustr,aHigh); break; case css::chart::ChartErrorCategory_ERROR_MARGIN: - setPropertyValue("ErrorMargin",aHigh); + setPropertyValue(u"ErrorMargin"_ustr,aHigh); break; default: break; @@ -846,7 +846,7 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty && bVaryColorsByPoint ) { uno::Reference< beans::XPropertyState > xPointState( DataSeriesPointWrapper::getDataPointProperties(), uno::UNO_QUERY ); - if( xPointState.is() && xPointState->getPropertyState("Color") == beans::PropertyState_DEFAULT_VALUE ) + if( xPointState.is() && xPointState->getPropertyState(u"Color"_ustr) == beans::PropertyState_DEFAULT_VALUE ) { rtl::Reference< ::chart::Diagram > xDiagram( m_spChart2ModelContact->getDiagram() ); if( xDiagram.is() ) @@ -864,7 +864,7 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty OUString SAL_CALL DataSeriesPointWrapper::getImplementationName() { - return "com.sun.star.comp.chart.DataSeries"; + return u"com.sun.star.comp.chart.DataSeries"_ustr; } sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServiceName ) @@ -875,13 +875,13 @@ sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServ css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServiceNames() { return { - "com.sun.star.chart.ChartDataRowProperties", - "com.sun.star.chart.ChartDataPointProperties", - "com.sun.star.xml.UserDefinedAttributesSupplier", - "com.sun.star.beans.PropertySet", - "com.sun.star.drawing.FillProperties", - "com.sun.star.drawing.LineProperties", - "com.sun.star.style.CharacterProperties" + u"com.sun.star.chart.ChartDataRowProperties"_ustr, + u"com.sun.star.chart.ChartDataPointProperties"_ustr, + u"com.sun.star.xml.UserDefinedAttributesSupplier"_ustr, + u"com.sun.star.beans.PropertySet"_ustr, + u"com.sun.star.drawing.FillProperties"_ustr, + u"com.sun.star.drawing.LineProperties"_ustr, + u"com.sun.star.style.CharacterProperties"_ustr }; } diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 2917b989f040..f0e8d0168e1a 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -463,20 +463,20 @@ OUString lcl_getDiagramType( std::u16string_view rTemplateServiceName ) // "Area" "StackedArea" "PercentStackedArea" "ThreeDArea" // "StackedThreeDArea" "PercentStackedThreeDArea" if( aName.find( u"Area" ) != std::u16string_view::npos ) - return "com.sun.star.chart.AreaDiagram"; + return u"com.sun.star.chart.AreaDiagram"_ustr; // Handle bar-of-pie and pie-of-pie before simple pie // "BarOfPie" if( aName.find( u"BarOfPie" ) != std::u16string_view::npos ) - return "com.sun.star.chart.BarOfPieDiagram"; + return u"com.sun.star.chart.BarOfPieDiagram"_ustr; // "PieOfPie" if( aName.find( u"PieOfPie" ) != std::u16string_view::npos ) - return "com.sun.star.chart.PieOfPieDiagram"; + return u"com.sun.star.chart.PieOfPieDiagram"_ustr; // "Pie" "PieAllExploded" "ThreeDPie" "ThreeDPieAllExploded" if( aName.find( u"Pie" ) != std::u16string_view::npos ) - return "com.sun.star.chart.PieDiagram"; + return u"com.sun.star.chart.PieDiagram"_ustr; // "Column" "StackedColumn" "PercentStackedColumn" "ThreeDColumnDeep" // "ThreeDColumnFlat" "StackedThreeDColumnFlat" @@ -485,33 +485,33 @@ OUString lcl_getDiagramType( std::u16string_view rTemplateServiceName ) // "StackedThreeDBarFlat" "PercentStackedThreeDBarFlat" "ColumnWithLine" // "StackedColumnWithLine" if( aName.find( u"Column" ) != std::u16string_view::npos || aName.find( u"Bar" ) != std::u16string_view::npos ) - return "com.sun.star.chart.BarDiagram"; + return u"com.sun.star.chart.BarDiagram"_ustr; // "Donut" "DonutAllExploded" "ThreeDDonut" "ThreeDDonutAllExploded" if( aName.find( u"Donut" ) != std::u16string_view::npos ) - return "com.sun.star.chart.DonutDiagram"; + return u"com.sun.star.chart.DonutDiagram"_ustr; // "ScatterLineSymbol" "ScatterLine" "ScatterSymbol" "ThreeDScatter" if( aName.find( u"Scatter" ) != std::u16string_view::npos ) - return "com.sun.star.chart.XYDiagram"; + return u"com.sun.star.chart.XYDiagram"_ustr; // "FilledNet" "StackedFilledNet" "PercentStackedFilledNet" if( aName.find( u"FilledNet" ) != std::u16string_view::npos ) - return "com.sun.star.chart.FilledNetDiagram"; + return u"com.sun.star.chart.FilledNetDiagram"_ustr; // "Net" "NetSymbol" "NetLine" "StackedNet" "StackedNetSymbol" // "StackedNetLine" "PercentStackedNet" "PercentStackedNetSymbol" // "PercentStackedNetLine" if( aName.find( u"Net" ) != std::u16string_view::npos ) - return "com.sun.star.chart.NetDiagram"; + return u"com.sun.star.chart.NetDiagram"_ustr; // "StockLowHighClose" "StockOpenLowHighClose" "StockVolumeLowHighClose" // "StockVolumeOpenLowHighClose" if( aName.find( u"Stock" ) != std::u16string_view::npos ) - return "com.sun.star.chart.StockDiagram"; + return u"com.sun.star.chart.StockDiagram"_ustr; if( aName.find( u"Bubble" ) != std::u16string_view::npos ) - return "com.sun.star.chart.BubbleDiagram"; + return u"com.sun.star.chart.BubbleDiagram"_ustr; // Note: this must be checked after Bar, Net and Scatter @@ -520,7 +520,7 @@ OUString lcl_getDiagramType( std::u16string_view rTemplateServiceName ) // "PercentStackedLineSymbol" "ThreeDLine" "StackedThreeDLine" // "PercentStackedThreeDLine" "ThreeDLineDeep" if( aName.find( u"Line" ) != std::u16string_view::npos || aName.find( u"Symbol" ) != std::u16string_view::npos ) - return "com.sun.star.chart.LineDiagram"; + return u"com.sun.star.chart.LineDiagram"_ustr; OSL_FAIL( "unknown template" ); } @@ -586,7 +586,7 @@ OUString SAL_CALL DiagramWrapper::getDiagramType() if( xChartDocProp.is() ) { uno::Reference< util::XRefreshable > xAddIn; - if( xChartDocProp->getPropertyValue( "AddIn" ) >>= xAddIn ) + if( xChartDocProp->getPropertyValue( u"AddIn"_ustr ) >>= xAddIn ) { uno::Reference< lang::XServiceName > xServiceName( xAddIn, uno::UNO_QUERY ); if( xServiceName.is()) @@ -626,12 +626,12 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataRowProperties( sal_Int32 nRow ) { if( nRow < 0 ) - throw lang::IndexOutOfBoundsException("DataSeries index invalid", + throw lang::IndexOutOfBoundsException(u"DataSeries index invalid"_ustr, static_cast< ::cppu::OWeakObject * >( this )); sal_Int32 nNewAPIIndex = lcl_getNewAPIIndexForOldAPIIndex( nRow, m_spChart2ModelContact->getDiagram() ); if( nNewAPIIndex < 0 ) - throw lang::IndexOutOfBoundsException("DataSeries index invalid", + throw lang::IndexOutOfBoundsException(u"DataSeries index invalid"_ustr, static_cast< ::cppu::OWeakObject * >( this )); Reference< beans::XPropertySet > xRet( new DataSeriesPointWrapper( @@ -643,12 +643,12 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) { if( nCol < 0 || nRow < 0 ) - throw lang::IndexOutOfBoundsException("DataSeries index invalid", + throw lang::IndexOutOfBoundsException(u"DataSeries index invalid"_ustr, static_cast< ::cppu::OWeakObject * >( this )); sal_Int32 nNewAPIIndex = lcl_getNewAPIIndexForOldAPIIndex( nRow, m_spChart2ModelContact->getDiagram() ); if( nNewAPIIndex < 0 ) - throw lang::IndexOutOfBoundsException("DataSeries index invalid", + throw lang::IndexOutOfBoundsException(u"DataSeries index invalid"_ustr, static_cast< ::cppu::OWeakObject * >( this )); //todo: check borders of point index @@ -683,11 +683,11 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) { OSL_FAIL("DiagramWrapper::setPosition called with a position out of range -> automatic values are taken instead" ); uno::Any aEmpty; - xProp->setPropertyValue( "RelativePosition", aEmpty ); + xProp->setPropertyValue( u"RelativePosition"_ustr, aEmpty ); return; } - xProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) ); - xProp->setPropertyValue( "PosSizeExcludeAxes", uno::Any(false) ); + xProp->setPropertyValue( u"RelativePosition"_ustr, uno::Any(aRelativePosition) ); + xProp->setPropertyValue( u"PosSizeExcludeAxes"_ustr, uno::Any(false) ); } awt::Size SAL_CALL DiagramWrapper::getSize() @@ -713,18 +713,18 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) { OSL_FAIL("DiagramWrapper::setSize called with sizes bigger than page -> automatic values are taken instead" ); uno::Any aEmpty; - xProp->setPropertyValue( "RelativeSize", aEmpty ); + xProp->setPropertyValue( u"RelativeSize"_ustr, aEmpty ); return; } - xProp->setPropertyValue( "RelativeSize", uno::Any(aRelativeSize) ); - xProp->setPropertyValue( "PosSizeExcludeAxes", uno::Any(false) ); + xProp->setPropertyValue( u"RelativeSize"_ustr, uno::Any(aRelativeSize) ); + xProp->setPropertyValue( u"PosSizeExcludeAxes"_ustr, uno::Any(false) ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL DiagramWrapper::getShapeType() { - return "com.sun.star.chart.Diagram"; + return u"com.sun.star.chart.Diagram"_ustr; } // ____ XDiagramPositioning ____ @@ -735,8 +735,8 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) { - xDiaProps->setPropertyValue( "RelativeSize", Any() ); - xDiaProps->setPropertyValue( "RelativePosition", Any() ); + xDiaProps->setPropertyValue( u"RelativeSize"_ustr, Any() ); + xDiaProps->setPropertyValue( u"RelativePosition"_ustr, Any() ); } } sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) @@ -744,8 +744,8 @@ sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) { - Any aRelativeSize( xDiaProps->getPropertyValue( "RelativeSize" ) ); - Any aRelativePosition( xDiaProps->getPropertyValue( "RelativePosition" ) ); + Any aRelativeSize( xDiaProps->getPropertyValue( u"RelativeSize"_ustr ) ); + Any aRelativePosition( xDiaProps->getPropertyValue( u"RelativePosition"_ustr ) ); if( aRelativeSize.hasValue() && aRelativePosition.hasValue() ) return false; } @@ -757,19 +757,19 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getDocumentModel(), rPositionRect ); uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) - xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::Any(true) ); + xDiaProps->setPropertyValue(u"PosSizeExcludeAxes"_ustr, uno::Any(true) ); } sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() { uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) { - Any aRelativeSize( xDiaProps->getPropertyValue( "RelativeSize" ) ); - Any aRelativePosition( xDiaProps->getPropertyValue( "RelativePosition" ) ); + Any aRelativeSize( xDiaProps->getPropertyValue( u"RelativeSize"_ustr ) ); + Any aRelativePosition( xDiaProps->getPropertyValue( u"RelativePosition"_ustr ) ); if( aRelativeSize.hasValue() && aRelativePosition.hasValue() ) { bool bPosSizeExcludeAxes = false; - xDiaProps->getPropertyValue( "PosSizeExcludeAxes" ) >>= bPosSizeExcludeAxes; + xDiaProps->getPropertyValue( u"PosSizeExcludeAxes"_ustr ) >>= bPosSizeExcludeAxes; return bPosSizeExcludeAxes; } } @@ -785,7 +785,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectan DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getDocumentModel(), rPositionRect ); uno::Reference< beans::XPropertySet > xDiaProps( getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) - xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::Any(false) ); + xDiaProps->setPropertyValue(u"PosSizeExcludeAxes"_ustr, uno::Any(false) ); } awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( ) { @@ -1114,7 +1114,7 @@ private: //member } WrappedDataRowSourceProperty::WrappedDataRowSourceProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty("DataRowSource",OUString()) + : WrappedProperty(u"DataRowSource"_ustr,OUString()) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { m_aOuterValue = WrappedDataRowSourceProperty::getPropertyDefault( nullptr ); @@ -1127,7 +1127,7 @@ void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, con { sal_Int32 nNew = sal_Int32(css::chart::ChartDataRowSource_ROWS); if( !(rOuterValue >>= nNew) ) - throw lang::IllegalArgumentException( "Property DataRowSource requires css::chart::ChartDataRowSource value", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property DataRowSource requires css::chart::ChartDataRowSource value"_ustr, nullptr, 0 ); eChartDataRowSource = css::chart::ChartDataRowSource(nNew); } @@ -1245,7 +1245,7 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) - throw lang::IllegalArgumentException( "Stacking Properties require boolean values", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Stacking Properties require boolean values"_ustr, nullptr, 0 ); StackMode eInnerStackMode; bool bHasDetectableInnerValue = detectInnerValue( eInnerStackMode ); @@ -1309,7 +1309,7 @@ private: //member } WrappedDim3DProperty::WrappedDim3DProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty("Dim3D",OUString()) + : WrappedProperty(u"Dim3D"_ustr,OUString()) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { m_aOuterValue = WrappedDim3DProperty::getPropertyDefault( nullptr ); @@ -1319,7 +1319,7 @@ void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Refer { bool bNew3D = false; if( ! (rOuterValue >>= bNew3D) ) - throw lang::IllegalArgumentException( "Property Dim3D requires boolean value", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property Dim3D requires boolean value"_ustr, nullptr, 0 ); m_aOuterValue = rOuterValue; @@ -1372,7 +1372,7 @@ private: //member } WrappedVerticalProperty::WrappedVerticalProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty("Vertical",OUString()) + : WrappedProperty(u"Vertical"_ustr,OUString()) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { m_aOuterValue = WrappedVerticalProperty::getPropertyDefault( nullptr ); @@ -1382,7 +1382,7 @@ void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Re { bool bNewVertical = false; if( ! (rOuterValue >>= bNewVertical) ) - throw lang::IllegalArgumentException( "Property Vertical requires boolean value", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property Vertical requires boolean value"_ustr, nullptr, 0 ); m_aOuterValue = rOuterValue; @@ -1443,7 +1443,7 @@ private: //member } WrappedNumberOfLinesProperty::WrappedNumberOfLinesProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty("NumberOfLines",OUString()) + : WrappedProperty(u"NumberOfLines"_ustr,OUString()) , m_spChart2ModelContact(std::move( spChart2ModelContact )) , m_aOuterValue( getPropertyDefault(nullptr) ) { @@ -1488,7 +1488,7 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con { sal_Int32 nNewValue; if( ! (rOuterValue >>= nNewValue) ) - throw lang::IllegalArgumentException( "property NumberOfLines requires sal_Int32 value", nullptr, 0 ); + throw lang::IllegalArgumentException( u"property NumberOfLines requires sal_Int32 value"_ustr, nullptr, 0 ); m_aOuterValue = rOuterValue; @@ -1525,14 +1525,14 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con } else { - xTemplate = xChartTypeManager->createTemplate("com.sun.star.chart2.template.Column"); + xTemplate = xChartTypeManager->createTemplate(u"com.sun.star.chart2.template.Column"_ustr); } } else if( aTemplateAndService.sServiceName == "com.sun.star.chart2.template.Column" ) { if( nNewValue == 0 ) return; - xTemplate = xChartTypeManager->createTemplate( "com.sun.star.chart2.template.ColumnWithLine" ); + xTemplate = xChartTypeManager->createTemplate( u"com.sun.star.chart2.template.ColumnWithLine"_ustr ); } if(!xTemplate.is()) @@ -1543,7 +1543,7 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con // locked controllers ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getDocumentModel() ); uno::Reference< beans::XPropertySet > xProp( static_cast<cppu::OWeakObject*>(xTemplate.get()), uno::UNO_QUERY ); - xProp->setPropertyValue( "NumberOfLines", uno::Any(nNewValue) ); + xProp->setPropertyValue( u"NumberOfLines"_ustr, uno::Any(nNewValue) ); xTemplate->changeDiagram( xDiagram ); } catch( const uno::Exception & ) @@ -1589,7 +1589,7 @@ private: //member } WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty("AttributedDataPoints",OUString()) + : WrappedProperty(u"AttributedDataPoints"_ustr,OUString()) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { m_aOuterValue = WrappedAttributedDataPointsProperty::getPropertyDefault( nullptr ); @@ -1599,7 +1599,7 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal { uno::Sequence< uno::Sequence< sal_Int32 > > aNewValue; if( ! (rOuterValue >>= aNewValue) ) - throw lang::IllegalArgumentException( "Property AttributedDataPoints requires value of type uno::Sequence< uno::Sequence< sal_Int32 > >", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property AttributedDataPoints requires value of type uno::Sequence< uno::Sequence< sal_Int32 > >"_ustr, nullptr, 0 ); m_aOuterValue = rOuterValue; @@ -1683,7 +1683,7 @@ private: //member } WrappedSolidTypeProperty::WrappedSolidTypeProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty( "SolidType", OUString() ) + : WrappedProperty( u"SolidType"_ustr, OUString() ) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { m_aOuterValue = WrappedSolidTypeProperty::getPropertyDefault( nullptr ); @@ -1693,7 +1693,7 @@ void WrappedSolidTypeProperty::setPropertyValue( const Any& rOuterValue, const R { sal_Int32 nNewSolidType = css::chart::ChartSolidType::RECTANGULAR_SOLID; if( ! (rOuterValue >>= nNewSolidType) ) - throw lang::IllegalArgumentException( "Property SolidType requires integer value", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property SolidType requires integer value"_ustr, nullptr, 0 ); m_aOuterValue = rOuterValue; @@ -1744,7 +1744,7 @@ public: } WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty() - : WrappedProperty( "AutomaticSize", OUString() ) + : WrappedProperty( u"AutomaticSize"_ustr, OUString() ) { } @@ -1755,15 +1755,15 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) - throw lang::IllegalArgumentException( "Property AutomaticSize requires value of type boolean", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property AutomaticSize requires value of type boolean"_ustr, nullptr, 0 ); try { if( bNewValue ) { - Any aRelativeSize( xInnerPropertySet->getPropertyValue( "RelativeSize" ) ); + Any aRelativeSize( xInnerPropertySet->getPropertyValue( u"RelativeSize"_ustr ) ); if( aRelativeSize.hasValue() ) - xInnerPropertySet->setPropertyValue( "RelativeSize", Any() ); + xInnerPropertySet->setPropertyValue( u"RelativeSize"_ustr, Any() ); } } catch( const uno::Exception & ) @@ -1777,7 +1777,7 @@ Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPro Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) { - Any aRelativeSize( xInnerPropertySet->getPropertyValue( "RelativeSize" ) ); + Any aRelativeSize( xInnerPropertySet->getPropertyValue( u"RelativeSize"_ustr ) ); if( !aRelativeSize.hasValue() ) aRet <<= true; } @@ -1809,7 +1809,7 @@ private: //member } WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : WrappedProperty("IncludeHiddenCells","IncludeHiddenCells") + : WrappedProperty(u"IncludeHiddenCells"_ustr,u"IncludeHiddenCells"_ustr) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { } @@ -1818,7 +1818,7 @@ void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) - throw lang::IllegalArgumentException( "Property IncludeHiddenCells requires boolean value", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property IncludeHiddenCells requires boolean value"_ustr, nullptr, 0 ); ChartModelHelper::setIncludeHiddenCells( bNewValue, *m_spChart2ModelContact->getDocumentModel() ); } @@ -1877,7 +1877,7 @@ std::vector< std::unique_ptr<WrappedProperty> > DiagramWrapper::createWrappedPro aWrappedProperties.emplace_back( new WrappedVerticalProperty( m_spChart2ModelContact ) ); aWrappedProperties.emplace_back( new WrappedNumberOfLinesProperty( m_spChart2ModelContact ) ); aWrappedProperties.emplace_back( new WrappedAttributedDataPointsProperty( m_spChart2ModelContact ) ); - aWrappedProperties.emplace_back( new WrappedProperty( "StackedBarsConnected", "ConnectBars" ) ); + aWrappedProperties.emplace_back( new WrappedProperty( u"StackedBarsConnected"_ustr, u"ConnectBars"_ustr ) ); aWrappedProperties.emplace_back( new WrappedSolidTypeProperty( m_spChart2ModelContact ) ); aWrappedProperties.emplace_back( new WrappedAutomaticSizeProperty() ); aWrappedProperties.emplace_back( new WrappedIncludeHiddenCellsProperty( m_spChart2ModelContact ) ); @@ -1887,7 +1887,7 @@ std::vector< std::unique_ptr<WrappedProperty> > DiagramWrapper::createWrappedPro OUString SAL_CALL DiagramWrapper::getImplementationName() { - return "com.sun.star.comp.chart.Diagram"; + return u"com.sun.star.comp.chart.Diagram"_ustr; } sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName ) @@ -1898,14 +1898,14 @@ sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames() { return { - "com.sun.star.chart.Diagram", - "com.sun.star.xml.UserDefinedAttributesSupplier", - "com.sun.star.chart.StackableDiagram", - "com.sun.star.chart.ChartAxisXSupplier", - "com.sun.star.chart.ChartAxisYSupplier", - "com.sun.star.chart.ChartAxisZSupplier", - "com.sun.star.chart.ChartTwoAxisXSupplier", - "com.sun.star.chart.ChartTwoAxisYSupplier" + u"com.sun.star.chart.Diagram"_ustr, + u"com.sun.star.xml.UserDefinedAttributesSupplier"_ustr, + u"com.sun.star.chart.StackableDiagram"_ustr, + u"com.sun.star.chart.ChartAxisXSupplier"_ustr, + u"com.sun.star.chart.ChartAxisYSupplier"_ustr, + u"com.sun.star.chart.ChartAxisZSupplier"_ustr, + u"com.sun.star.chart.ChartTwoAxisXSupplier"_ustr, + u"com.sun.star.chart.ChartTwoAxisYSupplier"_ustr }; } diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index 5f75aa686a69..b1a24bf7ce6d 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -141,14 +141,14 @@ std::vector< std::unique_ptr<WrappedProperty> > GridWrapper::createWrappedProper { std::vector< std::unique_ptr<WrappedProperty> > aWrappedProperties; - aWrappedProperties.emplace_back( new WrappedDefaultProperty( "LineColor", "LineColor", uno::Any( sal_Int32( 0x000000) ) ) ); // black + aWrappedProperties.emplace_back( new WrappedDefaultProperty( u"LineColor"_ustr, u"LineColor"_ustr, uno::Any( sal_Int32( 0x000000) ) ) ); // black return aWrappedProperties; } OUString SAL_CALL GridWrapper::getImplementationName() { - return "com.sun.star.comp.chart.Grid"; + return u"com.sun.star.comp.chart.Grid"_ustr; } sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName ) @@ -159,10 +159,10 @@ sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames() { return { - "com.sun.star.chart.ChartGrid", - "com.sun.star.xml.UserDefinedAttributesSupplier", - "com.sun.star.drawing.LineProperties", - "com.sun.star.beans.PropertySet" + u"com.sun.star.chart.ChartGrid"_ustr, + u"com.sun.star.xml.UserDefinedAttributesSupplier"_ustr, + u"com.sun.star.drawing.LineProperties"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 9ec8f02819ef..5d17f3a609c0 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -66,7 +66,7 @@ protected: } WrappedLegendAlignmentProperty::WrappedLegendAlignmentProperty() - : ::chart::WrappedProperty( "Alignment", "AnchorPosition" ) + : ::chart::WrappedProperty( u"Alignment"_ustr, u"AnchorPosition"_ustr ) { } @@ -76,7 +76,7 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP if( xInnerPropertySet.is() ) { bool bShowLegend = true; - xInnerPropertySet->getPropertyValue( "Show" ) >>= bShowLegend; + xInnerPropertySet->getPropertyValue( u"Show"_ustr ) >>= bShowLegend; if(!bShowLegend) { aRet <<= css::chart::ChartLegendPosition_NONE; @@ -101,11 +101,11 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c css::chart::ChartLegendPosition eOuterPos(css::chart::ChartLegendPosition_NONE); if( (rOuterValue >>= eOuterPos) && eOuterPos == css::chart::ChartLegendPosition_NONE ) bNewShowLegend = false; - xInnerPropertySet->getPropertyValue( "Show" ) >>= bOldShowLegend; + xInnerPropertySet->getPropertyValue( u"Show"_ustr ) >>= bOldShowLegend; } if(bNewShowLegend!=bOldShowLegend) { - xInnerPropertySet->setPropertyValue( "Show", uno::Any(bNewShowLegend) ); + xInnerPropertySet->setPropertyValue( u"Show"_ustr, uno::Any(bNewShowLegend) ); } if(!bNewShowLegend) return; @@ -126,17 +126,17 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c css::chart::ChartLegendExpansion eOldExpansion( css::chart::ChartLegendExpansion_HIGH ); bool bExpansionWasSet( - xInnerPropertySet->getPropertyValue( "Expansion" ) >>= eOldExpansion ); + xInnerPropertySet->getPropertyValue( u"Expansion"_ustr ) >>= eOldExpansion ); if( !bExpansionWasSet || (eOldExpansion != eNewExpansion)) - xInnerPropertySet->setPropertyValue( "Expansion", uno::Any( eNewExpansion )); + xInnerPropertySet->setPropertyValue( u"Expansion"_ustr, uno::Any( eNewExpansion )); } //correct RelativePosition - Any aRelativePosition( xInnerPropertySet->getPropertyValue("RelativePosition") ); + Any aRelativePosition( xInnerPropertySet->getPropertyValue(u"RelativePosition"_ustr) ); if(aRelativePosition.hasValue()) { - xInnerPropertySet->setPropertyValue( "RelativePosition", Any() ); + xInnerPropertySet->setPropertyValue( u"RelativePosition"_ustr, Any() ); } } @@ -276,7 +276,7 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT; aRelativePosition.Primary = aPageSize.Width == 0 ? 0 : double(aPosition.X)/double(aPageSize.Width); aRelativePosition.Secondary = aPageSize.Height == 0 ? 0 : double(aPosition.Y)/double(aPageSize.Height); - xProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) ); + xProp->setPropertyValue( u"RelativePosition"_ustr, uno::Any(aRelativePosition) ); } } @@ -304,7 +304,7 @@ void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL LegendWrapper::getShapeType() { - return "com.sun.star.chart.ChartLegend"; + return u"com.sun.star.chart.ChartLegend"_ustr; } // ____ XComponent ____ @@ -337,8 +337,8 @@ void LegendWrapper::updateReferenceSize() Reference< beans::XPropertySet > xProp = getInnerPropertySet(); if( xProp.is() ) { - if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue() ) - xProp->setPropertyValue( "ReferencePageSize", uno::Any( + if( xProp->getPropertyValue( u"ReferencePageSize"_ustr ).hasValue() ) + xProp->setPropertyValue( u"ReferencePageSize"_ustr, uno::Any( m_spChart2ModelContact->GetPageSize() )); } } @@ -347,7 +347,7 @@ Any LegendWrapper::getReferenceSize() Any aRet; Reference< beans::XPropertySet > xProp = getInnerPropertySet(); if( xProp.is() ) - aRet = xProp->getPropertyValue( "ReferencePageSize" ); + aRet = xProp->getPropertyValue( u"ReferencePageSize"_ustr ); return aRet; } @@ -377,11 +377,11 @@ std::vector< std::unique_ptr<WrappedProperty> > LegendWrapper::createWrappedProp std::vector< std::unique_ptr<WrappedProperty> > aWrappedProperties; aWrappedProperties.emplace_back( new WrappedLegendAlignmentProperty() ); - aWrappedProperties.emplace_back( new WrappedProperty( "Expansion", "Expansion")); + aWrappedProperties.emplace_back( new WrappedProperty( u"Expansion"_ustr, u"Expansion"_ustr)); WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this ); //same problem as for wall: the defaults in the old chart are different for different charttypes, so we need to export explicitly - aWrappedProperties.emplace_back( new WrappedDirectStateProperty("FillStyle", "FillStyle")); - aWrappedProperties.emplace_back( new WrappedDirectStateProperty("FillColor", "FillColor")); + aWrappedProperties.emplace_back( new WrappedDirectStateProperty(u"FillStyle"_ustr, u"FillStyle"_ustr)); + aWrappedProperties.emplace_back( new WrappedDirectStateProperty(u"FillColor"_ustr, u"FillColor"_ustr)); WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties ); WrappedScaleTextProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact ); @@ -390,7 +390,7 @@ std::vector< std::unique_ptr<WrappedProperty> > LegendWrapper::createWrappedProp OUString SAL_CALL LegendWrapper::getImplementationName() { - return "com.sun.star.comp.chart.Legend"; + return u"com.sun.star.comp.chart.Legend"_ustr; } sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName ) @@ -401,10 +401,10 @@ sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames() { return { - "com.sun.star.chart.ChartLegend", - "com.sun.star.drawing.Shape", - "com.sun.star.xml.UserDefinedAttributesSupplier", - "com.sun.star.style.CharacterProperties" + u"com.sun.star.chart.ChartLegend"_ustr, + u"com.sun.star.drawing.Shape"_ustr, + u"com.sun.star.xml.UserDefinedAttributesSupplier"_ustr, + u"com.sun.star.style.CharacterProperties"_ustr }; } diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index d0cb5eab6552..95e5a794d245 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -78,7 +78,7 @@ namespace chart::wrapper MinMaxLineWrapper::MinMaxLineWrapper(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) : m_spChart2ModelContact(std::move( spChart2ModelContact )) - , m_aWrappedLineJointProperty( "LineJoint", uno::Any( drawing::LineJoint_NONE )) + , m_aWrappedLineJointProperty( u"LineJoint"_ustr, uno::Any( drawing::LineJoint_NONE )) { } @@ -128,9 +128,9 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName if(aSeriesSeq[0].is()) { if( rPropertyName == "LineColor" ) - aSeriesSeq[0]->setPropertyValue( "Color", rValue ); + aSeriesSeq[0]->setPropertyValue( u"Color"_ustr, rValue ); else if( rPropertyName == "LineTransparence" ) - aSeriesSeq[0]->setPropertyValue( "Transparency", rValue ); + aSeriesSeq[0]->setPropertyValue( u"Transparency"_ustr, rValue ); else if( rPropertyName == m_aWrappedLineJointProperty.getOuterName() ) m_aWrappedLineJointProperty.setPropertyValue( rValue, aSeriesSeq[0] ); else @@ -164,9 +164,9 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rProperty if(xPropSet.is()) { if( rPropertyName == "LineColor" ) - aRet = xPropSet->getPropertyValue( "Color" ); + aRet = xPropSet->getPropertyValue( u"Color"_ustr ); else if( rPropertyName == "LineTransparence" ) - aRet = xPropSet->getPropertyValue( "Transparency" ); + aRet = xPropSet->getPropertyValue( u"Transparency"_ustr ); else if( rPropertyName == m_aWrappedLineJointProperty.getOuterName() ) aRet = m_aWrappedLineJointProperty.getPropertyValue( xPropSet ); else @@ -328,7 +328,7 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const OUString SAL_CALL MinMaxLineWrapper::getImplementationName() { - return "com.sun.star.comp.chart.ChartLine"; + return u"com.sun.star.comp.chart.ChartLine"_ustr; } sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceName ) @@ -339,9 +339,9 @@ sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceNa css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNames() { return { - "com.sun.star.chart.ChartLine", - "com.sun.star.xml.UserDefinedAttributesSupplier", - "com.sun.star.drawing.LineProperties" + u"com.sun.star.chart.ChartLine"_ustr, + u"com.sun.star.xml.UserDefinedAttributesSupplier"_ustr, + u"com.sun.star.drawing.LineProperties"_ustr }; } diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 129798d3706f..e4ca74c37f19 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -67,7 +67,7 @@ protected: } WrappedTitleStringProperty::WrappedTitleStringProperty( const Reference< uno::XComponentContext >& xContext ) - : ::chart::WrappedProperty( "String", OUString() ) + : ::chart::WrappedProperty( u"String"_ustr, OUString() ) , m_xContext( xContext ) { } @@ -119,7 +119,7 @@ namespace { } WrappedTitleFormStringsProperty::WrappedTitleFormStringsProperty() - : ::chart::WrappedProperty( "FormattedStrings", OUString() ) + : ::chart::WrappedProperty( u"FormattedStrings"_ustr, OUString() ) { } @@ -160,7 +160,7 @@ public: } WrappedStackedTextProperty::WrappedStackedTextProperty() - : ::chart::WrappedProperty( "StackedText", "StackCharacters" ) + : ::chart::WrappedProperty( u"StackedText"_ustr, u"StackCharacters"_ustr ) { } @@ -269,7 +269,7 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) aRelativePosition.Anchor = drawing::Alignment_TOP_LEFT; aRelativePosition.Primary = double(aPosition.X)/double(aPageSize.Width); aRelativePosition.Secondary = double(aPosition.Y)/double(aPageSize.Height); - xPropertySet->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) ); + xPropertySet->setPropertyValue( u"RelativePosition"_ustr, uno::Any(aRelativePosition) ); } } @@ -286,7 +286,7 @@ void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL TitleWrapper::getShapeType() { - return "com.sun.star.chart.ChartTitle"; + return u"com.sun.star.chart.ChartTitle"_ustr; } // ____ XComponent ____ @@ -481,8 +481,8 @@ void TitleWrapper::updateReferenceSize() Reference< beans::XPropertySet > xProp( getTitleObject(), uno::UNO_QUERY ); if( xProp.is() ) { - if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue() ) - xProp->setPropertyValue( "ReferencePageSize", uno::Any( + if( xProp->getPropertyValue( u"ReferencePageSize"_ustr ).hasValue() ) + xProp->setPropertyValue( u"ReferencePageSize"_ustr, uno::Any( m_spChart2ModelContact->GetPageSize() )); } } @@ -491,7 +491,7 @@ Any TitleWrapper::getReferenceSize() Any aRet; Reference< beans::XPropertySet > xProp( getTitleObject(), uno::UNO_QUERY ); if( xProp.is() ) - aRet = xProp->getPropertyValue( "ReferencePageSize" ); + aRet = xProp->getPropertyValue( u"ReferencePageSize"_ustr ); return aRet; } @@ -534,7 +534,7 @@ std::vector< std::unique_ptr<WrappedProperty> > TitleWrapper::createWrappedPrope OUString SAL_CALL TitleWrapper::getImplementationName() { - return "com.sun.star.comp.chart.Title"; + return u"com.sun.star.comp.chart.Title"_ustr; } sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName ) @@ -545,10 +545,10 @@ sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames() { return { - "com.sun.star.chart.ChartTitle", - "com.sun.star.drawing.Shape", - "com.sun.star.xml.UserDefinedAttributesSupplier", - "com.sun.star.style.CharacterProperties" + u"com.sun.star.chart.ChartTitle"_ustr, + u"com.sun.star.drawing.Shape"_ustr, + u"com.sun.star.xml.UserDefinedAttributesSupplier"_ustr, + u"com.sun.star.style.CharacterProperties"_ustr }; } diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index c63090d81ac8..f8645b46647a 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -73,7 +73,7 @@ namespace chart::wrapper UpDownBarWrapper::UpDownBarWrapper( bool bUp, std::shared_ptr<Chart2ModelContact> spChart2ModelContact) : m_spChart2ModelContact(std::move( spChart2ModelContact )) - , m_aPropertySetName( bUp ? OUString( "WhiteDay" ) : OUString( "BlackDay" )) + , m_aPropertySetName( bUp ? u"WhiteDay"_ustr : u"BlackDay"_ustr) { } @@ -292,7 +292,7 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const OUString SAL_CALL UpDownBarWrapper::getImplementationName() { - return "com.sun.star.comp.chart.ChartArea"; + return u"com.sun.star.comp.chart.ChartArea"_ustr; } sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceName ) @@ -303,10 +303,10 @@ sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceNam css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNames() { return { - "com.sun.star.chart.ChartArea", - "com.sun.star.drawing.LineProperties", - "com.sun.star.drawing.FillProperties", - "com.sun.star.xml.UserDefinedAttributesSupplier" + u"com.sun.star.chart.ChartArea"_ustr, + u"com.sun.star.drawing.LineProperties"_ustr, + u"com.sun.star.drawing.FillProperties"_ustr, + u"com.sun.star.xml.UserDefinedAttributesSupplier"_ustr }; } diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 9c8a6f61afb0..23ef0780ccae 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -117,15 +117,15 @@ std::vector< std::unique_ptr<WrappedProperty> > WallFloorWrapper::createWrappedP // exported. Because in the old chart the defaults is as follows: // Floor: SOLID (new and old model default), Wall: NONE, except for some chart types (line, scatter) if( m_bWall ) - aWrappedProperties.emplace_back( new WrappedDirectStateProperty( "FillStyle", "FillStyle" )); - aWrappedProperties.emplace_back( new WrappedDirectStateProperty( "FillColor", "FillColor" )); + aWrappedProperties.emplace_back( new WrappedDirectStateProperty( u"FillStyle"_ustr, u"FillStyle"_ustr )); + aWrappedProperties.emplace_back( new WrappedDirectStateProperty( u"FillColor"_ustr, u"FillColor"_ustr )); return aWrappedProperties; } OUString SAL_CALL WallFloorWrapper::getImplementationName() { - return "com.sun.star.comp.chart.WallOrFloor"; + return u"com.sun.star.comp.chart.WallOrFloor"_ustr; } sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceName ) @@ -136,10 +136,10 @@ sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceNam css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNames() { return { - "com.sun.star.xml.UserDefinedAttributesSupplier", - "com.sun.star.drawing.FillProperties", - "com.sun.star.drawing.LineProperties", - "com.sun.star.beans.PropertySet" + u"com.sun.star.xml.UserDefinedAttributesSupplier"_ustr, + u"com.sun.star.drawing.FillProperties"_ustr, + u"com.sun.star.drawing.LineProperties"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index 24a6dfb78a1c..261826eb0497 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -29,7 +29,7 @@ namespace chart::wrapper { WrappedAddInProperty::WrappedAddInProperty( ChartDocumentWrapper& rChartDocumentWrapper ) - : ::chart::WrappedProperty( "AddIn", OUString() ) + : ::chart::WrappedProperty( u"AddIn"_ustr, OUString() ) , m_rChartDocumentWrapper( rChartDocumentWrapper ) { } @@ -41,7 +41,7 @@ void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Refer { Reference< util::XRefreshable > xAddIn; if( ! (rOuterValue >>= xAddIn) ) - throw lang::IllegalArgumentException( "AddIn properties require type XRefreshable", nullptr, 0 ); + throw lang::IllegalArgumentException( u"AddIn properties require type XRefreshable"_ustr, nullptr, 0 ); m_rChartDocumentWrapper.setAddIn( xAddIn ); } @@ -52,7 +52,7 @@ Any WrappedAddInProperty::getPropertyValue( const Reference< beans::XPropertySet } WrappedBaseDiagramProperty::WrappedBaseDiagramProperty( ChartDocumentWrapper& rChartDocumentWrapper ) - : ::chart::WrappedProperty( "BaseDiagram" , OUString() ) + : ::chart::WrappedProperty( u"BaseDiagram"_ustr , OUString() ) , m_rChartDocumentWrapper( rChartDocumentWrapper ) { } @@ -64,7 +64,7 @@ void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const { OUString aBaseDiagram; if( ! (rOuterValue >>= aBaseDiagram) ) - throw lang::IllegalArgumentException( "BaseDiagram properties require type OUString", nullptr, 0 ); + throw lang::IllegalArgumentException( u"BaseDiagram properties require type OUString"_ustr, nullptr, 0 ); m_rChartDocumentWrapper.setBaseDiagram( aBaseDiagram ); } @@ -75,7 +75,7 @@ Any WrappedBaseDiagramProperty::getPropertyValue( const Reference< beans::XPrope } WrappedAdditionalShapesProperty::WrappedAdditionalShapesProperty( ChartDocumentWrapper& rChartDocumentWrapper ) - : ::chart::WrappedProperty( "AdditionalShapes" , OUString() ) + : ::chart::WrappedProperty( u"AdditionalShapes"_ustr , OUString() ) , m_rChartDocumentWrapper( rChartDocumentWrapper ) { } @@ -85,7 +85,7 @@ WrappedAdditionalShapesProperty::~WrappedAdditionalShapesProperty() void WrappedAdditionalShapesProperty::setPropertyValue( const Any& /*rOuterValue*/, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const { - throw lang::IllegalArgumentException( "AdditionalShapes is a read only property", nullptr, 0 ); + throw lang::IllegalArgumentException( u"AdditionalShapes is a read only property"_ustr, nullptr, 0 ); } Any WrappedAdditionalShapesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const @@ -94,7 +94,7 @@ Any WrappedAdditionalShapesProperty::getPropertyValue( const Reference< beans::X } WrappedRefreshAddInAllowedProperty::WrappedRefreshAddInAllowedProperty( ChartDocumentWrapper& rChartDocumentWrapper ) - : ::chart::WrappedProperty( "RefreshAddInAllowed" , OUString() ) + : ::chart::WrappedProperty( u"RefreshAddInAllowed"_ustr , OUString() ) , m_rChartDocumentWrapper( rChartDocumentWrapper ) { } @@ -106,7 +106,7 @@ void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValu { bool bUpdateAddIn = true; if( ! (rOuterValue >>= bUpdateAddIn) ) - throw lang::IllegalArgumentException( "The property RefreshAddInAllowed requires type boolean", nullptr, 0 ); + throw lang::IllegalArgumentException( u"The property RefreshAddInAllowed requires type boolean"_ustr, nullptr, 0 ); m_rChartDocumentWrapper.setUpdateAddIn( bUpdateAddIn ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index b88468c9941e..0434e6dc041e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -48,7 +48,7 @@ public: } WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty() - : ::chart::WrappedProperty( "AutomaticPosition" , OUString() ) + : ::chart::WrappedProperty( u"AutomaticPosition"_ustr , OUString() ) { } @@ -59,15 +59,15 @@ void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) - throw lang::IllegalArgumentException( "Property AutomaticPosition requires value of type boolean", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property AutomaticPosition requires value of type boolean"_ustr, nullptr, 0 ); try { if( bNewValue ) { - Any aRelativePosition( xInnerPropertySet->getPropertyValue( "RelativePosition" ) ); + Any aRelativePosition( xInnerPropertySet->getPropertyValue( u"RelativePosition"_ustr ) ); if( aRelativePosition.hasValue() ) - xInnerPropertySet->setPropertyValue( "RelativePosition", Any() ); + xInnerPropertySet->setPropertyValue( u"RelativePosition"_ustr, Any() ); } } catch( const uno::Exception & ) @@ -81,7 +81,7 @@ Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans:: Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) { - Any aRelativePosition( xInnerPropertySet->getPropertyValue( "RelativePosition" ) ); + Any aRelativePosition( xInnerPropertySet->getPropertyValue( u"RelativePosition"_ustr ) ); if( !aRelativePosition.hasValue() ) aRet <<= true; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 2b047ebfaf82..1208ad539d3e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -149,7 +149,7 @@ void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterVal { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) - throw lang::IllegalArgumentException( "Has axis or grid properties require boolean values", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Has axis or grid properties require boolean values"_ustr, nullptr, 0 ); bool bOldValue = false; getPropertyValue( xInnerPropertySet ) >>= bOldValue; @@ -264,7 +264,7 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) - throw lang::IllegalArgumentException( "Has axis or grid properties require boolean values", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Has axis or grid properties require boolean values"_ustr, nullptr, 0 ); bool bOldValue = false; getPropertyValue( xInnerPropertySet ) >>= bOldValue; @@ -362,7 +362,7 @@ void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) - throw lang::IllegalArgumentException( "Has axis or grid properties require boolean values", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Has axis or grid properties require boolean values"_ustr, nullptr, 0 ); bool bOldValue = false; getPropertyValue( xInnerPropertySet ) >>= bOldValue; @@ -377,10 +377,10 @@ void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue //create axis if needed xProp = AxisHelper::createAxis( m_nDimensionIndex, m_bMain, xDiagram, m_spChart2ModelContact->m_xContext ); if( xProp.is() ) - xProp->setPropertyValue( "Show", uno::Any( false ) ); + xProp->setPropertyValue( u"Show"_ustr, uno::Any( false ) ); } if( xProp.is() ) - xProp->setPropertyValue( "DisplayLabels", rOuterValue ); + xProp->setPropertyValue( u"DisplayLabels"_ustr, rOuterValue ); } Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const @@ -389,7 +389,7 @@ Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans: rtl::Reference< ::chart::Diagram > xDiagram( m_spChart2ModelContact->getDiagram() ); rtl::Reference< Axis > xProp = AxisHelper::getAxis( m_nDimensionIndex, m_bMain, xDiagram ); if( xProp.is() ) - aRet = xProp->getPropertyValue( "DisplayLabels" ); + aRet = xProp->getPropertyValue( u"DisplayLabels"_ustr ); else aRet <<= false; return aRet; diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index 67ea51b0e913..6e09285dfd62 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -110,7 +110,7 @@ Any WrappedCharacterHeightProperty_Base::convertOuterToInnerValue( const Any& rO } WrappedCharacterHeightProperty::WrappedCharacterHeightProperty( ReferenceSizePropertyProvider* pRefSizePropProvider ) - : WrappedCharacterHeightProperty_Base( "CharHeight", pRefSizePropProvider ) + : WrappedCharacterHeightProperty_Base( u"CharHeight"_ustr, pRefSizePropProvider ) { } WrappedCharacterHeightProperty::~WrappedCharacterHeightProperty() @@ -118,7 +118,7 @@ WrappedCharacterHeightProperty::~WrappedCharacterHeightProperty() } WrappedAsianCharacterHeightProperty::WrappedAsianCharacterHeightProperty( ReferenceSizePropertyProvider* pRefSizePropProvider ) - : WrappedCharacterHeightProperty_Base( "CharHeightAsian", pRefSizePropProvider ) + : WrappedCharacterHeightProperty_Base( u"CharHeightAsian"_ustr, pRefSizePropProvider ) { } WrappedAsianCharacterHeightProperty::~WrappedAsianCharacterHeightProperty() @@ -126,7 +126,7 @@ WrappedAsianCharacterHeightProperty::~WrappedAsianCharacterHeightProperty() } WrappedComplexCharacterHeightProperty::WrappedComplexCharacterHeightProperty( ReferenceSizePropertyProvider* pRefSizePropProvider ) - : WrappedCharacterHeightProperty_Base( "CharHeightComplex", pRefSizePropProvider ) + : WrappedCharacterHeightProperty_Base( u"CharHeightComplex"_ustr, pRefSizePropProvider ) { } WrappedComplexCharacterHeightProperty::~WrappedComplexCharacterHeightProperty() diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index d317210c3608..792bfdfadcb4 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -127,7 +127,7 @@ void WrappedDataCaptionProperties::addWrappedPropertiesForDiagram( std::vector< WrappedDataCaptionProperty::WrappedDataCaptionProperty( const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact , tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedSeriesOrDiagramProperty< sal_Int32 >( "DataCaption" + : WrappedSeriesOrDiagramProperty< sal_Int32 >( u"DataCaption"_ustr , uno::Any( sal_Int32(0) ), spChart2ModelContact, ePropertyType ) { } diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 079d25f63bb4..1da4fe9195cb 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -66,7 +66,7 @@ void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue, { sal_Int32 nNewValue = 0; if( ! (rOuterValue >>= nNewValue) ) - throw lang::IllegalArgumentException( "GapWidth and Overlap property require value of type sal_Int32", nullptr, 0 ); + throw lang::IllegalArgumentException( u"GapWidth and Overlap property require value of type sal_Int32"_ustr, nullptr, 0 ); m_aOuterValue = rOuterValue; @@ -147,7 +147,7 @@ Any WrappedBarPositionProperty_Base::getPropertyValue( const Reference< beans::X WrappedGapwidthProperty::WrappedGapwidthProperty( const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) - : WrappedBarPositionProperty_Base( "GapWidth", "GapwidthSequence", DEFAULT_GAPWIDTH, spChart2ModelContact ) + : WrappedBarPositionProperty_Base( u"GapWidth"_ustr, u"GapwidthSequence"_ustr, DEFAULT_GAPWIDTH, spChart2ModelContact ) { } WrappedGapwidthProperty::~WrappedGapwidthProperty() @@ -156,7 +156,7 @@ WrappedGapwidthProperty::~WrappedGapwidthProperty() WrappedBarOverlapProperty::WrappedBarOverlapProperty( const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact ) - : WrappedBarPositionProperty_Base( "Overlap", "OverlapSequence", DEFAULT_OVERLAP, spChart2ModelContact ) + : WrappedBarPositionProperty_Base( u"Overlap"_ustr, u"OverlapSequence"_ustr, DEFAULT_OVERLAP, spChart2ModelContact ) { } WrappedBarOverlapProperty::~WrappedBarOverlapProperty() diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 0598b4fd377f..1819bb2b2c91 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -46,7 +46,7 @@ void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, cons { sal_Int32 nFormat = 0; if( ! (rOuterValue >>= nFormat) ) - throw lang::IllegalArgumentException( "Property 'NumberFormat' requires value of type sal_Int32", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property 'NumberFormat' requires value of type sal_Int32"_ustr, nullptr, 0 ); if(xInnerPropertySet.is()) xInnerPropertySet->setPropertyValue(getInnerName(), convertOuterToInnerValue(rOuterValue)); diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 6e11fbe021a2..60a026c2fcaf 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -54,7 +54,7 @@ private: } WrappedScaleTextProperty::WrappedScaleTextProperty(std::shared_ptr<Chart2ModelContact> spChart2ModelContact) - : ::chart::WrappedProperty( "ScaleText" , OUString() ) + : ::chart::WrappedProperty( u"ScaleText"_ustr , OUString() ) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { } @@ -70,7 +70,7 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R if( ! (rOuterValue >>= bNewValue) ) { if( rOuterValue.hasValue() ) - throw lang::IllegalArgumentException( "Property ScaleText requires value of type boolean", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property ScaleText requires value of type boolean"_ustr, nullptr, 0 ); } try @@ -94,7 +94,7 @@ Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropert Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) { - if( xInnerPropertySet->getPropertyValue( "ReferencePageSize" ).hasValue() ) + if( xInnerPropertySet->getPropertyValue( u"ReferencePageSize"_ustr ).hasValue() ) aRet <<= true; else aRet <<= false; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index 5c22750dc17b..cf7a820115c3 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -37,7 +37,7 @@ void WrappedSceneProperty::addWrappedProperties( std::vector< std::unique_ptr<Wr WrappedD3DTransformMatrixProperty::WrappedD3DTransformMatrixProperty( std::shared_ptr<Chart2ModelContact> spChart2ModelContact ) - : WrappedProperty("D3DTransformMatrix","D3DTransformMatrix") + : WrappedProperty(u"D3DTransformMatrix"_ustr,u"D3DTransformMatrix"_ustr) , m_spChart2ModelContact(std::move( spChart2ModelContact )) { } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 8b0b54db3d7a..0eea39683474 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -104,7 +104,7 @@ public: { PROPERTYTYPE aNewValue = PROPERTYTYPE(); if( ! (rOuterValue >>= aNewValue) ) - throw css::lang::IllegalArgumentException( "statistic property requires different type", nullptr, 0 ); + throw css::lang::IllegalArgumentException( u"statistic property requires different type"_ustr, nullptr, 0 ); if( m_ePropertyType == DIAGRAM ) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 53ce90fa24f9..f40b9edd7fb2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -100,7 +100,7 @@ public: { PROPERTYTYPE aNewValue; if( ! (rOuterValue >>= aNewValue) ) - throw css::lang::IllegalArgumentException( "spline property requires different type", nullptr, 0 ); + throw css::lang::IllegalArgumentException( u"spline property requires different type"_ustr, nullptr, 0 ); m_aOuterValue = rOuterValue; diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index e5278bb5da49..1acc5b3749d2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -116,7 +116,7 @@ sal_Int32 lcl_getErrorBarStyle( const uno::Reference< beans::XPropertySet >& xEr { sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; if(xErrorBarProperties.is()) - xErrorBarProperties->getPropertyValue( "ErrorBarStyle" ) >>= nStyle; + xErrorBarProperties->getPropertyValue( u"ErrorBarStyle"_ustr ) >>= nStyle; return nStyle; } @@ -187,9 +187,9 @@ protected: { xErrorBarProperties = new ::chart::ErrorBar; //default in new and old api are different - xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::Any(false) ); - xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::Any(false) ); - xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::Any(css::chart::ErrorBarStyle::NONE) ); + xErrorBarProperties->setPropertyValue( u"ShowPositiveError"_ustr , uno::Any(false) ); + xErrorBarProperties->setPropertyValue( u"ShowNegativeError"_ustr , uno::Any(false) ); + xErrorBarProperties->setPropertyValue( u"ErrorBarStyle"_ustr , uno::Any(css::chart::ErrorBarStyle::NONE) ); xSeriesPropertySet->setPropertyValue( CHART_UNONAME_ERRORBAR_Y , uno::Any( xErrorBarProperties ) ); } return xErrorBarProperties; @@ -216,7 +216,7 @@ private: WrappedConstantErrorLowProperty::WrappedConstantErrorLowProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< double >( "ConstantErrorLow" + : WrappedStatisticProperty< double >( u"ConstantErrorLow"_ustr , uno::Any( 0.0 ), std::move(spChart2ModelContact), ePropertyType ) { } @@ -229,7 +229,7 @@ double WrappedConstantErrorLowProperty::getValueFromSeries( const Reference< bea if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) { if( lcl_getErrorBarStyle( xErrorBarProperties ) == css::chart::ErrorBarStyle::ABSOLUTE ) - xErrorBarProperties->getPropertyValue( "NegativeError" ) >>= aRet; + xErrorBarProperties->getPropertyValue( u"NegativeError"_ustr ) >>= aRet; else m_aOuterValue >>= aRet; } @@ -244,7 +244,7 @@ void WrappedConstantErrorLowProperty::setValueToSeries( const Reference< beans:: m_aOuterValue <<= aNewValue; if( lcl_getErrorBarStyle( xErrorBarProperties ) == css::chart::ErrorBarStyle::ABSOLUTE ) { - xErrorBarProperties->setPropertyValue( "NegativeError", m_aOuterValue ); + xErrorBarProperties->setPropertyValue( u"NegativeError"_ustr, m_aOuterValue ); } } } @@ -270,7 +270,7 @@ private: WrappedConstantErrorHighProperty::WrappedConstantErrorHighProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< double >( "ConstantErrorHigh" + : WrappedStatisticProperty< double >( u"ConstantErrorHigh"_ustr , uno::Any( 0.0 ), std::move(spChart2ModelContact), ePropertyType ) { } @@ -283,7 +283,7 @@ double WrappedConstantErrorHighProperty::getValueFromSeries( const Reference< be if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) { if( lcl_getErrorBarStyle( xErrorBarProperties ) == css::chart::ErrorBarStyle::ABSOLUTE ) - xErrorBarProperties->getPropertyValue( "PositiveError" ) >>= aRet; + xErrorBarProperties->getPropertyValue( u"PositiveError"_ustr ) >>= aRet; else m_aOuterValue >>= aRet; } @@ -298,7 +298,7 @@ void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans: m_aOuterValue <<= aNewValue; if( lcl_getErrorBarStyle( xErrorBarProperties ) == css::chart::ErrorBarStyle::ABSOLUTE ) { - xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue ); + xErrorBarProperties->setPropertyValue( u"PositiveError"_ustr , m_aOuterValue ); } } } @@ -321,7 +321,7 @@ public: WrappedMeanValueProperty::WrappedMeanValueProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< bool >( "MeanValue", uno::Any( false ), std::move(spChart2ModelContact), ePropertyType ) + : WrappedStatisticProperty< bool >( u"MeanValue"_ustr, uno::Any( false ), std::move(spChart2ModelContact), ePropertyType ) { } @@ -365,7 +365,7 @@ public: WrappedErrorCategoryProperty::WrappedErrorCategoryProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< css::chart::ChartErrorCategory >( "ErrorCategory" + : WrappedStatisticProperty< css::chart::ChartErrorCategory >( u"ErrorCategory"_ustr , uno::Any( css::chart::ChartErrorCategory_NONE ), std::move(spChart2ModelContact), ePropertyType ) { } @@ -378,7 +378,7 @@ css::chart::ChartErrorCategory WrappedErrorCategoryProperty::getValueFromSeries( if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) { sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; - xErrorBarProperties->getPropertyValue( "ErrorBarStyle" ) >>= nStyle; + xErrorBarProperties->getPropertyValue( u"ErrorBarStyle"_ustr ) >>= nStyle; switch(nStyle) { case css::chart::ErrorBarStyle::NONE: @@ -442,7 +442,7 @@ void WrappedErrorCategoryProperty::setValueToSeries( const Reference< beans::XPr default: break; } - xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::Any(nNewStyle) ); + xErrorBarProperties->setPropertyValue( u"ErrorBarStyle"_ustr , uno::Any(nNewStyle) ); } namespace { @@ -466,7 +466,7 @@ private: WrappedPercentageErrorProperty::WrappedPercentageErrorProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< double >( "PercentageError" + : WrappedStatisticProperty< double >( u"PercentageError"_ustr , uno::Any( 0.0 ), std::move(spChart2ModelContact), ePropertyType ) { } @@ -479,7 +479,7 @@ double WrappedPercentageErrorProperty::getValueFromSeries( const Reference< bean if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) { if( lcl_getErrorBarStyle( xErrorBarProperties ) == css::chart::ErrorBarStyle::RELATIVE ) - xErrorBarProperties->getPropertyValue( "PositiveError" ) >>= aRet; + xErrorBarProperties->getPropertyValue( u"PositiveError"_ustr ) >>= aRet; else m_aOuterValue >>= aRet; } @@ -493,8 +493,8 @@ void WrappedPercentageErrorProperty::setValueToSeries( const Reference< beans::X m_aOuterValue <<= aNewValue; if( lcl_getErrorBarStyle( xErrorBarProperties ) == css::chart::ErrorBarStyle::RELATIVE ) { - xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue ); - xErrorBarProperties->setPropertyValue( "NegativeError" , m_aOuterValue ); + xErrorBarProperties->setPropertyValue( u"PositiveError"_ustr , m_aOuterValue ); + xErrorBarProperties->setPropertyValue( u"NegativeError"_ustr , m_aOuterValue ); } } } @@ -520,7 +520,7 @@ private: WrappedErrorMarginProperty::WrappedErrorMarginProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< double >( "ErrorMargin" + : WrappedStatisticProperty< double >( u"ErrorMargin"_ustr , uno::Any( 0.0 ), std::move(spChart2ModelContact), ePropertyType ) { } @@ -533,7 +533,7 @@ double WrappedErrorMarginProperty::getValueFromSeries( const Reference< beans::X if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) { if( lcl_getErrorBarStyle( xErrorBarProperties ) == css::chart::ErrorBarStyle::ERROR_MARGIN ) - xErrorBarProperties->getPropertyValue( "PositiveError" ) >>= aRet; + xErrorBarProperties->getPropertyValue( u"PositiveError"_ustr ) >>= aRet; else m_aOuterValue >>= aRet; } @@ -547,8 +547,8 @@ void WrappedErrorMarginProperty::setValueToSeries( const Reference< beans::XProp m_aOuterValue <<= aNewValue; if( lcl_getErrorBarStyle( xErrorBarProperties ) == css::chart::ErrorBarStyle::ERROR_MARGIN ) { - xErrorBarProperties->setPropertyValue( "PositiveError" , m_aOuterValue ); - xErrorBarProperties->setPropertyValue( "NegativeError" , m_aOuterValue ); + xErrorBarProperties->setPropertyValue( u"PositiveError"_ustr , m_aOuterValue ); + xErrorBarProperties->setPropertyValue( u"NegativeError"_ustr , m_aOuterValue ); } } } @@ -571,7 +571,7 @@ public: WrappedErrorIndicatorProperty::WrappedErrorIndicatorProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< css::chart::ChartErrorIndicatorType >( "ErrorIndicator" + : WrappedStatisticProperty< css::chart::ChartErrorIndicatorType >( u"ErrorIndicator"_ustr , uno::Any( css::chart::ChartErrorIndicatorType_NONE ), std::move(spChart2ModelContact), ePropertyType ) { } @@ -585,8 +585,8 @@ css::chart::ChartErrorIndicatorType WrappedErrorIndicatorProperty::getValueFromS { bool bPositive = false; bool bNegative = false; - xErrorBarProperties->getPropertyValue( "ShowPositiveError" ) >>= bPositive; - xErrorBarProperties->getPropertyValue( "ShowNegativeError" ) >>= bNegative; + xErrorBarProperties->getPropertyValue( u"ShowPositiveError"_ustr ) >>= bPositive; + xErrorBarProperties->getPropertyValue( u"ShowNegativeError"_ustr ) >>= bNegative; if( bPositive && bNegative ) aRet = css::chart::ChartErrorIndicatorType_TOP_AND_BOTTOM; @@ -621,8 +621,8 @@ void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XP break; } - xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::Any(bPositive) ); - xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::Any(bNegative) ); + xErrorBarProperties->setPropertyValue( u"ShowPositiveError"_ustr , uno::Any(bPositive) ); + xErrorBarProperties->setPropertyValue( u"ShowNegativeError"_ustr , uno::Any(bNegative) ); } namespace { @@ -644,7 +644,7 @@ public: WrappedErrorBarStyleProperty::WrappedErrorBarStyleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< sal_Int32 >( "ErrorBarStyle" + : WrappedStatisticProperty< sal_Int32 >( u"ErrorBarStyle"_ustr , uno::Any( css::chart::ErrorBarStyle::NONE ), std::move(spChart2ModelContact), ePropertyType ) { } @@ -656,7 +656,7 @@ sal_Int32 WrappedErrorBarStyleProperty::getValueFromSeries( const Reference< bea uno::Reference< beans::XPropertySet > xErrorBarProperties; if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( CHART_UNONAME_ERRORBAR_Y ) >>= xErrorBarProperties ) && xErrorBarProperties.is()) { - xErrorBarProperties->getPropertyValue( "ErrorBarStyle" ) >>= nRet; + xErrorBarProperties->getPropertyValue( u"ErrorBarStyle"_ustr ) >>= nRet; } return nRet; } @@ -668,7 +668,7 @@ void WrappedErrorBarStyleProperty::setValueToSeries( const Reference< beans::XPr uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) ); if( xErrorBarProperties.is() ) { - xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::Any( nNewValue )); + xErrorBarProperties->setPropertyValue( u"ErrorBarStyle"_ustr , uno::Any( nNewValue )); } } @@ -690,7 +690,7 @@ public: WrappedErrorBarRangePositiveProperty::WrappedErrorBarRangePositiveProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< OUString >( "ErrorBarRangePositive" + : WrappedStatisticProperty< OUString >( u"ErrorBarRangePositive"_ustr , uno::Any( OUString() ), std::move(spChart2ModelContact), ePropertyType ) { } @@ -754,7 +754,7 @@ public: WrappedErrorBarRangeNegativeProperty::WrappedErrorBarRangeNegativeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< OUString >( "ErrorBarRangeNegative" + : WrappedStatisticProperty< OUString >( u"ErrorBarRangeNegative"_ustr , uno::Any( OUString() ), std::move(spChart2ModelContact), ePropertyType ) { } @@ -818,7 +818,7 @@ public: WrappedRegressionCurvesProperty::WrappedRegressionCurvesProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedStatisticProperty< css::chart::ChartRegressionCurveType >( "RegressionCurves" + : WrappedStatisticProperty< css::chart::ChartRegressionCurveType >( u"RegressionCurves"_ustr , lcl_getRegressionDefault(), std::move(spChart2ModelContact), ePropertyType ) { } @@ -887,10 +887,10 @@ WrappedStatisticPropertySetProperty::WrappedStatisticPropertySetProperty( , tSeriesOrDiagramPropertyType ePropertyType ) : WrappedStatisticProperty< Reference< beans::XPropertySet > >( (ePropertySetType == PROPERTY_SET_TYPE_REGRESSION) - ? OUString("DataRegressionProperties") + ? u"DataRegressionProperties"_ustr : (ePropertySetType == PROPERTY_SET_TYPE_ERROR_BAR) - ? OUString("DataErrorProperties") - : OUString("DataMeanValueProperties") + ? u"DataErrorProperties"_ustr + : u"DataMeanValueProperties"_ustr , uno::Any(), std::move(spChart2ModelContact), ePropertyType ) , m_eType( ePropertySetType ) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 093321843018..afd0d0d7e85a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -72,7 +72,7 @@ void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, c { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) - throw lang::IllegalArgumentException( "stock properties require type sal_Bool", nullptr, 0 ); + throw lang::IllegalArgumentException( u"stock properties require type sal_Bool"_ustr, nullptr, 0 ); m_aOuterValue = rOuterValue; @@ -126,7 +126,7 @@ public: } WrappedVolumeProperty::WrappedVolumeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) - : WrappedStockProperty( "Volume", uno::Any(false) , spChart2ModelContact ) + : WrappedStockProperty( u"Volume"_ustr, uno::Any(false) , spChart2ModelContact ) { } @@ -166,16 +166,16 @@ rtl::Reference< ::chart::ChartTypeTemplate > WrappedVolumeProperty::getNewTempla if( bNewValue ) //add volume { if( rCurrentTemplate == "com.sun.star.chart2.template.StockLowHighClose" ) - xTemplate = xFactory->createTemplate( "com.sun.star.chart2.template.StockVolumeLowHighClose" ); + xTemplate = xFactory->createTemplate( u"com.sun.star.chart2.template.StockVolumeLowHighClose"_ustr ); else if( rCurrentTemplate == "com.sun.star.chart2.template.StockOpenLowHighClose" ) - xTemplate = xFactory->createTemplate( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ); + xTemplate = xFactory->createTemplate( u"com.sun.star.chart2.template.StockVolumeOpenLowHighClose"_ustr ); } else //remove volume { if( rCurrentTemplate == "com.sun.star.chart2.template.StockVolumeLowHighClose" ) - xTemplate = xFactory->createTemplate( "com.sun.star.chart2.template.StockLowHighClose" ); + xTemplate = xFactory->createTemplate( u"com.sun.star.chart2.template.StockLowHighClose"_ustr ); else if( rCurrentTemplate == "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ) - xTemplate = xFactory->createTemplate( "com.sun.star.chart2.template.StockOpenLowHighClose" ); + xTemplate = xFactory->createTemplate( u"com.sun.star.chart2.template.StockOpenLowHighClose"_ustr ); } return xTemplate; } @@ -195,7 +195,7 @@ public: } WrappedUpDownProperty::WrappedUpDownProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact) - : WrappedStockProperty( "UpDown", uno::Any(false) , spChart2ModelContact ) + : WrappedStockProperty( u"UpDown"_ustr, uno::Any(false) , spChart2ModelContact ) { } @@ -230,16 +230,16 @@ rtl::Reference< ::chart::ChartTypeTemplate > WrappedUpDownProperty::getNewTempla if( bNewValue ) //add open series { if( rCurrentTemplate == "com.sun.star.chart2.template.StockLowHighClose" ) - xTemplate = xFactory->createTemplate( "com.sun.star.chart2.template.StockOpenLowHighClose" ); + xTemplate = xFactory->createTemplate( u"com.sun.star.chart2.template.StockOpenLowHighClose"_ustr ); else if( rCurrentTemplate == "com.sun.star.chart2.template.StockVolumeLowHighClose" ) - xTemplate = xFactory->createTemplate( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ); + xTemplate = xFactory->createTemplate( u"com.sun.star.chart2.template.StockVolumeOpenLowHighClose"_ustr ); } else //remove open series { if( rCurrentTemplate == "com.sun.star.chart2.template.StockOpenLowHighClose" ) - xTemplate = xFactory->createTemplate( "com.sun.star.chart2.template.StockLowHighClose" ); + xTemplate = xFactory->createTemplate( u"com.sun.star.chart2.template.StockLowHighClose"_ustr ); else if( rCurrentTemplate == "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ) - xTemplate = xFactory->createTemplate( "com.sun.star.chart2.template.StockVolumeLowHighClose" ); + xTemplate = xFactory->createTemplate( u"com.sun.star.chart2.template.StockVolumeLowHighClose"_ustr ); } return xTemplate; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 79c45ea1d888..209300f2f682 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -216,7 +216,7 @@ void WrappedSymbolProperties::addWrappedPropertiesForDiagram( std::vector< std:: WrappedSymbolTypeProperty::WrappedSymbolTypeProperty( const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedSeriesOrDiagramProperty< sal_Int32 >( "SymbolType" + : WrappedSeriesOrDiagramProperty< sal_Int32 >( u"SymbolType"_ustr , uno::Any( css::chart::ChartSymbolType::NONE ) , spChart2ModelContact , ePropertyType ) @@ -228,7 +228,7 @@ sal_Int32 WrappedSymbolTypeProperty::getValueFromSeries( const Reference< beans: sal_Int32 aRet = 0; m_aDefaultValue >>= aRet; chart2::Symbol aSymbol; - if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue("Symbol") >>= aSymbol ) ) + if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(u"Symbol"_ustr) >>= aSymbol ) ) aRet = lcl_getSymbolType( aSymbol ); return aRet; } @@ -239,10 +239,10 @@ void WrappedSymbolTypeProperty::setValueToSeries( const Reference< beans::XPrope return; chart2::Symbol aSymbol; - xSeriesPropertySet->getPropertyValue("Symbol") >>= aSymbol; + xSeriesPropertySet->getPropertyValue(u"Symbol"_ustr) >>= aSymbol; lcl_setSymbolTypeToSymbol( nSymbolType, aSymbol ); - xSeriesPropertySet->setPropertyValue( "Symbol", uno::Any( aSymbol ) ); + xSeriesPropertySet->setPropertyValue( u"Symbol"_ustr, uno::Any( aSymbol ) ); } Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const @@ -297,7 +297,7 @@ beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Referenc WrappedSymbolBitmapURLProperty::WrappedSymbolBitmapURLProperty( const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedSeriesOrDiagramProperty<OUString>("SymbolBitmapURL", + : WrappedSeriesOrDiagramProperty<OUString>(u"SymbolBitmapURL"_ustr, uno::Any(OUString()), spChart2ModelContact, ePropertyType) { } @@ -315,13 +315,13 @@ void WrappedSymbolBitmapURLProperty::setValueToSeries( return; chart2::Symbol aSymbol; - if (xSeriesPropertySet->getPropertyValue("Symbol") >>= aSymbol) + if (xSeriesPropertySet->getPropertyValue(u"Symbol"_ustr) >>= aSymbol) { if (!xNewGraphicURL.isEmpty()) { Graphic aGraphic = vcl::graphic::loadFromURL(xNewGraphicURL); aSymbol.Graphic.set(aGraphic.GetXGraphic()); - xSeriesPropertySet->setPropertyValue("Symbol", uno::Any(aSymbol)); + xSeriesPropertySet->setPropertyValue(u"Symbol"_ustr, uno::Any(aSymbol)); } } } @@ -329,7 +329,7 @@ void WrappedSymbolBitmapURLProperty::setValueToSeries( WrappedSymbolBitmapProperty::WrappedSymbolBitmapProperty( const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedSeriesOrDiagramProperty<uno::Reference<graphic::XGraphic>>("SymbolBitmap", + : WrappedSeriesOrDiagramProperty<uno::Reference<graphic::XGraphic>>(u"SymbolBitmap"_ustr, uno::Any(uno::Reference<graphic::XGraphic>()), spChart2ModelContact, ePropertyType) { } @@ -340,7 +340,7 @@ uno::Reference<graphic::XGraphic> WrappedSymbolBitmapProperty::getValueFromSerie m_aDefaultValue >>= xGraphic; chart2::Symbol aSymbol; - if (xSeriesPropertySet.is() && (xSeriesPropertySet->getPropertyValue("Symbol") >>= aSymbol) + if (xSeriesPropertySet.is() && (xSeriesPropertySet->getPropertyValue(u"Symbol"_ustr) >>= aSymbol) && aSymbol.Graphic.is()) { xGraphic = aSymbol.Graphic; @@ -356,12 +356,12 @@ void WrappedSymbolBitmapProperty::setValueToSeries( return; chart2::Symbol aSymbol; - if (xSeriesPropertySet->getPropertyValue("Symbol") >>= aSymbol) + if (xSeriesPropertySet->getPropertyValue(u"Symbol"_ustr) >>= aSymbol) { if (xNewGraphic.is()) { aSymbol.Graphic.set(xNewGraphic); - xSeriesPropertySet->setPropertyValue("Symbol", uno::Any(aSymbol)); + xSeriesPropertySet->setPropertyValue(u"Symbol"_ustr, uno::Any(aSymbol)); } } } @@ -389,7 +389,7 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol ) bool bFoundSize = false; try { - if( xProp->getPropertyValue( "Size100thMM" ) >>= aSize ) + if( xProp->getPropertyValue( u"Size100thMM"_ustr ) >>= aSize ) { if( aSize.Width == 0 && aSize.Height == 0 ) aSize = aDefaultSize; @@ -405,7 +405,7 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol ) if(!bFoundSize) { awt::Size aAWTPixelSize(10,10); - if( xProp->getPropertyValue( "SizePixel" ) >>= aAWTPixelSize ) + if( xProp->getPropertyValue( u"SizePixel"_ustr ) >>= aAWTPixelSize ) { Size aPixelSize(aAWTPixelSize.Width,aAWTPixelSize.Height); Size aNewSize = o3tl::convert(aPixelSize, o3tl::Length::pt, o3tl::Length::mm100); @@ -430,7 +430,7 @@ void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol ) WrappedSymbolSizeProperty::WrappedSymbolSizeProperty( const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedSeriesOrDiagramProperty< awt::Size >( "SymbolSize" + : WrappedSeriesOrDiagramProperty< awt::Size >( u"SymbolSize"_ustr , uno::Any( awt::Size(250,250) ), spChart2ModelContact, ePropertyType ) { } @@ -440,7 +440,7 @@ awt::Size WrappedSymbolSizeProperty::getValueFromSeries( const Reference< beans: awt::Size aRet; m_aDefaultValue >>= aRet; chart2::Symbol aSymbol; - if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue("Symbol") >>= aSymbol )) + if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(u"Symbol"_ustr) >>= aSymbol )) aRet = aSymbol.Size; return aRet; } @@ -453,11 +453,11 @@ void WrappedSymbolSizeProperty::setValueToSeries( return; chart2::Symbol aSymbol; - if( xSeriesPropertySet->getPropertyValue("Symbol") >>= aSymbol ) + if( xSeriesPropertySet->getPropertyValue(u"Symbol"_ustr) >>= aSymbol ) { aSymbol.Size = aNewSize; lcl_correctSymbolSizeForBitmaps(aSymbol); - xSeriesPropertySet->setPropertyValue( "Symbol", uno::Any( aSymbol ) ); + xSeriesPropertySet->setPropertyValue( u"Symbol"_ustr, uno::Any( aSymbol ) ); } } @@ -471,7 +471,7 @@ beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Referenc { chart2::Symbol aSymbol; Reference< beans::XPropertySet > xSeriesPropertySet( xInnerPropertyState, uno::UNO_QUERY ); - if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue("Symbol") >>= aSymbol )) + if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(u"Symbol"_ustr) >>= aSymbol )) { if( aSymbol.Style != chart2::SymbolStyle_NONE ) return beans::PropertyState_DIRECT_VALUE; @@ -487,7 +487,7 @@ beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Referenc WrappedSymbolAndLinesProperty::WrappedSymbolAndLinesProperty( const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ) - : WrappedSeriesOrDiagramProperty< bool >( "Lines" + : WrappedSeriesOrDiagramProperty< bool >( u"Lines"_ustr , uno::Any( true ), spChart2ModelContact, ePropertyType ) { } @@ -506,17 +506,17 @@ void WrappedSymbolAndLinesProperty::setValueToSeries( return; drawing::LineStyle eOldLineStyle( drawing::LineStyle_SOLID ); - xSeriesPropertySet->getPropertyValue( "LineStyle" ) >>= eOldLineStyle; + xSeriesPropertySet->getPropertyValue( u"LineStyle"_ustr ) >>= eOldLineStyle; if( bDrawLines ) { //#i114298# don't overwrite dashed lines with solid lines here if( eOldLineStyle == drawing::LineStyle_NONE ) - xSeriesPropertySet->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) ); + xSeriesPropertySet->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_SOLID ) ); } else { if( eOldLineStyle != drawing::LineStyle_NONE ) - xSeriesPropertySet->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) ); + xSeriesPropertySet->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); } } diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx index c35a75e31a54..850e916eaf0f 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx @@ -28,7 +28,7 @@ namespace chart { WrappedTextRotationProperty::WrappedTextRotationProperty( bool bDirectState ) - : ::chart::WrappedProperty( "TextRotation" , "TextRotation" ) + : ::chart::WrappedProperty( u"TextRotation"_ustr , u"TextRotation"_ustr ) , m_bDirectState( bDirectState ) { } diff --git a/chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx b/chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx index 91307afaad3d..3e426c4e02c9 100644 --- a/chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx +++ b/chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx @@ -32,11 +32,12 @@ const sal_uInt16 CUBIC_SPLINE_POS = 0; const sal_uInt16 B_SPLINE_POS = 1; SplinePropertiesDialog::SplinePropertiesDialog(weld::Window* pParent) - : GenericDialogController(pParent, "modules/schart/ui/smoothlinesdlg.ui", "SmoothLinesDialog") - , m_xLB_Spline_Type(m_xBuilder->weld_combo_box("SplineTypeComboBox")) - , m_xMF_SplineResolution(m_xBuilder->weld_spin_button("ResolutionSpinbutton")) - , m_xFT_SplineOrder(m_xBuilder->weld_label("PolynomialsLabel")) - , m_xMF_SplineOrder(m_xBuilder->weld_spin_button("PolynomialsSpinButton")) + : GenericDialogController(pParent, u"modules/schart/ui/smoothlinesdlg.ui"_ustr, + u"SmoothLinesDialog"_ustr) + , m_xLB_Spline_Type(m_xBuilder->weld_combo_box(u"SplineTypeComboBox"_ustr)) + , m_xMF_SplineResolution(m_xBuilder->weld_spin_button(u"ResolutionSpinbutton"_ustr)) + , m_xFT_SplineOrder(m_xBuilder->weld_label(u"PolynomialsLabel"_ustr)) + , m_xMF_SplineOrder(m_xBuilder->weld_spin_button(u"PolynomialsSpinButton"_ustr)) { m_xDialog->set_title(SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES)); @@ -85,11 +86,12 @@ IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl, weld::ComboBox&, v } SteppedPropertiesDialog::SteppedPropertiesDialog(weld::Window* pParent) - : GenericDialogController(pParent, "modules/schart/ui/steppedlinesdlg.ui", "SteppedLinesDialog") - , m_xRB_Start(m_xBuilder->weld_radio_button("step_start_rb")) - , m_xRB_End(m_xBuilder->weld_radio_button("step_end_rb")) - , m_xRB_CenterX(m_xBuilder->weld_radio_button("step_center_x_rb")) - , m_xRB_CenterY(m_xBuilder->weld_radio_button("step_center_y_rb")) + : GenericDialogController(pParent, u"modules/schart/ui/steppedlinesdlg.ui"_ustr, + u"SteppedLinesDialog"_ustr) + , m_xRB_Start(m_xBuilder->weld_radio_button(u"step_start_rb"_ustr)) + , m_xRB_End(m_xBuilder->weld_radio_button(u"step_end_rb"_ustr)) + , m_xRB_CenterX(m_xBuilder->weld_radio_button(u"step_center_x_rb"_ustr)) + , m_xRB_CenterY(m_xBuilder->weld_radio_button(u"step_center_y_rb"_ustr)) { m_xDialog->set_title(SchResId(STR_DLG_STEPPED_LINE_PROPERTIES)); } diff --git a/chart2/source/controller/dialogs/ChartResourceGroups.cxx b/chart2/source/controller/dialogs/ChartResourceGroups.cxx index e1550d2766c7..a684b481c07d 100644 --- a/chart2/source/controller/dialogs/ChartResourceGroups.cxx +++ b/chart2/source/controller/dialogs/ChartResourceGroups.cxx @@ -29,8 +29,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; Dim3DLookResourceGroup::Dim3DLookResourceGroup(weld::Builder* pBuilder) - : m_xCB_3DLook(pBuilder->weld_check_button("3dlook")) - , m_xLB_Scheme(pBuilder->weld_combo_box("3dscheme")) + : m_xCB_3DLook(pBuilder->weld_check_button(u"3dlook"_ustr)) + , m_xLB_Scheme(pBuilder->weld_combo_box(u"3dscheme"_ustr)) { m_xCB_3DLook->connect_toggled(LINK(this, Dim3DLookResourceGroup, Dim3DLookCheckHdl)); m_xLB_Scheme->connect_changed(LINK(this, Dim3DLookResourceGroup, SelectSchemeHdl)); @@ -87,7 +87,7 @@ IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl, weld::ComboBox&, void) } SortByXValuesResourceGroup::SortByXValuesResourceGroup(weld::Builder* pBuilder) - : m_xCB_XValueSorting(pBuilder->weld_check_button("sort")) + : m_xCB_XValueSorting(pBuilder->weld_check_button(u"sort"_ustr)) { m_xCB_XValueSorting->connect_toggled( LINK(this, SortByXValuesResourceGroup, SortByXValuesCheckHdl)); @@ -115,10 +115,10 @@ IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl, weld::Togglea } StackingResourceGroup::StackingResourceGroup(weld::Builder* pBuilder) - : m_xCB_Stacked(pBuilder->weld_check_button("stack")) - , m_xRB_Stack_Y(pBuilder->weld_radio_button("ontop")) - , m_xRB_Stack_Y_Percent(pBuilder->weld_radio_button("percent")) - , m_xRB_Stack_Z(pBuilder->weld_radio_button("deep")) + : m_xCB_Stacked(pBuilder->weld_check_button(u"stack"_ustr)) + , m_xRB_Stack_Y(pBuilder->weld_radio_button(u"ontop"_ustr)) + , m_xRB_Stack_Y_Percent(pBuilder->weld_radio_button(u"percent"_ustr)) + , m_xRB_Stack_Z(pBuilder->weld_radio_button(u"deep"_ustr)) { m_xCB_Stacked->connect_toggled(LINK(this, StackingResourceGroup, StackingEnableHdl)); m_xRB_Stack_Y->connect_toggled(LINK(this, StackingResourceGroup, StackingChangeHdl)); @@ -198,9 +198,9 @@ IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, weld::Toggleable&, voi SplineResourceGroup::SplineResourceGroup(weld::Builder* pBuilder, weld::Window* pParent) : m_pParent(pParent) - , m_xFT_LineType(pBuilder->weld_label("linetypeft")) - , m_xLB_LineType(pBuilder->weld_combo_box("linetype")) - , m_xPB_DetailsDialog(pBuilder->weld_button("properties")) + , m_xFT_LineType(pBuilder->weld_label(u"linetypeft"_ustr)) + , m_xLB_LineType(pBuilder->weld_combo_box(u"linetype"_ustr)) + , m_xPB_DetailsDialog(pBuilder->weld_button(u"properties"_ustr)) { m_xLB_LineType->connect_changed(LINK(this, SplineResourceGroup, LineTypeChangeHdl)); } diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 35284fbb6bfc..12ad91e3aa1b 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -147,7 +147,7 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService( try { - xTemplateProps->getPropertyValue( "Geometry3D" ) >>= aRet.nGeometry3D; + xTemplateProps->getPropertyValue( u"Geometry3D"_ustr ) >>= aRet.nGeometry3D; } catch( uno::Exception& ex ) { @@ -281,7 +281,7 @@ rtl::Reference< ChartTypeTemplate > ChartTypeDialogController::getCurrentTemplat } try { - xTemplateProps->setPropertyValue( "Geometry3D" , uno::Any(rParameter.nGeometry3D) ); + xTemplateProps->setPropertyValue( u"Geometry3D"_ustr , uno::Any(rParameter.nGeometry3D) ); } catch( uno::Exception & ex ) { @@ -1130,11 +1130,11 @@ void CombiColumnLineChartDialogController::showExtraControls(weld::Builder* pBui { if (!m_xFT_NumberOfLines) { - m_xFT_NumberOfLines = pBuilder->weld_label("nolinesft"); + m_xFT_NumberOfLines = pBuilder->weld_label(u"nolinesft"_ustr); } if (!m_xMF_NumberOfLines) { - m_xMF_NumberOfLines = pBuilder->weld_spin_button("nolines"); + m_xMF_NumberOfLines = pBuilder->weld_spin_button(u"nolines"_ustr); m_xMF_NumberOfLines->set_increments(1, 10); m_xMF_NumberOfLines->set_range(1, 100); @@ -1171,7 +1171,7 @@ void CombiColumnLineChartDialogController::fillExtraControls( { try { - xTemplateProps->getPropertyValue( "NumberOfLines" ) >>= nNumLines; + xTemplateProps->getPropertyValue( u"NumberOfLines"_ustr ) >>= nNumLines; } catch( const uno::Exception & ) { @@ -1192,7 +1192,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref if( xTemplateProps.is() ) { sal_Int32 nNumLines = m_xMF_NumberOfLines->get_value(); - xTemplateProps->setPropertyValue( "NumberOfLines" , uno::Any(nNumLines) ); + xTemplateProps->setPropertyValue( u"NumberOfLines"_ustr , uno::Any(nNumLines) ); } } diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 30182b95eeb8..db25ada7c1ff 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -233,15 +233,15 @@ private: SeriesHeader::SeriesHeader(weld::Container* pParent, weld::Container* pColorParent) : m_aUpdateDataTimer( "SeriesHeader UpdateDataTimer" ) - , m_xBuilder1(Application::CreateBuilder(pParent, "modules/schart/ui/columnfragment.ui")) - , m_xBuilder2(Application::CreateBuilder(pColorParent, "modules/schart/ui/imagefragment.ui")) + , m_xBuilder1(Application::CreateBuilder(pParent, u"modules/schart/ui/columnfragment.ui"_ustr)) + , m_xBuilder2(Application::CreateBuilder(pColorParent, u"modules/schart/ui/imagefragment.ui"_ustr)) , m_pParent(pParent) , m_pColorParent(pColorParent) - , m_xContainer1(m_xBuilder1->weld_container("container")) - , m_xContainer2(m_xBuilder2->weld_container("container")) - , m_spSymbol(m_xBuilder1->weld_image("image")) - , m_spSeriesName(new SeriesHeaderEdit(m_xBuilder1->weld_entry("entry"))) - , m_spColorBar(m_xBuilder2->weld_image("image")) + , m_xContainer1(m_xBuilder1->weld_container(u"container"_ustr)) + , m_xContainer2(m_xBuilder2->weld_container(u"container"_ustr)) + , m_spSymbol(m_xBuilder1->weld_image(u"image"_ustr)) + , m_spSeriesName(new SeriesHeaderEdit(m_xBuilder1->weld_entry(u"entry"_ustr))) + , m_spColorBar(m_xBuilder2->weld_image(u"image"_ustr)) , m_xDevice(Application::GetDefaultDevice()) , m_nStartCol( 0 ) , m_nEndCol( 0 ) @@ -642,14 +642,14 @@ void DataBrowser::RenewTable() Color nColor; // @todo: Set "DraftColor", i.e. interpolated colors for gradients, bitmaps, etc. if( elemHeader.m_xDataSeries.is() && - ( elemHeader.m_xDataSeries->getPropertyValue( "Color" ) >>= nColor )) + ( elemHeader.m_xDataSeries->getPropertyValue( u"Color"_ustr ) >>= nColor )) spHeader->SetColor( nColor ); spHeader->SetChartType( elemHeader.m_xChartType, elemHeader.m_bSwapXAndYAxis ); spHeader->SetSeriesName( elemHeader.m_xDataSeries->getLabelForRole( elemHeader.m_xChartType.is() ? elemHeader.m_xChartType->getRoleOfSequenceForSeriesLabel() : - OUString("values-y"))); + u"values-y"_ustr)); // index is 1-based, as 0 is for the column that contains the row-numbers spHeader->SetRange( elemHeader.m_nStartColumn + 1, elemHeader.m_nEndColumn + 1 ); spHeader->SetGetFocusHdl( aFocusLink ); @@ -1266,14 +1266,14 @@ void DataBrowser::RenewSeriesHeaders() auto spHeader = std::make_shared<impl::SeriesHeader>( m_pColumnsWin, m_pColorsWin ); Color nColor; if( elemHeader.m_xDataSeries.is() && - ( elemHeader.m_xDataSeries->getPropertyValue( "Color" ) >>= nColor )) + ( elemHeader.m_xDataSeries->getPropertyValue( u"Color"_ustr ) >>= nColor )) spHeader->SetColor( nColor ); spHeader->SetChartType( elemHeader.m_xChartType, elemHeader.m_bSwapXAndYAxis ); spHeader->SetSeriesName( elemHeader.m_xDataSeries->getLabelForRole( elemHeader.m_xChartType.is() ? elemHeader.m_xChartType->getRoleOfSequenceForSeriesLabel() : - OUString( "values-y"))); + u"values-y"_ustr)); spHeader->SetRange( elemHeader.m_nStartColumn + 1, elemHeader.m_nEndColumn + 1 ); spHeader->SetGetFocusHdl( aFocusLink ); spHeader->SetEditChangedHdl( aSeriesHeaderChangedLink ); diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 938da978dd07..1db3abc60c9a 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -67,7 +67,7 @@ OUString lcl_getRole( { try { - xProp->getPropertyValue( "Role" ) >>= aResult; + xProp->getPropertyValue( u"Role"_ustr ) >>= aResult; } catch( const uno::Exception & ) { @@ -859,7 +859,7 @@ void DataBrowserModel::updateFromModel() bool bSwapXAndYAxis = false; try { - coords->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXAndYAxis; + coords->getPropertyValue( u"SwapXAndYAxis"_ustr ) >>= bSwapXAndYAxis; } catch( const beans::UnknownPropertyException & ) {} diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 4c888e8ed5b6..3abf2b6b0a6a 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -99,21 +99,21 @@ lcl_tRoleIndexMap lcl_createRoleIndexMap() lcl_tRoleIndexMap aMap; sal_Int32 nIndex = 0; - aMap[ "label" ] = ++nIndex; - aMap[ "categories" ] = ++nIndex; - aMap[ "values-x" ] = ++nIndex; - aMap[ "values-y" ] = ++nIndex; - aMap[ "error-bars-x" ] = ++nIndex; - aMap[ "error-bars-x-positive" ] = ++nIndex; - aMap[ "error-bars-x-negative" ] = ++nIndex; - aMap[ "error-bars-y" ] = ++nIndex; - aMap[ "error-bars-y-positive" ] = ++nIndex; - aMap[ "error-bars-y-negative" ] = ++nIndex; - aMap[ "values-first" ] = ++nIndex; - aMap[ "values-min" ] = ++nIndex; - aMap[ "values-max" ] = ++nIndex; - aMap[ "values-last" ] = ++nIndex; - aMap[ "values-size" ] = ++nIndex; + aMap[ u"label"_ustr ] = ++nIndex; + aMap[ u"categories"_ustr ] = ++nIndex; + aMap[ u"values-x"_ustr ] = ++nIndex; + aMap[ u"values-y"_ustr ] = ++nIndex; + aMap[ u"error-bars-x"_ustr ] = ++nIndex; + aMap[ u"error-bars-x-positive"_ustr ] = ++nIndex; + aMap[ u"error-bars-x-negative"_ustr ] = ++nIndex; + aMap[ u"error-bars-y"_ustr ] = ++nIndex; + aMap[ u"error-bars-y-positive"_ustr ] = ++nIndex; + aMap[ u"error-bars-y-negative"_ustr ] = ++nIndex; + aMap[ u"values-first"_ustr ] = ++nIndex; + aMap[ u"values-min"_ustr ] = ++nIndex; + aMap[ u"values-max"_ustr ] = ++nIndex; + aMap[ u"values-last"_ustr ] = ++nIndex; + aMap[ u"values-size"_ustr ] = ++nIndex; return aMap; } @@ -142,7 +142,7 @@ struct lcl_RolesWithRangeAppend { OUString aRole; Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); - if( xProp->getPropertyValue( "Role" ) >>= aRole ) + if( xProp->getPropertyValue( u"Role"_ustr ) >>= aRole ) { m_rDestCnt->emplace(aRole, xSeq->getSourceRangeRepresentation()); // label @@ -199,7 +199,7 @@ void lcl_SetSequenceRole( { Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY ); if( xProp.is()) - xProp->setPropertyValue( "Role" , uno::Any( rRole )); + xProp->setPropertyValue( u"Role"_ustr , uno::Any( rRole )); } Sequence< OUString > lcl_CopyExcludingValuesFirst( @@ -240,7 +240,7 @@ rtl::Reference< ::chart::DataSeries > lcl_CreateNewSeries( // without setting it as hard attribute Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme()); if( xColorScheme.is()) - xResult->setPropertyValue( "Color" , uno::Any( xColorScheme->getColorByIndex( nNewSeriesIndex ))); + xResult->setPropertyValue( u"Color"_ustr , uno::Any( xColorScheme->getColorByIndex( nNewSeriesIndex ))); std::size_t nGroupIndex=0; if( xChartType.is()) { @@ -273,7 +273,7 @@ rtl::Reference< ::chart::DataSeries > lcl_CreateNewSeries( if( xInterpreter.is()) { sal_Int32 nStockVariant; - if( xInterpreter->getChartTypeSpecificData("stock variant") >>= nStockVariant ) + if( xInterpreter->getChartTypeSpecificData(u"stock variant"_ustr) >>= nStockVariant ) { if( nStockVariant == 0 || nStockVariant == 2) { //delete "values-first" role @@ -799,7 +799,7 @@ void DialogModel::applyInterpretedData( // without setting it as hard attribute Reference< XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme()); if( xColorScheme.is()) - aSeries[nSeries]->setPropertyValue( "Color" , + aSeries[nSeries]->setPropertyValue( u"Color"_ustr , uno::Any( xColorScheme->getColorByIndex( nSeriesCounter ))); } m_xTemplate->applyStyle2( aSeries[nSeries], nGroup, nNewSeriesIndex++, nSeriesInGroup ); diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx index f06c7af5e777..0178a725e384 100644 --- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx +++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx @@ -81,7 +81,7 @@ OUString lcl_getDataSeriesName( std::u16string_view rObjectCID, const rtl::Refer OUString lcl_getFullSeriesName( std::u16string_view rObjectCID, const rtl::Reference<::chart::ChartModel>& xChartModel ) { OUString aRet(SchResId(STR_TIP_DATASERIES)); - OUString aWildcard( "%SERIESNAME" ); + OUString aWildcard( u"%SERIESNAME"_ustr ); sal_Int32 nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) aRet = aRet.replaceAt( nIndex, aWildcard.getLength(), lcl_getDataSeriesName( rObjectCID, xChartModel ) ); @@ -131,7 +131,7 @@ OUString lcl_getDataPointValueText( const rtl::Reference< DataSeries >& xSeries, uno::Reference<beans::XPropertySet> xProp(xDataSequence, uno::UNO_QUERY ); if( xProp.is()) { - uno::Any aARole = xProp->getPropertyValue( "Role" ); + uno::Any aARole = xProp->getPropertyValue( u"Role"_ustr ); OUString aRole; aARole >>= aRole; @@ -199,7 +199,7 @@ OUString lcl_getDataPointValueText( const rtl::Reference< DataSeries >& xSeries, aRet = aX; } - OUString aSeparator( " " ); + OUString aSeparator( u" "_ustr ); lcl_addText( aRet, aSeparator, aY ); lcl_addText( aRet, aSeparator, aY_First ); @@ -513,7 +513,7 @@ OUString ObjectNameProvider::getHelpText( std::u16string_view rObjectCID, const sal_Int32 nPointIndex = o3tl::toInt32(ObjectIdentifier::getParticleID(rObjectCID)); //replace data point index - OUString aWildcard( "%POINTNUMBER" ); + OUString aWildcard( u"%POINTNUMBER"_ustr ); sal_Int32 nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { @@ -575,23 +575,23 @@ OUString ObjectNameProvider::getHelpText( std::u16string_view rObjectCID, const sal_Int32 aMovingType = css::chart2::MovingAverageType::Prior; bool bForceIntercept = false; double aInterceptValue = 0.0; - OUString aXName ("x"), aYName ("f(x)"); + OUString aXName (u"x"_ustr), aYName (u"f(x)"_ustr); const LocaleDataWrapper& rLocaleDataWrapper = Application::GetSettings().GetLocaleDataWrapper(); const OUString& aNumDecimalSep = rLocaleDataWrapper.getNumDecimalSep(); sal_Unicode cDecSeparator = aNumDecimalSep[0]; - xCurve->getPropertyValue( "PolynomialDegree") >>= aDegree; - xCurve->getPropertyValue( "MovingAveragePeriod") >>= aPeriod; - xCurve->getPropertyValue( "MovingAverageType") >>= aMovingType; - xCurve->getPropertyValue( "ForceIntercept") >>= bForceIntercept; + xCurve->getPropertyValue( u"PolynomialDegree"_ustr) >>= aDegree; + xCurve->getPropertyValue( u"MovingAveragePeriod"_ustr) >>= aPeriod; + xCurve->getPropertyValue( u"MovingAverageType"_ustr) >>= aMovingType; + xCurve->getPropertyValue( u"ForceIntercept"_ustr) >>= bForceIntercept; if (bForceIntercept) - xCurve->getPropertyValue( "InterceptValue") >>= aInterceptValue; + xCurve->getPropertyValue( u"InterceptValue"_ustr) >>= aInterceptValue; uno::Reference< beans::XPropertySet > xEqProp( xCurve->getEquationProperties()); if( xEqProp.is()) { - if ( !(xEqProp->getPropertyValue( "XName") >>= aXName) ) + if ( !(xEqProp->getPropertyValue( u"XName"_ustr) >>= aXName) ) aXName = "x"; - if ( !(xEqProp->getPropertyValue( "YName") >>= aYName) ) + if ( !(xEqProp->getPropertyValue( u"YName"_ustr) >>= aYName) ) aYName = "f(x)"; } xCalculator->setRegressionProperties(aDegree, bForceIntercept, aInterceptValue, aPeriod, aMovingType); @@ -606,7 +606,7 @@ OUString ObjectNameProvider::getHelpText( std::u16string_view rObjectCID, const else { // replace formula - OUString aWildcard = "%FORMULA"; + OUString aWildcard = u"%FORMULA"_ustr; sal_Int32 nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { @@ -674,7 +674,7 @@ OUString ObjectNameProvider::getHelpText( std::u16string_view rObjectCID, const const OUString& aNumDecimalSep = rLocaleDataWrapper.getNumDecimalSep(); sal_Unicode cDecSeparator = aNumDecimalSep[0]; - OUString aWildcard( "%AVERAGE_VALUE" ); + OUString aWildcard( u"%AVERAGE_VALUE"_ustr ); sal_Int32 nIndex = aRet.indexOf( aWildcard ); // as the curve is constant, the value at any x-value is ok if( nIndex != -1 ) diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx index 00e9a3cc8a8c..1ae7b3377b25 100644 --- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx @@ -112,17 +112,17 @@ bool RangeSelectionHelper::chooseRange( { Sequence< beans::PropertyValue > aArgs{ beans::PropertyValue( - "InitialValue", -1, uno::Any( aCurrentRange ), + u"InitialValue"_ustr, -1, uno::Any( aCurrentRange ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( - "Title", -1, + u"Title"_ustr, -1, uno::Any( aUIString ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( - "CloseOnMouseRelease", -1, uno::Any( true ), + u"CloseOnMouseRelease"_ustr, -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( - "MultiSelectionMode", -1, uno::Any( true ), + u"MultiSelectionMode"_ustr, -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ) }; if( m_xRangeSelectionListener.is() ) diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx index a1f52f5169a5..837f3f3acc25 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx @@ -28,9 +28,10 @@ using namespace ::com::sun::star; ChartTypeDialog::ChartTypeDialog(weld::Window* pParent, rtl::Reference<::chart::ChartModel> xChartModel) - : GenericDialogController(pParent, "modules/schart/ui/charttypedialog.ui", "ChartTypeDialog") + : GenericDialogController(pParent, u"modules/schart/ui/charttypedialog.ui"_ustr, + u"ChartTypeDialog"_ustr) , m_xChartModel(std::move(xChartModel)) - , m_xContentArea(m_xBuilder->weld_container("content")) + , m_xContentArea(m_xBuilder->weld_container(u"content"_ustr)) { m_xChartTypeTabPage = std::make_unique<ChartTypeTabPage>( m_xContentArea.get(), this, m_xChartModel, false /*don't show title description*/); diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 3a1fa1386f7a..e3c540743ff0 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -285,10 +285,10 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue(const OUString& rPropertyNa else if( rPropertyName == "UnlockControllersOnExecute" ) { if( ! (rValue >>= m_bUnlockControllersOnExecute) ) - throw lang::IllegalArgumentException( "Property 'UnlockControllers' requires value of type boolean" , nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property 'UnlockControllers' requires value of type boolean"_ustr , nullptr, 0 ); } else - throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard" , nullptr ); + throw beans::UnknownPropertyException( u"unknown property was tried to set to chart wizard"_ustr , nullptr ); } uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPropertyName ) @@ -325,7 +325,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope aRet <<= m_bUnlockControllersOnExecute; } else - throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard" , nullptr ); + throw beans::UnknownPropertyException( u"unknown property was tried to get from chart wizard"_ustr , nullptr ); return aRet; } diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index ee120df76fe7..a62a9d712693 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -33,15 +33,15 @@ namespace chart DataEditor::DataEditor(weld::Window* pParent, rtl::Reference<::chart::ChartModel> xChartDoc, const Reference< uno::XComponentContext > & xContext) - : GenericDialogController(pParent, "modules/schart/ui/chartdatadialog.ui", "ChartDataDialog") + : GenericDialogController(pParent, u"modules/schart/ui/chartdatadialog.ui"_ustr, u"ChartDataDialog"_ustr) , m_bReadOnly(false) , m_xChartDoc(std::move(xChartDoc)) , m_xContext(xContext) - , m_xTbxData(m_xBuilder->weld_toolbar("toolbar")) - , m_xCloseBtn(m_xBuilder->weld_button("close")) - , m_xTable(m_xBuilder->weld_container("datawindow")) - , m_xColumns(m_xBuilder->weld_container("columns")) - , m_xColors(m_xBuilder->weld_container("colorcolumns")) + , m_xTbxData(m_xBuilder->weld_toolbar(u"toolbar"_ustr)) + , m_xCloseBtn(m_xBuilder->weld_button(u"close"_ustr)) + , m_xTable(m_xBuilder->weld_container(u"datawindow"_ustr)) + , m_xColumns(m_xBuilder->weld_container(u"columns"_ustr)) + , m_xColors(m_xBuilder->weld_container(u"colorcolumns"_ustr)) , m_xTableCtrlParent(m_xTable->CreateChildFrame()) , m_xBrwData(VclPtr<DataBrowser>::Create(m_xTableCtrlParent, m_xColumns.get(), m_xColors.get())) { @@ -103,16 +103,16 @@ IMPL_LINK_NOARG(DataEditor, BrowserCursorMovedHdl, DataBrowser*, void) bool bIsDataValid = m_xBrwData->IsEnableItem(); - m_xTbxData->set_item_sensitive("InsertRow", bIsDataValid && m_xBrwData->MayInsertRow() ); - m_xTbxData->set_item_sensitive("InsertColumn", bIsDataValid && m_xBrwData->MayInsertColumn() ); - m_xTbxData->set_item_sensitive("InsertTextColumn", bIsDataValid && m_xBrwData->MayInsertColumn() ); - m_xTbxData->set_item_sensitive("RemoveRow", m_xBrwData->MayDeleteRow() ); - m_xTbxData->set_item_sensitive("RemoveColumn", m_xBrwData->MayDeleteColumn() ); + m_xTbxData->set_item_sensitive(u"InsertRow"_ustr, bIsDataValid && m_xBrwData->MayInsertRow() ); + m_xTbxData->set_item_sensitive(u"InsertColumn"_ustr, bIsDataValid && m_xBrwData->MayInsertColumn() ); + m_xTbxData->set_item_sensitive(u"InsertTextColumn"_ustr, bIsDataValid && m_xBrwData->MayInsertColumn() ); + m_xTbxData->set_item_sensitive(u"RemoveRow"_ustr, m_xBrwData->MayDeleteRow() ); + m_xTbxData->set_item_sensitive(u"RemoveColumn"_ustr, m_xBrwData->MayDeleteColumn() ); - m_xTbxData->set_item_sensitive("MoveLeftColumn", bIsDataValid && m_xBrwData->MayMoveLeftColumns() ); - m_xTbxData->set_item_sensitive("MoveRightColumn", bIsDataValid && m_xBrwData->MayMoveRightColumns() ); - m_xTbxData->set_item_sensitive("MoveDownRow", bIsDataValid && m_xBrwData->MayMoveDownRows() ); - m_xTbxData->set_item_sensitive("MoveUpRow", bIsDataValid && m_xBrwData->MayMoveUpRows() ); + m_xTbxData->set_item_sensitive(u"MoveLeftColumn"_ustr, bIsDataValid && m_xBrwData->MayMoveLeftColumns() ); + m_xTbxData->set_item_sensitive(u"MoveRightColumn"_ustr, bIsDataValid && m_xBrwData->MayMoveRightColumns() ); + m_xTbxData->set_item_sensitive(u"MoveDownRow"_ustr, bIsDataValid && m_xBrwData->MayMoveDownRows() ); + m_xTbxData->set_item_sensitive(u"MoveUpRow"_ustr, bIsDataValid && m_xBrwData->MayMoveUpRows() ); } // disable all modifying controls @@ -121,15 +121,15 @@ void DataEditor::SetReadOnly( bool bReadOnly ) m_bReadOnly = bReadOnly; if( m_bReadOnly ) { - m_xTbxData->set_item_sensitive("InsertRow", false); - m_xTbxData->set_item_sensitive("InsertColumn", false); - m_xTbxData->set_item_sensitive("InsertTextColumn", false); - m_xTbxData->set_item_sensitive("RemoveRow", false); - m_xTbxData->set_item_sensitive("RemoveColumn", false); - m_xTbxData->set_item_sensitive("MoveLeftColumn", false); - m_xTbxData->set_item_sensitive("MoveRightColumn", false); - m_xTbxData->set_item_sensitive("MoveUpRow", false); - m_xTbxData->set_item_sensitive("MoveDownRow", false); + m_xTbxData->set_item_sensitive(u"InsertRow"_ustr, false); + m_xTbxData->set_item_sensitive(u"InsertColumn"_ustr, false); + m_xTbxData->set_item_sensitive(u"InsertTextColumn"_ustr, false); + m_xTbxData->set_item_sensitive(u"RemoveRow"_ustr, false); + m_xTbxData->set_item_sensitive(u"RemoveColumn"_ustr, false); + m_xTbxData->set_item_sensitive(u"MoveLeftColumn"_ustr, false); + m_xTbxData->set_item_sensitive(u"MoveRightColumn"_ustr, false); + m_xTbxData->set_item_sensitive(u"MoveUpRow"_ustr, false); + m_xTbxData->set_item_sensitive(u"MoveDownRow"_ustr, false); } m_xBrwData->SetReadOnly( m_bReadOnly ); diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 25b0367f8885..be915f564990 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -76,20 +76,20 @@ sal_uInt16 DataSourceDialog::m_nLastPageId = 0; DataSourceDialog::DataSourceDialog(weld::Window * pParent, const rtl::Reference<::chart::ChartModel> & xChartDocument) - : GenericDialogController(pParent, "modules/schart/ui/datarangedialog.ui", - "DataRangeDialog") + : GenericDialogController(pParent, u"modules/schart/ui/datarangedialog.ui"_ustr, + u"DataRangeDialog"_ustr) , m_apDocTemplateProvider(new DocumentChartTypeTemplateProvider(xChartDocument)) , m_apDialogModel(new DialogModel(xChartDocument)) , m_bRangeChooserTabIsValid(true) , m_bDataSourceTabIsValid(true) , m_bTogglingEnabled(true) - , m_xTabControl(m_xBuilder->weld_notebook("tabcontrol")) - , m_xBtnOK(m_xBuilder->weld_button("ok")) + , m_xTabControl(m_xBuilder->weld_notebook(u"tabcontrol"_ustr)) + , m_xBtnOK(m_xBuilder->weld_button(u"ok"_ustr)) { - m_xRangeChooserTabPage = std::make_unique<RangeChooserTabPage>(m_xTabControl->get_page("range"), this, + m_xRangeChooserTabPage = std::make_unique<RangeChooserTabPage>(m_xTabControl->get_page(u"range"_ustr), this, *m_apDialogModel, m_apDocTemplateProvider.get(), true /* bHideDescription */ ); - m_xDataSourceTabPage = std::make_unique<DataSourceTabPage>(m_xTabControl->get_page("series"), this, + m_xDataSourceTabPage = std::make_unique<DataSourceTabPage>(m_xTabControl->get_page(u"series"_ustr), this, *m_apDialogModel, m_apDocTemplateProvider.get(), true /* bHideDescription */ ); m_xTabControl->connect_enter_page(LINK(this, DataSourceDialog, ActivatePageHdl)); diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index 6a79bac4a414..0fcdcaf164a9 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -34,17 +34,17 @@ SchAxisDlg::SchAxisDlg(weld::Window* pWindow, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg) : GenericDialogController(pWindow, bAxisDlg ? - OUString("modules/schart/ui/insertaxisdlg.ui") : - OUString("modules/schart/ui/insertgriddlg.ui"), + u"modules/schart/ui/insertaxisdlg.ui"_ustr : + u"modules/schart/ui/insertgriddlg.ui"_ustr, bAxisDlg ? - OUString("InsertAxisDialog") : - OUString("InsertGridDialog")) - , m_xCbPrimaryX(m_xBuilder->weld_check_button("primaryX")) - , m_xCbPrimaryY(m_xBuilder->weld_check_button("primaryY")) - , m_xCbPrimaryZ(m_xBuilder->weld_check_button("primaryZ")) - , m_xCbSecondaryX(m_xBuilder->weld_check_button("secondaryX")) - , m_xCbSecondaryY(m_xBuilder->weld_check_button("secondaryY")) - , m_xCbSecondaryZ(m_xBuilder->weld_check_button("secondaryZ")) + u"InsertAxisDialog"_ustr : + u"InsertGridDialog"_ustr) + , m_xCbPrimaryX(m_xBuilder->weld_check_button(u"primaryX"_ustr)) + , m_xCbPrimaryY(m_xBuilder->weld_check_button(u"primaryY"_ustr)) + , m_xCbPrimaryZ(m_xBuilder->weld_check_button(u"primaryZ"_ustr)) + , m_xCbSecondaryX(m_xBuilder->weld_check_button(u"secondaryX"_ustr)) + , m_xCbSecondaryY(m_xBuilder->weld_check_button(u"secondaryY"_ustr)) + , m_xCbSecondaryZ(m_xBuilder->weld_check_button(u"secondaryZ"_ustr)) { if (bAxisDlg) { diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx index 57817d883d66..c917e4f0fb82 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx @@ -24,7 +24,7 @@ namespace chart { DataLabelsDialog::DataLabelsDialog(weld::Window* pWindow, const SfxItemSet& rInAttrs, SvNumberFormatter* pFormatter) - : GenericDialogController(pWindow, "modules/schart/ui/dlg_DataLabel.ui", "dlg_DataLabels") + : GenericDialogController(pWindow, u"modules/schart/ui/dlg_DataLabel.ui"_ustr, u"dlg_DataLabels"_ustr) , m_apDataLabelResources(new DataLabelResources(m_xBuilder.get(), pWindow, rInAttrs)) { m_apDataLabelResources->SetNumberFormatter( pFormatter ); diff --git a/chart2/source/controller/dialogs/dlg_InsertDataTable.cxx b/chart2/source/controller/dialogs/dlg_InsertDataTable.cxx index 4b5e928db057..a2adef7c0f1a 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataTable.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertDataTable.cxx @@ -12,10 +12,10 @@ namespace chart { InsertDataTableDialog::InsertDataTableDialog(weld::Window* pWindow) - : GenericDialogController(pWindow, "modules/schart/ui/dlg_InsertDataTable.ui", - "InsertDataTableDialog") + : GenericDialogController(pWindow, u"modules/schart/ui/dlg_InsertDataTable.ui"_ustr, + u"InsertDataTableDialog"_ustr) , m_aDataTablePropertiesResources(*m_xBuilder) - , m_xCbShowDataTable(m_xBuilder->weld_check_button("showDataTable")) + , m_xCbShowDataTable(m_xBuilder->weld_check_button(u"showDataTable"_ustr)) { m_xCbShowDataTable->connect_toggled(LINK(this, InsertDataTableDialog, ShowDataTableToggle)); init(m_aData); diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx index 8ed2c1d7d650..693af9b5caae 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx @@ -40,7 +40,7 @@ InsertErrorBarsDialog::InsertErrorBarsDialog( weld::Window* pParent, const SfxItemSet& rMyAttrs, const rtl::Reference<::chart::ChartModel> & xChartDocument, ErrorBarResources::tErrorBarType eType /* = ErrorBarResources::ERROR_BAR_Y */ ) - : GenericDialogController(pParent, "modules/schart/ui/dlg_InsertErrorBars.ui", "dlg_InsertErrorBars") + : GenericDialogController(pParent, u"modules/schart/ui/dlg_InsertErrorBars.ui"_ustr, u"dlg_InsertErrorBars"_ustr) , m_apErrorBarResources( new ErrorBarResources( m_xBuilder.get(), this, rMyAttrs, /* bNoneAvailable = */ true, eType )) diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx index c55ecc3e88d6..919a99ba1ffc 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx @@ -25,7 +25,8 @@ namespace chart using namespace ::com::sun::star; SchLegendDlg::SchLegendDlg(weld::Window* pWindow, const uno::Reference<uno::XComponentContext>& xCC) - : GenericDialogController(pWindow, "modules/schart/ui/dlg_InsertLegend.ui", "dlg_InsertLegend") + : GenericDialogController(pWindow, u"modules/schart/ui/dlg_InsertLegend.ui"_ustr, + u"dlg_InsertLegend"_ustr) , m_xLegendPositionResources(new LegendPositionResources(*m_xBuilder, xCC)) { } diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx index 03f942945823..5e96f9ae9c73 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx @@ -24,7 +24,8 @@ namespace chart { SchTitleDlg::SchTitleDlg(weld::Window* pWindow, const TitleDialogData& rInput) - : GenericDialogController(pWindow, "modules/schart/ui/inserttitledlg.ui", "InsertTitleDialog") + : GenericDialogController(pWindow, u"modules/schart/ui/inserttitledlg.ui"_ustr, + u"InsertTitleDialog"_ustr) , m_xTitleResources(new TitleResources(*m_xBuilder, true)) { m_xDialog->set_title(ObjectNameProvider::getName(OBJECTTYPE_TITLE, true)); diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx index f5cfe8e3bda4..968c437c049e 100644 --- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx +++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx @@ -30,8 +30,8 @@ namespace chart using namespace ::com::sun::star; NumberFormatDialog::NumberFormatDialog(weld::Window* pParent, const SfxItemSet& rSet) - : SfxSingleTabDialogController(pParent, &rSet, "cui/ui/formatnumberdialog.ui", "FormatNumberDialog") - , m_xContent( m_xBuilder->weld_container("content") ) + : SfxSingleTabDialogController(pParent, &rSet, u"cui/ui/formatnumberdialog.ui"_ustr, u"FormatNumberDialog"_ustr) + , m_xContent( m_xBuilder->weld_container(u"content"_ustr) ) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ); diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index e885fdaef32e..f067bd2b0987 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -235,7 +235,7 @@ void ObjectPropertiesDialogParameter::init( const rtl::Reference<::chart::ChartM Reference< data::XDataSequence > xSeq( aDataSeqs[i]->getValues()); Reference< XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); OUString aRole; - if( xProp->getPropertyValue( "Role" ) >>= aRole ) + if( xProp->getPropertyValue( u"Role"_ustr ) >>= aRole ) { if( !bXValuesFound && aRole == "values-x" ) { @@ -334,7 +334,7 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent, const ObjectPropertiesDialogParameter* pDialogParameter, const ViewElementListProvider* pViewElementListProvider, const uno::Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier) - : SfxTabDialogController(pParent, "modules/schart/ui/attributedialog.ui", "AttributeDialog", pAttr) + : SfxTabDialogController(pParent, u"modules/schart/ui/attributedialog.ui"_ustr, u"AttributeDialog"_ustr, pAttr) , m_pParameter( pDialogParameter ) , m_pViewElementListProvider( pViewElementListProvider ) , m_pNumberFormatter(nullptr) @@ -349,55 +349,55 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent, switch (pDialogParameter->getObjectType()) { case OBJECTTYPE_TITLE: - AddTabPage("border", SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE); - AddTabPage("area", SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); - AddTabPage("transparent", SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE); - AddTabPage("fontname", SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); - AddTabPage("effects", SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); - AddTabPage("alignment", SchResId(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::Create); + AddTabPage(u"border"_ustr, SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE); + AddTabPage(u"area"_ustr, SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); + AddTabPage(u"transparent"_ustr, SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE); + AddTabPage(u"fontname"_ustr, SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); + AddTabPage(u"effects"_ustr, SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); + AddTabPage(u"alignment"_ustr, SchResId(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::Create); if( SvtCJKOptions::IsAsianTypographyEnabled() ) - AddTabPage("asian", SchResId(STR_PAGE_ASIAN), RID_SVXPAGE_PARA_ASIAN); + AddTabPage(u"asian"_ustr, SchResId(STR_PAGE_ASIAN), RID_SVXPAGE_PARA_ASIAN); break; case OBJECTTYPE_LEGEND: - AddTabPage("border", SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE); - AddTabPage("area", SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); - AddTabPage("transparent", SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE); - AddTabPage("fontname", SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); - AddTabPage("effects", SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); - AddTabPage("legendpos", SchResId(STR_PAGE_POSITION), SchLegendPosTabPage::Create); + AddTabPage(u"border"_ustr, SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE); + AddTabPage(u"area"_ustr, SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); + AddTabPage(u"transparent"_ustr, SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE); + AddTabPage(u"fontname"_ustr, SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); + AddTabPage(u"effects"_ustr, SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); + AddTabPage(u"legendpos"_ustr, SchResId(STR_PAGE_POSITION), SchLegendPosTabPage::Create); if (SvtCJKOptions::IsAsianTypographyEnabled()) - AddTabPage("asian", SchResId(STR_PAGE_ASIAN), RID_SVXPAGE_PARA_ASIAN); + AddTabPage(u"asian"_ustr, SchResId(STR_PAGE_ASIAN), RID_SVXPAGE_PARA_ASIAN); break; case OBJECTTYPE_DATA_SERIES: case OBJECTTYPE_DATA_POINT: if( m_pParameter->ProvidesSecondaryYAxis() || m_pParameter->ProvidesOverlapAndGapWidth() || m_pParameter->ProvidesMissingValueTreatments() ) - AddTabPage("options", SchResId(STR_PAGE_OPTIONS),SchOptionTabPage::Create); + AddTabPage(u"options"_ustr, SchResId(STR_PAGE_OPTIONS),SchOptionTabPage::Create); if( m_pParameter->ProvidesStartingAngle()) - AddTabPage("polaroptions", SchResId(STR_PAGE_OPTIONS), PolarOptionsTabPage::Create); + AddTabPage(u"polaroptions"_ustr, SchResId(STR_PAGE_OPTIONS), PolarOptionsTabPage::Create); if (m_pParameter->IsPieChartDataPoint()) - AddTabPage("datapointoption", SchResId(STR_PAGE_OPTIONS), DataPointOptionTabPage::Create); + AddTabPage(u"datapointoption"_ustr, SchResId(STR_PAGE_OPTIONS), DataPointOptionTabPage::Create); if( m_pParameter->HasGeometryProperties() ) - AddTabPage("layout", SchResId(STR_PAGE_LAYOUT), SchLayoutTabPage::Create); + AddTabPage(u"layout"_ustr, SchResId(STR_PAGE_LAYOUT), SchLayoutTabPage::Create); if(m_pParameter->HasAreaProperties()) { - AddTabPage("area", SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); - AddTabPage("transparent", SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE); + AddTabPage(u"area"_ustr, SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); + AddTabPage(u"transparent"_ustr, SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE); } - AddTabPage("border", SchResId( m_pParameter->HasAreaProperties() ? STR_PAGE_BORDER : STR_PAGE_LINE ), RID_SVXPAGE_LINE); + AddTabPage(u"border"_ustr, SchResId( m_pParameter->HasAreaProperties() ? STR_PAGE_BORDER : STR_PAGE_LINE ), RID_SVXPAGE_LINE); break; case OBJECTTYPE_DATA_LABEL: case OBJECTTYPE_DATA_LABELS: - AddTabPage("border", SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE); - AddTabPage("datalabels", SchResId(STR_OBJECT_DATALABELS), DataLabelsTabPage::Create); - AddTabPage("fontname", SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); - AddTabPage("effects", SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); + AddTabPage(u"border"_ustr, SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE); + AddTabPage(u"datalabels"_ustr, SchResId(STR_OBJECT_DATALABELS), DataLabelsTabPage::Create); + AddTabPage(u"fontname"_ustr, SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); + AddTabPage(u"effects"_ustr, SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); if( SvtCJKOptions::IsAsianTypographyEnabled() ) - AddTabPage("asian", SchResId(STR_PAGE_ASIAN), RID_SVXPAGE_PARA_ASIAN); + AddTabPage(u"asian"_ustr, SchResId(STR_PAGE_ASIAN), RID_SVXPAGE_PARA_ASIAN); break; @@ -405,29 +405,29 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent, { if( m_pParameter->HasScaleProperties() ) { - AddTabPage("scale", SchResId(STR_PAGE_SCALE), ScaleTabPage::Create); + AddTabPage(u"scale"_ustr, SchResId(STR_PAGE_SCALE), ScaleTabPage::Create); //no positioning page for z axes so far as the tickmarks are not shown so far - AddTabPage("axispos", SchResId(STR_PAGE_POSITIONING), AxisPositionsTabPage::Create); + AddTabPage(u"axispos"_ustr, SchResId(STR_PAGE_POSITIONING), AxisPositionsTabPage::Create); } - AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); - AddTabPage("axislabel", SchResId(STR_OBJECT_LABEL), SchAxisLabelTabPage::Create); + AddTabPage(u"border"_ustr, SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); + AddTabPage(u"axislabel"_ustr, SchResId(STR_OBJECT_LABEL), SchAxisLabelTabPage::Create); if( m_pParameter->HasNumberProperties() ) - AddTabPage("numberformat", SchResId(STR_PAGE_NUMBERS), RID_SVXPAGE_NUMBERFORMAT); - AddTabPage("fontname", SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); - AddTabPage("effects", SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); + AddTabPage(u"numberformat"_ustr, SchResId(STR_PAGE_NUMBERS), RID_SVXPAGE_NUMBERFORMAT); + AddTabPage(u"fontname"_ustr, SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); + AddTabPage(u"effects"_ustr, SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); if( SvtCJKOptions::IsAsianTypographyEnabled() ) - AddTabPage("asian", SchResId(STR_PAGE_ASIAN), RID_SVXPAGE_PARA_ASIAN); + AddTabPage(u"asian"_ustr, SchResId(STR_PAGE_ASIAN), RID_SVXPAGE_PARA_ASIAN); break; } case OBJECTTYPE_DATA_ERRORS_X: - AddTabPage("xerrorbar", SchResId(STR_PAGE_XERROR_BARS), ErrorBarsTabPage::Create); - AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); + AddTabPage(u"xerrorbar"_ustr, SchResId(STR_PAGE_XERROR_BARS), ErrorBarsTabPage::Create); + AddTabPage(u"border"_ustr, SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); break; case OBJECTTYPE_DATA_ERRORS_Y: - AddTabPage("yerrorbar", SchResId(STR_PAGE_YERROR_BARS), ErrorBarsTabPage::Create); - AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); + AddTabPage(u"yerrorbar"_ustr, SchResId(STR_PAGE_YERROR_BARS), ErrorBarsTabPage::Create); + AddTabPage(u"border"_ustr, SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); break; case OBJECTTYPE_DATA_ERRORS_Z: @@ -437,12 +437,12 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent, case OBJECTTYPE_SUBGRID: case OBJECTTYPE_DATA_AVERAGE_LINE: case OBJECTTYPE_DATA_STOCK_RANGE: - AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); + AddTabPage(u"border"_ustr, SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); break; case OBJECTTYPE_DATA_CURVE: - AddTabPage("trendline", SchResId(STR_PAGE_TRENDLINE_TYPE), TrendlineTabPage::Create); - AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); + AddTabPage(u"trendline"_ustr, SchResId(STR_PAGE_TRENDLINE_TYPE), TrendlineTabPage::Create); + AddTabPage(u"border"_ustr, SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); break; case OBJECTTYPE_DATA_STOCK_LOSS: @@ -451,9 +451,9 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent, case OBJECTTYPE_DIAGRAM_FLOOR: case OBJECTTYPE_DIAGRAM_WALL: case OBJECTTYPE_DIAGRAM: - AddTabPage("border", SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE); - AddTabPage("area", SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); - AddTabPage("transparent", SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE); + AddTabPage(u"border"_ustr, SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE); + AddTabPage(u"area"_ustr, SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); + AddTabPage(u"transparent"_ustr, SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE); break; case OBJECTTYPE_LEGEND_ENTRY: @@ -462,25 +462,25 @@ SchAttribTabDlg::SchAttribTabDlg(weld::Window* pParent, // nothing break; case OBJECTTYPE_DATA_TABLE: - AddTabPage("datatable", SchResId(STR_DATA_TABLE), DataTableTabPage::Create); - AddTabPage("border", SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); - AddTabPage("area", SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); - AddTabPage("fontname", SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); - AddTabPage("effects", SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); + AddTabPage(u"datatable"_ustr, SchResId(STR_DATA_TABLE), DataTableTabPage::Create); + AddTabPage(u"border"_ustr, SchResId(STR_PAGE_LINE), RID_SVXPAGE_LINE); + AddTabPage(u"area"_ustr, SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); + AddTabPage(u"fontname"_ustr, SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); + AddTabPage(u"effects"_ustr, SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); break; case OBJECTTYPE_DATA_CURVE_EQUATION: - AddTabPage("border", SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE); - AddTabPage("area", SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); - AddTabPage("transparent", SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE); - AddTabPage("fontname", SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); - AddTabPage("effects", SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); - AddTabPage("numberformat", SchResId(STR_PAGE_NUMBERS), RID_SVXPAGE_NUMBERFORMAT); + AddTabPage(u"border"_ustr, SchResId(STR_PAGE_BORDER), RID_SVXPAGE_LINE); + AddTabPage(u"area"_ustr, SchResId(STR_PAGE_AREA), RID_SVXPAGE_AREA); + AddTabPage(u"transparent"_ustr, SchResId(STR_PAGE_TRANSPARENCY), RID_SVXPAGE_TRANSPARENCE); + AddTabPage(u"fontname"_ustr, SchResId(STR_PAGE_FONT), RID_SVXPAGE_CHAR_NAME); + AddTabPage(u"effects"_ustr, SchResId(STR_PAGE_FONT_EFFECTS), RID_SVXPAGE_CHAR_EFFECTS); + AddTabPage(u"numberformat"_ustr, SchResId(STR_PAGE_NUMBERS), RID_SVXPAGE_NUMBERFORMAT); if (SvtCTLOptions::IsCTLFontEnabled()) { /* When rotation is supported for equation text boxes, use SchAlignmentTabPage::Create here. The special SchAlignmentTabPage::CreateWithoutRotation can be deleted. */ - AddTabPage("alignment", SchResId(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::CreateWithoutRotation); + AddTabPage(u"alignment"_ustr, SchResId(STR_PAGE_ALIGNMENT), SchAlignmentTabPage::CreateWithoutRotation); } break; default: diff --git a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx index b742e8a22eda..4f4efb96085d 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeFont.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeFont.cxx @@ -33,12 +33,12 @@ namespace chart ShapeFontDialog::ShapeFontDialog(weld::Window* pParent, const SfxItemSet* pAttr, const ViewElementListProvider* pViewElementListProvider) - : SfxTabDialogController(pParent, "modules/schart/ui/chardialog.ui", "CharDialog", pAttr) + : SfxTabDialogController(pParent, u"modules/schart/ui/chardialog.ui"_ustr, u"CharDialog"_ustr, pAttr) , m_pViewElementListProvider(pViewElementListProvider) { - AddTabPage("font", RID_SVXPAGE_CHAR_NAME); - AddTabPage("fonteffects", RID_SVXPAGE_CHAR_EFFECTS); - AddTabPage("position", RID_SVXPAGE_CHAR_POSITION ); + AddTabPage(u"font"_ustr, RID_SVXPAGE_CHAR_NAME); + AddTabPage(u"fonteffects"_ustr, RID_SVXPAGE_CHAR_EFFECTS); + AddTabPage(u"position"_ustr, RID_SVXPAGE_CHAR_POSITION ); } void ShapeFontDialog::PageCreated(const OUString& rId, SfxTabPage& rPage) diff --git a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx index 4c72d4d8126b..9af94eef04d0 100644 --- a/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx +++ b/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx @@ -32,19 +32,19 @@ namespace chart ShapeParagraphDialog::ShapeParagraphDialog(weld::Window* pParent, const SfxItemSet* pAttr) - : SfxTabDialogController(pParent, "modules/schart/ui/paradialog.ui", "ParagraphDialog", pAttr) + : SfxTabDialogController(pParent, u"modules/schart/ui/paradialog.ui"_ustr, u"ParagraphDialog"_ustr, pAttr) { - AddTabPage("labelTP_PARA_STD", RID_SVXPAGE_STD_PARAGRAPH); - AddTabPage("labelTP_PARA_ALIGN", RID_SVXPAGE_ALIGN_PARAGRAPH ); + AddTabPage(u"labelTP_PARA_STD"_ustr, RID_SVXPAGE_STD_PARAGRAPH); + AddTabPage(u"labelTP_PARA_ALIGN"_ustr, RID_SVXPAGE_ALIGN_PARAGRAPH ); if (SvtCJKOptions::IsAsianTypographyEnabled()) { - AddTabPage("labelTP_PARA_ASIAN", RID_SVXPAGE_PARA_ASIAN); + AddTabPage(u"labelTP_PARA_ASIAN"_ustr, RID_SVXPAGE_PARA_ASIAN); } else { - RemoveTabPage("labelTP_PARA_ASIAN"); + RemoveTabPage(u"labelTP_PARA_ASIAN"_ustr); } - AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); + AddTabPage(u"labelTP_TABULATOR"_ustr, RID_SVXPAGE_TABULATOR); } void ShapeParagraphDialog::PageCreated(const OUString& rId, SfxTabPage& rPage) diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 08a783df5e45..1e5232dfc387 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -35,20 +35,20 @@ using namespace ::com::sun::star; sal_uInt16 View3DDialog::m_nLastPageId = 0; View3DDialog::View3DDialog(weld::Window* pParent, const rtl::Reference<::chart::ChartModel> & xChartModel) - : GenericDialogController(pParent, "modules/schart/ui/3dviewdialog.ui", "3DViewDialog") + : GenericDialogController(pParent, u"modules/schart/ui/3dviewdialog.ui"_ustr, u"3DViewDialog"_ustr) , m_aControllerLocker(xChartModel) - , m_xTabControl(m_xBuilder->weld_notebook("tabcontrol")) + , m_xTabControl(m_xBuilder->weld_notebook(u"tabcontrol"_ustr)) { rtl::Reference< Diagram > xSceneProperties = xChartModel->getFirstChartDiagram(); - m_xTabControl->append_page("geometry", SchResId(STR_PAGE_PERSPECTIVE)); - m_xGeometry.reset(new ThreeD_SceneGeometry_TabPage(m_xTabControl->get_page("geometry"), xSceneProperties, m_aControllerLocker)); + m_xTabControl->append_page(u"geometry"_ustr, SchResId(STR_PAGE_PERSPECTIVE)); + m_xGeometry.reset(new ThreeD_SceneGeometry_TabPage(m_xTabControl->get_page(u"geometry"_ustr), xSceneProperties, m_aControllerLocker)); - m_xTabControl->append_page("appearance", SchResId(STR_PAGE_APPEARANCE)); - m_xAppearance.reset(new ThreeD_SceneAppearance_TabPage(m_xTabControl->get_page("appearance"), xChartModel, m_aControllerLocker)); + m_xTabControl->append_page(u"appearance"_ustr, SchResId(STR_PAGE_APPEARANCE)); + m_xAppearance.reset(new ThreeD_SceneAppearance_TabPage(m_xTabControl->get_page(u"appearance"_ustr), xChartModel, m_aControllerLocker)); - m_xTabControl->append_page("illumination", SchResId(STR_PAGE_ILLUMINATION)); - m_xIllumination.reset(new ThreeD_SceneIllumination_TabPage(m_xTabControl->get_page("illumination"), m_xDialog.get(), + m_xTabControl->append_page(u"illumination"_ustr, SchResId(STR_PAGE_ILLUMINATION)); + m_xIllumination.reset(new ThreeD_SceneIllumination_TabPage(m_xTabControl->get_page(u"illumination"_ustr), m_xDialog.get(), xSceneProperties, xChartModel)); m_xTabControl->connect_enter_page(LINK(this, View3DDialog, ActivatePageHdl)); diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index 81d933b208bc..cf25d970e99d 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -24,8 +24,8 @@ namespace chart { BarGeometryResources::BarGeometryResources(weld::Builder* pBuilder) - : m_xFT_Geometry(pBuilder->weld_label("shapeft")) - , m_xLB_Geometry(pBuilder->weld_tree_view("shape")) + : m_xFT_Geometry(pBuilder->weld_label(u"shapeft"_ustr)) + , m_xLB_Geometry(pBuilder->weld_tree_view(u"shape"_ustr)) { for (size_t i = 0; i < std::size(CHART_TYPE); ++i) m_xLB_Geometry->append_text(SchResId(CHART_TYPE[i])); diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index c3d755cf92d6..98db10ff1873 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -92,25 +92,25 @@ DataLabelResources::DataLabelResources(weld::Builder* pBuilder, weld::Window* pP , m_bSourceFormatForPercent(true) , m_pWindow(pParent) , m_pPool(rInAttrs.GetPool()) - , m_xCBNumber(pBuilder->weld_check_button("CB_VALUE_AS_NUMBER")) - , m_xPB_NumberFormatForValue(pBuilder->weld_button("PB_NUMBERFORMAT")) - , m_xCBPercent(pBuilder->weld_check_button("CB_VALUE_AS_PERCENTAGE")) - , m_xPB_NumberFormatForPercent(pBuilder->weld_button("PB_PERCENT_NUMBERFORMAT")) - , m_xFT_NumberFormatForPercent(pBuilder->weld_label("STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE")) - , m_xCBCategory(pBuilder->weld_check_button("CB_CATEGORY")) - , m_xCBSymbol(pBuilder->weld_check_button("CB_SYMBOL")) - , m_xCBDataSeries(pBuilder->weld_check_button("CB_DATA_SERIES_NAME")) - , m_xCBWrapText(pBuilder->weld_check_button("CB_WRAP_TEXT")) - , m_xLB_Separator(pBuilder->weld_combo_box("LB_TEXT_SEPARATOR")) - , m_xLB_LabelPlacement(pBuilder->weld_combo_box("LB_LABEL_PLACEMENT")) - , m_xBxOrientation(pBuilder->weld_widget("boxORIENTATION")) - , m_xFT_Dial(pBuilder->weld_label("CT_LABEL_DIAL")) - , m_xNF_Degrees(pBuilder->weld_metric_spin_button("NF_LABEL_DEGREES", FieldUnit::DEGREE)) - , m_xBxTextDirection(pBuilder->weld_widget("boxTXT_DIRECTION")) - , m_aLB_TextDirection(pBuilder->weld_combo_box("LB_LABEL_TEXTDIR")) + , m_xCBNumber(pBuilder->weld_check_button(u"CB_VALUE_AS_NUMBER"_ustr)) + , m_xPB_NumberFormatForValue(pBuilder->weld_button(u"PB_NUMBERFORMAT"_ustr)) + , m_xCBPercent(pBuilder->weld_check_button(u"CB_VALUE_AS_PERCENTAGE"_ustr)) + , m_xPB_NumberFormatForPercent(pBuilder->weld_button(u"PB_PERCENT_NUMBERFORMAT"_ustr)) + , m_xFT_NumberFormatForPercent(pBuilder->weld_label(u"STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE"_ustr)) + , m_xCBCategory(pBuilder->weld_check_button(u"CB_CATEGORY"_ustr)) + , m_xCBSymbol(pBuilder->weld_check_button(u"CB_SYMBOL"_ustr)) + , m_xCBDataSeries(pBuilder->weld_check_button(u"CB_DATA_SERIES_NAME"_ustr)) + , m_xCBWrapText(pBuilder->weld_check_button(u"CB_WRAP_TEXT"_ustr)) + , m_xLB_Separator(pBuilder->weld_combo_box(u"LB_TEXT_SEPARATOR"_ustr)) + , m_xLB_LabelPlacement(pBuilder->weld_combo_box(u"LB_LABEL_PLACEMENT"_ustr)) + , m_xBxOrientation(pBuilder->weld_widget(u"boxORIENTATION"_ustr)) + , m_xFT_Dial(pBuilder->weld_label(u"CT_LABEL_DIAL"_ustr)) + , m_xNF_Degrees(pBuilder->weld_metric_spin_button(u"NF_LABEL_DEGREES"_ustr, FieldUnit::DEGREE)) + , m_xBxTextDirection(pBuilder->weld_widget(u"boxTXT_DIRECTION"_ustr)) + , m_aLB_TextDirection(pBuilder->weld_combo_box(u"LB_LABEL_TEXTDIR"_ustr)) , m_xDC_Dial(new svx::DialControl) - , m_xDC_DialWin(new weld::CustomWeld(*pBuilder, "CT_DIAL", *m_xDC_Dial)) - , m_xCBCustomLeaderLines(pBuilder->weld_check_button("CB_CUSTOM_LEADER_LINES")) + , m_xDC_DialWin(new weld::CustomWeld(*pBuilder, u"CT_DIAL"_ustr, *m_xDC_Dial)) + , m_xCBCustomLeaderLines(pBuilder->weld_check_button(u"CB_CUSTOM_LEADER_LINES"_ustr)) { m_xDC_Dial->SetText(m_xFT_Dial->get_label()); diff --git a/chart2/source/controller/dialogs/res_DataTableProperties.cxx b/chart2/source/controller/dialogs/res_DataTableProperties.cxx index 327298e312d9..493be52ea5bc 100644 --- a/chart2/source/controller/dialogs/res_DataTableProperties.cxx +++ b/chart2/source/controller/dialogs/res_DataTableProperties.cxx @@ -17,10 +17,10 @@ using namespace css; namespace chart { DataTablePropertiesResources::DataTablePropertiesResources(weld::Builder& rBuilder) - : m_xCbHorizontalBorder(rBuilder.weld_check_button("horizontalBorderCB")) - , m_xCbVerticalBorder(rBuilder.weld_check_button("verticalBorderCB")) - , m_xCbOutilne(rBuilder.weld_check_button("outlineCB")) - , m_xCbKeys(rBuilder.weld_check_button("keysCB")) + : m_xCbHorizontalBorder(rBuilder.weld_check_button(u"horizontalBorderCB"_ustr)) + , m_xCbVerticalBorder(rBuilder.weld_check_button(u"verticalBorderCB"_ustr)) + , m_xCbOutilne(rBuilder.weld_check_button(u"outlineCB"_ustr)) + , m_xCbKeys(rBuilder.weld_check_button(u"keysCB"_ustr)) { } diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index ae8e7cd28e2e..82c3f3ab4acc 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -96,31 +96,31 @@ ErrorBarResources::ErrorBarResources(weld::Builder* pParent, weld::DialogControl , m_pCurrentRangeChoosingField( nullptr ) , m_bHasInternalDataProvider( true ) , m_bEnableDataTableDialog( true ) - , m_xRbNone(pParent->weld_radio_button("RB_NONE")) - , m_xRbConst(pParent->weld_radio_button("RB_CONST")) - , m_xRbPercent(pParent->weld_radio_button("RB_PERCENT")) - , m_xRbFunction(pParent->weld_radio_button("RB_FUNCTION")) - , m_xRbRange(pParent->weld_radio_button("RB_RANGE")) - , m_xLbFunction(pParent->weld_combo_box("LB_FUNCTION")) - , m_xFlParameters(pParent->weld_frame("framePARAMETERS")) - , m_xBxPositive(pParent->weld_widget("boxPOSITIVE")) - , m_xMfPositive(pParent->weld_metric_spin_button("MF_POSITIVE", FieldUnit::NONE)) - , m_xEdRangePositive(pParent->weld_entry("ED_RANGE_POSITIVE")) - , m_xIbRangePositive(pParent->weld_button("IB_RANGE_POSITIVE")) - , m_xBxNegative(pParent->weld_widget("boxNEGATIVE")) - , m_xMfNegative(pParent->weld_metric_spin_button("MF_NEGATIVE", FieldUnit::NONE)) - , m_xEdRangeNegative(pParent->weld_entry("ED_RANGE_NEGATIVE")) - , m_xIbRangeNegative(pParent->weld_button("IB_RANGE_NEGATIVE")) - , m_xCbSyncPosNeg(pParent->weld_check_button("CB_SYN_POS_NEG")) - , m_xRbBoth(pParent->weld_radio_button("RB_BOTH")) - , m_xRbPositive(pParent->weld_radio_button("RB_POSITIVE")) - , m_xRbNegative(pParent->weld_radio_button("RB_NEGATIVE")) - , m_xFiBoth(pParent->weld_image("FI_BOTH")) - , m_xFiPositive(pParent->weld_image("FI_POSITIVE")) - , m_xFiNegative(pParent->weld_image("FI_NEGATIVE")) - , m_xUIStringPos(pParent->weld_label("STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS")) - , m_xUIStringNeg(pParent->weld_label("STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS")) - , m_xUIStringRbRange(pParent->weld_label("STR_CONTROLTEXT_ERROR_BARS_FROM_DATA")) + , m_xRbNone(pParent->weld_radio_button(u"RB_NONE"_ustr)) + , m_xRbConst(pParent->weld_radio_button(u"RB_CONST"_ustr)) + , m_xRbPercent(pParent->weld_radio_button(u"RB_PERCENT"_ustr)) + , m_xRbFunction(pParent->weld_radio_button(u"RB_FUNCTION"_ustr)) + , m_xRbRange(pParent->weld_radio_button(u"RB_RANGE"_ustr)) + , m_xLbFunction(pParent->weld_combo_box(u"LB_FUNCTION"_ustr)) + , m_xFlParameters(pParent->weld_frame(u"framePARAMETERS"_ustr)) + , m_xBxPositive(pParent->weld_widget(u"boxPOSITIVE"_ustr)) + , m_xMfPositive(pParent->weld_metric_spin_button(u"MF_POSITIVE"_ustr, FieldUnit::NONE)) + , m_xEdRangePositive(pParent->weld_entry(u"ED_RANGE_POSITIVE"_ustr)) + , m_xIbRangePositive(pParent->weld_button(u"IB_RANGE_POSITIVE"_ustr)) + , m_xBxNegative(pParent->weld_widget(u"boxNEGATIVE"_ustr)) + , m_xMfNegative(pParent->weld_metric_spin_button(u"MF_NEGATIVE"_ustr, FieldUnit::NONE)) + , m_xEdRangeNegative(pParent->weld_entry(u"ED_RANGE_NEGATIVE"_ustr)) + , m_xIbRangeNegative(pParent->weld_button(u"IB_RANGE_NEGATIVE"_ustr)) + , m_xCbSyncPosNeg(pParent->weld_check_button(u"CB_SYN_POS_NEG"_ustr)) + , m_xRbBoth(pParent->weld_radio_button(u"RB_BOTH"_ustr)) + , m_xRbPositive(pParent->weld_radio_button(u"RB_POSITIVE"_ustr)) + , m_xRbNegative(pParent->weld_radio_button(u"RB_NEGATIVE"_ustr)) + , m_xFiBoth(pParent->weld_image(u"FI_BOTH"_ustr)) + , m_xFiPositive(pParent->weld_image(u"FI_POSITIVE"_ustr)) + , m_xFiNegative(pParent->weld_image(u"FI_NEGATIVE"_ustr)) + , m_xUIStringPos(pParent->weld_label(u"STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS"_ustr)) + , m_xUIStringNeg(pParent->weld_label(u"STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS"_ustr)) + , m_xUIStringRbRange(pParent->weld_label(u"STR_CONTROLTEXT_ERROR_BARS_FROM_DATA"_ustr)) { if( bNoneAvailable ) m_xRbNone->connect_toggled(LINK(this, ErrorBarResources, CategoryChosen)); @@ -175,7 +175,7 @@ void ErrorBarResources::SetChartDocumentForRangeChoosing( { try { - xProps->getPropertyValue("EnableDataTableDialog") >>= m_bEnableDataTableDialog; + xProps->getPropertyValue(u"EnableDataTableDialog"_ustr) >>= m_bEnableDataTableDialog; } catch( const uno::Exception& ) { diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 92cb4399e563..e1743886086a 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -41,10 +41,10 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; LegendPositionResources::LegendPositionResources(weld::Builder& rBuilder) - : m_xRbtLeft(rBuilder.weld_radio_button("left")) - , m_xRbtRight(rBuilder.weld_radio_button("right")) - , m_xRbtTop(rBuilder.weld_radio_button("top")) - , m_xRbtBottom(rBuilder.weld_radio_button("bottom")) + : m_xRbtLeft(rBuilder.weld_radio_button(u"left"_ustr)) + , m_xRbtRight(rBuilder.weld_radio_button(u"right"_ustr)) + , m_xRbtTop(rBuilder.weld_radio_button(u"top"_ustr)) + , m_xRbtBottom(rBuilder.weld_radio_button(u"bottom"_ustr)) { impl_setRadioButtonToggleHdl(); } @@ -52,11 +52,11 @@ LegendPositionResources::LegendPositionResources(weld::Builder& rBuilder) LegendPositionResources::LegendPositionResources(weld::Builder& rBuilder, uno::Reference< uno::XComponentContext > xCC) : m_xCC(std::move(xCC)) - , m_xCbxShow(rBuilder.weld_check_button("show")) - , m_xRbtLeft(rBuilder.weld_radio_button("left")) - , m_xRbtRight(rBuilder.weld_radio_button("right")) - , m_xRbtTop(rBuilder.weld_radio_button("top")) - , m_xRbtBottom(rBuilder.weld_radio_button("bottom")) + , m_xCbxShow(rBuilder.weld_check_button(u"show"_ustr)) + , m_xRbtLeft(rBuilder.weld_radio_button(u"left"_ustr)) + , m_xRbtRight(rBuilder.weld_radio_button(u"right"_ustr)) + , m_xRbtTop(rBuilder.weld_radio_button(u"top"_ustr)) + , m_xRbtBottom(rBuilder.weld_radio_button(u"bottom"_ustr)) { m_xCbxShow->connect_toggled( LINK( this, LegendPositionResources, PositionEnableHdl ) ); impl_setRadioButtonToggleHdl(); @@ -84,14 +84,14 @@ void LegendPositionResources::writeToResources( const rtl::Reference<::chart::Ch { //show bool bShowLegend = false; - xLegend->getPropertyValue( "Show" ) >>= bShowLegend; + xLegend->getPropertyValue( u"Show"_ustr ) >>= bShowLegend; if (m_xCbxShow) m_xCbxShow->set_active( bShowLegend ); PositionEnable(); //position chart2::LegendPosition ePos; - xLegend->getPropertyValue( "AnchorPosition" ) >>= ePos; + xLegend->getPropertyValue( u"AnchorPosition"_ustr ) >>= ePos; switch( ePos ) { case chart2::LegendPosition_LINE_START: @@ -126,7 +126,7 @@ void LegendPositionResources::writeToModel( const rtl::Reference<::chart::ChartM if( xProp.is() ) { //show - xProp->setPropertyValue( "Show" , uno::Any( bShowLegend )); + xProp->setPropertyValue( u"Show"_ustr , uno::Any( bShowLegend )); //position chart2::LegendPosition eNewPos; @@ -149,9 +149,9 @@ void LegendPositionResources::writeToModel( const rtl::Reference<::chart::ChartM eExp = css::chart::ChartLegendExpansion_WIDE; } - xProp->setPropertyValue( "AnchorPosition" , uno::Any( eNewPos )); - xProp->setPropertyValue( "Expansion" , uno::Any( eExp )); - xProp->setPropertyValue( "RelativePosition" , uno::Any()); + xProp->setPropertyValue( u"AnchorPosition"_ustr , uno::Any( eNewPos )); + xProp->setPropertyValue( u"Expansion"_ustr , uno::Any( eExp )); + xProp->setPropertyValue( u"RelativePosition"_ustr , uno::Any()); } } catch( const uno::Exception & ) diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index 59b0f00b9b37..dda48b055320 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -24,20 +24,20 @@ namespace chart { TitleResources::TitleResources(weld::Builder& rBuilder, bool bShowSecondaryAxesTitle) - : m_xFT_Main(rBuilder.weld_label("labelMainTitle")) - , m_xFT_Sub(rBuilder.weld_label("labelSubTitle")) - , m_xEd_Main(rBuilder.weld_entry("maintitle")) - , m_xEd_Sub(rBuilder.weld_entry("subtitle")) - , m_xFT_XAxis(rBuilder.weld_label("labelPrimaryXaxis")) - , m_xFT_YAxis(rBuilder.weld_label("labelPrimaryYaxis")) - , m_xFT_ZAxis(rBuilder.weld_label("labelPrimaryZaxis")) - , m_xEd_XAxis(rBuilder.weld_entry("primaryXaxis")) - , m_xEd_YAxis(rBuilder.weld_entry("primaryYaxis")) - , m_xEd_ZAxis(rBuilder.weld_entry("primaryZaxis")) - , m_xFT_SecondaryXAxis(rBuilder.weld_label("labelSecondaryXAxis")) - , m_xFT_SecondaryYAxis(rBuilder.weld_label("labelSecondaryYAxis")) - , m_xEd_SecondaryXAxis(rBuilder.weld_entry("secondaryXaxis")) - , m_xEd_SecondaryYAxis(rBuilder.weld_entry("secondaryYaxis")) + : m_xFT_Main(rBuilder.weld_label(u"labelMainTitle"_ustr)) + , m_xFT_Sub(rBuilder.weld_label(u"labelSubTitle"_ustr)) + , m_xEd_Main(rBuilder.weld_entry(u"maintitle"_ustr)) + , m_xEd_Sub(rBuilder.weld_entry(u"subtitle"_ustr)) + , m_xFT_XAxis(rBuilder.weld_label(u"labelPrimaryXaxis"_ustr)) + , m_xFT_YAxis(rBuilder.weld_label(u"labelPrimaryYaxis"_ustr)) + , m_xFT_ZAxis(rBuilder.weld_label(u"labelPrimaryZaxis"_ustr)) + , m_xEd_XAxis(rBuilder.weld_entry(u"primaryXaxis"_ustr)) + , m_xEd_YAxis(rBuilder.weld_entry(u"primaryYaxis"_ustr)) + , m_xEd_ZAxis(rBuilder.weld_entry(u"primaryZaxis"_ustr)) + , m_xFT_SecondaryXAxis(rBuilder.weld_label(u"labelSecondaryXAxis"_ustr)) + , m_xFT_SecondaryYAxis(rBuilder.weld_label(u"labelSecondaryYAxis"_ustr)) + , m_xEd_SecondaryXAxis(rBuilder.weld_entry(u"secondaryXaxis"_ustr)) + , m_xEd_SecondaryYAxis(rBuilder.weld_entry(u"secondaryYaxis"_ustr)) { m_xFT_SecondaryXAxis->set_visible(bShowSecondaryAxesTitle); m_xFT_SecondaryYAxis->set_visible(bShowSecondaryAxesTitle); diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 3cbba1e59a28..ce8a893702d7 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -46,30 +46,30 @@ TrendlineResources::TrendlineResources(weld::Builder& rBuilder, const SfxItemSet , m_bTrendLineUnique(true) , m_pNumFormatter(nullptr) , m_nNbPoints(0) - , m_xRB_Linear(rBuilder.weld_radio_button("linear")) - , m_xRB_Logarithmic(rBuilder.weld_radio_button("logarithmic")) - , m_xRB_Exponential(rBuilder.weld_radio_button("exponential")) - , m_xRB_Power(rBuilder.weld_radio_button("power")) - , m_xRB_Polynomial(rBuilder.weld_radio_button("polynomial")) - , m_xRB_MovingAverage(rBuilder.weld_radio_button("movingAverage")) - , m_xFI_Linear(rBuilder.weld_image("imageLinear")) - , m_xFI_Logarithmic(rBuilder.weld_image("imageLogarithmic")) - , m_xFI_Exponential(rBuilder.weld_image("imageExponential")) - , m_xFI_Power(rBuilder.weld_image("imagePower")) - , m_xFI_Polynomial(rBuilder.weld_image("imagePolynomial")) - , m_xFI_MovingAverage(rBuilder.weld_image("imageMovingAverage")) - , m_xNF_Degree(rBuilder.weld_spin_button("degree")) - , m_xNF_Period(rBuilder.weld_spin_button("period")) - , m_xEE_Name(rBuilder.weld_entry("entry_name")) - , m_xFmtFld_ExtrapolateForward(rBuilder.weld_formatted_spin_button("extrapolateForward")) - , m_xFmtFld_ExtrapolateBackward(rBuilder.weld_formatted_spin_button("extrapolateBackward")) - , m_xCB_SetIntercept(rBuilder.weld_check_button("setIntercept")) - , m_xFmtFld_InterceptValue(rBuilder.weld_formatted_spin_button("interceptValue")) - , m_xCB_ShowEquation(rBuilder.weld_check_button("showEquation")) - , m_xEE_XName(rBuilder.weld_entry("entry_Xname")) - , m_xEE_YName(rBuilder.weld_entry("entry_Yname")) - , m_xCB_ShowCorrelationCoeff(rBuilder.weld_check_button("showCorrelationCoefficient")) - , m_xCB_RegressionMovingType(rBuilder.weld_combo_box("combo_moving_type")) + , m_xRB_Linear(rBuilder.weld_radio_button(u"linear"_ustr)) + , m_xRB_Logarithmic(rBuilder.weld_radio_button(u"logarithmic"_ustr)) + , m_xRB_Exponential(rBuilder.weld_radio_button(u"exponential"_ustr)) + , m_xRB_Power(rBuilder.weld_radio_button(u"power"_ustr)) + , m_xRB_Polynomial(rBuilder.weld_radio_button(u"polynomial"_ustr)) + , m_xRB_MovingAverage(rBuilder.weld_radio_button(u"movingAverage"_ustr)) + , m_xFI_Linear(rBuilder.weld_image(u"imageLinear"_ustr)) + , m_xFI_Logarithmic(rBuilder.weld_image(u"imageLogarithmic"_ustr)) + , m_xFI_Exponential(rBuilder.weld_image(u"imageExponential"_ustr)) + , m_xFI_Power(rBuilder.weld_image(u"imagePower"_ustr)) + , m_xFI_Polynomial(rBuilder.weld_image(u"imagePolynomial"_ustr)) + , m_xFI_MovingAverage(rBuilder.weld_image(u"imageMovingAverage"_ustr)) + , m_xNF_Degree(rBuilder.weld_spin_button(u"degree"_ustr)) + , m_xNF_Period(rBuilder.weld_spin_button(u"period"_ustr)) + , m_xEE_Name(rBuilder.weld_entry(u"entry_name"_ustr)) + , m_xFmtFld_ExtrapolateForward(rBuilder.weld_formatted_spin_button(u"extrapolateForward"_ustr)) + , m_xFmtFld_ExtrapolateBackward(rBuilder.weld_formatted_spin_button(u"extrapolateBackward"_ustr)) + , m_xCB_SetIntercept(rBuilder.weld_check_button(u"setIntercept"_ustr)) + , m_xFmtFld_InterceptValue(rBuilder.weld_formatted_spin_button(u"interceptValue"_ustr)) + , m_xCB_ShowEquation(rBuilder.weld_check_button(u"showEquation"_ustr)) + , m_xEE_XName(rBuilder.weld_entry(u"entry_Xname"_ustr)) + , m_xEE_YName(rBuilder.weld_entry(u"entry_Yname"_ustr)) + , m_xCB_ShowCorrelationCoeff(rBuilder.weld_check_button(u"showCorrelationCoefficient"_ustr)) + , m_xCB_RegressionMovingType(rBuilder.weld_combo_box(u"combo_moving_type"_ustr)) { FillValueSets(); @@ -133,7 +133,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs ) } else { - m_xEE_Name->set_text(""); + m_xEE_Name->set_text(u""_ustr); } if( const SfxStringItem* pRegressionXNameItem = rInAttrs.GetItemIfSet( SCHATTR_REGRESSION_XNAME ) ) { @@ -142,7 +142,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs ) } else { - m_xEE_XName->set_text("x"); + m_xEE_XName->set_text(u"x"_ustr); } if( const SfxStringItem* pRegressionYNameItem = rInAttrs.GetItemIfSet( SCHATTR_REGRESSION_YNAME ) ) { @@ -151,7 +151,7 @@ void TrendlineResources::Reset( const SfxItemSet& rInAttrs ) } else { - m_xEE_YName->set_text("f(x)"); + m_xEE_YName->set_text(u"f(x)"_ustr); } const SfxPoolItem* pPoolItem = nullptr; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index adeb27a02501..9e0127f23180 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -53,7 +53,7 @@ lcl_ModelProperties lcl_getPropertiesFromModel( rtl::Reference<::chart::ChartMod try { rtl::Reference< ::chart::Diagram > xDiagram( xModel->getFirstChartDiagram() ); - xDiagram->getPropertyValue( "D3DSceneShadeMode" ) >>= aProps.m_aShadeMode; + xDiagram->getPropertyValue( u"D3DSceneShadeMode"_ustr ) >>= aProps.m_aShadeMode; ::chart::ThreeDHelper::getRoundedEdgesAndObjectLines( xDiagram, aProps.m_nRoundedEdges, aProps.m_nObjectLines ); aProps.m_eScheme = xDiagram->detectScheme(); } @@ -69,7 +69,7 @@ void lcl_setShadeModeAtModel( rtl::Reference<::chart::ChartModel> const & xModel try { rtl::Reference< ::chart::Diagram > xDiaProp = xModel->getFirstChartDiagram(); - xDiaProp->setPropertyValue( "D3DSceneShadeMode" , uno::Any( aShadeMode )); + xDiaProp->setPropertyValue( u"D3DSceneShadeMode"_ustr , uno::Any( aShadeMode )); } catch( const uno::Exception & ) { @@ -93,12 +93,12 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage(weld::Container* , m_bUpdateOtherControls(true) , m_bCommitToModel(true) , m_rControllerLockHelper(rControllerLockHelper) - , m_xBuilder(Application::CreateBuilder(pParent, "modules/schart/ui/tp_3D_SceneAppearance.ui")) - , m_xContainer(m_xBuilder->weld_container("tp_3D_SceneAppearance")) - , m_xLB_Scheme(m_xBuilder->weld_combo_box("LB_SCHEME")) - , m_xCB_Shading(m_xBuilder->weld_check_button("CB_SHADING")) - , m_xCB_ObjectLines(m_xBuilder->weld_check_button("CB_OBJECTLINES")) - , m_xCB_RoundedEdge(m_xBuilder->weld_check_button("CB_ROUNDEDEDGE")) + , m_xBuilder(Application::CreateBuilder(pParent, u"modules/schart/ui/tp_3D_SceneAppearance.ui"_ustr)) + , m_xContainer(m_xBuilder->weld_container(u"tp_3D_SceneAppearance"_ustr)) + , m_xLB_Scheme(m_xBuilder->weld_combo_box(u"LB_SCHEME"_ustr)) + , m_xCB_Shading(m_xBuilder->weld_check_button(u"CB_SHADING"_ustr)) + , m_xCB_ObjectLines(m_xBuilder->weld_check_button(u"CB_OBJECTLINES"_ustr)) + , m_xCB_RoundedEdge(m_xBuilder->weld_check_button(u"CB_ROUNDEDEDGE"_ustr)) { m_aCustom = m_xLB_Scheme->get_text(POS_3DSCHEME_CUSTOM); m_xLB_Scheme->remove(POS_3DSCHEME_CUSTOM); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index f368a8193a58..d6711921fda4 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -57,15 +57,15 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage(weld::Container* pPar , m_bAngleChangePending( false ) , m_bPerspectiveChangePending( false ) , m_rControllerLockHelper( rControllerLockHelper ) - , m_xBuilder(Application::CreateBuilder(pParent, "modules/schart/ui/tp_3D_SceneGeometry.ui")) - , m_xContainer(m_xBuilder->weld_container("tp_3DSceneGeometry")) - , m_xCbxRightAngledAxes(m_xBuilder->weld_check_button("CBX_RIGHT_ANGLED_AXES")) - , m_xMFXRotation(m_xBuilder->weld_metric_spin_button("MTR_FLD_X_ROTATION", FieldUnit::DEGREE)) - , m_xMFYRotation(m_xBuilder->weld_metric_spin_button("MTR_FLD_Y_ROTATION", FieldUnit::DEGREE)) - , m_xFtZRotation(m_xBuilder->weld_label("FT_Z_ROTATION")) - , m_xMFZRotation(m_xBuilder->weld_metric_spin_button("MTR_FLD_Z_ROTATION", FieldUnit::DEGREE)) - , m_xCbxPerspective(m_xBuilder->weld_check_button("CBX_PERSPECTIVE")) - , m_xMFPerspective(m_xBuilder->weld_metric_spin_button("MTR_FLD_PERSPECTIVE", FieldUnit::PERCENT)) + , m_xBuilder(Application::CreateBuilder(pParent, u"modules/schart/ui/tp_3D_SceneGeometry.ui"_ustr)) + , m_xContainer(m_xBuilder->weld_container(u"tp_3DSceneGeometry"_ustr)) + , m_xCbxRightAngledAxes(m_xBuilder->weld_check_button(u"CBX_RIGHT_ANGLED_AXES"_ustr)) + , m_xMFXRotation(m_xBuilder->weld_metric_spin_button(u"MTR_FLD_X_ROTATION"_ustr, FieldUnit::DEGREE)) + , m_xMFYRotation(m_xBuilder->weld_metric_spin_button(u"MTR_FLD_Y_ROTATION"_ustr, FieldUnit::DEGREE)) + , m_xFtZRotation(m_xBuilder->weld_label(u"FT_Z_ROTATION"_ustr)) + , m_xMFZRotation(m_xBuilder->weld_metric_spin_button(u"MTR_FLD_Z_ROTATION"_ustr, FieldUnit::DEGREE)) + , m_xCbxPerspective(m_xBuilder->weld_check_button(u"CBX_PERSPECTIVE"_ustr)) + , m_xMFPerspective(m_xBuilder->weld_metric_spin_button(u"MTR_FLD_PERSPECTIVE"_ustr, FieldUnit::PERCENT)) { double fXAngle, fYAngle, fZAngle; m_xDiagram->getRotationAngle( fXAngle, fYAngle, fZAngle ); @@ -99,12 +99,12 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage(weld::Container* pPar m_xMFZRotation->connect_value_changed( aAngleEditedLink ); drawing::ProjectionMode aProjectionMode = drawing::ProjectionMode_PERSPECTIVE; - m_xDiagram->getPropertyValue( "D3DScenePerspective" ) >>= aProjectionMode; + m_xDiagram->getPropertyValue( u"D3DScenePerspective"_ustr ) >>= aProjectionMode; m_xCbxPerspective->set_active( aProjectionMode == drawing::ProjectionMode_PERSPECTIVE ); m_xCbxPerspective->connect_toggled( LINK( this, ThreeD_SceneGeometry_TabPage, PerspectiveToggled )); sal_Int32 nPerspectivePercentage = 20; - m_xDiagram->getPropertyValue( "Perspective" ) >>= nPerspectivePercentage; + m_xDiagram->getPropertyValue( u"Perspective"_ustr ) >>= nPerspectivePercentage; m_xMFPerspective->set_value(nPerspectivePercentage, FieldUnit::PERCENT); m_aPerspectiveTimer.SetTimeout(nTimeout); @@ -116,7 +116,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage(weld::Container* pPar if (ChartTypeHelper::isSupportingRightAngledAxes(m_xDiagram->getChartTypeByIndex(0))) { bool bRightAngledAxes = false; - m_xDiagram->getPropertyValue( "RightAngledAxes" ) >>= bRightAngledAxes; + m_xDiagram->getPropertyValue( u"RightAngledAxes"_ustr ) >>= bRightAngledAxes; m_xCbxRightAngledAxes->connect_toggled( LINK( this, ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled )); m_xCbxRightAngledAxes->set_active( bRightAngledAxes ); RightAngledAxesToggled(*m_xCbxRightAngledAxes); @@ -189,8 +189,8 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel() try { - m_xDiagram->setPropertyValue( "D3DScenePerspective" , uno::Any( aMode )); - m_xDiagram->setPropertyValue( "Perspective" , uno::Any( static_cast<sal_Int32>(m_xMFPerspective->get_value(FieldUnit::PERCENT)) )); + m_xDiagram->setPropertyValue( u"D3DScenePerspective"_ustr , uno::Any( aMode )); + m_xDiagram->setPropertyValue( u"Perspective"_ustr , uno::Any( static_cast<sal_Int32>(m_xMFPerspective->get_value(FieldUnit::PERCENT)) )); } catch( const uno::Exception & ) { @@ -233,7 +233,7 @@ IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, weld::Togg m_xMFXRotation->set_value(static_cast<sal_Int64>(ThreeDHelper::getValueClippedToRange(static_cast<double>(m_nXRotation), ThreeDHelper::getXDegreeAngleLimitForRightAngledAxes())), FieldUnit::DEGREE); m_xMFYRotation->set_value(static_cast<sal_Int64>(ThreeDHelper::getValueClippedToRange(static_cast<double>(m_nYRotation), ThreeDHelper::getYDegreeAngleLimitForRightAngledAxes())), FieldUnit::DEGREE); - m_xMFZRotation->set_text(""); + m_xMFZRotation->set_text(u""_ustr); lcl_SetMetricFieldLimits( *m_xMFXRotation, static_cast<sal_Int64>(ThreeDHelper::getXDegreeAngleLimitForRightAngledAxes())); lcl_SetMetricFieldLimits( *m_xMFYRotation, static_cast<sal_Int64>(ThreeDHelper::getYDegreeAngleLimitForRightAngledAxes())); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 2650e56fe8a4..3d258e8e70f5 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -157,7 +157,7 @@ namespace Color nResult; try { - xSceneProperties->getPropertyValue("D3DSceneAmbientColor") >>= nResult; + xSceneProperties->getPropertyValue(u"D3DSceneAmbientColor"_ustr) >>= nResult; } catch( const uno::Exception & ) { @@ -172,7 +172,7 @@ namespace { try { - xSceneProperties->setPropertyValue("D3DSceneAmbientColor", + xSceneProperties->setPropertyValue(u"D3DSceneAmbientColor"_ustr, uno::Any( rColor )); } catch( const uno::Exception & ) @@ -192,25 +192,25 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage(weld::Contain , m_aModelChangeListener( LINK( this, ThreeD_SceneIllumination_TabPage, fillControlsFromModel ) ) , m_xChartModel( xChartModel ) , m_pTopLevel(pTopLevel) - , m_xBuilder(Application::CreateBuilder(pParent, "modules/schart/ui/tp_3D_SceneIllumination.ui")) - , m_xContainer(m_xBuilder->weld_container("tp_3D_SceneIllumination")) - , m_aBtn_Light1(m_xBuilder->weld_toggle_button("BTN_LIGHT_1")) - , m_aBtn_Light2(m_xBuilder->weld_toggle_button("BTN_LIGHT_2")) - , m_aBtn_Light3(m_xBuilder->weld_toggle_button("BTN_LIGHT_3")) - , m_aBtn_Light4(m_xBuilder->weld_toggle_button("BTN_LIGHT_4")) - , m_aBtn_Light5(m_xBuilder->weld_toggle_button("BTN_LIGHT_5")) - , m_aBtn_Light6(m_xBuilder->weld_toggle_button("BTN_LIGHT_6")) - , m_aBtn_Light7(m_xBuilder->weld_toggle_button("BTN_LIGHT_7")) - , m_aBtn_Light8(m_xBuilder->weld_toggle_button("BTN_LIGHT_8")) - , m_xLB_LightSource(new ColorListBox(m_xBuilder->weld_menu_button("LB_LIGHTSOURCE"), [this]{ return m_pTopLevel; })) - , m_xBtn_LightSource_Color(m_xBuilder->weld_button("BTN_LIGHTSOURCE_COLOR")) - , m_xLB_AmbientLight(new ColorListBox(m_xBuilder->weld_menu_button("LB_AMBIENTLIGHT"), [this]{ return m_pTopLevel; })) - , m_xBtn_AmbientLight_Color(m_xBuilder->weld_button("BTN_AMBIENT_COLOR")) - , m_xHoriScale(m_xBuilder->weld_scale("hori")) - , m_xVertScale(m_xBuilder->weld_scale("vert")) - , m_xBtn_Corner(m_xBuilder->weld_button("corner")) + , m_xBuilder(Application::CreateBuilder(pParent, u"modules/schart/ui/tp_3D_SceneIllumination.ui"_ustr)) + , m_xContainer(m_xBuilder->weld_container(u"tp_3D_SceneIllumination"_ustr)) + , m_aBtn_Light1(m_xBuilder->weld_toggle_button(u"BTN_LIGHT_1"_ustr)) + , m_aBtn_Light2(m_xBuilder->weld_toggle_button(u"BTN_LIGHT_2"_ustr)) + , m_aBtn_Light3(m_xBuilder->weld_toggle_button(u"BTN_LIGHT_3"_ustr)) + , m_aBtn_Light4(m_xBuilder->weld_toggle_button(u"BTN_LIGHT_4"_ustr)) + , m_aBtn_Light5(m_xBuilder->weld_toggle_button(u"BTN_LIGHT_5"_ustr)) + , m_aBtn_Light6(m_xBuilder->weld_toggle_button(u"BTN_LIGHT_6"_ustr)) + , m_aBtn_Light7(m_xBuilder->weld_toggle_button(u"BTN_LIGHT_7"_ustr)) + , m_aBtn_Light8(m_xBuilder->weld_toggle_button(u"BTN_LIGHT_8"_ustr)) + , m_xLB_LightSource(new ColorListBox(m_xBuilder->weld_menu_button(u"LB_LIGHTSOURCE"_ustr), [this]{ return m_pTopLevel; })) + , m_xBtn_LightSource_Color(m_xBuilder->weld_button(u"BTN_LIGHTSOURCE_COLOR"_ustr)) + , m_xLB_AmbientLight(new ColorListBox(m_xBuilder->weld_menu_button(u"LB_AMBIENTLIGHT"_ustr), [this]{ return m_pTopLevel; })) + , m_xBtn_AmbientLight_Color(m_xBuilder->weld_button(u"BTN_AMBIENT_COLOR"_ustr)) + , m_xHoriScale(m_xBuilder->weld_scale(u"hori"_ustr)) + , m_xVertScale(m_xBuilder->weld_scale(u"vert"_ustr)) + , m_xBtn_Corner(m_xBuilder->weld_button(u"corner"_ustr)) , m_xPreview(new Svx3DLightControl) - , m_xPreviewWnd(new weld::CustomWeld(*m_xBuilder, "CTL_LIGHT_PREVIEW", *m_xPreview)) + , m_xPreviewWnd(new weld::CustomWeld(*m_xBuilder, u"CTL_LIGHT_PREVIEW"_ustr, *m_xPreview)) , m_xCtl_Preview(new SvxLightCtl3D(*m_xPreview, *m_xHoriScale, *m_xVertScale, *m_xBtn_Corner)) { m_pLightSourceInfoList.reset(new LightSourceInfo[8]); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 79976618341c..396086bb46a6 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -31,30 +31,30 @@ namespace chart { SchAxisLabelTabPage::SchAxisLabelTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_axisLabel.ui", "AxisLabelTabPage", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_axisLabel.ui"_ustr, u"AxisLabelTabPage"_ustr, &rInAttrs) , m_bShowStaggeringControls( true ) , m_nInitialDegrees( 0 ) , m_bHasInitialDegrees( true ) , m_bInitialStacking( false ) , m_bHasInitialStacking( true ) , m_bComplexCategories( false ) - , m_xCbShowDescription(m_xBuilder->weld_check_button("showlabelsCB")) - , m_xFlOrder(m_xBuilder->weld_label("orderL")) - , m_xRbSideBySide(m_xBuilder->weld_radio_button("tile")) - , m_xRbUpDown(m_xBuilder->weld_radio_button("odd")) - , m_xRbDownUp(m_xBuilder->weld_radio_button("even")) - , m_xRbAuto(m_xBuilder->weld_radio_button("auto")) - , m_xFlTextFlow(m_xBuilder->weld_label("textflowL")) - , m_xCbTextOverlap(m_xBuilder->weld_check_button("overlapCB")) - , m_xCbTextBreak(m_xBuilder->weld_check_button("breakCB")) - , m_xFtABCD(m_xBuilder->weld_label("labelABCD")) - , m_xFtRotate(m_xBuilder->weld_label("degreeL")) - , m_xNfRotate(m_xBuilder->weld_metric_spin_button("OrientDegree", FieldUnit::DEGREE)) - , m_xCbStacked(m_xBuilder->weld_check_button("stackedCB")) - , m_xFtTextDirection(m_xBuilder->weld_label("textdirL")) - , m_aLbTextDirection(m_xBuilder->weld_combo_box("textdirLB")) + , m_xCbShowDescription(m_xBuilder->weld_check_button(u"showlabelsCB"_ustr)) + , m_xFlOrder(m_xBuilder->weld_label(u"orderL"_ustr)) + , m_xRbSideBySide(m_xBuilder->weld_radio_button(u"tile"_ustr)) + , m_xRbUpDown(m_xBuilder->weld_radio_button(u"odd"_ustr)) + , m_xRbDownUp(m_xBuilder->weld_radio_button(u"even"_ustr)) + , m_xRbAuto(m_xBuilder->weld_radio_button(u"auto"_ustr)) + , m_xFlTextFlow(m_xBuilder->weld_label(u"textflowL"_ustr)) + , m_xCbTextOverlap(m_xBuilder->weld_check_button(u"overlapCB"_ustr)) + , m_xCbTextBreak(m_xBuilder->weld_check_button(u"breakCB"_ustr)) + , m_xFtABCD(m_xBuilder->weld_label(u"labelABCD"_ustr)) + , m_xFtRotate(m_xBuilder->weld_label(u"degreeL"_ustr)) + , m_xNfRotate(m_xBuilder->weld_metric_spin_button(u"OrientDegree"_ustr, FieldUnit::DEGREE)) + , m_xCbStacked(m_xBuilder->weld_check_button(u"stackedCB"_ustr)) + , m_xFtTextDirection(m_xBuilder->weld_label(u"textdirL"_ustr)) + , m_aLbTextDirection(m_xBuilder->weld_combo_box(u"textdirLB"_ustr)) , m_xCtrlDial(new svx::DialControl) - , m_xCtrlDialWin(new weld::CustomWeld(*m_xBuilder, "dialCtrl", *m_xCtrlDial)) + , m_xCtrlDialWin(new weld::CustomWeld(*m_xBuilder, u"dialCtrl"_ustr, *m_xCtrlDial)) { m_xCtrlDial->SetText(m_xFtABCD->get_label()); m_xCtrlDial->SetLinkedField(m_xNfRotate.get()); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 2e3988267c77..2faddaad81dd 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -33,26 +33,26 @@ namespace chart { AxisPositionsTabPage::AxisPositionsTabPage(weld::Container* pPage, weld::DialogController* pController,const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_AxisPositions.ui", "tp_AxisPositions", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_AxisPositions.ui"_ustr, u"tp_AxisPositions"_ustr, &rInAttrs) , m_pNumFormatter(nullptr) , m_bCrossingAxisIsCategoryAxis(false) , m_bSupportAxisPositioning(false) , m_bSupportCategoryPositioning(false) - , m_xFL_AxisLine(m_xBuilder->weld_frame("FL_AXIS_LINE")) - , m_xLB_CrossesAt(m_xBuilder->weld_combo_box("LB_CROSSES_OTHER_AXIS_AT")) - , m_xED_CrossesAt(m_xBuilder->weld_formatted_spin_button("EDT_CROSSES_OTHER_AXIS_AT")) - , m_xED_CrossesAtCategory(m_xBuilder->weld_combo_box( "EDT_CROSSES_OTHER_AXIS_AT_CATEGORY")) - , m_xFL_Position(m_xBuilder->weld_frame("FL_POSITION")) - , m_xRB_On(m_xBuilder->weld_radio_button("RB_ON")) - , m_xRB_Between(m_xBuilder->weld_radio_button("RB_BETWEEN")) - , m_xFL_Labels(m_xBuilder->weld_frame("FL_LABELS")) - , m_xLB_PlaceLabels(m_xBuilder->weld_combo_box("LB_PLACE_LABELS")) - , m_xCB_TicksInner(m_xBuilder->weld_check_button("CB_TICKS_INNER")) - , m_xCB_TicksOuter(m_xBuilder->weld_check_button("CB_TICKS_OUTER")) - , m_xCB_MinorInner(m_xBuilder->weld_check_button("CB_MINOR_INNER")) - , m_xCB_MinorOuter(m_xBuilder->weld_check_button("CB_MINOR_OUTER")) - , m_xBxPlaceTicks(m_xBuilder->weld_widget("boxPLACE_TICKS")) - , m_xLB_PlaceTicks(m_xBuilder->weld_combo_box("LB_PLACE_TICKS")) + , m_xFL_AxisLine(m_xBuilder->weld_frame(u"FL_AXIS_LINE"_ustr)) + , m_xLB_CrossesAt(m_xBuilder->weld_combo_box(u"LB_CROSSES_OTHER_AXIS_AT"_ustr)) + , m_xED_CrossesAt(m_xBuilder->weld_formatted_spin_button(u"EDT_CROSSES_OTHER_AXIS_AT"_ustr)) + , m_xED_CrossesAtCategory(m_xBuilder->weld_combo_box( u"EDT_CROSSES_OTHER_AXIS_AT_CATEGORY"_ustr)) + , m_xFL_Position(m_xBuilder->weld_frame(u"FL_POSITION"_ustr)) + , m_xRB_On(m_xBuilder->weld_radio_button(u"RB_ON"_ustr)) + , m_xRB_Between(m_xBuilder->weld_radio_button(u"RB_BETWEEN"_ustr)) + , m_xFL_Labels(m_xBuilder->weld_frame(u"FL_LABELS"_ustr)) + , m_xLB_PlaceLabels(m_xBuilder->weld_combo_box(u"LB_PLACE_LABELS"_ustr)) + , m_xCB_TicksInner(m_xBuilder->weld_check_button(u"CB_TICKS_INNER"_ustr)) + , m_xCB_TicksOuter(m_xBuilder->weld_check_button(u"CB_TICKS_OUTER"_ustr)) + , m_xCB_MinorInner(m_xBuilder->weld_check_button(u"CB_MINOR_INNER"_ustr)) + , m_xCB_MinorOuter(m_xBuilder->weld_check_button(u"CB_MINOR_OUTER"_ustr)) + , m_xBxPlaceTicks(m_xBuilder->weld_widget(u"boxPLACE_TICKS"_ustr)) + , m_xLB_PlaceTicks(m_xBuilder->weld_combo_box(u"LB_PLACE_TICKS"_ustr)) { m_xLB_CrossesAt->connect_changed(LINK(this, AxisPositionsTabPage, CrossesAtSelectHdl)); m_xLB_PlaceLabels->connect_changed(LINK(this, AxisPositionsTabPage, PlaceLabelsSelectHdl)); @@ -176,7 +176,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs) else { m_xED_CrossesAtCategory->set_active(-1); - m_xED_CrossesAt->set_text(""); + m_xED_CrossesAt->set_text(u""_ustr); } } else diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index b301a9794d5d..b92caf4902e9 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::chart2; ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, weld::DialogController* pController, rtl::Reference<::chart::ChartModel> xChartModel, bool bShowDescription) - : OWizardPage(pPage, pController, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType") + : OWizardPage(pPage, pController, u"modules/schart/ui/tp_ChartType.ui"_ustr, u"tp_ChartType"_ustr) , m_pDim3DLookResourceGroup( new Dim3DLookResourceGroup(m_xBuilder.get()) ) , m_pStackingResourceGroup( new StackingResourceGroup(m_xBuilder.get()) ) , m_pSplineResourceGroup( new SplineResourceGroup(m_xBuilder.get(), pController->getDialog()) ) @@ -52,10 +52,10 @@ ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, weld::DialogControlle , m_pCurrentMainType(nullptr) , m_nChangingCalls(0) , m_aTimerTriggeredControllerLock( m_xChartModel ) - , m_xFT_ChooseType(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD")) - , m_xMainTypeList(m_xBuilder->weld_tree_view("charttype")) - , m_xSubTypeList(new ValueSet(m_xBuilder->weld_scrolled_window("subtypewin", true))) - , m_xSubTypeListWin(new weld::CustomWeld(*m_xBuilder, "subtype", *m_xSubTypeList)) + , m_xFT_ChooseType(m_xBuilder->weld_label(u"FT_CAPTION_FOR_WIZARD"_ustr)) + , m_xMainTypeList(m_xBuilder->weld_tree_view(u"charttype"_ustr)) + , m_xSubTypeList(new ValueSet(m_xBuilder->weld_scrolled_window(u"subtypewin"_ustr, true))) + , m_xSubTypeListWin(new weld::CustomWeld(*m_xBuilder, u"subtype"_ustr, *m_xSubTypeList)) { Size aSize(m_xSubTypeList->GetDrawingArea()->get_ref_device().LogicToPixel(Size(150, 50), MapMode(MapUnit::MapAppFont))); m_xSubTypeListWin->set_size_request(aSize.Width(), aSize.Height()); @@ -85,7 +85,7 @@ ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, weld::DialogControlle { try { - xProps->getPropertyValue("EnableComplexChartTypes") >>= bEnableComplexChartTypes; + xProps->getPropertyValue(u"EnableComplexChartTypes"_ustr) >>= bEnableComplexChartTypes; } catch( const uno::Exception& ) { @@ -114,7 +114,7 @@ ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, weld::DialogControlle for (auto const& elem : m_aChartTypeDialogControllerList) { - m_xMainTypeList->append("", elem->getName(), elem->getImage()); + m_xMainTypeList->append(u""_ustr, elem->getName(), elem->getImage()); elem->setChangeListener( this ); } diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx index 3594e3e8ffeb..0bd8f6831f27 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.cxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx @@ -23,7 +23,7 @@ namespace chart { DataLabelsTabPage::DataLabelsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_DataLabel.ui", "tp_DataLabel", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_DataLabel.ui"_ustr, u"tp_DataLabel"_ustr, &rInAttrs) , m_aDataLabelResources(m_xBuilder.get(), pController->getDialog(), rInAttrs) { } diff --git a/chart2/source/controller/dialogs/tp_DataPointOption.cxx b/chart2/source/controller/dialogs/tp_DataPointOption.cxx index 4c824287206c..c7bdebde8370 100644 --- a/chart2/source/controller/dialogs/tp_DataPointOption.cxx +++ b/chart2/source/controller/dialogs/tp_DataPointOption.cxx @@ -27,9 +27,9 @@ namespace chart DataPointOptionTabPage::DataPointOptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_DataPointOption.ui", - "tp_DataPointOption", &rInAttrs) - , m_xCBHideLegendEntry(m_xBuilder->weld_check_button("CB_LEGEND_ENTRY_HIDDEN")) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_DataPointOption.ui"_ustr, + u"tp_DataPointOption"_ustr, &rInAttrs) + , m_xCBHideLegendEntry(m_xBuilder->weld_check_button(u"CB_LEGEND_ENTRY_HIDDEN"_ustr)) { } diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index fe4ba0981599..fdd7c9a83b62 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -105,7 +105,7 @@ OUString lcl_GetSelectedRolesRange( const weld::TreeView& rRoleListBox ) OUString lcl_GetSequenceNameForLabel(const ::chart::SeriesEntry* pEntry) { - OUString aResult("values-y"); + OUString aResult(u"values-y"_ustr); if (pEntry && pEntry->m_xChartType.is()) aResult = pEntry->m_xChartType->getRoleOfSequenceForSeriesLabel(); return aResult; @@ -160,28 +160,28 @@ DataSourceTabPage::DataSourceTabPage(weld::Container* pPage, weld::DialogControl DialogModel & rDialogModel, ChartTypeTemplateProvider* pTemplateProvider, bool bHideDescription /* = false */) - : ::vcl::OWizardPage(pPage, pController, "modules/schart/ui/tp_DataSource.ui", "tp_DataSource") + : ::vcl::OWizardPage(pPage, pController, u"modules/schart/ui/tp_DataSource.ui"_ustr, u"tp_DataSource"_ustr) , m_pTemplateProvider(pTemplateProvider) , m_rDialogModel(rDialogModel) , m_pCurrentRangeChoosingField( nullptr ) , m_bIsDirty( false ) , m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(pController)) - , m_xFT_CAPTION(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD")) - , m_xFT_SERIES(m_xBuilder->weld_label("FT_SERIES")) - , m_xLB_SERIES(m_xBuilder->weld_tree_view("LB_SERIES")) - , m_xBTN_ADD(m_xBuilder->weld_button("BTN_ADD")) - , m_xBTN_REMOVE(m_xBuilder->weld_button("BTN_REMOVE")) - , m_xBTN_UP(m_xBuilder->weld_button("BTN_UP")) - , m_xBTN_DOWN(m_xBuilder->weld_button("BTN_DOWN")) - , m_xFT_ROLE(m_xBuilder->weld_label("FT_ROLE")) - , m_xLB_ROLE(m_xBuilder->weld_tree_view("LB_ROLE")) - , m_xFT_RANGE(m_xBuilder->weld_label("FT_RANGE")) - , m_xEDT_RANGE(m_xBuilder->weld_entry("EDT_RANGE")) - , m_xIMB_RANGE_MAIN(m_xBuilder->weld_button("IMB_RANGE_MAIN")) - , m_xFT_CATEGORIES(m_xBuilder->weld_label("FT_CATEGORIES")) - , m_xFT_DATALABELS(m_xBuilder->weld_label("FT_DATALABELS")) - , m_xEDT_CATEGORIES(m_xBuilder->weld_entry("EDT_CATEGORIES")) - , m_xIMB_RANGE_CAT(m_xBuilder->weld_button("IMB_RANGE_CAT")) + , m_xFT_CAPTION(m_xBuilder->weld_label(u"FT_CAPTION_FOR_WIZARD"_ustr)) + , m_xFT_SERIES(m_xBuilder->weld_label(u"FT_SERIES"_ustr)) + , m_xLB_SERIES(m_xBuilder->weld_tree_view(u"LB_SERIES"_ustr)) + , m_xBTN_ADD(m_xBuilder->weld_button(u"BTN_ADD"_ustr)) + , m_xBTN_REMOVE(m_xBuilder->weld_button(u"BTN_REMOVE"_ustr)) + , m_xBTN_UP(m_xBuilder->weld_button(u"BTN_UP"_ustr)) + , m_xBTN_DOWN(m_xBuilder->weld_button(u"BTN_DOWN"_ustr)) + , m_xFT_ROLE(m_xBuilder->weld_label(u"FT_ROLE"_ustr)) + , m_xLB_ROLE(m_xBuilder->weld_tree_view(u"LB_ROLE"_ustr)) + , m_xFT_RANGE(m_xBuilder->weld_label(u"FT_RANGE"_ustr)) + , m_xEDT_RANGE(m_xBuilder->weld_entry(u"EDT_RANGE"_ustr)) + , m_xIMB_RANGE_MAIN(m_xBuilder->weld_button(u"IMB_RANGE_MAIN"_ustr)) + , m_xFT_CATEGORIES(m_xBuilder->weld_label(u"FT_CATEGORIES"_ustr)) + , m_xFT_DATALABELS(m_xBuilder->weld_label(u"FT_DATALABELS"_ustr)) + , m_xEDT_CATEGORIES(m_xBuilder->weld_entry(u"EDT_CATEGORIES"_ustr)) + , m_xIMB_RANGE_CAT(m_xBuilder->weld_button(u"IMB_RANGE_CAT"_ustr)) { m_xLB_SERIES->set_size_request(m_xLB_SERIES->get_approximate_digit_width() * 25, m_xLB_SERIES->get_height_rows(10)); @@ -510,7 +510,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, weld::Button&, voi OUString aUIStr(SchResId(STR_DATA_SELECT_RANGE_FOR_SERIES)); // replace role - OUString aReplacement( "%VALUETYPE" ); + OUString aReplacement( u"%VALUETYPE"_ustr ); sal_Int32 nIndex = aUIStr.indexOf( aReplacement ); if( nIndex != -1 ) { @@ -833,10 +833,10 @@ bool DataSourceTabPage::updateModelFromControl(const weld::Entry* pField) // "$Sheet1.$A$1" aRange = xNewSeq->getSourceRangeRepresentation(); Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW ); - xProp->setPropertyValue( "Role" , uno::Any( lcl_aLabelRole )); + xProp->setPropertyValue( u"Role"_ustr , uno::Any( lcl_aLabelRole )); //Labels should always include hidden cells, regardless of the setting chosen - xProp->setPropertyValue( "IncludeHiddenCells", uno::Any(true)); + xProp->setPropertyValue( u"IncludeHiddenCells"_ustr, uno::Any(true)); xLabeledSeq->setLabel( xNewSeq ); } } @@ -868,7 +868,7 @@ bool DataSourceTabPage::updateModelFromControl(const weld::Entry* pField) aRange = xNewSeq->getSourceRangeRepresentation(); Reference< beans::XPropertySet > xProp( xNewSeq, uno::UNO_QUERY_THROW ); - xProp->setPropertyValue( "Role" , uno::Any( aSelectedRole )); + xProp->setPropertyValue( u"Role"_ustr , uno::Any( aSelectedRole )); if( !xLabeledSeq.is()) { if( aSelectedRole == aSequenceNameForLabel ) diff --git a/chart2/source/controller/dialogs/tp_DataTable.cxx b/chart2/source/controller/dialogs/tp_DataTable.cxx index e6982b4a5067..acf447501483 100644 --- a/chart2/source/controller/dialogs/tp_DataTable.cxx +++ b/chart2/source/controller/dialogs/tp_DataTable.cxx @@ -13,8 +13,8 @@ namespace chart { DataTableTabPage::DataTableTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_DataTable.ui", "DataTableTabPage", - &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_DataTable.ui"_ustr, + u"DataTableTabPage"_ustr, &rInAttrs) , m_aDataTablePropertiesResources(*m_xBuilder) { } diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx index 927bf1130a43..8c63332e5e7d 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx @@ -25,7 +25,7 @@ namespace chart { ErrorBarsTabPage::ErrorBarsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_ErrorBars.ui", "tp_ErrorBars", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_ErrorBars.ui"_ustr, u"tp_ErrorBars"_ustr, &rInAttrs) , m_aErrorBarResources(m_xBuilder.get(), pController, rInAttrs, /* bNoneAvailable = */ false) { } diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx index 21a889bf854f..6c059cec7795 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx @@ -28,10 +28,10 @@ namespace chart { SchLegendPosTabPage::SchLegendPosTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_LegendPosition.ui", "tp_LegendPosition", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_LegendPosition.ui"_ustr, u"tp_LegendPosition"_ustr, &rInAttrs) , m_aLegendPositionResources(*m_xBuilder) - , m_aLbTextDirection(m_xBuilder->weld_combo_box("LB_LEGEND_TEXTDIR")) - , m_xCBLegendNoOverlay(m_xBuilder->weld_check_button("CB_NO_OVERLAY")) + , m_aLbTextDirection(m_xBuilder->weld_combo_box(u"LB_LEGEND_TEXTDIR"_ustr)) + , m_xCBLegendNoOverlay(m_xBuilder->weld_check_button(u"CB_NO_OVERLAY"_ustr)) { } diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 7c2c4d942e66..e9f1d1b957d7 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -29,7 +29,7 @@ namespace chart { SchLayoutTabPage::SchLayoutTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_ChartType.ui"_ustr, u"tp_ChartType"_ustr, &rInAttrs) { m_pGeometryResources.reset(new BarGeometryResources(m_xBuilder.get())); } diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index ad7b2b6f0f3e..cb646e3266be 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -28,14 +28,14 @@ namespace chart { PolarOptionsTabPage::PolarOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_PolarOptions.ui", "tp_PolarOptions", &rInAttrs) - , m_xCB_Clockwise(m_xBuilder->weld_check_button("CB_CLOCKWISE")) - , m_xFL_StartingAngle(m_xBuilder->weld_frame("frameANGLE")) - , m_xNF_StartingAngle(m_xBuilder->weld_metric_spin_button("NF_STARTING_ANGLE", FieldUnit::DEGREE)) - , m_xFL_PlotOptions(m_xBuilder->weld_frame("framePLOT_OPTIONS")) - , m_xCB_IncludeHiddenCells(m_xBuilder->weld_check_button("CB_INCLUDE_HIDDEN_CELLS_POLAR")) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_PolarOptions.ui"_ustr, u"tp_PolarOptions"_ustr, &rInAttrs) + , m_xCB_Clockwise(m_xBuilder->weld_check_button(u"CB_CLOCKWISE"_ustr)) + , m_xFL_StartingAngle(m_xBuilder->weld_frame(u"frameANGLE"_ustr)) + , m_xNF_StartingAngle(m_xBuilder->weld_metric_spin_button(u"NF_STARTING_ANGLE"_ustr, FieldUnit::DEGREE)) + , m_xFL_PlotOptions(m_xBuilder->weld_frame(u"framePLOT_OPTIONS"_ustr)) + , m_xCB_IncludeHiddenCells(m_xBuilder->weld_check_button(u"CB_INCLUDE_HIDDEN_CELLS_POLAR"_ustr)) , m_xAngleDial(new svx::DialControl) - , m_xAngleDialWin(new weld::CustomWeld(*m_xBuilder, "CT_ANGLE_DIAL", *m_xAngleDial)) + , m_xAngleDialWin(new weld::CustomWeld(*m_xBuilder, u"CT_ANGLE_DIAL"_ustr, *m_xAngleDial)) { m_xAngleDial->SetLinkedField(m_xNF_StartingAngle.get()); } diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index a88f6a826e0b..d5d4a621d8cf 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -62,26 +62,26 @@ using ::com::sun::star::uno::Sequence; RangeChooserTabPage::RangeChooserTabPage(weld::Container* pPage, weld::DialogController* pController, DialogModel & rDialogModel, ChartTypeTemplateProvider* pTemplateProvider, bool bHideDescription /* = false */) - : OWizardPage(pPage, pController, "modules/schart/ui/tp_RangeChooser.ui", "tp_RangeChooser") + : OWizardPage(pPage, pController, u"modules/schart/ui/tp_RangeChooser.ui"_ustr, u"tp_RangeChooser"_ustr) , m_nChangingControlCalls(0) , m_bIsDirty(false) , m_pTemplateProvider(pTemplateProvider) , m_rDialogModel( rDialogModel ) , m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(pController)) - , m_xFT_Caption(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD")) - , m_xED_Range(m_xBuilder->weld_entry("ED_RANGE")) - , m_xIB_Range(m_xBuilder->weld_button("IB_RANGE")) - , m_xRB_Rows(m_xBuilder->weld_radio_button("RB_DATAROWS")) - , m_xRB_Columns(m_xBuilder->weld_radio_button("RB_DATACOLS")) - , m_xCB_FirstRowAsLabel(m_xBuilder->weld_check_button("CB_FIRST_ROW_ASLABELS")) - , m_xCB_FirstColumnAsLabel(m_xBuilder->weld_check_button("CB_FIRST_COLUMN_ASLABELS")) - , m_xFTTitle(m_xBuilder->weld_label("STR_PAGE_DATA_RANGE")) - , m_xFL_TimeBased(m_xBuilder->weld_widget("separator1")) - , m_xCB_TimeBased(m_xBuilder->weld_check_button("CB_TIME_BASED")) - , m_xFT_TimeStart(m_xBuilder->weld_label("label1")) - , m_xEd_TimeStart(m_xBuilder->weld_entry("ED_TIME_BASED_START")) - , m_xFT_TimeEnd(m_xBuilder->weld_label("label2")) - , m_xEd_TimeEnd(m_xBuilder->weld_entry("ED_TIME_BASED_END")) + , m_xFT_Caption(m_xBuilder->weld_label(u"FT_CAPTION_FOR_WIZARD"_ustr)) + , m_xED_Range(m_xBuilder->weld_entry(u"ED_RANGE"_ustr)) + , m_xIB_Range(m_xBuilder->weld_button(u"IB_RANGE"_ustr)) + , m_xRB_Rows(m_xBuilder->weld_radio_button(u"RB_DATAROWS"_ustr)) + , m_xRB_Columns(m_xBuilder->weld_radio_button(u"RB_DATACOLS"_ustr)) + , m_xCB_FirstRowAsLabel(m_xBuilder->weld_check_button(u"CB_FIRST_ROW_ASLABELS"_ustr)) + , m_xCB_FirstColumnAsLabel(m_xBuilder->weld_check_button(u"CB_FIRST_COLUMN_ASLABELS"_ustr)) + , m_xFTTitle(m_xBuilder->weld_label(u"STR_PAGE_DATA_RANGE"_ustr)) + , m_xFL_TimeBased(m_xBuilder->weld_widget(u"separator1"_ustr)) + , m_xCB_TimeBased(m_xBuilder->weld_check_button(u"CB_TIME_BASED"_ustr)) + , m_xFT_TimeStart(m_xBuilder->weld_label(u"label1"_ustr)) + , m_xEd_TimeStart(m_xBuilder->weld_entry(u"ED_TIME_BASED_START"_ustr)) + , m_xFT_TimeEnd(m_xBuilder->weld_label(u"label2"_ustr)) + , m_xEd_TimeEnd(m_xBuilder->weld_entry(u"ED_TIME_BASED_END"_ustr)) { m_xFT_Caption->set_visible(!bHideDescription); @@ -216,7 +216,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls() { aArguments.realloc( aArguments.getLength() + 1 ); aArguments.getArray()[aArguments.getLength() - 1] = - beans::PropertyValue( "TimeBased", -1, uno::Any(bTimeBased), + beans::PropertyValue( u"TimeBased"_ustr, -1, uno::Any(bTimeBased), beans::PropertyState_DIRECT_VALUE ); } @@ -227,7 +227,7 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls() m_rDialogModel.setTemplate( m_xCurrentChartTypeTemplate ); aArguments.realloc( aArguments.getLength() + 1 ); aArguments.getArray()[aArguments.getLength() - 1] = - beans::PropertyValue( "CellRangeRepresentation" , -1, + beans::PropertyValue( u"CellRangeRepresentation"_ustr , -1, uno::Any( m_aLastValidRangeString ), beans::PropertyState_DIRECT_VALUE ); m_rDialogModel.setData( aArguments ); diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index b8c9f0598357..8d7ce3d9ff58 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -54,7 +54,7 @@ void lcl_setValue(weld::FormattedSpinButton& rFmtField, double fValue) } ScaleTabPage::ScaleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_Scale.ui", "tp_Scale", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_Scale.ui"_ustr, u"tp_Scale"_ustr, &rInAttrs) , fMin(0.0) , fMax(0.0) , fStepMain(0.0) @@ -67,31 +67,31 @@ ScaleTabPage::ScaleTabPage(weld::Container* pPage, weld::DialogController* pCont , m_bAllowDateAxis(false) , pNumFormatter(nullptr) , m_bShowAxisOrigin(false) - , m_xCbxReverse(m_xBuilder->weld_check_button("CBX_REVERSE")) - , m_xCbxLogarithm(m_xBuilder->weld_check_button("CBX_LOGARITHM")) - , m_xBxType(m_xBuilder->weld_widget("boxTYPE")) - , m_xLB_AxisType(m_xBuilder->weld_combo_box("LB_AXIS_TYPE")) - , m_xBxMinMax(m_xBuilder->weld_widget("gridMINMAX")) - , m_xFmtFldMin(m_xBuilder->weld_formatted_spin_button("EDT_MIN")) - , m_xCbxAutoMin(m_xBuilder->weld_check_button("CBX_AUTO_MIN")) - , m_xFmtFldMax(m_xBuilder->weld_formatted_spin_button("EDT_MAX")) - , m_xCbxAutoMax(m_xBuilder->weld_check_button("CBX_AUTO_MAX")) - , m_xBxResolution(m_xBuilder->weld_widget("boxRESOLUTION")) - , m_xLB_TimeResolution(m_xBuilder->weld_combo_box("LB_TIME_RESOLUTION")) - , m_xCbx_AutoTimeResolution(m_xBuilder->weld_check_button("CBX_AUTO_TIME_RESOLUTION")) - , m_xTxtMain(m_xBuilder->weld_label("TXT_STEP_MAIN")) - , m_xFmtFldStepMain(m_xBuilder->weld_formatted_spin_button("EDT_STEP_MAIN")) - , m_xMt_MainDateStep(m_xBuilder->weld_spin_button("MT_MAIN_DATE_STEP")) - , m_xLB_MainTimeUnit(m_xBuilder->weld_combo_box("LB_MAIN_TIME_UNIT")) - , m_xCbxAutoStepMain(m_xBuilder->weld_check_button("CBX_AUTO_STEP_MAIN")) - , m_xTxtHelpCount(m_xBuilder->weld_label("TXT_STEP_HELP_COUNT")) - , m_xTxtHelp(m_xBuilder->weld_label("TXT_STEP_HELP")) - , m_xMtStepHelp(m_xBuilder->weld_spin_button("MT_STEPHELP")) - , m_xLB_HelpTimeUnit(m_xBuilder->weld_combo_box("LB_HELP_TIME_UNIT")) - , m_xCbxAutoStepHelp(m_xBuilder->weld_check_button("CBX_AUTO_STEP_HELP")) - , m_xFmtFldOrigin(m_xBuilder->weld_formatted_spin_button("EDT_ORIGIN")) - , m_xCbxAutoOrigin(m_xBuilder->weld_check_button("CBX_AUTO_ORIGIN")) - , m_xBxOrigin(m_xBuilder->weld_widget("boxORIGIN")) + , m_xCbxReverse(m_xBuilder->weld_check_button(u"CBX_REVERSE"_ustr)) + , m_xCbxLogarithm(m_xBuilder->weld_check_button(u"CBX_LOGARITHM"_ustr)) + , m_xBxType(m_xBuilder->weld_widget(u"boxTYPE"_ustr)) + , m_xLB_AxisType(m_xBuilder->weld_combo_box(u"LB_AXIS_TYPE"_ustr)) + , m_xBxMinMax(m_xBuilder->weld_widget(u"gridMINMAX"_ustr)) + , m_xFmtFldMin(m_xBuilder->weld_formatted_spin_button(u"EDT_MIN"_ustr)) + , m_xCbxAutoMin(m_xBuilder->weld_check_button(u"CBX_AUTO_MIN"_ustr)) + , m_xFmtFldMax(m_xBuilder->weld_formatted_spin_button(u"EDT_MAX"_ustr)) + , m_xCbxAutoMax(m_xBuilder->weld_check_button(u"CBX_AUTO_MAX"_ustr)) + , m_xBxResolution(m_xBuilder->weld_widget(u"boxRESOLUTION"_ustr)) + , m_xLB_TimeResolution(m_xBuilder->weld_combo_box(u"LB_TIME_RESOLUTION"_ustr)) + , m_xCbx_AutoTimeResolution(m_xBuilder->weld_check_button(u"CBX_AUTO_TIME_RESOLUTION"_ustr)) + , m_xTxtMain(m_xBuilder->weld_label(u"TXT_STEP_MAIN"_ustr)) + , m_xFmtFldStepMain(m_xBuilder->weld_formatted_spin_button(u"EDT_STEP_MAIN"_ustr)) + , m_xMt_MainDateStep(m_xBuilder->weld_spin_button(u"MT_MAIN_DATE_STEP"_ustr)) + , m_xLB_MainTimeUnit(m_xBuilder->weld_combo_box(u"LB_MAIN_TIME_UNIT"_ustr)) + , m_xCbxAutoStepMain(m_xBuilder->weld_check_button(u"CBX_AUTO_STEP_MAIN"_ustr)) + , m_xTxtHelpCount(m_xBuilder->weld_label(u"TXT_STEP_HELP_COUNT"_ustr)) + , m_xTxtHelp(m_xBuilder->weld_label(u"TXT_STEP_HELP"_ustr)) + , m_xMtStepHelp(m_xBuilder->weld_spin_button(u"MT_STEPHELP"_ustr)) + , m_xLB_HelpTimeUnit(m_xBuilder->weld_combo_box(u"LB_HELP_TIME_UNIT"_ustr)) + , m_xCbxAutoStepHelp(m_xBuilder->weld_check_button(u"CBX_AUTO_STEP_HELP"_ustr)) + , m_xFmtFldOrigin(m_xBuilder->weld_formatted_spin_button(u"EDT_ORIGIN"_ustr)) + , m_xCbxAutoOrigin(m_xBuilder->weld_check_button(u"CBX_AUTO_ORIGIN"_ustr)) + , m_xBxOrigin(m_xBuilder->weld_widget(u"boxORIGIN"_ustr)) { m_xCbxAutoMin->connect_toggled(LINK(this, ScaleTabPage, EnableValueHdl)); m_xCbxAutoMax->connect_toggled(LINK(this, ScaleTabPage, EnableValueHdl)); diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index 3ffbc3642e9c..ee6dabc07a6f 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -31,26 +31,26 @@ namespace chart { SchOptionTabPage::SchOptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_SeriesToAxis.ui", "TP_OPTIONS", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_SeriesToAxis.ui"_ustr, u"TP_OPTIONS"_ustr, &rInAttrs) , m_nAllSeriesAxisIndex(0) , m_bProvidesSecondaryYAxis(true) , m_bProvidesOverlapAndGapWidth(false) , m_bProvidesBarConnectors(false) - , m_xGrpAxis(m_xBuilder->weld_widget("frameGrpAxis")) - , m_xRbtAxis1(m_xBuilder->weld_radio_button("RBT_OPT_AXIS_1")) - , m_xRbtAxis2(m_xBuilder->weld_radio_button("RBT_OPT_AXIS_2")) - , m_xGrpBar(m_xBuilder->weld_widget("frameSettings")) - , m_xMTGap(m_xBuilder->weld_metric_spin_button("MT_GAP", FieldUnit::PERCENT)) - , m_xMTOverlap(m_xBuilder->weld_metric_spin_button("MT_OVERLAP", FieldUnit::PERCENT)) - , m_xCBConnect(m_xBuilder->weld_check_button("CB_CONNECTOR")) - , m_xCBAxisSideBySide(m_xBuilder->weld_check_button("CB_BARS_SIDE_BY_SIDE")) - , m_xGrpPlotOptions(m_xBuilder->weld_widget("frameFL_PLOT_OPTIONS")) - , m_xGridPlotOptions(m_xBuilder->weld_widget("gridPLOT_OPTIONS")) - , m_xRB_DontPaint(m_xBuilder->weld_radio_button("RB_DONT_PAINT")) - , m_xRB_AssumeZero(m_xBuilder->weld_radio_button("RB_ASSUME_ZERO")) - , m_xRB_ContinueLine(m_xBuilder->weld_radio_button("RB_CONTINUE_LINE")) - , m_xCBIncludeHiddenCells(m_xBuilder->weld_check_button("CB_INCLUDE_HIDDEN_CELLS")) - , m_xCBHideLegendEntry(m_xBuilder->weld_check_button("CB_LEGEND_ENTRY_HIDDEN")) + , m_xGrpAxis(m_xBuilder->weld_widget(u"frameGrpAxis"_ustr)) + , m_xRbtAxis1(m_xBuilder->weld_radio_button(u"RBT_OPT_AXIS_1"_ustr)) + , m_xRbtAxis2(m_xBuilder->weld_radio_button(u"RBT_OPT_AXIS_2"_ustr)) + , m_xGrpBar(m_xBuilder->weld_widget(u"frameSettings"_ustr)) + , m_xMTGap(m_xBuilder->weld_metric_spin_button(u"MT_GAP"_ustr, FieldUnit::PERCENT)) + , m_xMTOverlap(m_xBuilder->weld_metric_spin_button(u"MT_OVERLAP"_ustr, FieldUnit::PERCENT)) + , m_xCBConnect(m_xBuilder->weld_check_button(u"CB_CONNECTOR"_ustr)) + , m_xCBAxisSideBySide(m_xBuilder->weld_check_button(u"CB_BARS_SIDE_BY_SIDE"_ustr)) + , m_xGrpPlotOptions(m_xBuilder->weld_widget(u"frameFL_PLOT_OPTIONS"_ustr)) + , m_xGridPlotOptions(m_xBuilder->weld_widget(u"gridPLOT_OPTIONS"_ustr)) + , m_xRB_DontPaint(m_xBuilder->weld_radio_button(u"RB_DONT_PAINT"_ustr)) + , m_xRB_AssumeZero(m_xBuilder->weld_radio_button(u"RB_ASSUME_ZERO"_ustr)) + , m_xRB_ContinueLine(m_xBuilder->weld_radio_button(u"RB_CONTINUE_LINE"_ustr)) + , m_xCBIncludeHiddenCells(m_xBuilder->weld_check_button(u"CB_INCLUDE_HIDDEN_CELLS"_ustr)) + , m_xCBHideLegendEntry(m_xBuilder->weld_check_button(u"CB_LEGEND_ENTRY_HIDDEN"_ustr)) { m_xRbtAxis1->connect_toggled(LINK(this, SchOptionTabPage, EnableHdl)); m_xRbtAxis2->connect_toggled(LINK(this, SchOptionTabPage, EnableHdl)); diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index f3380042eb13..11a3795fb3cd 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -31,14 +31,14 @@ namespace chart SchAlignmentTabPage::SchAlignmentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs, bool bWithRotation) - : SfxTabPage(pPage, pController, "modules/schart/ui/titlerotationtabpage.ui", "TitleRotationTabPage", &rInAttrs) - , m_xFtRotate(m_xBuilder->weld_label("degreeL")) - , m_xNfRotate(m_xBuilder->weld_metric_spin_button("OrientDegree", FieldUnit::DEGREE)) - , m_xCbStacked(m_xBuilder->weld_check_button("stackedCB")) - , m_xFtABCD(m_xBuilder->weld_label("labelABCD")) - , m_aLbTextDirection(m_xBuilder->weld_combo_box("textdirLB")) + : SfxTabPage(pPage, pController, u"modules/schart/ui/titlerotationtabpage.ui"_ustr, u"TitleRotationTabPage"_ustr, &rInAttrs) + , m_xFtRotate(m_xBuilder->weld_label(u"degreeL"_ustr)) + , m_xNfRotate(m_xBuilder->weld_metric_spin_button(u"OrientDegree"_ustr, FieldUnit::DEGREE)) + , m_xCbStacked(m_xBuilder->weld_check_button(u"stackedCB"_ustr)) + , m_xFtABCD(m_xBuilder->weld_label(u"labelABCD"_ustr)) + , m_aLbTextDirection(m_xBuilder->weld_combo_box(u"textdirLB"_ustr)) , m_xCtrlDial(new svx::DialControl) - , m_xCtrlDialWin(new weld::CustomWeld(*m_xBuilder, "dialCtrl", *m_xCtrlDial)) + , m_xCtrlDialWin(new weld::CustomWeld(*m_xBuilder, u"dialCtrl"_ustr, *m_xCtrlDial)) { m_xCtrlDial->SetLinkedField(m_xNfRotate.get()); m_xCtrlDial->SetText(m_xFtABCD->get_label()); diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx index fe25959bdd51..cace8a073b87 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.cxx +++ b/chart2/source/controller/dialogs/tp_Trendline.cxx @@ -23,7 +23,7 @@ namespace chart { TrendlineTabPage::TrendlineTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs) - : SfxTabPage(pPage, pController, "modules/schart/ui/tp_Trendline.ui", "TP_TRENDLINE", &rInAttrs) + : SfxTabPage(pPage, pController, u"modules/schart/ui/tp_Trendline.ui"_ustr, u"TP_TRENDLINE"_ustr, &rInAttrs) , m_aTrendlineResources(*m_xBuilder, rInAttrs) { } diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index 4e813b4593fa..480bf3fe20b6 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -34,16 +34,16 @@ using namespace ::com::sun::star::chart2; TitlesAndObjectsTabPage::TitlesAndObjectsTabPage(weld::Container* pPage, weld::DialogController* pController, rtl::Reference<::chart::ChartModel> xChartModel, const uno::Reference< uno::XComponentContext >& xContext ) - : OWizardPage(pPage, pController, "modules/schart/ui/wizelementspage.ui", "WizElementsPage") + : OWizardPage(pPage, pController, u"modules/schart/ui/wizelementspage.ui"_ustr, u"WizElementsPage"_ustr) , m_xTitleResources(new TitleResources(*m_xBuilder, false)) , m_xLegendPositionResources(new LegendPositionResources(*m_xBuilder, xContext)) , m_xChartModel(std::move(xChartModel)) , m_xCC(xContext) , m_bCommitToModel(true) , m_aTimerTriggeredControllerLock( m_xChartModel ) - , m_xCB_Grid_X(m_xBuilder->weld_check_button("x")) - , m_xCB_Grid_Y(m_xBuilder->weld_check_button("y")) - , m_xCB_Grid_Z(m_xBuilder->weld_check_button("z")) + , m_xCB_Grid_X(m_xBuilder->weld_check_button(u"x"_ustr)) + , m_xCB_Grid_Y(m_xBuilder->weld_check_button(u"y"_ustr)) + , m_xCB_Grid_Z(m_xBuilder->weld_check_button(u"z"_ustr)) { m_xTitleResources->connect_changed( LINK( this, TitlesAndObjectsTabPage, ChangeEditHdl )); m_xLegendPositionResources->SetChangeHdl( LINK( this, TitlesAndObjectsTabPage, ChangeHdl )); diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index c91eb41dbe97..4876b5ab3ac6 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -98,7 +98,7 @@ AxisItemConverter::AxisItemConverter( xChartDoc, GraphicObjectType::LineProperties )); m_aConverters.emplace_back( - new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, "ReferencePageSize")); + new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, u"ReferencePageSize"_ustr)); m_xAxis = dynamic_cast<::chart::Axis*>(rPropertySet.get()); assert(m_xAxis); @@ -335,7 +335,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SCHATTR_AXIS_POSITION: { css::chart::ChartAxisPosition eAxisPos( css::chart::ChartAxisPosition_ZERO ); - GetPropertySet()->getPropertyValue( "CrossoverPosition" ) >>= eAxisPos; + GetPropertySet()->getPropertyValue( u"CrossoverPosition"_ustr ) >>= eAxisPos; rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast<sal_Int32>(eAxisPos) ) ); } break; @@ -343,7 +343,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SCHATTR_AXIS_POSITION_VALUE: { double fValue = 0.0; - if( GetPropertySet()->getPropertyValue( "CrossoverValue" ) >>= fValue ) + if( GetPropertySet()->getPropertyValue( u"CrossoverValue"_ustr ) >>= fValue ) rOutItemSet.Put( SvxDoubleItem( fValue, SCHATTR_AXIS_POSITION_VALUE ) ); } break; @@ -372,7 +372,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SCHATTR_AXIS_LABEL_POSITION: { css::chart::ChartAxisLabelPosition ePos( css::chart::ChartAxisLabelPosition_NEAR_AXIS ); - GetPropertySet()->getPropertyValue( "LabelPosition" ) >>= ePos; + GetPropertySet()->getPropertyValue( u"LabelPosition"_ustr ) >>= ePos; rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast<sal_Int32>(ePos) ) ); } break; @@ -380,7 +380,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI case SCHATTR_AXIS_MARK_POSITION: { css::chart::ChartAxisMarkPosition ePos( css::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ); - GetPropertySet()->getPropertyValue( "MarkPosition" ) >>= ePos; + GetPropertySet()->getPropertyValue( u"MarkPosition"_ustr ) >>= ePos; rOutItemSet.Put( SfxInt32Item( nWhichId, static_cast<sal_Int32>(ePos) ) ); } break; @@ -390,7 +390,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI // convert double to int (times 100) double fVal = 0; - if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fVal ) + if( GetPropertySet()->getPropertyValue( u"TextRotation"_ustr ) >>= fVal ) { rOutItemSet.Put( SdrAngleItem( SCHATTR_TEXT_DEGREES, Degree100(static_cast< sal_Int32 >( ::rtl::math::round( fVal * 100.0 )) ) )); @@ -727,11 +727,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet double fValue = 0.0; if( aValue >>= fValue ) { - xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::Any( css::chart::ChartAxisPosition_VALUE )); - xCrossingMainAxis->setPropertyValue( "CrossoverValue" , uno::Any( fValue )); + xCrossingMainAxis->setPropertyValue( u"CrossoverPosition"_ustr , uno::Any( css::chart::ChartAxisPosition_VALUE )); + xCrossingMainAxis->setPropertyValue( u"CrossoverValue"_ustr , uno::Any( fValue )); } else - xCrossingMainAxis->setPropertyValue( "CrossoverPosition" , uno::Any( css::chart::ChartAxisPosition_START )); + xCrossingMainAxis->setPropertyValue( u"CrossoverPosition"_ustr , uno::Any( css::chart::ChartAxisPosition_START )); } } } @@ -746,11 +746,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet static_cast<css::chart::ChartAxisPosition>(static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue()); css::chart::ChartAxisPosition eOldAxisPos( css::chart::ChartAxisPosition_ZERO ); - bool bPropExisted = ( GetPropertySet()->getPropertyValue( "CrossoverPosition" ) >>= eOldAxisPos ); + bool bPropExisted = ( GetPropertySet()->getPropertyValue( u"CrossoverPosition"_ustr ) >>= eOldAxisPos ); if( !bPropExisted || ( eOldAxisPos != eAxisPos )) { - GetPropertySet()->setPropertyValue( "CrossoverPosition" , uno::Any( eAxisPos )); + GetPropertySet()->setPropertyValue( u"CrossoverPosition"_ustr , uno::Any( eAxisPos )); bChangedOtherwise = true; //move the parallel axes to the other side if necessary @@ -761,7 +761,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet if( xParallelAxis.is() ) { css::chart::ChartAxisPosition eOtherPos; - if( xParallelAxis->getPropertyValue( "CrossoverPosition" ) >>= eOtherPos ) + if( xParallelAxis->getPropertyValue( u"CrossoverPosition"_ustr ) >>= eOtherPos ) { if( eOtherPos == eAxisPos ) { @@ -769,7 +769,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet (eAxisPos==css::chart::ChartAxisPosition_START) ? css::chart::ChartAxisPosition_END : css::chart::ChartAxisPosition_START; - xParallelAxis->setPropertyValue( "CrossoverPosition" , uno::Any( eOppositePos )); + xParallelAxis->setPropertyValue( u"CrossoverPosition"_ustr , uno::Any( eOppositePos )); } } } @@ -783,11 +783,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet double fValue = static_cast< const SvxDoubleItem & >( rItemSet.Get( nWhichId )).GetValue(); double fOldValue = 0.0; - bool bPropExisted = ( GetPropertySet()->getPropertyValue( "CrossoverValue" ) >>= fOldValue ); + bool bPropExisted = ( GetPropertySet()->getPropertyValue( u"CrossoverValue"_ustr ) >>= fOldValue ); if( !bPropExisted || ( fOldValue != fValue )) { - GetPropertySet()->setPropertyValue( "CrossoverValue" , uno::Any( fValue )); + GetPropertySet()->setPropertyValue( u"CrossoverValue"_ustr , uno::Any( fValue )); bChangedOtherwise = true; //keep old and new settings for axis positioning in sync somehow @@ -830,11 +830,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet static_cast<css::chart::ChartAxisLabelPosition>(static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue()); css::chart::ChartAxisLabelPosition eOldPos( css::chart::ChartAxisLabelPosition_NEAR_AXIS ); - bool bPropExisted = ( GetPropertySet()->getPropertyValue( "LabelPosition" ) >>= eOldPos ); + bool bPropExisted = ( GetPropertySet()->getPropertyValue( u"LabelPosition"_ustr ) >>= eOldPos ); if( !bPropExisted || ( eOldPos != ePos )) { - GetPropertySet()->setPropertyValue( "LabelPosition" , uno::Any( ePos )); + GetPropertySet()->setPropertyValue( u"LabelPosition"_ustr , uno::Any( ePos )); bChangedOtherwise = true; //move the parallel axes to the other side if necessary @@ -845,7 +845,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet if( xParallelAxis.is() ) { css::chart::ChartAxisLabelPosition eOtherPos; - if( xParallelAxis->getPropertyValue( "LabelPosition" ) >>= eOtherPos ) + if( xParallelAxis->getPropertyValue( u"LabelPosition"_ustr ) >>= eOtherPos ) { if( eOtherPos == ePos ) { @@ -853,7 +853,7 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet (ePos==css::chart::ChartAxisLabelPosition_OUTSIDE_START) ? css::chart::ChartAxisLabelPosition_OUTSIDE_END : css::chart::ChartAxisLabelPosition_OUTSIDE_START; - xParallelAxis->setPropertyValue( "LabelPosition" , uno::Any( eOppositePos )); + xParallelAxis->setPropertyValue( u"LabelPosition"_ustr , uno::Any( eOppositePos )); } } } @@ -868,11 +868,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet static_cast<css::chart::ChartAxisMarkPosition>(static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue()); css::chart::ChartAxisMarkPosition eOldPos( css::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ); - bool bPropExisted = ( GetPropertySet()->getPropertyValue( "MarkPosition" ) >>= eOldPos ); + bool bPropExisted = ( GetPropertySet()->getPropertyValue( u"MarkPosition"_ustr ) >>= eOldPos ); if( !bPropExisted || ( eOldPos != ePos )) { - GetPropertySet()->setPropertyValue( "MarkPosition" , uno::Any( ePos )); + GetPropertySet()->setPropertyValue( u"MarkPosition"_ustr , uno::Any( ePos )); bChangedOtherwise = true; } } @@ -883,11 +883,11 @@ bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet double fVal = toDegrees(rItemSet.Get(SCHATTR_TEXT_DEGREES).GetValue()); double fOldVal = 0.0; bool bPropExisted = - ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldVal ); + ( GetPropertySet()->getPropertyValue( u"TextRotation"_ustr ) >>= fOldVal ); if( ! bPropExisted || fOldVal != fVal ) { - GetPropertySet()->setPropertyValue( "TextRotation" , uno::Any( fVal )); + GetPropertySet()->setPropertyValue( u"TextRotation"_ustr , uno::Any( fVal )); bChangedOtherwise = true; } } diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index a338ae70b4b8..a924d6db1803 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -142,21 +142,21 @@ void CharacterPropertyItemConverter::FillSpecialItem( SvxUnderlineItem aItem(LINESTYLE_NONE, EE_CHAR_UNDERLINE); bool bModified = false; - uno::Any aValue( GetPropertySet()->getPropertyValue( "CharUnderline" )); + uno::Any aValue( GetPropertySet()->getPropertyValue( u"CharUnderline"_ustr )); if( aValue.hasValue()) { aItem.PutValue( aValue, MID_TL_STYLE ); bModified = true; } - aValue = GetPropertySet()->getPropertyValue( "CharUnderlineHasColor" ); + aValue = GetPropertySet()->getPropertyValue( u"CharUnderlineHasColor"_ustr ); if( aValue.hasValue() && *o3tl::doAccess<bool>(aValue) ) { aItem.PutValue( aValue, MID_TL_HASCOLOR ); bModified = true; } - aValue = GetPropertySet()->getPropertyValue( "CharUnderlineColor" ); + aValue = GetPropertySet()->getPropertyValue( u"CharUnderlineColor"_ustr ); if( aValue.hasValue()) { aItem.PutValue( aValue, MID_TL_COLOR ); @@ -173,21 +173,21 @@ void CharacterPropertyItemConverter::FillSpecialItem( SvxOverlineItem aItem( LINESTYLE_NONE, EE_CHAR_OVERLINE ); bool bModified = false; - uno::Any aValue( GetPropertySet()->getPropertyValue( "CharOverline" ) ); + uno::Any aValue( GetPropertySet()->getPropertyValue( u"CharOverline"_ustr ) ); if ( aValue.hasValue() ) { aItem.PutValue( aValue, MID_TL_STYLE ); bModified = true; } - aValue = GetPropertySet()->getPropertyValue( "CharOverlineHasColor" ); + aValue = GetPropertySet()->getPropertyValue( u"CharOverlineHasColor"_ustr ); if ( aValue.hasValue() && *o3tl::doAccess<bool>(aValue) ) { aItem.PutValue( aValue, MID_TL_HASCOLOR ); bModified = true; } - aValue = GetPropertySet()->getPropertyValue( "CharOverlineColor" ); + aValue = GetPropertySet()->getPropertyValue( u"CharOverlineColor"_ustr ); if ( aValue.hasValue() ) { aItem.PutValue( aValue, MID_TL_COLOR ); @@ -377,27 +377,27 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( if( rItem.QueryValue( aValue, MID_TL_STYLE )) { - if( aValue != GetPropertySet()->getPropertyValue( "CharUnderline" )) + if( aValue != GetPropertySet()->getPropertyValue( u"CharUnderline"_ustr )) { - GetPropertySet()->setPropertyValue( "CharUnderline" , aValue ); + GetPropertySet()->setPropertyValue( u"CharUnderline"_ustr , aValue ); bChanged = true; } } if( rItem.QueryValue( aValue, MID_TL_COLOR )) { - if( aValue != GetPropertySet()->getPropertyValue( "CharUnderlineColor" )) + if( aValue != GetPropertySet()->getPropertyValue( u"CharUnderlineColor"_ustr )) { - GetPropertySet()->setPropertyValue( "CharUnderlineColor" , aValue ); + GetPropertySet()->setPropertyValue( u"CharUnderlineColor"_ustr , aValue ); bChanged = true; } } if( rItem.QueryValue( aValue, MID_TL_HASCOLOR )) { - if( aValue != GetPropertySet()->getPropertyValue( "CharUnderlineHasColor" )) + if( aValue != GetPropertySet()->getPropertyValue( u"CharUnderlineHasColor"_ustr )) { - GetPropertySet()->setPropertyValue( "CharUnderlineHasColor" , aValue ); + GetPropertySet()->setPropertyValue( u"CharUnderlineHasColor"_ustr , aValue ); bChanged = true; } } @@ -410,27 +410,27 @@ bool CharacterPropertyItemConverter::ApplySpecialItem( if ( rItem.QueryValue( aValue, MID_TL_STYLE ) ) { - if ( aValue != GetPropertySet()->getPropertyValue( "CharOverline" ) ) + if ( aValue != GetPropertySet()->getPropertyValue( u"CharOverline"_ustr ) ) { - GetPropertySet()->setPropertyValue( "CharOverline" , aValue ); + GetPropertySet()->setPropertyValue( u"CharOverline"_ustr , aValue ); bChanged = true; } } if ( rItem.QueryValue( aValue, MID_TL_COLOR ) ) { - if ( aValue != GetPropertySet()->getPropertyValue( "CharOverlineColor" ) ) + if ( aValue != GetPropertySet()->getPropertyValue( u"CharOverlineColor"_ustr ) ) { - GetPropertySet()->setPropertyValue( "CharOverlineColor" , aValue ); + GetPropertySet()->setPropertyValue( u"CharOverlineColor"_ustr , aValue ); bChanged = true; } } if ( rItem.QueryValue( aValue, MID_TL_HASCOLOR ) ) { - if ( aValue != GetPropertySet()->getPropertyValue( "CharOverlineHasColor" ) ) + if ( aValue != GetPropertySet()->getPropertyValue( u"CharOverlineHasColor"_ustr ) ) { - GetPropertySet()->setPropertyValue( "CharOverlineHasColor" , aValue ); + GetPropertySet()->setPropertyValue( u"CharOverlineHasColor"_ustr , aValue ); bChanged = true; } } diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 571f98a56952..cc00f5f300ba 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -106,7 +106,7 @@ bool lcl_NumberFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxItemSe bool bChanged = false; if( !xPropertySet.is() ) return bChanged; - OUString aPropertyName = (nWhichId==SID_ATTR_NUMBERFORMAT_VALUE) ? CHART_UNONAME_NUMFMT : OUString( "PercentageNumberFormat" ); + OUString aPropertyName = (nWhichId==SID_ATTR_NUMBERFORMAT_VALUE) ? CHART_UNONAME_NUMFMT : u"PercentageNumberFormat"_ustr; sal_uInt16 nSourceWhich = (nWhichId==SID_ATTR_NUMBERFORMAT_VALUE) ? SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE; if( rItemSet.GetItemState( nSourceWhich ) != SfxItemState::SET ) @@ -153,7 +153,7 @@ bool lcl_UseSourceFormatFromItemToPropertySet( sal_uInt16 nWhichId, const SfxIte bool bChanged = false; if( !xPropertySet.is() ) return bChanged; - OUString aPropertyName = (nWhichId==SID_ATTR_NUMBERFORMAT_SOURCE) ? CHART_UNONAME_NUMFMT : OUString( "PercentageNumberFormat" ); + OUString aPropertyName = (nWhichId==SID_ATTR_NUMBERFORMAT_SOURCE) ? CHART_UNONAME_NUMFMT : u"PercentageNumberFormat"_ustr; sal_uInt16 nFormatWhich = (nWhichId==SID_ATTR_NUMBERFORMAT_SOURCE) ? SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE; if( rItemSet.GetItemState( nWhichId ) != SfxItemState::SET ) @@ -230,7 +230,7 @@ DataPointItemConverter::DataPointItemConverter( { m_aConverters.emplace_back( new GraphicPropertyItemConverter( rPropertySet, rItemPool, rDrawModel, xNamedPropertyContainerFactory, eMapTo )); - m_aConverters.emplace_back( new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, "ReferencePageSize")); + m_aConverters.emplace_back( new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, u"ReferencePageSize"_ustr)); if( bDataSeries ) { assert(dynamic_cast<DataSeries*>(rPropertySet.get())); @@ -379,20 +379,20 @@ bool DataPointItemConverter::ApplySpecialItem( try { OUString aOldValue; - GetPropertySet()->getPropertyValue( "LabelSeparator" ) >>= aOldValue; + GetPropertySet()->getPropertyValue( u"LabelSeparator"_ustr ) >>= aOldValue; if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { rtl::Reference<DataSeries> xSeries(dynamic_cast<DataSeries*>(GetPropertySet().get())); if( aOldValue != aNewValue || - DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelSeparator" , uno::Any( aOldValue ) ) ) + DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, u"LabelSeparator"_ustr , uno::Any( aOldValue ) ) ) { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelSeparator" , uno::Any( aNewValue ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"LabelSeparator"_ustr , uno::Any( aNewValue ) ); bChanged = true; } } else if( aOldValue != aNewValue ) { - GetPropertySet()->setPropertyValue( "LabelSeparator" , uno::Any( aNewValue )); + GetPropertySet()->setPropertyValue( u"LabelSeparator"_ustr , uno::Any( aNewValue )); bChanged = true; } } @@ -410,20 +410,20 @@ bool DataPointItemConverter::ApplySpecialItem( { bool bNew = static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue(); bool bOld = false; - GetPropertySet()->getPropertyValue( "TextWordWrap" ) >>= bOld; + GetPropertySet()->getPropertyValue( u"TextWordWrap"_ustr ) >>= bOld; if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { rtl::Reference<DataSeries> xSeries(dynamic_cast<DataSeries*>(GetPropertySet().get())); if( bOld!=bNew || - DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "TextWordWrap", uno::Any( bOld ) ) ) + DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, u"TextWordWrap"_ustr, uno::Any( bOld ) ) ) { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "TextWordWrap", uno::Any( bNew ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"TextWordWrap"_ustr, uno::Any( bNew ) ); bChanged = true; } } else if( bOld!=bNew ) { - GetPropertySet()->setPropertyValue( "TextWordWrap", uno::Any( bNew )); + GetPropertySet()->setPropertyValue( u"TextWordWrap"_ustr, uno::Any( bNew )); bChanged = true; } } @@ -442,22 +442,22 @@ bool DataPointItemConverter::ApplySpecialItem( sal_Int32 nNew = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); sal_Int32 nOld = -1; RelativePosition aCustomLabelPosition; - GetPropertySet()->getPropertyValue("LabelPlacement") >>= nOld; + GetPropertySet()->getPropertyValue(u"LabelPlacement"_ustr) >>= nOld; if( m_bOverwriteLabelsForAttributedDataPointsAlso ) { rtl::Reference<DataSeries> xSeries(dynamic_cast<DataSeries*>(GetPropertySet().get())); if( nOld!=nNew || - DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "LabelPlacement" , uno::Any( nOld ) ) ) + DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, u"LabelPlacement"_ustr , uno::Any( nOld ) ) ) { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "LabelPlacement" , uno::Any( nNew ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"LabelPlacement"_ustr , uno::Any( nNew ) ); bChanged = true; } } - else if( nOld!=nNew || (GetPropertySet()->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition) ) + else if( nOld!=nNew || (GetPropertySet()->getPropertyValue(u"CustomLabelPosition"_ustr) >>= aCustomLabelPosition) ) { - GetPropertySet()->setPropertyValue("LabelPlacement", uno::Any(nNew)); - GetPropertySet()->setPropertyValue("CustomLabelPosition", uno::Any()); - GetPropertySet()->setPropertyValue("CustomLabelSize", uno::Any()); + GetPropertySet()->setPropertyValue(u"LabelPlacement"_ustr, uno::Any(nNew)); + GetPropertySet()->setPropertyValue(u"CustomLabelPosition"_ustr, uno::Any()); + GetPropertySet()->setPropertyValue(u"CustomLabelSize"_ustr, uno::Any()); bChanged = true; } } @@ -475,7 +475,7 @@ bool DataPointItemConverter::ApplySpecialItem( rItemSet.Get( nWhichId )).GetValue(); chart2::Symbol aSymbol; - GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol; + GetPropertySet()->getPropertyValue( u"Symbol"_ustr ) >>= aSymbol; sal_Int32 nOldStyle = lcl_getSymbolStyleForSymbol( aSymbol ); if( nStyle != nOldStyle ) @@ -502,9 +502,9 @@ bool DataPointItemConverter::ApplySpecialItem( } if( bDeleteSymbol ) - GetPropertySet()->setPropertyValue( "Symbol" , uno::Any()); + GetPropertySet()->setPropertyValue( u"Symbol"_ustr , uno::Any()); else - GetPropertySet()->setPropertyValue( "Symbol" , uno::Any( aSymbol )); + GetPropertySet()->setPropertyValue( u"Symbol"_ustr , uno::Any( aSymbol )); bChanged = true; } } @@ -516,14 +516,14 @@ bool DataPointItemConverter::ApplySpecialItem( rItemSet.Get( nWhichId )).GetSize(); chart2::Symbol aSymbol; - GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol; + GetPropertySet()->getPropertyValue( u"Symbol"_ustr ) >>= aSymbol; if( aSize.getWidth() != aSymbol.Size.Width || aSize.getHeight() != aSymbol.Size.Height ) { aSymbol.Size.Width = aSize.getWidth(); aSymbol.Size.Height = aSize.getHeight(); - GetPropertySet()->setPropertyValue( "Symbol" , uno::Any( aSymbol )); + GetPropertySet()->setPropertyValue( u"Symbol"_ustr , uno::Any( aSymbol )); bChanged = true; } } @@ -542,11 +542,11 @@ bool DataPointItemConverter::ApplySpecialItem( { aXGraphicAny <<= xGraphic; chart2::Symbol aSymbol; - GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol; + GetPropertySet()->getPropertyValue( u"Symbol"_ustr ) >>= aSymbol; if( aSymbol.Graphic != xGraphic ) { aSymbol.Graphic = xGraphic; - GetPropertySet()->setPropertyValue( "Symbol" , uno::Any( aSymbol )); + GetPropertySet()->setPropertyValue( u"Symbol"_ustr , uno::Any( aSymbol )); bChanged = true; } } @@ -559,11 +559,11 @@ bool DataPointItemConverter::ApplySpecialItem( double fValue = toDegrees(rItemSet.Get(SCHATTR_TEXT_DEGREES).GetValue()); double fOldValue = 0.0; bool bPropExisted = - ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldValue ); + ( GetPropertySet()->getPropertyValue( u"TextRotation"_ustr ) >>= fOldValue ); if( ! bPropExisted || fOldValue != fValue ) { - GetPropertySet()->setPropertyValue( "TextRotation" , uno::Any( fValue )); + GetPropertySet()->setPropertyValue( u"TextRotation"_ustr , uno::Any( fValue )); bChanged = true; } } @@ -659,7 +659,7 @@ void DataPointItemConverter::FillSpecialItem( case SCHATTR_PERCENT_NUMBERFORMAT_VALUE: { sal_Int32 nKey = 0; - if( !(GetPropertySet()->getPropertyValue( "PercentageNumberFormat" ) >>= nKey) ) + if( !(GetPropertySet()->getPropertyValue( u"PercentageNumberFormat"_ustr ) >>= nKey) ) nKey = m_nPercentNumberFormat; rOutItemSet.Put( SfxUInt32Item( nWhichId, nKey )); } @@ -691,7 +691,7 @@ void DataPointItemConverter::FillSpecialItem( { TOOLS_WARN_EXCEPTION("chart2", ""); } - bool bNumberFormatIsSet = GetPropertySet()->getPropertyValue( "PercentageNumberFormat" ).hasValue() && !bUseSourceFormat; + bool bNumberFormatIsSet = GetPropertySet()->getPropertyValue( u"PercentageNumberFormat"_ustr ).hasValue() && !bUseSourceFormat; rOutItemSet.Put( SfxBoolItem( nWhichId, ! bNumberFormatIsSet )); } break; @@ -701,7 +701,7 @@ void DataPointItemConverter::FillSpecialItem( try { OUString aValue; - GetPropertySet()->getPropertyValue( "LabelSeparator" ) >>= aValue; + GetPropertySet()->getPropertyValue( u"LabelSeparator"_ustr ) >>= aValue; rOutItemSet.Put( SfxStringItem( nWhichId, aValue )); } catch( const uno::Exception& ) @@ -716,7 +716,7 @@ void DataPointItemConverter::FillSpecialItem( try { bool bValue = false; - GetPropertySet()->getPropertyValue( "TextWordWrap" ) >>= bValue; + GetPropertySet()->getPropertyValue( u"TextWordWrap"_ustr ) >>= bValue; rOutItemSet.Put( SfxBoolItem( nWhichId, bValue )); } catch( const uno::Exception& ) @@ -732,9 +732,9 @@ void DataPointItemConverter::FillSpecialItem( { sal_Int32 nPlacement=0; RelativePosition aCustomLabelPosition; - if( !m_bOverwriteLabelsForAttributedDataPointsAlso && (GetPropertySet()->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition) ) + if( !m_bOverwriteLabelsForAttributedDataPointsAlso && (GetPropertySet()->getPropertyValue(u"CustomLabelPosition"_ustr) >>= aCustomLabelPosition) ) rOutItemSet.Put(SfxInt32Item(nWhichId, css::chart::DataLabelPlacement::CUSTOM)); - else if( GetPropertySet()->getPropertyValue( "LabelPlacement" ) >>= nPlacement ) + else if( GetPropertySet()->getPropertyValue( u"LabelPlacement"_ustr ) >>= nPlacement ) rOutItemSet.Put( SfxInt32Item( nWhichId, nPlacement )); else if( m_aAvailableLabelPlacements.hasElements() ) rOutItemSet.Put( SfxInt32Item( nWhichId, m_aAvailableLabelPlacements[0] )); @@ -776,7 +776,7 @@ void DataPointItemConverter::FillSpecialItem( case SCHATTR_STYLE_SYMBOL: { chart2::Symbol aSymbol; - if( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol ) + if( GetPropertySet()->getPropertyValue( u"Symbol"_ustr ) >>= aSymbol ) rOutItemSet.Put( SfxInt32Item( nWhichId, lcl_getSymbolStyleForSymbol( aSymbol ) )); } break; @@ -784,7 +784,7 @@ void DataPointItemConverter::FillSpecialItem( case SCHATTR_SYMBOL_SIZE: { chart2::Symbol aSymbol; - if( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol ) + if( GetPropertySet()->getPropertyValue( u"Symbol"_ustr ) >>= aSymbol ) rOutItemSet.Put( SvxSizeItem( nWhichId, Size( aSymbol.Size.Width, aSymbol.Size.Height ) )); } @@ -793,7 +793,7 @@ void DataPointItemConverter::FillSpecialItem( case SCHATTR_SYMBOL_BRUSH: { chart2::Symbol aSymbol; - if(( GetPropertySet()->getPropertyValue( "Symbol" ) >>= aSymbol ) + if(( GetPropertySet()->getPropertyValue( u"Symbol"_ustr ) >>= aSymbol ) && aSymbol.Graphic.is() ) { rOutItemSet.Put( SvxBrushItem( Graphic( aSymbol.Graphic ), GPOS_MM, SCHATTR_SYMBOL_BRUSH )); @@ -805,7 +805,7 @@ void DataPointItemConverter::FillSpecialItem( { double fValue = 0; - if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fValue ) + if( GetPropertySet()->getPropertyValue( u"TextRotation"_ustr ) >>= fValue ) { rOutItemSet.Put( SdrAngleItem( SCHATTR_TEXT_DEGREES, Degree100(static_cast< sal_Int32 >( ::rtl::math::round( fValue * 100.0 ) ) ))); diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index 33e09062a9a7..48efdee3a38d 100644 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -46,8 +46,8 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar try { - xErrorBarProp->getPropertyValue( "PositiveError" ) >>= rOutPosError; - xErrorBarProp->getPropertyValue( "NegativeError" ) >>= rOutNegError; + xErrorBarProp->getPropertyValue( u"PositiveError"_ustr ) >>= rOutPosError; + xErrorBarProp->getPropertyValue( u"NegativeError"_ustr ) >>= rOutNegError; } catch( const uno::Exception & ) { @@ -64,8 +64,8 @@ void lcl_getErrorIndicatorValues( try { - xErrorBarProp->getPropertyValue( "ShowPositiveError" ) >>= rOutShowPosError; - xErrorBarProp->getPropertyValue( "ShowNegativeError" ) >>= rOutShowNegError; + xErrorBarProp->getPropertyValue( u"ShowPositiveError"_ustr ) >>= rOutShowPosError; + xErrorBarProp->getPropertyValue( u"ShowNegativeError"_ustr ) >>= rOutShowNegError; } catch( const uno::Exception & ) { @@ -170,7 +170,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( nStyle = css::chart::ErrorBarStyle::FROM_DATA; break; } - xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::Any( nStyle )); + xErrorBarProp->setPropertyValue( u"ErrorBarStyle"_ustr , uno::Any( nStyle )); bChanged = true; } } @@ -191,8 +191,8 @@ bool ErrorBarItemConverter::ApplySpecialItem( if( ! ( ::rtl::math::approxEqual( fPos, fValue ) && ::rtl::math::approxEqual( fNeg, fValue ))) { - xErrorBarProp->setPropertyValue( "PositiveError" , uno::Any( fValue )); - xErrorBarProp->setPropertyValue( "NegativeError" , uno::Any( fValue )); + xErrorBarProp->setPropertyValue( u"PositiveError"_ustr , uno::Any( fValue )); + xErrorBarProp->setPropertyValue( u"NegativeError"_ustr , uno::Any( fValue )); bChanged = true; } } @@ -208,7 +208,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( if( ! ::rtl::math::approxEqual( fPos, fValue )) { - GetPropertySet()->setPropertyValue( "PositiveError" , uno::Any( fValue )); + GetPropertySet()->setPropertyValue( u"PositiveError"_ustr , uno::Any( fValue )); bChanged = true; } } @@ -226,7 +226,7 @@ bool ErrorBarItemConverter::ApplySpecialItem( if( ! ::rtl::math::approxEqual( fNeg, fValue )) { - xErrorBarProp->setPropertyValue( "NegativeError" , uno::Any( fValue )); + xErrorBarProp->setPropertyValue( u"NegativeError"_ustr , uno::Any( fValue )); bChanged = true; } } @@ -249,8 +249,8 @@ bool ErrorBarItemConverter::ApplySpecialItem( if( bShowPos != bNewIndPos || bShowNeg != bNewIndNeg ) { - xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::Any( bNewIndPos )); - xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::Any( bNewIndNeg )); + xErrorBarProp->setPropertyValue( u"ShowPositiveError"_ustr , uno::Any( bNewIndPos )); + xErrorBarProp->setPropertyValue( u"ShowNegativeError"_ustr , uno::Any( bNewIndNeg )); bChanged = true; } } @@ -327,7 +327,7 @@ void ErrorBarItemConverter::FillSpecialItem( uno::Reference< beans::XPropertySet > xErrorBarProp( GetPropertySet()); sal_Int32 nStyle = 0; - if( xErrorBarProp->getPropertyValue( "ErrorBarStyle" ) >>= nStyle ) + if( xErrorBarProp->getPropertyValue( u"ErrorBarStyle"_ustr ) >>= nStyle ) { switch( nStyle ) { diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index ac0b961ba2e4..b67872d3d0e3 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -217,7 +217,7 @@ void GraphicPropertyItemConverter::FillSpecialItem( case XATTR_FILLBMP_STRETCH: { drawing::BitmapMode aMode = drawing::BitmapMode_REPEAT; - if( GetPropertySet()->getPropertyValue( "FillBitmapMode" ) >>= aMode ) + if( GetPropertySet()->getPropertyValue( u"FillBitmapMode"_ustr ) >>= aMode ) { rOutItemSet.Put( XFillBmpTileItem( aMode == drawing::BitmapMode_REPEAT )); rOutItemSet.Put( XFillBmpStretchItem( aMode == drawing::BitmapMode_STRETCH )); @@ -232,8 +232,8 @@ void GraphicPropertyItemConverter::FillSpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "TransparencyGradientName" ) - : OUString( "FillTransparenceGradientName" ); + ? u"TransparencyGradientName"_ustr + : u"FillTransparenceGradientName"_ustr; uno::Any aValue( GetPropertySet()->getPropertyValue( aPropName )); if( aValue.hasValue()) @@ -242,7 +242,7 @@ void GraphicPropertyItemConverter::FillSpecialItem( aItem.PutValue( aValue, MID_NAME ); lcl_SetContentForNamedProperty( - m_xNamedPropertyTableFactory, "com.sun.star.drawing.TransparencyGradientTable" , + m_xNamedPropertyTableFactory, u"com.sun.star.drawing.TransparencyGradientTable"_ustr , aItem, MID_FILLGRADIENT ); // this is important to enable the item @@ -267,8 +267,8 @@ void GraphicPropertyItemConverter::FillSpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "GradientStepCount" ) - : OUString( "FillGradientStepCount" ); + ? u"GradientStepCount"_ustr + : u"FillGradientStepCount"_ustr; uno::Any aValue( GetPropertySet()->getPropertyValue( aPropName ) ); if( hasLongOrShortValue(aValue) ) @@ -283,14 +283,14 @@ void GraphicPropertyItemConverter::FillSpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "BorderDashName" ) - : OUString( "LineDashName" ); + ? u"BorderDashName"_ustr + : u"LineDashName"_ustr; XLineDashItem aItem; aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME ); lcl_SetContentForNamedProperty( - m_xNamedPropertyTableFactory, "com.sun.star.drawing.DashTable" , + m_xNamedPropertyTableFactory, u"com.sun.star.drawing.DashTable"_ustr , aItem, MID_LINEDASH ); // translate model name to UI-name for predefined entries, so @@ -309,14 +309,14 @@ void GraphicPropertyItemConverter::FillSpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "GradientName" ) - : OUString( "FillGradientName" ); + ? u"GradientName"_ustr + : u"FillGradientName"_ustr; XFillGradientItem aItem; aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME ); lcl_SetContentForNamedProperty( - m_xNamedPropertyTableFactory, "com.sun.star.drawing.GradientTable" , + m_xNamedPropertyTableFactory, u"com.sun.star.drawing.GradientTable"_ustr , aItem, MID_FILLGRADIENT ); // translate model name to UI-name for predefined entries, so @@ -335,14 +335,14 @@ void GraphicPropertyItemConverter::FillSpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "HatchName" ) - : OUString( "FillHatchName" ); + ? u"HatchName"_ustr + : u"FillHatchName"_ustr; XFillHatchItem aItem; aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), MID_NAME ); lcl_SetContentForNamedProperty( - m_xNamedPropertyTableFactory, "com.sun.star.drawing.HatchTable" , + m_xNamedPropertyTableFactory, u"com.sun.star.drawing.HatchTable"_ustr , aItem, MID_FILLHATCH ); // translate model name to UI-name for predefined entries, so @@ -360,10 +360,10 @@ void GraphicPropertyItemConverter::FillSpecialItem( if( lcl_supportsFillProperties( m_GraphicObjectType )) { XFillBitmapItem aItem; - aItem.PutValue( GetPropertySet()->getPropertyValue( "FillBitmapName" ), MID_NAME ); + aItem.PutValue( GetPropertySet()->getPropertyValue( u"FillBitmapName"_ustr ), MID_NAME ); lcl_SetContentForNamedProperty( - m_xNamedPropertyTableFactory, "com.sun.star.drawing.BitmapTable" , + m_xNamedPropertyTableFactory, u"com.sun.star.drawing.BitmapTable"_ustr , aItem, MID_BITMAP ); // translate model name to UI-name for predefined entries, so @@ -383,10 +383,10 @@ void GraphicPropertyItemConverter::FillSpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "BorderTransparency" ) + ? u"BorderTransparency"_ustr : (m_GraphicObjectType == GraphicObjectType::LineDataPoint) - ? OUString( "Transparency" ) - : OUString( "LineTransparence" ); + ? u"Transparency"_ustr + : u"LineTransparence"_ustr; XLineTransparenceItem aItem; aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), 0 ); @@ -402,8 +402,8 @@ void GraphicPropertyItemConverter::FillSpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "Transparency" ) - : OUString( "FillTransparence" ); + ? u"Transparency"_ustr + : u"FillTransparence"_ustr; XFillTransparenceItem aItem; aItem.PutValue( GetPropertySet()->getPropertyValue( aPropName ), 0 ); @@ -469,8 +469,8 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "TransparencyGradientName" ) - : OUString( "FillTransparenceGradientName" ); + ? u"TransparencyGradientName"_ustr + : u"FillTransparenceGradientName"_ustr; const XFillFloatTransparenceItem & rItem = static_cast< const XFillFloatTransparenceItem & >( @@ -520,8 +520,8 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "GradientStepCount" ) - : OUString( "FillGradientStepCount" ); + ? u"GradientStepCount"_ustr + : u"FillGradientStepCount"_ustr; sal_Int16 nStepCount = static_cast< const XGradientStepCountItem & >( rItemSet.Get( nWhichId )).GetValue(); @@ -540,8 +540,8 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "BorderDashName" ) - : OUString( "LineDashName" ); + ? u"BorderDashName"_ustr + : u"LineDashName"_ustr; const XLineDashItem & rItem = static_cast< const XLineDashItem & >( @@ -572,8 +572,8 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "GradientName" ) - : OUString( "FillGradientName" ); + ? u"GradientName"_ustr + : u"FillGradientName"_ustr; const XFillGradientItem & rItem = static_cast< const XFillGradientItem & >( @@ -605,8 +605,8 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "HatchName" ) - : OUString( "FillHatchName" ); + ? u"HatchName"_ustr + : u"FillHatchName"_ustr; const XFillHatchItem & rItem = static_cast< const XFillHatchItem & >( @@ -642,7 +642,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( if( rItem.QueryValue( aValue, MID_NAME )) { - if( aValue != GetPropertySet()->getPropertyValue( "FillBitmapName" )) + if( aValue != GetPropertySet()->getPropertyValue( u"FillBitmapName"_ustr )) { // add Bitmap to list uno::Any aBitmap; @@ -652,7 +652,7 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( aValue <<= PropertyHelper::addBitmapUniqueNameToTable( aBitmap, m_xNamedPropertyTableFactory, aPreferredName ); - GetPropertySet()->setPropertyValue( "FillBitmapName" , aValue ); + GetPropertySet()->setPropertyValue( u"FillBitmapName"_ustr , aValue ); bChanged = true; } } @@ -666,10 +666,10 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "BorderTransparency" ) + ? u"BorderTransparency"_ustr : (m_GraphicObjectType == GraphicObjectType::LineDataPoint) - ? OUString( "Transparency" ) - : OUString( "LineTransparence" ); + ? u"Transparency"_ustr + : u"LineTransparence"_ustr; const XLineTransparenceItem & rItem = static_cast< const XLineTransparenceItem & >( @@ -705,8 +705,8 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( { OUString aPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "Transparency" ) - : OUString( "FillTransparence" ); + ? u"Transparency"_ustr + : u"FillTransparence"_ustr; const XFillTransparenceItem & rItem = static_cast< const XFillTransparenceItem & >( @@ -728,8 +728,8 @@ bool GraphicPropertyItemConverter::ApplySpecialItem( // if linear or no transparence is set, delete the gradient OUString aTransGradPropName = (m_GraphicObjectType == GraphicObjectType::FilledDataPoint) - ? OUString( "TransparencyGradientName" ) - : OUString( "FillTransparenceGradientName" ); + ? u"TransparencyGradientName"_ustr + : u"FillTransparenceGradientName"_ustr; GetPropertySet()->setPropertyValue( aTransGradPropName, uno::Any( OUString() )); diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index 255445764b04..a431efc34349 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -49,7 +49,7 @@ LegendItemConverter::LegendItemConverter( GraphicObjectType::LineAndFillProperties )); m_aConverters.emplace_back( new CharacterPropertyItemConverter( rPropertySet, rItemPool, pRefSize, - "ReferencePageSize" )); + u"ReferencePageSize"_ustr )); } LegendItemConverter::~LegendItemConverter() @@ -100,10 +100,10 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe { bool bShow = pShowItem->GetValue(); bool bWasShown = true; - if( ! (GetPropertySet()->getPropertyValue( "Show" ) >>= bWasShown) || + if( ! (GetPropertySet()->getPropertyValue( u"Show"_ustr ) >>= bWasShown) || ( bWasShown != bShow )) { - GetPropertySet()->setPropertyValue( "Show" , uno::Any( bShow )); + GetPropertySet()->setPropertyValue( u"Show"_ustr , uno::Any( bShow )); bChanged = true; } } @@ -134,12 +134,12 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe try { chart2::LegendPosition eOldPos; - if( ! ( GetPropertySet()->getPropertyValue( "AnchorPosition" ) >>= eOldPos ) || + if( ! ( GetPropertySet()->getPropertyValue( u"AnchorPosition"_ustr ) >>= eOldPos ) || ( eOldPos != eNewPos )) { - GetPropertySet()->setPropertyValue( "AnchorPosition" , uno::Any( eNewPos )); - GetPropertySet()->setPropertyValue( "Expansion" , uno::Any( eExpansion )); - GetPropertySet()->setPropertyValue( "RelativePosition" , uno::Any()); + GetPropertySet()->setPropertyValue( u"AnchorPosition"_ustr , uno::Any( eNewPos )); + GetPropertySet()->setPropertyValue( u"Expansion"_ustr , uno::Any( eExpansion )); + GetPropertySet()->setPropertyValue( u"RelativePosition"_ustr , uno::Any()); bChanged = true; } } @@ -156,10 +156,10 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe { bool bOverlay = !pNoOverlayItem->GetValue(); bool bOldOverlay = false; - if(!(GetPropertySet()->getPropertyValue("Overlay") >>= bOldOverlay) || + if(!(GetPropertySet()->getPropertyValue(u"Overlay"_ustr) >>= bOldOverlay) || (bOldOverlay != bOverlay)) { - GetPropertySet()->setPropertyValue("Overlay", uno::Any(bOverlay)); + GetPropertySet()->setPropertyValue(u"Overlay"_ustr, uno::Any(bOverlay)); bChanged = true; } } @@ -179,21 +179,21 @@ void LegendItemConverter::FillSpecialItem( case SCHATTR_LEGEND_SHOW: { bool bShow = true; - GetPropertySet()->getPropertyValue( "Show" ) >>= bShow; + GetPropertySet()->getPropertyValue( u"Show"_ustr ) >>= bShow; rOutItemSet.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, bShow) ); } break; case SCHATTR_LEGEND_POS: { chart2::LegendPosition eLegendPos( chart2::LegendPosition_LINE_END ); - GetPropertySet()->getPropertyValue( "AnchorPosition" ) >>= eLegendPos; + GetPropertySet()->getPropertyValue( u"AnchorPosition"_ustr ) >>= eLegendPos; rOutItemSet.Put( SfxInt32Item(SCHATTR_LEGEND_POS, static_cast<sal_Int32>(eLegendPos) ) ); } break; case SCHATTR_LEGEND_NO_OVERLAY: { bool bOverlay = false; - GetPropertySet()->getPropertyValue("Overlay") >>= bOverlay; + GetPropertySet()->getPropertyValue(u"Overlay"_ustr) >>= bOverlay; rOutItemSet.Put(SfxBoolItem(SCHATTR_LEGEND_NO_OVERLAY, !bOverlay)); } break; diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index da521d874df6..684c6fc1cdd5 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -169,84 +169,84 @@ bool RegressionCurveItemConverter::ApplySpecialItem( case SCHATTR_REGRESSION_DEGREE: { uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY ); - bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, "PolynomialDegree"); + bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, u"PolynomialDegree"_ustr); } break; case SCHATTR_REGRESSION_PERIOD: { uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY ); - bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, "MovingAveragePeriod"); + bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, u"MovingAveragePeriod"_ustr); } break; case SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD: { uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY ); - bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, "ExtrapolateForward"); + bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, u"ExtrapolateForward"_ustr); } break; case SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD: { uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY ); - bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, "ExtrapolateBackward"); + bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, u"ExtrapolateBackward"_ustr); } break; case SCHATTR_REGRESSION_SET_INTERCEPT: { uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY ); - bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xProperties, "ForceIntercept"); + bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xProperties, u"ForceIntercept"_ustr); } break; case SCHATTR_REGRESSION_INTERCEPT_VALUE: { uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY ); - bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, "InterceptValue"); + bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, u"InterceptValue"_ustr); } break; case SCHATTR_REGRESSION_CURVE_NAME: { uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY ); - bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xProperties, "CurveName"); + bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xProperties, u"CurveName"_ustr); } break; case SCHATTR_REGRESSION_MOVING_TYPE: { uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY ); - bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, "MovingAverageType"); + bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, u"MovingAverageType"_ustr); } break; case SCHATTR_REGRESSION_SHOW_EQUATION: { uno::Reference< beans::XPropertySet > xEqProp( xCurve->getEquationProperties()); - bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowEquation"); + bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, u"ShowEquation"_ustr); } break; case SCHATTR_REGRESSION_XNAME: { uno::Reference< beans::XPropertySet > xEqProp( xCurve->getEquationProperties()); - bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xEqProp, "XName"); + bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xEqProp, u"XName"_ustr); } break; case SCHATTR_REGRESSION_YNAME: { uno::Reference< beans::XPropertySet > xEqProp( xCurve->getEquationProperties()); - bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xEqProp, "YName"); + bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xEqProp, u"YName"_ustr); } break; case SCHATTR_REGRESSION_SHOW_COEFF: { uno::Reference< beans::XPropertySet > xEqProp( xCurve->getEquationProperties()); - bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowCorrelationCoefficient"); + bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, u"ShowCorrelationCoefficient"_ustr); } break; @@ -274,73 +274,73 @@ void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemS case SCHATTR_REGRESSION_DEGREE: { - lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, "PolynomialDegree"); + lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, u"PolynomialDegree"_ustr); } break; case SCHATTR_REGRESSION_PERIOD: { - lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, "MovingAveragePeriod"); + lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, u"MovingAveragePeriod"_ustr); } break; case SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD: { - lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD, xProperties, "ExtrapolateForward"); + lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD, xProperties, u"ExtrapolateForward"_ustr); } break; case SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD: { - lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD, xProperties, "ExtrapolateBackward"); + lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD, xProperties, u"ExtrapolateBackward"_ustr); } break; case SCHATTR_REGRESSION_SET_INTERCEPT: { - lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xProperties, "ForceIntercept"); + lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xProperties, u"ForceIntercept"_ustr); } break; case SCHATTR_REGRESSION_INTERCEPT_VALUE: { - lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_INTERCEPT_VALUE, xProperties, "InterceptValue"); + lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_INTERCEPT_VALUE, xProperties, u"InterceptValue"_ustr); } break; case SCHATTR_REGRESSION_CURVE_NAME: { - lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xProperties, "CurveName"); + lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xProperties, u"CurveName"_ustr); } break; case SCHATTR_REGRESSION_MOVING_TYPE: { - lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, "MovingAverageType"); + lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, u"MovingAverageType"_ustr); } break; case SCHATTR_REGRESSION_SHOW_EQUATION: { - lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), "ShowEquation"); + lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), u"ShowEquation"_ustr); } break; case SCHATTR_REGRESSION_XNAME: { - lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), "XName"); + lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), u"XName"_ustr); } break; case SCHATTR_REGRESSION_YNAME: { - lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), "YName"); + lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), u"YName"_ustr); } break; case SCHATTR_REGRESSION_SHOW_COEFF: { - lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), "ShowCorrelationCoefficient"); + lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xCurve->getEquationProperties(), u"ShowCorrelationCoefficient"_ustr); } break; } diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index 9b10afd4f79d..239bf2ecadf9 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -58,7 +58,7 @@ RegressionEquationItemConverter::RegressionEquationItemConverter( GraphicObjectType::LineAndFillProperties )); m_aConverters.emplace_back( - new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, "ReferencePageSize")); + new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, u"ReferencePageSize"_ustr)); } RegressionEquationItemConverter::~RegressionEquationItemConverter() diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index 653e7bf20e5a..da74846568b4 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -94,12 +94,12 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( uno::Sequence< sal_Int32 > aBarPositionSequence; if( xChartType.is() ) { - if( xChartType->getPropertyValue( "OverlapSequence" ) >>= aBarPositionSequence ) + if( xChartType->getPropertyValue( u"OverlapSequence"_ustr ) >>= aBarPositionSequence ) { if( nAxisIndex >= 0 && nAxisIndex < aBarPositionSequence.getLength() ) m_nBarOverlap = aBarPositionSequence[nAxisIndex]; } - if( xChartType->getPropertyValue( "GapwidthSequence" ) >>= aBarPositionSequence ) + if( xChartType->getPropertyValue( u"GapwidthSequence"_ustr ) >>= aBarPositionSequence ) { if( nAxisIndex >= 0 && nAxisIndex < aBarPositionSequence.getLength() ) m_nGapWidth = aBarPositionSequence[nAxisIndex]; @@ -110,19 +110,19 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( m_bSupportingBarConnectors = ChartTypeHelper::isSupportingBarConnectors( xChartType, nDimensionCount ); if( m_bSupportingBarConnectors && xDiagram.is() ) { - xDiagram->getPropertyValue( "ConnectBars" ) >>= m_bConnectBars; + xDiagram->getPropertyValue( u"ConnectBars"_ustr ) >>= m_bConnectBars; } m_bSupportingAxisSideBySide = ChartTypeHelper::isSupportingAxisSideBySide( xChartType, nDimensionCount ); if( m_bSupportingAxisSideBySide && xDiagram.is() ) { - xDiagram->getPropertyValue( "GroupBarsPerAxis" ) >>= m_bGroupBarsPerAxis; + xDiagram->getPropertyValue( u"GroupBarsPerAxis"_ustr ) >>= m_bGroupBarsPerAxis; } m_bSupportingStartingAngle = ChartTypeHelper::isSupportingStartingAngle( xChartType ); if( m_bSupportingStartingAngle ) { - xDiagram->getPropertyValue( "StartingAngle" ) >>= m_nStartingAngle; + xDiagram->getPropertyValue( u"StartingAngle"_ustr ) >>= m_nStartingAngle; } m_aSupportedMissingValueTreatments = ChartTypeHelper::getSupportedMissingValueTreatments( xChartType ); @@ -134,17 +134,17 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( try { //test whether the data provider offers this property - xProp->getPropertyValue( "IncludeHiddenCells" ); + xProp->getPropertyValue( u"IncludeHiddenCells"_ustr ); //if not exception is thrown the property is offered m_bSupportingPlottingOfHiddenCells = true; - xDiagram->getPropertyValue( "IncludeHiddenCells" ) >>= m_bIncludeHiddenCells; + xDiagram->getPropertyValue( u"IncludeHiddenCells"_ustr ) >>= m_bIncludeHiddenCells; } catch( const beans::UnknownPropertyException& ) { } } - m_bHideLegendEntry = !xDataSeries->getPropertyValue("ShowLegendEntry").get<bool>(); + m_bHideLegendEntry = !xDataSeries->getPropertyValue(u"ShowLegendEntry"_ustr).get<bool>(); } catch( const uno::Exception & ) { @@ -198,7 +198,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf sal_Int32& rBarPosition = ( nWhichId == SCHATTR_BAR_OVERLAP ) ? m_nBarOverlap : m_nGapWidth; rBarPosition = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue(); - OUString aPropName("GapwidthSequence" ); + OUString aPropName(u"GapwidthSequence"_ustr ); if( nWhichId == SCHATTR_BAR_OVERLAP ) aPropName = "OverlapSequence"; @@ -238,10 +238,10 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf bool bOldConnectBars = false; rtl::Reference< Diagram > xDiagramProperties( m_xChartModel->getFirstChartDiagram() ); if( xDiagramProperties.is() && - (xDiagramProperties->getPropertyValue( "ConnectBars" ) >>= bOldConnectBars) && + (xDiagramProperties->getPropertyValue( u"ConnectBars"_ustr ) >>= bOldConnectBars) && bOldConnectBars != m_bConnectBars ) { - xDiagramProperties->setPropertyValue( "ConnectBars" , uno::Any(m_bConnectBars) ); + xDiagramProperties->setPropertyValue( u"ConnectBars"_ustr , uno::Any(m_bConnectBars) ); bChanged = true; } } @@ -257,10 +257,10 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf bool bOldGroupBarsPerAxis = true; rtl::Reference< Diagram > xDiagramProperties( m_xChartModel->getFirstChartDiagram() ); if( xDiagramProperties.is() && - (xDiagramProperties->getPropertyValue( "GroupBarsPerAxis" ) >>= bOldGroupBarsPerAxis) && + (xDiagramProperties->getPropertyValue( u"GroupBarsPerAxis"_ustr ) >>= bOldGroupBarsPerAxis) && bOldGroupBarsPerAxis != m_bGroupBarsPerAxis ) { - xDiagramProperties->setPropertyValue( "GroupBarsPerAxis" , uno::Any(m_bGroupBarsPerAxis) ); + xDiagramProperties->setPropertyValue( u"GroupBarsPerAxis"_ustr , uno::Any(m_bGroupBarsPerAxis) ); bChanged = true; } } @@ -275,7 +275,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf rtl::Reference< Diagram > xDiagramProperties( m_xChartModel->getFirstChartDiagram() ); if( xDiagramProperties.is() ) { - xDiagramProperties->setPropertyValue( "StartingAngle" , uno::Any(m_nStartingAngle) ); + xDiagramProperties->setPropertyValue( u"StartingAngle"_ustr , uno::Any(m_nStartingAngle) ); bChanged = true; } } @@ -312,7 +312,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf rtl::Reference< Diagram > xDiagramProperties( m_xChartModel->getFirstChartDiagram() ); if( xDiagramProperties.is() ) { - xDiagramProperties->setPropertyValue( "MissingValueTreatment" , uno::Any( nNew )); + xDiagramProperties->setPropertyValue( u"MissingValueTreatment"_ustr , uno::Any( nNew )); bChanged = true; } } @@ -342,7 +342,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf bool bHideLegendEntry = static_cast<const SfxBoolItem &>(rItemSet.Get(nWhichId)).GetValue(); if (bHideLegendEntry != m_bHideLegendEntry) { - GetPropertySet()->setPropertyValue("ShowLegendEntry", css::uno::Any(!bHideLegendEntry)); + GetPropertySet()->setPropertyValue(u"ShowLegendEntry"_ustr, css::uno::Any(!bHideLegendEntry)); } } break; diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index c725972c249b..e8703926c5a7 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -73,8 +73,8 @@ void lcl_getErrorValues( const uno::Reference< beans::XPropertySet > & xErrorBar try { - xErrorBarProp->getPropertyValue( "PositiveError" ) >>= rOutPosError; - xErrorBarProp->getPropertyValue( "NegativeError" ) >>= rOutNegError; + xErrorBarProp->getPropertyValue( u"PositiveError"_ustr ) >>= rOutPosError; + xErrorBarProp->getPropertyValue( u"NegativeError"_ustr ) >>= rOutNegError; } catch( const uno::Exception & ) { @@ -91,8 +91,8 @@ void lcl_getErrorIndicatorValues( try { - xErrorBarProp->getPropertyValue( "ShowPositiveError" ) >>= rOutShowPosError; - xErrorBarProp->getPropertyValue( "ShowNegativeError" ) >>= rOutShowNegError; + xErrorBarProp->getPropertyValue( u"ShowPositiveError"_ustr ) >>= rOutShowPosError; + xErrorBarProp->getPropertyValue( u"ShowNegativeError"_ustr ) >>= rOutShowNegError; } catch( const uno::Exception & ) { @@ -312,7 +312,7 @@ bool StatisticsItemConverter::ApplySpecialItem( uno::Any( xErrorBarProp )); } - xErrorBarProp->setPropertyValue( "ErrorBarStyle" , uno::Any( nStyle )); + xErrorBarProp->setPropertyValue( u"ErrorBarStyle"_ustr , uno::Any( nStyle )); bChanged = true; } } @@ -339,8 +339,8 @@ bool StatisticsItemConverter::ApplySpecialItem( ! ( ::rtl::math::approxEqual( fPos, fValue ) && ::rtl::math::approxEqual( fNeg, fValue ))) { - xErrorBarProp->setPropertyValue( "PositiveError" , uno::Any( fValue )); - xErrorBarProp->setPropertyValue( "NegativeError" , uno::Any( fValue )); + xErrorBarProp->setPropertyValue( u"PositiveError"_ustr , uno::Any( fValue )); + xErrorBarProp->setPropertyValue( u"NegativeError"_ustr , uno::Any( fValue )); bChanged = true; } } @@ -364,7 +364,7 @@ bool StatisticsItemConverter::ApplySpecialItem( if( bOldHasErrorBar && ! ::rtl::math::approxEqual( fPos, fValue )) { - xErrorBarProp->setPropertyValue( "PositiveError" , uno::Any( fValue )); + xErrorBarProp->setPropertyValue( u"PositiveError"_ustr , uno::Any( fValue )); bChanged = true; } } @@ -387,7 +387,7 @@ bool StatisticsItemConverter::ApplySpecialItem( if( bOldHasErrorBar && ! ::rtl::math::approxEqual( fNeg, fValue )) { - xErrorBarProp->setPropertyValue( "NegativeError" , uno::Any( fValue )); + xErrorBarProp->setPropertyValue( u"NegativeError"_ustr , uno::Any( fValue )); bChanged = true; } } @@ -435,84 +435,84 @@ bool StatisticsItemConverter::ApplySpecialItem( case SCHATTR_REGRESSION_DEGREE: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, "PolynomialDegree"); + bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, u"PolynomialDegree"_ustr); } break; case SCHATTR_REGRESSION_PERIOD: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, "MovingAveragePeriod"); + bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, u"MovingAveragePeriod"_ustr); } break; case SCHATTR_REGRESSION_MOVING_TYPE: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, "MovingAverageType"); + bChanged = lclConvertToPropertySet<sal_Int32, SfxInt32Item>(rItemSet, nWhichId, xProperties, u"MovingAverageType"_ustr); } break; case SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, "ExtrapolateForward"); + bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, u"ExtrapolateForward"_ustr); } break; case SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, "ExtrapolateBackward"); + bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, u"ExtrapolateBackward"_ustr); } break; case SCHATTR_REGRESSION_SET_INTERCEPT: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xProperties, "ForceIntercept"); + bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xProperties, u"ForceIntercept"_ustr); } break; case SCHATTR_REGRESSION_INTERCEPT_VALUE: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, "InterceptValue"); + bChanged = lclConvertToPropertySet<double, SvxDoubleItem>(rItemSet, nWhichId, xProperties, u"InterceptValue"_ustr); } break; case SCHATTR_REGRESSION_CURVE_NAME: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xProperties, "CurveName"); + bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xProperties, u"CurveName"_ustr); } break; case SCHATTR_REGRESSION_SHOW_EQUATION: { uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowEquation"); + bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, u"ShowEquation"_ustr); } break; case SCHATTR_REGRESSION_XNAME: { uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xEqProp, "XName"); + bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xEqProp, u"XName"_ustr); } break; case SCHATTR_REGRESSION_YNAME: { uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xEqProp, "YName"); + bChanged = lclConvertToPropertySet<OUString, SfxStringItem>(rItemSet, nWhichId, xEqProp, u"YName"_ustr); } break; case SCHATTR_REGRESSION_SHOW_COEFF: { uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), &rItemSet )); - bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, "ShowCorrelationCoefficient"); + bChanged = lclConvertToPropertySet<bool, SfxBoolItem>(rItemSet, nWhichId, xEqProp, u"ShowCorrelationCoefficient"_ustr); } break; @@ -538,8 +538,8 @@ bool StatisticsItemConverter::ApplySpecialItem( ( bShowPos != bNewIndPos || bShowNeg != bNewIndNeg )) { - xErrorBarProp->setPropertyValue( "ShowPositiveError" , uno::Any( bNewIndPos )); - xErrorBarProp->setPropertyValue( "ShowNegativeError" , uno::Any( bNewIndNeg )); + xErrorBarProp->setPropertyValue( u"ShowPositiveError"_ustr , uno::Any( bNewIndPos )); + xErrorBarProp->setPropertyValue( u"ShowNegativeError"_ustr , uno::Any( bNewIndNeg )); bChanged = true; } } @@ -626,7 +626,7 @@ void StatisticsItemConverter::FillSpecialItem( if( xErrorBarProp.is() ) { sal_Int32 nStyle = 0; - if( xErrorBarProp->getPropertyValue( "ErrorBarStyle" ) >>= nStyle ) + if( xErrorBarProp->getPropertyValue( u"ErrorBarStyle"_ustr ) >>= nStyle ) { switch( nStyle ) { @@ -723,84 +723,84 @@ void StatisticsItemConverter::FillSpecialItem( { uno::Reference<beans::XPropertySet> xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); - lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, "PolynomialDegree"); + lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, u"PolynomialDegree"_ustr); } break; case SCHATTR_REGRESSION_PERIOD: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); - lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, "MovingAveragePeriod"); + lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, u"MovingAveragePeriod"_ustr); } break; case SCHATTR_REGRESSION_MOVING_TYPE: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); - lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, "MovingAverageType"); + lclConvertToItemSet<sal_Int32, SfxInt32Item>(rOutItemSet, nWhichId, xProperties, u"MovingAverageType"_ustr); } break; case SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); - lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD, xProperties, "ExtrapolateForward"); + lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_EXTRAPOLATE_FORWARD, xProperties, u"ExtrapolateForward"_ustr); } break; case SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); - lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD, xProperties, "ExtrapolateBackward"); + lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_EXTRAPOLATE_BACKWARD, xProperties, u"ExtrapolateBackward"_ustr); } break; case SCHATTR_REGRESSION_SET_INTERCEPT: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); - lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xProperties, "ForceIntercept"); + lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xProperties, u"ForceIntercept"_ustr); } break; case SCHATTR_REGRESSION_INTERCEPT_VALUE: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); - lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_INTERCEPT_VALUE, xProperties, "InterceptValue"); + lclConvertToItemSetDouble(rOutItemSet, SCHATTR_REGRESSION_INTERCEPT_VALUE, xProperties, u"InterceptValue"_ustr); } break; case SCHATTR_REGRESSION_CURVE_NAME: { uno::Reference< beans::XPropertySet > xProperties( lcl_getCurveProperties( GetPropertySet(), nullptr )); - lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xProperties, "CurveName"); + lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xProperties, u"CurveName"_ustr); } break; case SCHATTR_REGRESSION_SHOW_EQUATION: { uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), nullptr )); - lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xEqProp, "ShowEquation"); + lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xEqProp, u"ShowEquation"_ustr); } break; case SCHATTR_REGRESSION_XNAME: { uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), nullptr )); - lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xEqProp, "XName"); + lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xEqProp, u"XName"_ustr); } break; case SCHATTR_REGRESSION_YNAME: { uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), nullptr )); - lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xEqProp, "YName"); + lclConvertToItemSet<OUString, SfxStringItem>(rOutItemSet, nWhichId, xEqProp, u"YName"_ustr); } break; case SCHATTR_REGRESSION_SHOW_COEFF: { uno::Reference< beans::XPropertySet > xEqProp( lcl_getEquationProperties( GetPropertySet(), nullptr )); - lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xEqProp, "ShowCorrelationCoefficient"); + lclConvertToItemSet<bool, SfxBoolItem>(rOutItemSet, nWhichId, xEqProp, u"ShowCorrelationCoefficient"_ustr); } break; diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx index a8838f3b24e0..cd70c5a22368 100644 --- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx @@ -101,7 +101,7 @@ bool numberFormatFromItemToPropertySet( if (!xPropertySet.is()) return bChanged; - OUString aPropertyName = (nWhichId == SID_ATTR_NUMBERFORMAT_VALUE) ? CHART_UNONAME_NUMFMT : OUString("PercentageNumberFormat"); + OUString aPropertyName = (nWhichId == SID_ATTR_NUMBERFORMAT_VALUE) ? CHART_UNONAME_NUMFMT : u"PercentageNumberFormat"_ustr; sal_uInt16 nSourceWhich = (nWhichId == SID_ATTR_NUMBERFORMAT_VALUE) ? SID_ATTR_NUMBERFORMAT_SOURCE : SCHATTR_PERCENT_NUMBERFORMAT_SOURCE; if (rItemSet.GetItemState(nSourceWhich) != SfxItemState::SET) @@ -149,7 +149,7 @@ bool useSourceFormatFromItemToPropertySet( bool bChanged = false; if (!xPropertySet.is()) return bChanged; - OUString aPropertyName = (nWhichId == SID_ATTR_NUMBERFORMAT_SOURCE) ? CHART_UNONAME_NUMFMT : OUString("PercentageNumberFormat"); + OUString aPropertyName = (nWhichId == SID_ATTR_NUMBERFORMAT_SOURCE) ? CHART_UNONAME_NUMFMT : u"PercentageNumberFormat"_ustr; sal_uInt16 nFormatWhich = (nWhichId == SID_ATTR_NUMBERFORMAT_SOURCE) ? SID_ATTR_NUMBERFORMAT_VALUE : SCHATTR_PERCENT_NUMBERFORMAT_VALUE; if (rItemSet.GetItemState(nWhichId) != SfxItemState::SET) @@ -208,7 +208,7 @@ TextLabelItemConverter::TextLabelItemConverter( mbForbidPercentValue(true), m_xSeries(xSeries) { - maConverters.emplace_back(new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, "ReferencePageSize")); + maConverters.emplace_back(new CharacterPropertyItemConverter(rPropertySet, rItemPool, pRefSize, u"ReferencePageSize"_ustr)); rtl::Reference< Diagram > xDiagram(xChartModel->getFirstChartDiagram()); rtl::Reference< ChartType > xChartType(xDiagram->getChartTypeOfSeries(xSeries)); @@ -323,20 +323,20 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte try { OUString aOldValue; - GetPropertySet()->getPropertyValue("LabelSeparator") >>= aOldValue; + GetPropertySet()->getPropertyValue(u"LabelSeparator"_ustr) >>= aOldValue; if (mbDataSeries) { rtl::Reference<DataSeries> xSeries(dynamic_cast<DataSeries*>(GetPropertySet().get())); if (aOldValue != aNewValue || - DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, "LabelSeparator", uno::Any(aOldValue))) + DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, u"LabelSeparator"_ustr, uno::Any(aOldValue))) { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, "LabelSeparator", uno::Any(aNewValue)); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, u"LabelSeparator"_ustr, uno::Any(aNewValue)); bChanged = true; } } else if (aOldValue != aNewValue) { - GetPropertySet()->setPropertyValue("LabelSeparator", uno::Any(aNewValue)); + GetPropertySet()->setPropertyValue(u"LabelSeparator"_ustr, uno::Any(aNewValue)); bChanged = true; } } @@ -353,20 +353,20 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte { bool bNew = static_cast< const SfxBoolItem & >( rItemSet.Get( nWhichId )).GetValue(); bool bOld = false; - GetPropertySet()->getPropertyValue( "TextWordWrap" ) >>= bOld; + GetPropertySet()->getPropertyValue( u"TextWordWrap"_ustr ) >>= bOld; if( mbDataSeries ) { rtl::Reference< DataSeries > xSeries( dynamic_cast<DataSeries*>(GetPropertySet().get()) ); if( bOld!=bNew || - DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "TextWordWrap", uno::Any( bOld ) ) ) + DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, u"TextWordWrap"_ustr, uno::Any( bOld ) ) ) { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "TextWordWrap", uno::Any( bNew ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"TextWordWrap"_ustr, uno::Any( bNew ) ); bChanged = true; } } else if( bOld!=bNew ) { - GetPropertySet()->setPropertyValue( "TextWordWrap", uno::Any( bNew )); + GetPropertySet()->setPropertyValue( u"TextWordWrap"_ustr, uno::Any( bNew )); bChanged = true; } } @@ -383,22 +383,22 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte sal_Int32 nNew = static_cast<const SfxInt32Item&>(rItemSet.Get(nWhichId)).GetValue(); sal_Int32 nOld = -1; RelativePosition aCustomLabelPosition; - GetPropertySet()->getPropertyValue("LabelPlacement") >>= nOld; + GetPropertySet()->getPropertyValue(u"LabelPlacement"_ustr) >>= nOld; if (mbDataSeries) { rtl::Reference<DataSeries> xSeries(dynamic_cast<DataSeries*>(GetPropertySet().get())); if (nOld != nNew || - DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, "LabelPlacement", uno::Any(nOld))) + DataSeriesHelper::hasAttributedDataPointDifferentValue(xSeries, u"LabelPlacement"_ustr, uno::Any(nOld))) { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, "LabelPlacement", uno::Any(nNew)); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(xSeries, u"LabelPlacement"_ustr, uno::Any(nNew)); bChanged = true; } } - else if (nOld != nNew || (GetPropertySet()->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition)) + else if (nOld != nNew || (GetPropertySet()->getPropertyValue(u"CustomLabelPosition"_ustr) >>= aCustomLabelPosition)) { - GetPropertySet()->setPropertyValue("LabelPlacement", uno::Any(nNew)); - GetPropertySet()->setPropertyValue("CustomLabelPosition", uno::Any()); - GetPropertySet()->setPropertyValue("CustomLabelSize", uno::Any()); + GetPropertySet()->setPropertyValue(u"LabelPlacement"_ustr, uno::Any(nNew)); + GetPropertySet()->setPropertyValue(u"CustomLabelPosition"_ustr, uno::Any()); + GetPropertySet()->setPropertyValue(u"CustomLabelSize"_ustr, uno::Any()); bChanged = true; } } @@ -415,7 +415,7 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte rItemSet.Get(nWhichId)).GetValue(); chart2::Symbol aSymbol; - GetPropertySet()->getPropertyValue("Symbol") >>= aSymbol; + GetPropertySet()->getPropertyValue(u"Symbol"_ustr) >>= aSymbol; sal_Int32 nOldStyle = getSymbolStyleForSymbol(aSymbol); if (nStyle != nOldStyle) @@ -442,9 +442,9 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte } if (bDeleteSymbol) - GetPropertySet()->setPropertyValue("Symbol", uno::Any()); + GetPropertySet()->setPropertyValue(u"Symbol"_ustr, uno::Any()); else - GetPropertySet()->setPropertyValue("Symbol", uno::Any(aSymbol)); + GetPropertySet()->setPropertyValue(u"Symbol"_ustr, uno::Any(aSymbol)); bChanged = true; } } @@ -455,14 +455,14 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte rItemSet.Get(nWhichId)).GetSize(); chart2::Symbol aSymbol; - GetPropertySet()->getPropertyValue("Symbol") >>= aSymbol; + GetPropertySet()->getPropertyValue(u"Symbol"_ustr) >>= aSymbol; if (aSize.getWidth() != aSymbol.Size.Width || aSize.getHeight() != aSymbol.Size.Height) { aSymbol.Size.Width = aSize.getWidth(); aSymbol.Size.Height = aSize.getHeight(); - GetPropertySet()->setPropertyValue("Symbol", uno::Any(aSymbol)); + GetPropertySet()->setPropertyValue(u"Symbol"_ustr, uno::Any(aSymbol)); bChanged = true; } } @@ -480,11 +480,11 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte { aXGraphicAny <<= xGraphic; chart2::Symbol aSymbol; - GetPropertySet()->getPropertyValue("Symbol") >>= aSymbol; + GetPropertySet()->getPropertyValue(u"Symbol"_ustr) >>= aSymbol; if (aSymbol.Graphic != xGraphic) { aSymbol.Graphic = xGraphic; - GetPropertySet()->setPropertyValue("Symbol", uno::Any(aSymbol)); + GetPropertySet()->setPropertyValue(u"Symbol"_ustr, uno::Any(aSymbol)); bChanged = true; } } @@ -498,11 +498,11 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte rItemSet.Get(nWhichId)).GetValue().get()) / 100.0; double fOldValue = 0.0; bool bPropExisted = - (GetPropertySet()->getPropertyValue("TextRotation") >>= fOldValue); + (GetPropertySet()->getPropertyValue(u"TextRotation"_ustr) >>= fOldValue); if (!bPropExisted || fOldValue != fValue) { - GetPropertySet()->setPropertyValue("TextRotation", uno::Any(fValue)); + GetPropertySet()->setPropertyValue(u"TextRotation"_ustr, uno::Any(fValue)); bChanged = true; } } @@ -572,7 +572,7 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r case SCHATTR_PERCENT_NUMBERFORMAT_VALUE: { sal_Int32 nKey = 0; - if (!(GetPropertySet()->getPropertyValue("PercentageNumberFormat") >>= nKey)) + if (!(GetPropertySet()->getPropertyValue(u"PercentageNumberFormat"_ustr) >>= nKey)) nKey = mnPercentNumberFormat; rOutItemSet.Put(SfxUInt32Item(nWhichId, nKey)); } @@ -603,7 +603,7 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r { TOOLS_WARN_EXCEPTION("chart2", ""); } - bool bNumberFormatIsSet = GetPropertySet()->getPropertyValue("PercentageNumberFormat").hasValue() && !bUseSourceFormat; + bool bNumberFormatIsSet = GetPropertySet()->getPropertyValue(u"PercentageNumberFormat"_ustr).hasValue() && !bUseSourceFormat; rOutItemSet.Put(SfxBoolItem(nWhichId, !bNumberFormatIsSet)); } break; @@ -612,7 +612,7 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r try { OUString aValue; - GetPropertySet()->getPropertyValue("LabelSeparator") >>= aValue; + GetPropertySet()->getPropertyValue(u"LabelSeparator"_ustr) >>= aValue; rOutItemSet.Put(SfxStringItem(nWhichId, aValue)); } catch (const uno::Exception&) @@ -626,7 +626,7 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r try { bool bValue = false; - GetPropertySet()->getPropertyValue( "TextWordWrap" ) >>= bValue; + GetPropertySet()->getPropertyValue( u"TextWordWrap"_ustr ) >>= bValue; rOutItemSet.Put( SfxBoolItem( nWhichId, bValue )); } catch( const uno::Exception& ) @@ -641,9 +641,9 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r { sal_Int32 nPlacement = 0; RelativePosition aCustomLabelPosition; - if (!mbDataSeries && (GetPropertySet()->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition)) + if (!mbDataSeries && (GetPropertySet()->getPropertyValue(u"CustomLabelPosition"_ustr) >>= aCustomLabelPosition)) rOutItemSet.Put(SfxInt32Item(nWhichId, css::chart::DataLabelPlacement::CUSTOM)); - else if (GetPropertySet()->getPropertyValue("LabelPlacement") >>= nPlacement) + else if (GetPropertySet()->getPropertyValue(u"LabelPlacement"_ustr) >>= nPlacement) rOutItemSet.Put(SfxInt32Item(nWhichId, nPlacement)); else if (maAvailableLabelPlacements.hasElements()) rOutItemSet.Put(SfxInt32Item(nWhichId, maAvailableLabelPlacements[0])); @@ -681,14 +681,14 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r case SCHATTR_STYLE_SYMBOL: { chart2::Symbol aSymbol; - if (GetPropertySet()->getPropertyValue("Symbol") >>= aSymbol) + if (GetPropertySet()->getPropertyValue(u"Symbol"_ustr) >>= aSymbol) rOutItemSet.Put(SfxInt32Item(nWhichId, getSymbolStyleForSymbol(aSymbol))); } break; case SCHATTR_SYMBOL_SIZE: { chart2::Symbol aSymbol; - if (GetPropertySet()->getPropertyValue("Symbol") >>= aSymbol) + if (GetPropertySet()->getPropertyValue(u"Symbol"_ustr) >>= aSymbol) rOutItemSet.Put( SvxSizeItem(nWhichId, Size(aSymbol.Size.Width, aSymbol.Size.Height))); } @@ -696,7 +696,7 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r case SCHATTR_SYMBOL_BRUSH: { chart2::Symbol aSymbol; - if ((GetPropertySet()->getPropertyValue("Symbol") >>= aSymbol) + if ((GetPropertySet()->getPropertyValue(u"Symbol"_ustr) >>= aSymbol) && aSymbol.Graphic.is()) { rOutItemSet.Put( @@ -708,7 +708,7 @@ void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& r { double fValue = 0; - if (GetPropertySet()->getPropertyValue("TextRotation") >>= fValue) + if (GetPropertySet()->getPropertyValue(u"TextRotation"_ustr) >>= fValue) { rOutItemSet.Put( SdrAngleItem(SCHATTR_TEXT_DEGREES, Degree100(static_cast<sal_Int32>(rtl::math::round(fValue * 100.0))))); diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index 1327a0a0d91b..004309868dbe 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -75,7 +75,7 @@ FormattedStringsConverter::FormattedStringsConverter( if( bHasRefSize ) m_aConverters.emplace_back( new CharacterPropertyItemConverter( - xProp, rItemPool, pRefSize, "ReferencePageSize", xParentProp)); + xProp, rItemPool, pRefSize, u"ReferencePageSize"_ustr, xParentProp)); else m_aConverters.emplace_back( new CharacterPropertyItemConverter( xProp, rItemPool )); } @@ -171,11 +171,11 @@ bool TitleItemConverter::ApplySpecialItem( rItemSet.Get( nWhichId )).GetValue().get()) / 100.0; double fOldVal = 0.0; bool bPropExisted = - ( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fOldVal ); + ( GetPropertySet()->getPropertyValue( u"TextRotation"_ustr ) >>= fOldVal ); if( ! bPropExisted || fOldVal != fVal ) { - GetPropertySet()->setPropertyValue( "TextRotation" , uno::Any( fVal )); + GetPropertySet()->setPropertyValue( u"TextRotation"_ustr , uno::Any( fVal )); bChanged = true; } } @@ -195,7 +195,7 @@ void TitleItemConverter::FillSpecialItem( // convert double to int (times 100) double fVal = 0; - if( GetPropertySet()->getPropertyValue( "TextRotation" ) >>= fVal ) + if( GetPropertySet()->getPropertyValue( u"TextRotation"_ustr ) >>= fVal ) { rOutItemSet.Put( SdrAngleItem( SCHATTR_TEXT_DEGREES, Degree100(static_cast< sal_Int32 >( ::rtl::math::round( fVal * 100.0 ) ) ))); diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 2bd0bf549e89..6504c3efd981 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -248,42 +248,42 @@ OUString ChartController::GetContextName() uno::Any aAny = getSelection(); if (!aAny.hasValue()) - return "Chart"; + return u"Chart"_ustr; OUString aCID; aAny >>= aCID; if (aCID.isEmpty()) - return "Chart"; + return u"Chart"_ustr; ObjectType eObjectID = ObjectIdentifier::getObjectType(aCID); switch (eObjectID) { case OBJECTTYPE_DATA_SERIES: - return "Series"; + return u"Series"_ustr; case OBJECTTYPE_DATA_ERRORS_X: case OBJECTTYPE_DATA_ERRORS_Y: case OBJECTTYPE_DATA_ERRORS_Z: - return "ErrorBar"; + return u"ErrorBar"_ustr; case OBJECTTYPE_AXIS: - return "Axis"; + return u"Axis"_ustr; case OBJECTTYPE_GRID: - return "Grid"; + return u"Grid"_ustr; case OBJECTTYPE_DIAGRAM: { rtl::Reference<ChartType> xChartType = getChartType(getChartModel()); if (xChartType.is() && xChartType->getChartType() == "com.sun.star.chart2.PieChartType") - return "ChartElements"; + return u"ChartElements"_ustr; break; } case OBJECTTYPE_DATA_CURVE: case OBJECTTYPE_DATA_AVERAGE_LINE: - return "Trendline"; + return u"Trendline"_ustr; default: break; } - return "Chart"; + return u"Chart"_ustr; } // private methods @@ -401,23 +401,23 @@ void SAL_CALL ChartController::attachFrame( try { uno::Reference< css::frame::XLayoutManager > xLayoutManager; - xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager; + xPropSet->getPropertyValue( u"LayoutManager"_ustr ) >>= xLayoutManager; if ( xLayoutManager.is() ) { xLayoutManager->lock(); - xLayoutManager->requestElement( "private:resource/menubar/menubar" ); + xLayoutManager->requestElement( u"private:resource/menubar/menubar"_ustr ); //@todo: createElement should become unnecessary, remove when #i79198# is fixed - xLayoutManager->createElement( "private:resource/toolbar/standardbar" ); - xLayoutManager->requestElement( "private:resource/toolbar/standardbar" ); + xLayoutManager->createElement( u"private:resource/toolbar/standardbar"_ustr ); + xLayoutManager->requestElement( u"private:resource/toolbar/standardbar"_ustr ); //@todo: createElement should become unnecessary, remove when #i79198# is fixed - xLayoutManager->createElement( "private:resource/toolbar/toolbar" ); - xLayoutManager->requestElement( "private:resource/toolbar/toolbar" ); + xLayoutManager->createElement( u"private:resource/toolbar/toolbar"_ustr ); + xLayoutManager->requestElement( u"private:resource/toolbar/toolbar"_ustr ); // #i12587# support for shapes in chart - xLayoutManager->createElement( "private:resource/toolbar/drawbar" ); - xLayoutManager->requestElement( "private:resource/toolbar/drawbar" ); + xLayoutManager->createElement( u"private:resource/toolbar/drawbar"_ustr ); + xLayoutManager->requestElement( u"private:resource/toolbar/drawbar"_ustr ); - xLayoutManager->requestElement( "private:resource/statusbar/statusbar" ); + xLayoutManager->requestElement( u"private:resource/statusbar/statusbar"_ustr ); xLayoutManager->unlock(); // add as listener to get notified when @@ -949,8 +949,8 @@ void SAL_CALL ChartController::layoutEvent( Reference< frame::XLayoutManager > xLM( aSource.Source, uno::UNO_QUERY ); if( xLM.is()) { - xLM->createElement( "private:resource/statusbar/statusbar" ); - xLM->requestElement( "private:resource/statusbar/statusbar" ); + xLM->createElement( u"private:resource/statusbar/statusbar"_ustr ); + xLM->requestElement( u"private:resource/statusbar/statusbar"_ustr ); } } } @@ -1281,26 +1281,26 @@ void SAL_CALL ChartController::dispatch( if( xPropSet.is() ) { uno::Reference< css::frame::XLayoutManager > xLayoutManager; - xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager; + xPropSet->getPropertyValue( u"LayoutManager"_ustr ) >>= xLayoutManager; if ( xLayoutManager.is() ) { - bool bIsVisible( xLayoutManager->isElementVisible( "private:resource/statusbar/statusbar" )); + bool bIsVisible( xLayoutManager->isElementVisible( u"private:resource/statusbar/statusbar"_ustr )); if( bIsVisible ) { - xLayoutManager->hideElement( "private:resource/statusbar/statusbar" ); - xLayoutManager->destroyElement( "private:resource/statusbar/statusbar" ); + xLayoutManager->hideElement( u"private:resource/statusbar/statusbar"_ustr ); + xLayoutManager->destroyElement( u"private:resource/statusbar/statusbar"_ustr ); } else { - xLayoutManager->createElement( "private:resource/statusbar/statusbar" ); - xLayoutManager->showElement( "private:resource/statusbar/statusbar" ); + xLayoutManager->createElement( u"private:resource/statusbar/statusbar"_ustr ); + xLayoutManager->showElement( u"private:resource/statusbar/statusbar"_ustr ); } // @todo: update menu state (checkmark next to "Statusbar"). } } } else if( aCommand == "ChangeTheme" ) - comphelper::dispatchCommand(".uno:ChangeTheme", getFrame(), rArgs); + comphelper::dispatchCommand(u".uno:ChangeTheme"_ustr, getFrame(), rArgs); } void SAL_CALL ChartController::addStatusListener( @@ -1580,69 +1580,69 @@ const o3tl::sorted_vector< OUString >& ChartController::impl_getAvailableCommand { static const o3tl::sorted_vector< OUString > s_AvailableCommands { // commands for container forward - "AddDirect", "NewDoc", "Open", - "Save", "SaveAs", "SendMail", - "EditDoc", "ExportDirectToPDF", "PrintDefault", + u"AddDirect"_ustr, u"NewDoc"_ustr, u"Open"_ustr, + u"Save"_ustr, u"SaveAs"_ustr, u"SendMail"_ustr, + u"EditDoc"_ustr, u"ExportDirectToPDF"_ustr, u"PrintDefault"_ustr, // own commands - "Cut", "Copy", "Paste", - "DataRanges", "DiagramData", + u"Cut"_ustr, u"Copy"_ustr, u"Paste"_ustr, + u"DataRanges"_ustr, u"DiagramData"_ustr, // insert objects - "InsertMenuTitles", "InsertTitles", - "InsertMenuLegend", "InsertLegend", "DeleteLegend", - "InsertMenuDataLabels", - "InsertMenuAxes", "InsertRemoveAxes", "InsertMenuGrids", - "InsertSymbol", - "InsertTrendlineEquation", "InsertTrendlineEquationAndR2", - "InsertR2Value", "DeleteR2Value", - "InsertMenuTrendlines", "InsertTrendline", - "InsertMenuMeanValues", "InsertMeanValue", - "InsertMenuXErrorBars", "InsertXErrorBars", - "InsertMenuYErrorBars", "InsertYErrorBars", - "InsertDataLabels", "InsertDataLabel", - "DeleteTrendline", "DeleteMeanValue", "DeleteTrendlineEquation", - "DeleteXErrorBars", "DeleteYErrorBars", - "DeleteDataLabels", "DeleteDataLabel", - "InsertMenuDataTable", - "InsertDataTable", "DeleteDataTable", + u"InsertMenuTitles"_ustr, u"InsertTitles"_ustr, + u"InsertMenuLegend"_ustr, u"InsertLegend"_ustr, u"DeleteLegend"_ustr, + u"InsertMenuDataLabels"_ustr, + u"InsertMenuAxes"_ustr, u"InsertRemoveAxes"_ustr, u"InsertMenuGrids"_ustr, + u"InsertSymbol"_ustr, + u"InsertTrendlineEquation"_ustr, u"InsertTrendlineEquationAndR2"_ustr, + u"InsertR2Value"_ustr, u"DeleteR2Value"_ustr, + u"InsertMenuTrendlines"_ustr, u"InsertTrendline"_ustr, + u"InsertMenuMeanValues"_ustr, u"InsertMeanValue"_ustr, + u"InsertMenuXErrorBars"_ustr, u"InsertXErrorBars"_ustr, + u"InsertMenuYErrorBars"_ustr, u"InsertYErrorBars"_ustr, + u"InsertDataLabels"_ustr, u"InsertDataLabel"_ustr, + u"DeleteTrendline"_ustr, u"DeleteMeanValue"_ustr, u"DeleteTrendlineEquation"_ustr, + u"DeleteXErrorBars"_ustr, u"DeleteYErrorBars"_ustr, + u"DeleteDataLabels"_ustr, u"DeleteDataLabel"_ustr, + u"InsertMenuDataTable"_ustr, + u"InsertDataTable"_ustr, u"DeleteDataTable"_ustr, //format objects - "FormatSelection", "FontDialog", "TransformDialog", - "DiagramType", "View3D", - "Forward", "Backward", - "MainTitle", "SubTitle", - "XTitle", "YTitle", "ZTitle", - "SecondaryXTitle", "SecondaryYTitle", - "AllTitles", "Legend", - "DiagramAxisX", "DiagramAxisY", "DiagramAxisZ", - "DiagramAxisA", "DiagramAxisB", "DiagramAxisAll", - "DiagramGridXMain", "DiagramGridYMain", "DiagramGridZMain", - "DiagramGridXHelp", "DiagramGridYHelp", "DiagramGridZHelp", - "DiagramGridAll", - "DiagramWall", "DiagramFloor", "DiagramArea", + u"FormatSelection"_ustr, u"FontDialog"_ustr, u"TransformDialog"_ustr, + u"DiagramType"_ustr, u"View3D"_ustr, + u"Forward"_ustr, u"Backward"_ustr, + u"MainTitle"_ustr, u"SubTitle"_ustr, + u"XTitle"_ustr, u"YTitle"_ustr, u"ZTitle"_ustr, + u"SecondaryXTitle"_ustr, u"SecondaryYTitle"_ustr, + u"AllTitles"_ustr, u"Legend"_ustr, + u"DiagramAxisX"_ustr, u"DiagramAxisY"_ustr, u"DiagramAxisZ"_ustr, + u"DiagramAxisA"_ustr, u"DiagramAxisB"_ustr, u"DiagramAxisAll"_ustr, + u"DiagramGridXMain"_ustr, u"DiagramGridYMain"_ustr, u"DiagramGridZMain"_ustr, + u"DiagramGridXHelp"_ustr, u"DiagramGridYHelp"_ustr, u"DiagramGridZHelp"_ustr, + u"DiagramGridAll"_ustr, + u"DiagramWall"_ustr, u"DiagramFloor"_ustr, u"DiagramArea"_ustr, //context menu - format objects entries - "FormatWall", "FormatFloor", "FormatChartArea", - "FormatLegend", + u"FormatWall"_ustr, u"FormatFloor"_ustr, u"FormatChartArea"_ustr, + u"FormatLegend"_ustr, - "FormatAxis", "FormatTitle", - "FormatDataSeries", "FormatDataPoint", - "ResetAllDataPoints", "ResetDataPoint", - "FormatDataLabels", "FormatDataLabel", - "FormatMeanValue", "FormatTrendline", "FormatTrendlineEquation", - "FormatXErrorBars", "FormatYErrorBars", - "FormatStockLoss", "FormatStockGain", + u"FormatAxis"_ustr, u"FormatTitle"_ustr, + u"FormatDataSeries"_ustr, u"FormatDataPoint"_ustr, + u"ResetAllDataPoints"_ustr, u"ResetDataPoint"_ustr, + u"FormatDataLabels"_ustr, u"FormatDataLabel"_ustr, + u"FormatMeanValue"_ustr, u"FormatTrendline"_ustr, u"FormatTrendlineEquation"_ustr, + u"FormatXErrorBars"_ustr, u"FormatYErrorBars"_ustr, + u"FormatStockLoss"_ustr, u"FormatStockGain"_ustr, - "FormatMajorGrid", "InsertMajorGrid", "DeleteMajorGrid", - "FormatMinorGrid", "InsertMinorGrid", "DeleteMinorGrid", - "InsertAxis", "DeleteAxis", "InsertAxisTitle", + u"FormatMajorGrid"_ustr, u"InsertMajorGrid"_ustr, u"DeleteMajorGrid"_ustr, + u"FormatMinorGrid"_ustr, u"InsertMinorGrid"_ustr, u"DeleteMinorGrid"_ustr, + u"InsertAxis"_ustr, u"DeleteAxis"_ustr, u"InsertAxisTitle"_ustr, // toolbar commands - "ToggleGridHorizontal", "ToggleGridVertical", "ToggleLegend", "ScaleText", - "NewArrangement", "Update", - "DefaultColors", "BarWidth", "NumberOfLines", - "ArrangeRow", - "StatusBarVisible", - "ChartElementSelector"}; + u"ToggleGridHorizontal"_ustr, u"ToggleGridVertical"_ustr, u"ToggleLegend"_ustr, u"ScaleText"_ustr, + u"NewArrangement"_ustr, u"Update"_ustr, + u"DefaultColors"_ustr, u"BarWidth"_ustr, u"NumberOfLines"_ustr, + u"ArrangeRow"_ustr, + u"StatusBarVisible"_ustr, + u"ChartElementSelector"_ustr}; return s_AvailableCommands; } diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index b3455ad49e04..3ec8b62c1ecb 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -178,19 +178,19 @@ void ChartController::executeDispatch_OpenInsertDataTableDialog() { uno::Reference<beans::XPropertySet> xProperties(xDataTable, uno::UNO_QUERY); - uno::Any aAny = xProperties->getPropertyValue("HBorder"); + uno::Any aAny = xProperties->getPropertyValue(u"HBorder"_ustr); if (aAny.has<bool>()) aData.mbHorizontalBorders = aAny.get<bool>(); - aAny = xProperties->getPropertyValue("VBorder"); + aAny = xProperties->getPropertyValue(u"VBorder"_ustr); if (aAny.has<bool>()) aData.mbVerticalBorders = aAny.get<bool>(); - aAny = xProperties->getPropertyValue("Outline"); + aAny = xProperties->getPropertyValue(u"Outline"_ustr); if (aAny.has<bool>()) aData.mbOutline = aAny.get<bool>(); - aAny = xProperties->getPropertyValue("Keys"); + aAny = xProperties->getPropertyValue(u"Keys"_ustr); if (aAny.has<bool>()) aData.mbKeys = aAny.get<bool>(); } @@ -224,10 +224,10 @@ void ChartController::executeDispatch_OpenInsertDataTableDialog() if (rDialogData.mbShow && xDataTable.is()) { uno::Reference<beans::XPropertySet> xProperties(xDataTable, uno::UNO_QUERY); - xProperties->setPropertyValue("HBorder" , uno::Any(rDialogData.mbHorizontalBorders)); - xProperties->setPropertyValue("VBorder" , uno::Any(rDialogData.mbVerticalBorders)); - xProperties->setPropertyValue("Outline" , uno::Any(rDialogData.mbOutline)); - xProperties->setPropertyValue("Keys" , uno::Any(rDialogData.mbKeys)); + xProperties->setPropertyValue(u"HBorder"_ustr , uno::Any(rDialogData.mbHorizontalBorders)); + xProperties->setPropertyValue(u"VBorder"_ustr , uno::Any(rDialogData.mbVerticalBorders)); + xProperties->setPropertyValue(u"Outline"_ustr , uno::Any(rDialogData.mbOutline)); + xProperties->setPropertyValue(u"Keys"_ustr , uno::Any(rDialogData.mbKeys)); bChanged = true; } @@ -644,10 +644,10 @@ void ChartController::executeDispatch_InsertTrendlineEquation( bool bInsertR2 ) ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); - xEqProp->setPropertyValue( "ShowEquation", uno::Any( true )); - xEqProp->setPropertyValue( "XName", uno::Any( OUString("x") )); - xEqProp->setPropertyValue( "YName", uno::Any( OUString("f(x)") )); - xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( bInsertR2 )); + xEqProp->setPropertyValue( u"ShowEquation"_ustr, uno::Any( true )); + xEqProp->setPropertyValue( u"XName"_ustr, uno::Any( u"x"_ustr )); + xEqProp->setPropertyValue( u"YName"_ustr, uno::Any( u"f(x)"_ustr )); + xEqProp->setPropertyValue( u"ShowCorrelationCoefficient"_ustr, uno::Any( bInsertR2 )); aUndoGuard.commit(); } } @@ -662,7 +662,7 @@ void ChartController::executeDispatch_InsertR2Value() ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); - xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( true )); + xEqProp->setPropertyValue( u"ShowCorrelationCoefficient"_ustr, uno::Any( true )); aUndoGuard.commit(); } } @@ -677,7 +677,7 @@ void ChartController::executeDispatch_DeleteR2Value() ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Insert, SchResId( STR_OBJECT_CURVE_EQUATION )), m_xUndoManager ); - xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( false )); + xEqProp->setPropertyValue( u"ShowCorrelationCoefficient"_ustr, uno::Any( false )); aUndoGuard.commit(); } } diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx index 600d46b434d0..bc8e65409130 100644 --- a/chart2/source/controller/main/ChartController_TextEdit.cxx +++ b/chart2/source/controller/main/ChartController_TextEdit.cxx @@ -78,7 +78,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel ) //#i77362 change notification for changes on additional shapes are missing if( m_xChartView.is() ) - m_xChartView->setPropertyValue( "SdrViewIsInEditMode", uno::Any(true) ); + m_xChartView->setPropertyValue( u"SdrViewIsInEditMode"_ustr, uno::Any(true) ); auto pChartWindow(GetChartWindow()); @@ -122,7 +122,7 @@ bool ChartController::EndTextEdit() //#i77362 change notification for changes on additional shapes are missing if( m_xChartView.is() ) - m_xChartView->setPropertyValue( "SdrViewIsInEditMode", uno::Any(false) ); + m_xChartView->setPropertyValue( u"SdrViewIsInEditMode"_ustr, uno::Any(false) ); SdrObject* pTextObject = m_pDrawViewWrapper->getTextEditObject(); if(!pTextObject) diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 5774ff1350d4..67ea64a11fb9 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -191,9 +191,9 @@ void ChartController::executeDispatch_NewArrangement() ControllerLockGuardUNO aCtlLockGuard( xModel ); // diagram - xDiagram->setPropertyToDefault( "RelativeSize"); - xDiagram->setPropertyToDefault( "RelativePosition"); - xDiagram->setPropertyToDefault( "PosSizeExcludeAxes"); + xDiagram->setPropertyToDefault( u"RelativeSize"_ustr); + xDiagram->setPropertyToDefault( u"RelativePosition"_ustr); + xDiagram->setPropertyToDefault( u"PosSizeExcludeAxes"_ustr); // 3d rotation xDiagram->set3DSettingsToDefault(); @@ -202,9 +202,9 @@ void ChartController::executeDispatch_NewArrangement() rtl::Reference< Legend > xLegend = xDiagram->getLegend2(); if( xLegend.is()) { - xLegend->setPropertyToDefault( "RelativePosition"); - xLegend->setPropertyToDefault( "RelativeSize"); - xLegend->setPropertyToDefault( "AnchorPosition"); + xLegend->setPropertyToDefault( u"RelativePosition"_ustr); + xLegend->setPropertyToDefault( u"RelativeSize"_ustr); + xLegend->setPropertyToDefault( u"AnchorPosition"_ustr); } // titles @@ -216,7 +216,7 @@ void ChartController::executeDispatch_NewArrangement() TitleHelper::getTitle( static_cast< TitleHelper::eTitleType >( eType ), xModel ); if( xTitleState.is()) - xTitleState->setPropertyToDefault( "RelativePosition"); + xTitleState->setPropertyToDefault( u"RelativePosition"_ustr); } // regression curve equations @@ -356,13 +356,13 @@ void ChartController::impl_PasteGraphic( m_aSelection.setSelection( xGraphicShape ); m_aSelection.applySelection( m_pDrawViewWrapper.get() ); } - xGraphicShape->SvxShape::setPropertyValue( "Graphic", uno::Any( xGraphic )); + xGraphicShape->SvxShape::setPropertyValue( u"Graphic"_ustr, uno::Any( xGraphic )); awt::Size aGraphicSize( 1000, 1000 ); bool bGotGraphicSize = false; try { - bGotGraphicSize = xGraphicShape->SvxShape::getPropertyValue( "Size100thMM") >>= aGraphicSize; + bGotGraphicSize = xGraphicShape->SvxShape::getPropertyValue( u"Size100thMM"_ustr) >>= aGraphicSize; } catch (css::beans::UnknownPropertyException& ) {} @@ -373,7 +373,7 @@ void ChartController::impl_PasteGraphic( bool bGotSizePixel = false; try { - bGotSizePixel = xGraphicShape->SvxShape::getPropertyValue( "SizePixel") >>= aGraphicSize; + bGotSizePixel = xGraphicShape->SvxShape::getPropertyValue( u"SizePixel"_ustr) >>= aGraphicSize; } catch (css::beans::UnknownPropertyException& ) {} @@ -466,14 +466,14 @@ void ChartController::impl_PasteStringAsTextShape( const OUString& rString, cons xTextShape->setString( rString ); float fCharHeight = 10.0; - xTextShape->SvxShape::setPropertyValue( "TextAutoGrowHeight", uno::Any( true ) ); - xTextShape->SvxShape::setPropertyValue( "TextAutoGrowWidth", uno::Any( true ) ); - xTextShape->SvxShape::setPropertyValue( "CharHeight", uno::Any( fCharHeight ) ); - xTextShape->SvxShape::setPropertyValue( "CharHeightAsian", uno::Any( fCharHeight ) ); - xTextShape->SvxShape::setPropertyValue( "CharHeightComplex", uno::Any( fCharHeight ) ); - xTextShape->SvxShape::setPropertyValue( "TextVerticalAdjust", uno::Any( drawing::TextVerticalAdjust_CENTER ) ); - xTextShape->SvxShape::setPropertyValue( "TextHorizontalAdjust", uno::Any( drawing::TextHorizontalAdjust_CENTER ) ); - xTextShape->SvxShape::setPropertyValue( "CharFontName", uno::Any( OUString("Albany") ) ); + xTextShape->SvxShape::setPropertyValue( u"TextAutoGrowHeight"_ustr, uno::Any( true ) ); + xTextShape->SvxShape::setPropertyValue( u"TextAutoGrowWidth"_ustr, uno::Any( true ) ); + xTextShape->SvxShape::setPropertyValue( u"CharHeight"_ustr, uno::Any( fCharHeight ) ); + xTextShape->SvxShape::setPropertyValue( u"CharHeightAsian"_ustr, uno::Any( fCharHeight ) ); + xTextShape->SvxShape::setPropertyValue( u"CharHeightComplex"_ustr, uno::Any( fCharHeight ) ); + xTextShape->SvxShape::setPropertyValue( u"TextVerticalAdjust"_ustr, uno::Any( drawing::TextVerticalAdjust_CENTER ) ); + xTextShape->SvxShape::setPropertyValue( u"TextHorizontalAdjust"_ustr, uno::Any( drawing::TextHorizontalAdjust_CENTER ) ); + xTextShape->SvxShape::setPropertyValue( u"CharFontName"_ustr, uno::Any( u"Albany"_ustr ) ); xTextShape->setPosition( rPosition ); @@ -639,7 +639,7 @@ bool ChartController::executeDispatch_Delete() ActionDescriptionProvider::createDescription( ActionDescriptionProvider::ActionType::Delete, SchResId( STR_OBJECT_LEGEND )), m_xUndoManager ); - xLegend->setPropertyValue( "Show", uno::Any( false )); + xLegend->setPropertyValue( u"Show"_ustr, uno::Any( false )); bReturn = true; aUndoGuard.commit(); } @@ -712,10 +712,10 @@ bool ChartController::executeDispatch_Delete() m_xUndoManager ); { ControllerLockGuardUNO aCtlLockGuard( xModel ); - xEqProp->setPropertyValue( "ShowEquation", uno::Any( false )); - xEqProp->setPropertyValue( "XName", uno::Any( OUString("x") )); - xEqProp->setPropertyValue( "YName", uno::Any( OUString("f(x)") )); - xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( false )); + xEqProp->setPropertyValue( u"ShowEquation"_ustr, uno::Any( false )); + xEqProp->setPropertyValue( u"XName"_ustr, uno::Any( u"x"_ustr )); + xEqProp->setPropertyValue( u"YName"_ustr, uno::Any( u"f(x)"_ustr )); + xEqProp->setPropertyValue( u"ShowCorrelationCoefficient"_ustr, uno::Any( false )); } bReturn = true; aUndoGuard.commit(); @@ -748,7 +748,7 @@ bool ChartController::executeDispatch_Delete() { ControllerLockGuardUNO aCtlLockGuard( xModel ); xErrorBarProp->setPropertyValue( - "ErrorBarStyle", + u"ErrorBarStyle"_ustr, uno::Any( css::chart::ErrorBarStyle::NONE )); } bReturn = true; @@ -846,9 +846,9 @@ void ChartController::executeDispatch_ToggleLegend() try { bool bShow = false; - if( xLegendProp->getPropertyValue( "Show") >>= bShow ) + if( xLegendProp->getPropertyValue( u"Show"_ustr) >>= bShow ) { - xLegendProp->setPropertyValue( "Show", uno::Any( ! bShow )); + xLegendProp->setPropertyValue( u"Show"_ustr, uno::Any( ! bShow )); bChanged = true; } } @@ -945,7 +945,7 @@ void ChartController::executeDispatch_FillColor(sal_uInt32 nColor) Reference< beans::XPropertySet > xPointProperties( ObjectIdentifier::getObjectPropertySet( aCID, xChartModel ) ); if( xPointProperties.is() ) - xPointProperties->setPropertyValue( "FillColor", uno::Any( nColor ) ); + xPointProperties->setPropertyValue( u"FillColor"_ustr, uno::Any( nColor ) ); } } catch( const uno::Exception& ) @@ -980,7 +980,7 @@ void ChartController::executeDispatch_FillGradient(std::u16string_view sJSONGrad xChartModel, aPrefferedName); - xPropSet->setPropertyValue("FillGradientName", css::uno::Any(aNewName)); + xPropSet->setPropertyValue(u"FillGradientName"_ustr, css::uno::Any(aNewName)); } } } @@ -1011,7 +1011,7 @@ void ChartController::executeDispatch_LineColor(sal_uInt32 nColor) } if( xPropSet.is() ) - xPropSet->setPropertyValue( "LineColor", css::uno::Any( Color(ColorTransparency, nColor) ) ); + xPropSet->setPropertyValue( u"LineColor"_ustr, css::uno::Any( Color(ColorTransparency, nColor) ) ); } } catch( const uno::Exception& ) @@ -1041,7 +1041,7 @@ void ChartController::executeDispatch_LineWidth(sal_uInt32 nWidth) } if( xPropSet.is() ) - xPropSet->setPropertyValue( "LineWidth", css::uno::Any( nWidth ) ); + xPropSet->setPropertyValue( u"LineWidth"_ustr, css::uno::Any( nWidth ) ); } } catch( const uno::Exception& ) @@ -1092,7 +1092,7 @@ void ChartController::executeDispatch_LOKPieSegmentDragging( int nOffset ) Reference< beans::XPropertySet > xPointProperties( ObjectIdentifier::getObjectPropertySet( aCID, xChartModel ) ); if( xPointProperties.is() ) - xPointProperties->setPropertyValue( "Offset", uno::Any( nOffset / 100.0 ) ); + xPointProperties->setPropertyValue( u"Offset"_ustr, uno::Any( nOffset / 100.0 ) ); } } catch( const uno::Exception & ) diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 375c2824a8a1..d8f5662ab882 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -146,13 +146,13 @@ void lcl_insertMenuCommand( const uno::Reference< awt::XPopupMenu > & xMenu, sal_Int16 nId, const OUString & rCommand ) { - xMenu->insertItem( nId, "", 0, -1 ); + xMenu->insertItem( nId, u""_ustr, 0, -1 ); xMenu->setCommand( nId, rCommand ); } OUString lcl_getFormatCommandForObjectCID( std::u16string_view rCID ) { - OUString aDispatchCommand( ".uno:FormatSelection" ); + OUString aDispatchCommand( u".uno:FormatSelection"_ustr ); ObjectType eObjectType = ObjectIdentifier::getObjectType( rCID ); @@ -275,7 +275,7 @@ void SAL_CALL ChartController::setPosSize( { "ScaleYNumerator", uno::Any( nScaleYNumerator ) }, { "ScaleYDenominator", uno::Any( nScaleYDenominator ) } })); - m_xChartView->setPropertyValue( "ZoomFactors", uno::Any( aZoomFactors )); + m_xChartView->setPropertyValue( u"ZoomFactors"_ustr, uno::Any( aZoomFactors )); } //a correct work area is at least necessary for correct values in the position and size dialog and for dragging area @@ -480,7 +480,7 @@ void ChartController::execute_Paint(vcl::RenderContext& rRenderContext, const to aResolution.Height = pChartWindow->GetSizePixel().Height(); } } - m_xChartView->setPropertyValue( "Resolution", uno::Any( aResolution )); + m_xChartView->setPropertyValue( u"Resolution"_ustr, uno::Any( aResolution )); } if (m_xChartView.is()) @@ -1024,9 +1024,9 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) sal_Int16 nUniqueId = 1; if (eObjectType != OBJECTTYPE_DATA_TABLE) { - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:Cut" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:Copy" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:Paste" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:Cut"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:Copy"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:Paste"_ustr ); xPopupMenu->insertSeparator( -1 ); } @@ -1035,7 +1035,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) OUString aFormatCommand( lcl_getFormatCommandForObjectCID( m_aSelection.getSelectedCID() ) ); lcl_insertMenuCommand( xPopupMenu, nUniqueId++, aFormatCommand ); if (eObjectType == OBJECTTYPE_TITLE && m_pDrawViewWrapper->IsTextEdit()) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FontDialog" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FontDialog"_ustr ); //some commands for dataseries and points: @@ -1085,17 +1085,17 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) if( bIsPoint ) { if( bHasDataLabelAtPoint ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatDataLabel" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatDataLabel"_ustr ); if( !bHasDataLabelAtPoint ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertDataLabel" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertDataLabel"_ustr ); else - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteDataLabel" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteDataLabel"_ustr ); if( bSelectedPointIsFormatted ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:ResetDataPoint" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:ResetDataPoint"_ustr ); xPopupMenu->insertSeparator( -1 ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatDataSeries" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatDataSeries"_ustr ); } rtl::Reference< ChartType > xChartType( xDiagram->getChartTypeOfSeries( xSeries ) ); @@ -1104,12 +1104,12 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) try { bool bJapaneseStyle = false; - xChartType->getPropertyValue( "Japanese" ) >>= bJapaneseStyle; + xChartType->getPropertyValue( u"Japanese"_ustr ) >>= bJapaneseStyle; if( bJapaneseStyle ) { - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatStockLoss" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatStockGain" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatStockLoss"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatStockGain"_ustr ); } } catch( const uno::Exception & ) @@ -1119,68 +1119,68 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) } if( bHasDataLabelsAtSeries ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatDataLabels" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatDataLabels"_ustr ); if( bHasEquation ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatTrendlineEquation" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatTrendlineEquation"_ustr ); if( xMeanValue.is() ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatMeanValue" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatMeanValue"_ustr ); if( bHasXErrorBars ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatXErrorBars" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatXErrorBars"_ustr ); if( bHasYErrorBars ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatYErrorBars" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatYErrorBars"_ustr ); xPopupMenu->insertSeparator( -1 ); if( !bHasDataLabelsAtSeries ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertDataLabels" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertDataLabels"_ustr ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertTrendline" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertTrendline"_ustr ); if( !xMeanValue.is() ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertMeanValue" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertMeanValue"_ustr ); if( !bHasXErrorBars ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertXErrorBars" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertXErrorBars"_ustr ); if( !bHasYErrorBars ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertYErrorBars" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertYErrorBars"_ustr ); if( bHasDataLabelsAtSeries || ( bHasDataLabelsAtPoints && bHasFormattedDataPointsOtherThanSelected ) ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteDataLabels" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteDataLabels"_ustr ); if( bHasEquation ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteTrendlineEquation" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteTrendlineEquation"_ustr ); if( xMeanValue.is() ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteMeanValue" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteMeanValue"_ustr ); if( bHasXErrorBars ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteXErrorBars" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteXErrorBars"_ustr ); if( bHasYErrorBars ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteYErrorBars" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteYErrorBars"_ustr ); if( bHasFormattedDataPointsOtherThanSelected ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:ResetAllDataPoints" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:ResetAllDataPoints"_ustr ); xPopupMenu->insertSeparator( -1 ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId, ".uno:ArrangeRow" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId, u".uno:ArrangeRow"_ustr ); rtl::Reference< VCLXPopupMenu > xArrangePopupMenu = new VCLXPopupMenu(); sal_Int16 nSubId = nUniqueId + 1; - lcl_insertMenuCommand( xArrangePopupMenu, nSubId++, ".uno:Forward" ); - lcl_insertMenuCommand( xArrangePopupMenu, nSubId, ".uno:Backward" ); + lcl_insertMenuCommand( xArrangePopupMenu, nSubId++, u".uno:Forward"_ustr ); + lcl_insertMenuCommand( xArrangePopupMenu, nSubId, u".uno:Backward"_ustr ); xPopupMenu->setPopupMenu( nUniqueId, xArrangePopupMenu ); nUniqueId = nSubId; ++nUniqueId; } else if( eObjectType == OBJECTTYPE_DATA_CURVE ) { - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteTrendline" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatTrendlineEquation" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertTrendlineEquation" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertTrendlineEquationAndR2" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertR2Value" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteTrendlineEquation" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteR2Value" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteTrendline"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatTrendlineEquation"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertTrendlineEquation"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertTrendlineEquationAndR2"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertR2Value"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteTrendlineEquation"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteR2Value"_ustr ); } else if( eObjectType == OBJECTTYPE_DATA_CURVE_EQUATION ) { - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertR2Value" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteR2Value" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertR2Value"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteR2Value"_ustr ); } //some commands for axes: and grids @@ -1201,44 +1201,44 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) bool bHasTitle = !TitleHelper::getCompleteString( xAxis->getTitleObject2() ).isEmpty(); if( eObjectType != OBJECTTYPE_AXIS && bIsAxisVisible ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatAxis" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatAxis"_ustr ); if( eObjectType != OBJECTTYPE_GRID && bIsMajorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatMajorGrid" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatMajorGrid"_ustr ); if( eObjectType != OBJECTTYPE_SUBGRID && bIsMinorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatMinorGrid" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatMinorGrid"_ustr ); xPopupMenu->insertSeparator( -1 ); if( eObjectType != OBJECTTYPE_AXIS && !bIsAxisVisible ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertAxis" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertAxis"_ustr ); if( eObjectType != OBJECTTYPE_GRID && !bIsMajorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertMajorGrid" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertMajorGrid"_ustr ); if( eObjectType != OBJECTTYPE_SUBGRID && !bIsMinorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertMinorGrid" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertMinorGrid"_ustr ); if( !bHasTitle ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertAxisTitle" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertAxisTitle"_ustr ); if( bIsAxisVisible ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteAxis" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteAxis"_ustr ); if( bIsMajorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteMajorGrid" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteMajorGrid"_ustr ); if( bIsMinorGridVisible && !bIsSecondaryAxis ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteMinorGrid" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteMinorGrid"_ustr ); if (bIsAxisVisible) - lcl_insertMenuCommand(xPopupMenu, nUniqueId++, ".uno:InsertDataTable"); + lcl_insertMenuCommand(xPopupMenu, nUniqueId++, u".uno:InsertDataTable"_ustr); } } else if (eObjectType == OBJECTTYPE_DATA_TABLE) { - lcl_insertMenuCommand(xPopupMenu, nUniqueId++, ".uno:DeleteDataTable"); + lcl_insertMenuCommand(xPopupMenu, nUniqueId++, u".uno:DeleteDataTable"_ustr); } if( eObjectType == OBJECTTYPE_DATA_STOCK_LOSS ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatStockGain" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatStockGain"_ustr ); else if( eObjectType == OBJECTTYPE_DATA_STOCK_GAIN ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:FormatStockLoss" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:FormatStockLoss"_ustr ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:TransformDialog" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:TransformDialog"_ustr ); if( eObjectType == OBJECTTYPE_PAGE || eObjectType == OBJECTTYPE_DIAGRAM || eObjectType == OBJECTTYPE_DIAGRAM_WALL @@ -1248,30 +1248,30 @@ void ChartController::execute_Command( const CommandEvent& rCEvt ) if( eObjectType != OBJECTTYPE_UNKNOWN ) xPopupMenu->insertSeparator( -1 ); bool bHasLegend = LegendHelper::hasLegend( xDiagram ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertTitles" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertTitles"_ustr ); if( !bHasLegend ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertLegend" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:InsertRemoveAxes" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertLegend"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:InsertRemoveAxes"_ustr ); if( bHasLegend ) - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DeleteLegend" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DeleteLegend"_ustr ); } xPopupMenu->insertSeparator( -1 ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DiagramType" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DataRanges" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:DiagramData" ); - lcl_insertMenuCommand( xPopupMenu, nUniqueId++, ".uno:View3D" ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DiagramType"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DataRanges"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:DiagramData"_ustr ); + lcl_insertMenuCommand( xPopupMenu, nUniqueId++, u".uno:View3D"_ustr ); } css::uno::Sequence< css::uno::Any > aArgs{ - css::uno::Any(comphelper::makePropertyValue( "IsContextMenu", true )), - css::uno::Any(comphelper::makePropertyValue( "Frame", m_xFrame )), - css::uno::Any(comphelper::makePropertyValue( "Value", aMenuName )) + css::uno::Any(comphelper::makePropertyValue( u"IsContextMenu"_ustr, true )), + css::uno::Any(comphelper::makePropertyValue( u"Frame"_ustr, m_xFrame )), + css::uno::Any(comphelper::makePropertyValue( u"Value"_ustr, aMenuName )) }; css::uno::Reference< css::frame::XPopupMenuController > xPopupController( m_xCC->getServiceManager()->createInstanceWithArgumentsAndContext( - "com.sun.star.comp.framework.ResourceMenuController", aArgs, m_xCC ), css::uno::UNO_QUERY ); + u"com.sun.star.comp.framework.ResourceMenuController"_ustr, aArgs, m_xCC ), css::uno::UNO_QUERY ); if ( !xPopupController.is() || !xPopupMenu.is() ) return; @@ -1564,7 +1564,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) rtl::Reference< ChartModel > xChartModel = getChartModel(); if(xChartModel.is()) { - OUString aDump = xChartModel->dump("shapes"); + OUString aDump = xChartModel->dump(u"shapes"_ustr); SAL_WARN("chart2", aDump); } } @@ -1589,8 +1589,8 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt ) uno::Sequence< beans::PropertyValue > aArgs; xDispatchHelper->executeDispatch( uno::Reference< frame::XDispatchProvider >( m_xFrame, uno::UNO_QUERY ), - ".uno:TerminateInplaceActivation", - "_parent", + u".uno:TerminateInplaceActivation"_ustr, + u"_parent"_ustr, frame::FrameSearchFlag::PARENT, aArgs ); bReturn = true; @@ -1783,8 +1783,8 @@ bool ChartController::impl_moveOrResizeObject( chart2::RelativePosition aRelPos; chart2::RelativeSize aRelSize; - bool bDeterminePos = !(xObjProp->getPropertyValue( "RelativePosition") >>= aRelPos); - bool bDetermineSize = !bNeedResize || !(xObjProp->getPropertyValue( "RelativeSize") >>= aRelSize); + bool bDeterminePos = !(xObjProp->getPropertyValue( u"RelativePosition"_ustr) >>= aRelPos); + bool bDetermineSize = !bNeedResize || !(xObjProp->getPropertyValue( u"RelativeSize"_ustr) >>= aRelSize); if( ( bDeterminePos || bDetermineSize ) && ( aRefSize.Width > 0 && aRefSize.Height > 0 ) ) @@ -1836,9 +1836,9 @@ bool ChartController::impl_moveOrResizeObject( eActionType, ObjectNameProvider::getName( eObjectType )), m_xUndoManager ); { ControllerLockGuardUNO aCLGuard( xChartModel ); - xObjProp->setPropertyValue( "RelativePosition", uno::Any( aRelPos )); + xObjProp->setPropertyValue( u"RelativePosition"_ustr, uno::Any( aRelPos )); if( bNeedResize || (eObjectType == OBJECTTYPE_DIAGRAM) )//Also set an explicit size at the diagram when an explicit position is set - xObjProp->setPropertyValue( "RelativeSize", uno::Any( aRelSize )); + xObjProp->setPropertyValue( u"RelativeSize"_ustr, uno::Any( aRelSize )); } aUndoGuard.commit(); } @@ -1862,7 +1862,7 @@ bool ChartController::impl_DragDataPoint( std::u16string_view rCID, double fAddi uno::Reference< beans::XPropertySet > xPointProp( xSeries->getDataPointByIndex( nDataPointIndex )); double fOffset = 0.0; if( xPointProp.is() && - (xPointProp->getPropertyValue( "Offset" ) >>= fOffset ) && + (xPointProp->getPropertyValue( u"Offset"_ustr ) >>= fOffset ) && (( fAdditionalOffset > 0.0 && fOffset < 1.0 ) || (fOffset > 0.0)) ) { fOffset += fAdditionalOffset; @@ -1870,7 +1870,7 @@ bool ChartController::impl_DragDataPoint( std::u16string_view rCID, double fAddi fOffset = 1.0; else if( fOffset < 0.0 ) fOffset = 0.0; - xPointProp->setPropertyValue( "Offset", uno::Any( fOffset )); + xPointProp->setPropertyValue( u"Offset"_ustr, uno::Any( fOffset )); bResult = true; } } diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 60ab7eb0ed2d..c2879e60d35d 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -53,7 +53,7 @@ ChartWindow::ChartWindow( ChartController* pController, vcl::Window* pParent, Wi , m_bInPaint(false) , m_pViewShellWindow( nullptr ) { - set_id("chart_window"); + set_id(u"chart_window"_ustr); SetHelpId( HID_SCH_WIN_DOCUMENT ); SetMapMode( MapMode(MapUnit::Map100thMM) ); adjustHighContrastMode(); diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index c16a0e45be37..e84d4877b5e9 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -72,9 +72,9 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL( const util::URL & rURL ) { static const o3tl::sorted_vector< OUString > s_aContainerDocumentCommands { - "AddDirect", "NewDoc", "Open", - "Save", "SaveAs", "SendMail", - "EditDoc", "ExportDirectToPDF", "PrintDefault"}; + u"AddDirect"_ustr, u"NewDoc"_ustr, u"Open"_ustr, + u"Save"_ustr, u"SaveAs"_ustr, u"SendMail"_ustr, + u"EditDoc"_ustr, u"ExportDirectToPDF"_ustr, u"PrintDefault"_ustr}; Reference< frame::XDispatch > xResult; tDispatchMap::const_iterator aIt( m_aCachedDispatches.find( rURL.Complete )); @@ -92,10 +92,10 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL( rtl::Reference<CommandDispatch> pDispatch = new UndoCommandDispatch( m_xContext, xModel ); xResult.set( pDispatch ); pDispatch->initialize(); - m_aCachedDispatches[ ".uno:Undo" ].set( xResult ); - m_aCachedDispatches[ ".uno:Redo" ].set( xResult ); - m_aCachedDispatches[ ".uno:GetUndoStrings" ].set( xResult ); - m_aCachedDispatches[ ".uno:GetRedoStrings" ].set( xResult ); + m_aCachedDispatches[ u".uno:Undo"_ustr ].set( xResult ); + m_aCachedDispatches[ u".uno:Redo"_ustr ].set( xResult ); + m_aCachedDispatches[ u".uno:GetUndoStrings"_ustr ].set( xResult ); + m_aCachedDispatches[ u".uno:GetRedoStrings"_ustr ].set( xResult ); m_aToBeDisposedDispatches.push_back( xResult ); } else if( xModel.is() && ( rURL.Path == "Context" || rURL.Path == "ModifiedStatus" ) ) @@ -104,8 +104,8 @@ Reference< frame::XDispatch > CommandDispatchContainer::getDispatchForURL( rtl::Reference<CommandDispatch> pDispatch = new StatusBarCommandDispatch( m_xContext, xModel, xSelSupp ); xResult.set( pDispatch ); pDispatch->initialize(); - m_aCachedDispatches[ ".uno:Context" ].set( xResult ); - m_aCachedDispatches[ ".uno:ModifiedStatus" ].set( xResult ); + m_aCachedDispatches[ u".uno:Context"_ustr ].set( xResult ); + m_aCachedDispatches[ u".uno:ModifiedStatus"_ustr ].set( xResult ); m_aToBeDisposedDispatches.push_back( xResult ); } else if( xModel.is() && @@ -178,7 +178,7 @@ Reference< frame::XDispatch > CommandDispatchContainer::getContainerDispatchForU { Reference< frame::XDispatchProvider > xDispProv( xFrame->getCreator(), uno::UNO_QUERY ); if( xDispProv.is()) - xResult.set( xDispProv->queryDispatch( rURL, "_self", 0 )); + xResult.set( xDispProv->queryDispatch( rURL, u"_self"_ustr, 0 )); } } return xResult; diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 8d7bc490e569..787968b3f13b 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -66,9 +66,9 @@ bool lcl_isStatusBarVisible( const Reference< frame::XController > & xController if( xPropSet.is() ) { uno::Reference< css::frame::XLayoutManager > xLayoutManager; - xPropSet->getPropertyValue( "LayoutManager" ) >>= xLayoutManager; + xPropSet->getPropertyValue( u"LayoutManager"_ustr ) >>= xLayoutManager; if ( xLayoutManager.is() ) - bIsStatusBarVisible = xLayoutManager->isElementVisible( "private:resource/statusbar/statusbar" ); + bIsStatusBarVisible = xLayoutManager->isElementVisible( u"private:resource/statusbar/statusbar"_ustr ); } } return bIsStatusBarVisible; @@ -294,8 +294,8 @@ void ControllerState::update( ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel ); if( xEquationProperties.is() ) { - xEquationProperties->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bHasR2Value; - xEquationProperties->getPropertyValue( "MayHaveCorrelationCoefficient" ) >>= bMayHaveR2; + xEquationProperties->getPropertyValue( u"ShowCorrelationCoefficient"_ustr ) >>= bHasR2Value; + xEquationProperties->getPropertyValue( u"MayHaveCorrelationCoefficient"_ustr ) >>= bMayHaveR2; } } catch(const uno::RuntimeException&) @@ -543,7 +543,7 @@ void ControllerCommandDispatch::updateCommandAvailability() { try { - xProps->getPropertyValue("EnableDataTableDialog") >>= bEnableDataTableDialog; + xProps->getPropertyValue(u"EnableDataTableDialog"_ustr) >>= bEnableDataTableDialog; } catch( const uno::Exception& ) { @@ -561,157 +561,157 @@ void ControllerCommandDispatch::updateCommandAvailability() } // edit commands - m_aCommandAvailability[ ".uno:Cut" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsDeleteableObjectSelected; - m_aCommandAvailability[ ".uno:Copy" ] = bControllerStateIsValid && m_apControllerState->bHasSelectedObject; - m_aCommandAvailability[ ".uno:Paste" ] = bIsWritable; + m_aCommandAvailability[ u".uno:Cut"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsDeleteableObjectSelected; + m_aCommandAvailability[ u".uno:Copy"_ustr ] = bControllerStateIsValid && m_apControllerState->bHasSelectedObject; + m_aCommandAvailability[ u".uno:Paste"_ustr ] = bIsWritable; // toolbar commands - m_aCommandAvailability[ ".uno:ToggleGridHorizontal" ] = bIsWritable; - m_aCommandArguments[ ".uno:ToggleGridHorizontal" ] <<= bModelStateIsValid && m_apModelState->bHasMainYGrid; - m_aCommandAvailability[ ".uno:ToggleGridVertical" ] = bIsWritable; - m_aCommandArguments[ ".uno:ToggleGridVertical" ] <<= bModelStateIsValid && m_apModelState->bHasMainXGrid; - - m_aCommandAvailability[ ".uno:ToggleLegend" ] = bIsWritable; - m_aCommandArguments[ ".uno:ToggleLegend" ] <<= bModelStateIsValid && m_apModelState->bHasLegend; - - m_aCommandAvailability[ ".uno:NewArrangement" ] = bIsWritable; - m_aCommandAvailability[ ".uno:Update" ] = bIsWritable; - m_aCommandAvailability[ ".uno:DefaultColors" ] = bIsWritable; - m_aCommandAvailability[ ".uno:BarWidth" ] = bIsWritable; - m_aCommandAvailability[ ".uno:NumberOfLines" ] = bIsWritable; - m_aCommandAvailability[ ".uno:ArrangeRow" ] = + m_aCommandAvailability[ u".uno:ToggleGridHorizontal"_ustr ] = bIsWritable; + m_aCommandArguments[ u".uno:ToggleGridHorizontal"_ustr ] <<= bModelStateIsValid && m_apModelState->bHasMainYGrid; + m_aCommandAvailability[ u".uno:ToggleGridVertical"_ustr ] = bIsWritable; + m_aCommandArguments[ u".uno:ToggleGridVertical"_ustr ] <<= bModelStateIsValid && m_apModelState->bHasMainXGrid; + + m_aCommandAvailability[ u".uno:ToggleLegend"_ustr ] = bIsWritable; + m_aCommandArguments[ u".uno:ToggleLegend"_ustr ] <<= bModelStateIsValid && m_apModelState->bHasLegend; + + m_aCommandAvailability[ u".uno:NewArrangement"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:Update"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:DefaultColors"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:BarWidth"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:NumberOfLines"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:ArrangeRow"_ustr ] = bShapeContext || ( bIsWritable && bControllerStateIsValid && ( m_apControllerState->bMayMoveSeriesForward || m_apControllerState->bMayMoveSeriesBackward ) ); // insert objects - m_aCommandAvailability[ ".uno:InsertTitles" ] = m_aCommandAvailability[ ".uno:InsertMenuTitles" ] = bIsWritable; - m_aCommandAvailability[ ".uno:InsertLegend" ] = m_aCommandAvailability[ ".uno:InsertMenuLegend" ] = bIsWritable; - m_aCommandAvailability[ ".uno:DeleteLegend" ] = bIsWritable; - m_aCommandAvailability[ ".uno:InsertMenuDataLabels" ] = bIsWritable; - m_aCommandAvailability[ ".uno:InsertRemoveAxes" ] = m_aCommandAvailability[ ".uno:InsertMenuAxes" ] = bIsWritable && m_apModelState->bSupportsAxes; - m_aCommandAvailability[ ".uno:InsertMenuGrids" ] = bIsWritable && m_apModelState->bSupportsAxes; - m_aCommandAvailability[ ".uno:InsertMenuTrendlines" ] = bIsWritable && m_apModelState->bSupportsStatistics && bControllerStateIsValid && m_apControllerState->bMayAddMenuTrendline; - m_aCommandAvailability[ ".uno:InsertMenuMeanValues" ] = bIsWritable && m_apModelState->bSupportsStatistics; - m_aCommandAvailability[ ".uno:InsertMenuXErrorBars" ] = bIsWritable && m_apModelState->bSupportsStatistics; - m_aCommandAvailability[ ".uno:InsertMenuYErrorBars" ] = bIsWritable && m_apModelState->bSupportsStatistics; - m_aCommandAvailability[ ".uno:InsertSymbol" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsTextObject; - m_aCommandAvailability[ ".uno:InsertMenuDataTable" ] = bIsWritable; + m_aCommandAvailability[ u".uno:InsertTitles"_ustr ] = m_aCommandAvailability[ u".uno:InsertMenuTitles"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:InsertLegend"_ustr ] = m_aCommandAvailability[ u".uno:InsertMenuLegend"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:DeleteLegend"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:InsertMenuDataLabels"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:InsertRemoveAxes"_ustr ] = m_aCommandAvailability[ u".uno:InsertMenuAxes"_ustr ] = bIsWritable && m_apModelState->bSupportsAxes; + m_aCommandAvailability[ u".uno:InsertMenuGrids"_ustr ] = bIsWritable && m_apModelState->bSupportsAxes; + m_aCommandAvailability[ u".uno:InsertMenuTrendlines"_ustr ] = bIsWritable && m_apModelState->bSupportsStatistics && bControllerStateIsValid && m_apControllerState->bMayAddMenuTrendline; + m_aCommandAvailability[ u".uno:InsertMenuMeanValues"_ustr ] = bIsWritable && m_apModelState->bSupportsStatistics; + m_aCommandAvailability[ u".uno:InsertMenuXErrorBars"_ustr ] = bIsWritable && m_apModelState->bSupportsStatistics; + m_aCommandAvailability[ u".uno:InsertMenuYErrorBars"_ustr ] = bIsWritable && m_apModelState->bSupportsStatistics; + m_aCommandAvailability[ u".uno:InsertSymbol"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsTextObject; + m_aCommandAvailability[ u".uno:InsertMenuDataTable"_ustr ] = bIsWritable; // format objects bool bFormatObjectAvailable = bIsWritable && bControllerStateIsValid && m_apControllerState->bIsFormateableObjectSelected; - m_aCommandAvailability[ ".uno:FormatSelection" ] = bFormatObjectAvailable && !bIsTextEdit; - m_aCommandAvailability[ ".uno:FontDialog" ] = bFormatObjectAvailable && bIsTextEdit; - m_aCommandAvailability[ ".uno:FormatAxis" ] = bFormatObjectAvailable; - m_aCommandAvailability[ ".uno:FormatTitle" ] = bFormatObjectAvailable && !bIsTextEdit; - m_aCommandAvailability[ ".uno:FormatDataSeries" ] = bFormatObjectAvailable; - m_aCommandAvailability[ ".uno:FormatDataPoint" ] = bFormatObjectAvailable; - m_aCommandAvailability[ ".uno:FormatDataLabels" ] = bFormatObjectAvailable; - m_aCommandAvailability[ ".uno:FormatDataLabel" ] = bFormatObjectAvailable; - m_aCommandAvailability[ ".uno:FormatXErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatXErrorBars; - m_aCommandAvailability[ ".uno:FormatYErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatYErrorBars; - m_aCommandAvailability[ ".uno:FormatMeanValue" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatMeanValue; - m_aCommandAvailability[ ".uno:FormatTrendline" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendline; - m_aCommandAvailability[ ".uno:FormatTrendlineEquation" ] = bFormatObjectAvailable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendlineEquation; - m_aCommandAvailability[ ".uno:FormatStockLoss" ] = bFormatObjectAvailable; - m_aCommandAvailability[ ".uno:FormatStockGain" ] = bFormatObjectAvailable; - - m_aCommandAvailability[ ".uno:DiagramType" ] = bIsWritable; - m_aCommandAvailability[ ".uno:Legend" ] = bIsWritable && m_apModelState->bHasLegend; - m_aCommandAvailability[ ".uno:DiagramWall" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasWall; - m_aCommandAvailability[ ".uno:DiagramArea" ] = bIsWritable; - - m_aCommandAvailability[ ".uno:TransformDialog" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bHasSelectedObject && m_apControllerState->bIsPositionableObject; + m_aCommandAvailability[ u".uno:FormatSelection"_ustr ] = bFormatObjectAvailable && !bIsTextEdit; + m_aCommandAvailability[ u".uno:FontDialog"_ustr ] = bFormatObjectAvailable && bIsTextEdit; + m_aCommandAvailability[ u".uno:FormatAxis"_ustr ] = bFormatObjectAvailable; + m_aCommandAvailability[ u".uno:FormatTitle"_ustr ] = bFormatObjectAvailable && !bIsTextEdit; + m_aCommandAvailability[ u".uno:FormatDataSeries"_ustr ] = bFormatObjectAvailable; + m_aCommandAvailability[ u".uno:FormatDataPoint"_ustr ] = bFormatObjectAvailable; + m_aCommandAvailability[ u".uno:FormatDataLabels"_ustr ] = bFormatObjectAvailable; + m_aCommandAvailability[ u".uno:FormatDataLabel"_ustr ] = bFormatObjectAvailable; + m_aCommandAvailability[ u".uno:FormatXErrorBars"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatXErrorBars; + m_aCommandAvailability[ u".uno:FormatYErrorBars"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatYErrorBars; + m_aCommandAvailability[ u".uno:FormatMeanValue"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatMeanValue; + m_aCommandAvailability[ u".uno:FormatTrendline"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendline; + m_aCommandAvailability[ u".uno:FormatTrendlineEquation"_ustr ] = bFormatObjectAvailable && bControllerStateIsValid && m_apControllerState->bMayFormatTrendlineEquation; + m_aCommandAvailability[ u".uno:FormatStockLoss"_ustr ] = bFormatObjectAvailable; + m_aCommandAvailability[ u".uno:FormatStockGain"_ustr ] = bFormatObjectAvailable; + + m_aCommandAvailability[ u".uno:DiagramType"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:Legend"_ustr ] = bIsWritable && m_apModelState->bHasLegend; + m_aCommandAvailability[ u".uno:DiagramWall"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasWall; + m_aCommandAvailability[ u".uno:DiagramArea"_ustr ] = bIsWritable; + + m_aCommandAvailability[ u".uno:TransformDialog"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bHasSelectedObject && m_apControllerState->bIsPositionableObject; // 3d commands - m_aCommandAvailability[ ".uno:View3D" ] = bIsWritable && bModelStateIsValid && m_apModelState->bIsThreeD; - m_aCommandAvailability[ ".uno:DiagramFloor" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasFloor; + m_aCommandAvailability[ u".uno:View3D"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bIsThreeD; + m_aCommandAvailability[ u".uno:DiagramFloor"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasFloor; //some more format commands with different ui text - m_aCommandAvailability[ ".uno:FormatWall" ] = m_aCommandAvailability[ ".uno:DiagramWall" ]; - m_aCommandAvailability[ ".uno:FormatFloor" ] = m_aCommandAvailability[ ".uno:DiagramFloor" ]; - m_aCommandAvailability[ ".uno:FormatChartArea" ] = m_aCommandAvailability[ ".uno:DiagramArea" ]; - m_aCommandAvailability[ ".uno:FormatLegend" ] = m_aCommandAvailability[ ".uno:Legend" ]; + m_aCommandAvailability[ u".uno:FormatWall"_ustr ] = m_aCommandAvailability[ u".uno:DiagramWall"_ustr ]; + m_aCommandAvailability[ u".uno:FormatFloor"_ustr ] = m_aCommandAvailability[ u".uno:DiagramFloor"_ustr ]; + m_aCommandAvailability[ u".uno:FormatChartArea"_ustr ] = m_aCommandAvailability[ u".uno:DiagramArea"_ustr ]; + m_aCommandAvailability[ u".uno:FormatLegend"_ustr ] = m_aCommandAvailability[ u".uno:Legend"_ustr ]; // depending on own data and ability to create new data provider - m_aCommandAvailability[".uno:DataRanges"] = bIsWritable && bModelStateIsValid && !m_apModelState->bHasDataFromPivotTable + m_aCommandAvailability[u".uno:DataRanges"_ustr] = bIsWritable && bModelStateIsValid && !m_apModelState->bHasDataFromPivotTable && ((m_apModelState->bHasOwnData && bCanCreateDataProvider) || !m_apModelState->bHasOwnData); - m_aCommandAvailability[ ".uno:DiagramData" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasOwnData && bEnableDataTableDialog; + m_aCommandAvailability[ u".uno:DiagramData"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasOwnData && bEnableDataTableDialog; // titles - m_aCommandAvailability[ ".uno:MainTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainTitle; - m_aCommandAvailability[ ".uno:SubTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSubTitle; - m_aCommandAvailability[ ".uno:XTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxisTitle; - m_aCommandAvailability[ ".uno:YTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxisTitle; - m_aCommandAvailability[ ".uno:ZTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxisTitle; - m_aCommandAvailability[ ".uno:SecondaryXTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryXAxisTitle; - m_aCommandAvailability[ ".uno:SecondaryYTitle" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryYAxisTitle; - m_aCommandAvailability[ ".uno:AllTitles" ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyTitle(); + m_aCommandAvailability[ u".uno:MainTitle"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainTitle; + m_aCommandAvailability[ u".uno:SubTitle"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSubTitle; + m_aCommandAvailability[ u".uno:XTitle"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxisTitle; + m_aCommandAvailability[ u".uno:YTitle"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxisTitle; + m_aCommandAvailability[ u".uno:ZTitle"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxisTitle; + m_aCommandAvailability[ u".uno:SecondaryXTitle"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryXAxisTitle; + m_aCommandAvailability[ u".uno:SecondaryYTitle"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasSecondaryYAxisTitle; + m_aCommandAvailability[ u".uno:AllTitles"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyTitle(); // text - m_aCommandAvailability[ ".uno:ScaleText" ] = bIsWritable && bModelStateIsValid ; - m_aCommandArguments[ ".uno:ScaleText" ] <<= bModelStateIsValid && m_apModelState->bHasAutoScaledText; + m_aCommandAvailability[ u".uno:ScaleText"_ustr ] = bIsWritable && bModelStateIsValid ; + m_aCommandArguments[ u".uno:ScaleText"_ustr ] <<= bModelStateIsValid && m_apModelState->bHasAutoScaledText; // axes - m_aCommandAvailability[ ".uno:DiagramAxisX" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxis; - m_aCommandAvailability[ ".uno:DiagramAxisY" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxis; - m_aCommandAvailability[ ".uno:DiagramAxisZ" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxis; - m_aCommandAvailability[ ".uno:DiagramAxisA" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasAAxis; - m_aCommandAvailability[ ".uno:DiagramAxisB" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasBAxis; - m_aCommandAvailability[ ".uno:DiagramAxisAll" ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyAxis(); + m_aCommandAvailability[ u".uno:DiagramAxisX"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasXAxis; + m_aCommandAvailability[ u".uno:DiagramAxisY"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasYAxis; + m_aCommandAvailability[ u".uno:DiagramAxisZ"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasZAxis; + m_aCommandAvailability[ u".uno:DiagramAxisA"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasAAxis; + m_aCommandAvailability[ u".uno:DiagramAxisB"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasBAxis; + m_aCommandAvailability[ u".uno:DiagramAxisAll"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyAxis(); // grids // note: x and y are swapped in the commands! - m_aCommandAvailability[ ".uno:DiagramGridYMain" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainXGrid; - m_aCommandAvailability[ ".uno:DiagramGridXMain" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainYGrid; - m_aCommandAvailability[ ".uno:DiagramGridZMain" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainZGrid; - m_aCommandAvailability[ ".uno:DiagramGridYHelp" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpXGrid; - m_aCommandAvailability[ ".uno:DiagramGridXHelp" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpYGrid; - m_aCommandAvailability[ ".uno:DiagramGridZHelp" ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpZGrid; - m_aCommandAvailability[ ".uno:DiagramGridAll" ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyGrid(); + m_aCommandAvailability[ u".uno:DiagramGridYMain"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainXGrid; + m_aCommandAvailability[ u".uno:DiagramGridXMain"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainYGrid; + m_aCommandAvailability[ u".uno:DiagramGridZMain"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasMainZGrid; + m_aCommandAvailability[ u".uno:DiagramGridYHelp"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpXGrid; + m_aCommandAvailability[ u".uno:DiagramGridXHelp"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpYGrid; + m_aCommandAvailability[ u".uno:DiagramGridZHelp"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bHasHelpZGrid; + m_aCommandAvailability[ u".uno:DiagramGridAll"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->HasAnyGrid(); // series arrangement - m_aCommandAvailability[ ".uno:Forward" ] = ( bShapeContext ? isShapeControllerCommandAvailable( ".uno:Forward" ) : + m_aCommandAvailability[ u".uno:Forward"_ustr ] = ( bShapeContext ? isShapeControllerCommandAvailable( u".uno:Forward"_ustr ) : ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesForward && bEnableDataTableDialog ) ); - m_aCommandAvailability[ ".uno:Backward" ] = ( bShapeContext ? isShapeControllerCommandAvailable( ".uno:Backward" ) : + m_aCommandAvailability[ u".uno:Backward"_ustr ] = ( bShapeContext ? isShapeControllerCommandAvailable( u".uno:Backward"_ustr ) : ( bIsWritable && bControllerStateIsValid && m_apControllerState->bMayMoveSeriesBackward && bEnableDataTableDialog ) ); - m_aCommandAvailability[ ".uno:InsertDataLabels" ] = bIsWritable; - m_aCommandAvailability[ ".uno:InsertDataLabel" ] = bIsWritable; - m_aCommandAvailability[ ".uno:InsertMeanValue" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddMeanValue; - m_aCommandAvailability[ ".uno:InsertTrendline" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddTrendline; + m_aCommandAvailability[ u".uno:InsertDataLabels"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:InsertDataLabel"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:InsertMeanValue"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddMeanValue; + m_aCommandAvailability[ u".uno:InsertTrendline"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddTrendline; const bool bInsertTrendlineEquation = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddTrendlineEquation; - m_aCommandAvailability[ ".uno:InsertTrendlineEquation" ] = bInsertTrendlineEquation; - m_aCommandAvailability[ ".uno:InsertTrendlineEquationAndR2" ] = bInsertTrendlineEquation && m_apControllerState->bMayAddR2Value; - m_aCommandAvailability[ ".uno:InsertR2Value" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddR2Value + m_aCommandAvailability[ u".uno:InsertTrendlineEquation"_ustr ] = bInsertTrendlineEquation; + m_aCommandAvailability[ u".uno:InsertTrendlineEquationAndR2"_ustr ] = bInsertTrendlineEquation && m_apControllerState->bMayAddR2Value; + m_aCommandAvailability[ u".uno:InsertR2Value"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddR2Value && !m_apControllerState->bMayAddTrendlineEquation; - m_aCommandAvailability[ ".uno:DeleteR2Value" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteR2Value; - - m_aCommandAvailability[ ".uno:InsertXErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddXErrorBars; - m_aCommandAvailability[ ".uno:InsertYErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddYErrorBars; - - m_aCommandAvailability[ ".uno:DeleteDataLabels" ] = bIsWritable; - m_aCommandAvailability[ ".uno:DeleteDataLabel" ] = bIsWritable; - m_aCommandAvailability[ ".uno:DeleteTrendline" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendline; - m_aCommandAvailability[ ".uno:DeleteTrendlineEquation" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendlineEquation; - m_aCommandAvailability[ ".uno:DeleteMeanValue" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteMeanValue; - m_aCommandAvailability[ ".uno:DeleteXErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteXErrorBars; - m_aCommandAvailability[ ".uno:DeleteYErrorBars" ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteYErrorBars; - - m_aCommandAvailability[ ".uno:ResetDataPoint" ] = bIsWritable; - m_aCommandAvailability[ ".uno:ResetAllDataPoints" ] = bIsWritable; - - m_aCommandAvailability[ ".uno:InsertAxis" ] = bIsWritable; - m_aCommandAvailability[ ".uno:DeleteAxis" ] = bIsWritable; - m_aCommandAvailability[ ".uno:InsertAxisTitle" ] = bIsWritable; - m_aCommandAvailability[ ".uno:FormatMajorGrid" ] = bIsWritable; - m_aCommandAvailability[ ".uno:InsertMajorGrid" ] = bIsWritable; - m_aCommandAvailability[ ".uno:DeleteMajorGrid" ] = bIsWritable; - m_aCommandAvailability[ ".uno:FormatMinorGrid" ] = bIsWritable; - m_aCommandAvailability[ ".uno:InsertMinorGrid" ] = bIsWritable; - m_aCommandAvailability[ ".uno:DeleteMinorGrid" ] = bIsWritable; + m_aCommandAvailability[ u".uno:DeleteR2Value"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteR2Value; + + m_aCommandAvailability[ u".uno:InsertXErrorBars"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddXErrorBars; + m_aCommandAvailability[ u".uno:InsertYErrorBars"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayAddYErrorBars; + + m_aCommandAvailability[ u".uno:DeleteDataLabels"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:DeleteDataLabel"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:DeleteTrendline"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendline; + m_aCommandAvailability[ u".uno:DeleteTrendlineEquation"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteTrendlineEquation; + m_aCommandAvailability[ u".uno:DeleteMeanValue"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteMeanValue; + m_aCommandAvailability[ u".uno:DeleteXErrorBars"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteXErrorBars; + m_aCommandAvailability[ u".uno:DeleteYErrorBars"_ustr ] = bIsWritable && bControllerStateIsValid && m_apControllerState->bMayDeleteYErrorBars; + + m_aCommandAvailability[ u".uno:ResetDataPoint"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:ResetAllDataPoints"_ustr ] = bIsWritable; + + m_aCommandAvailability[ u".uno:InsertAxis"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:DeleteAxis"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:InsertAxisTitle"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:FormatMajorGrid"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:InsertMajorGrid"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:DeleteMajorGrid"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:FormatMinorGrid"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:InsertMinorGrid"_ustr ] = bIsWritable; + m_aCommandAvailability[ u".uno:DeleteMinorGrid"_ustr ] = bIsWritable; // data table - m_aCommandAvailability[ ".uno:InsertDataTable" ] = bIsWritable && bModelStateIsValid && !m_apModelState->bDataTable; - m_aCommandAvailability[ ".uno:DeleteDataTable" ] = bIsWritable && bModelStateIsValid && m_apModelState->bDataTable; + m_aCommandAvailability[ u".uno:InsertDataTable"_ustr ] = bIsWritable && bModelStateIsValid && !m_apModelState->bDataTable; + m_aCommandAvailability[ u".uno:DeleteDataTable"_ustr ] = bIsWritable && bModelStateIsValid && m_apModelState->bDataTable; } bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand ) @@ -748,7 +748,7 @@ void ControllerCommandDispatch::fireStatusEvent( { uno::Any aArg; aArg <<= Reference< frame::XController >(m_xChartController); - fireStatusEventForURL( ".uno:ChartElementSelector", aArg, true, xSingleListener ); + fireStatusEventForURL( u".uno:ChartElementSelector"_ustr, aArg, true, xSingleListener ); } if( rURL.isEmpty() ) @@ -764,7 +764,7 @@ void ControllerCommandDispatch::fireStatusEvent( if( rURL.isEmpty() || rURL == ".uno:StatusBarVisible" ) { bool bIsStatusBarVisible( lcl_isStatusBarVisible( m_xChartController )); - fireStatusEventForURL( ".uno:StatusBarVisible", uno::Any( bIsStatusBarVisible ), true, xSingleListener ); + fireStatusEventForURL( u".uno:StatusBarVisible"_ustr, uno::Any( bIsStatusBarVisible ), true, xSingleListener ); } } diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index 5bd85faaf959..f5145d276c99 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -117,7 +117,7 @@ bool DragMethod_PieSegment::EndSdrDrag(bool /*bCopy*/) Reference< beans::XPropertySet > xPointProperties( ObjectIdentifier::getObjectPropertySet( m_aObjectCID, xChartModel ) ); if( xPointProperties.is() ) - xPointProperties->setPropertyValue( "Offset", uno::Any( m_fAdditionalOffset+m_fInitialOffset )); + xPointProperties->setPropertyValue( u"Offset"_ustr, uno::Any( m_fAdditionalOffset+m_fInitialOffset )); } } catch( const uno::Exception & ) diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx index 6172a25edad2..6e496dbe1c4e 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx @@ -82,7 +82,7 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr if( ChartTypeHelper::isSupportingRightAngledAxes( xDiagram->getChartTypeByIndex( 0 ) ) ) - xDiagram->getPropertyValue("RightAngledAxes") >>= m_bRightAngledAxes; + xDiagram->getPropertyValue(u"RightAngledAxes"_ustr) >>= m_bRightAngledAxes; if(m_bRightAngledAxes) { if( m_eRotationDirection==ROTATIONDIRECTION_Z ) diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index d538108ae8e9..f342b3538aad 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -51,8 +51,8 @@ constexpr OUStringLiteral lcl_aServiceName } SelectorListBox::SelectorListBox(vcl::Window* pParent) - : InterimItemWindow(pParent, "modules/schart/ui/combobox.ui", "ComboBox") - , m_xWidget(m_xBuilder->weld_combo_box("combobox")) + : InterimItemWindow(pParent, u"modules/schart/ui/combobox.ui"_ustr, u"ComboBox"_ustr) + , m_xWidget(m_xBuilder->weld_combo_box(u"combobox"_ustr)) , m_bReleaseFocus(true) { InitControlBase(m_xWidget.get()); @@ -251,7 +251,7 @@ sal_Bool SAL_CALL ElementSelectorToolbarController::supportsService( const OUStr css::uno::Sequence< OUString > SAL_CALL ElementSelectorToolbarController::getSupportedServiceNames() { - return { "com.sun.star.frame.ToolbarController" }; + return { u"com.sun.star.frame.ToolbarController"_ustr }; } ElementSelectorToolbarController::ElementSelectorToolbarController() { diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 3a215ac99522..f2d130aa014c 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -74,8 +74,8 @@ void lcl_getChildOIDs( Reference< beans::XPropertySetInfo > xInfo( xShapeProp->getPropertySetInfo()); OUString aName; if( xInfo.is() && - xInfo->hasPropertyByName( "Name") && - (xShapeProp->getPropertyValue( "Name") >>= aName ) && + xInfo->hasPropertyByName( u"Name"_ustr) && + (xShapeProp->getPropertyValue( u"Name"_ustr) >>= aName ) && !aName.isEmpty() && ::chart::ObjectIdentifier::isCID( aName )) { @@ -369,7 +369,7 @@ void ObjectHierarchy::createDataSeriesTree( xErrorBarProp.is()) { sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; - if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && + if( ( xErrorBarProp->getPropertyValue( u"ErrorBarStyle"_ustr) >>= nStyle ) && ( nStyle != css::chart::ErrorBarStyle::NONE ) ) { aSeriesSubContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierWithParent( @@ -381,7 +381,7 @@ void ObjectHierarchy::createDataSeriesTree( xErrorBarProp.is()) { sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; - if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && + if( ( xErrorBarProp->getPropertyValue( u"ErrorBarStyle"_ustr) >>= nStyle ) && ( nStyle != css::chart::ErrorBarStyle::NONE ) ) { aSeriesSubContainer.emplace_back( ObjectIdentifier::createClassifiedIdentifierWithParent( @@ -531,7 +531,7 @@ ObjectHierarchy::~ObjectHierarchy() ObjectIdentifier ObjectHierarchy::getRootNodeOID() { - return ObjectIdentifier( "ROOT" ); + return ObjectIdentifier( u"ROOT"_ustr ); } bool ObjectHierarchy::isRootNode( const ObjectIdentifier& rOID ) diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index 8cad36404fdc..dbb5368686ae 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -57,7 +57,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType Point aPos = aObjectRect.TopLeft(); aRelativePosition.Primary = (double(aPos.X())+double(aObjectRect.getOpenWidth())/2.0)/double(aPageRect.getOpenWidth()); aRelativePosition.Secondary = (double(aPos.Y())+double(aObjectRect.getOpenHeight())/2.0)/double(aPageRect.getOpenHeight()); - xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) ); + xObjectProp->setPropertyValue( u"RelativePosition"_ustr, uno::Any(aRelativePosition) ); } else if( eObjectType == OBJECTTYPE_DATA_LABEL ) { @@ -66,7 +66,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType aAbsolutePosition.Primary = double(rOldPositionAndSize.X) / double(aPageRect.getOpenWidth()); aAbsolutePosition.Secondary = double(rOldPositionAndSize.Y) / double(aPageRect.getOpenHeight()); - if( xObjectProp->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition ) + if( xObjectProp->getPropertyValue(u"CustomLabelPosition"_ustr) >>= aCustomLabelPosition ) { aAbsolutePosition.Primary -= aCustomLabelPosition.Primary; aAbsolutePosition.Secondary -= aCustomLabelPosition.Secondary; @@ -75,7 +75,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType //the anchor point at the data label object is top/left Point aPos = aObjectRect.TopLeft(); double fRotation = 0.0; - xObjectProp->getPropertyValue("TextRotation") >>= fRotation; + xObjectProp->getPropertyValue(u"TextRotation"_ustr) >>= fRotation; if( fRotation == 90.0 ) aPos = aObjectRect.BottomLeft(); else if( fRotation == 270.0 ) @@ -83,7 +83,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType aCustomLabelPosition.Primary = double(aPos.X()) / double(aPageRect.getOpenWidth()) - aAbsolutePosition.Primary; aCustomLabelPosition.Secondary = double(aPos.Y()) / double(aPageRect.getOpenHeight()) - aAbsolutePosition.Secondary; - xObjectProp->setPropertyValue("CustomLabelPosition", uno::Any(aCustomLabelPosition)); + xObjectProp->setPropertyValue(u"CustomLabelPosition"_ustr, uno::Any(aCustomLabelPosition)); } else if( eObjectType==OBJECTTYPE_DATA_CURVE_EQUATION ) { @@ -94,11 +94,11 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType Point aPos = aObjectRect.TopLeft(); aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getOpenWidth()); aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getOpenHeight()); - xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) ); + xObjectProp->setPropertyValue( u"RelativePosition"_ustr, uno::Any(aRelativePosition) ); } else if(eObjectType==OBJECTTYPE_LEGEND) { - xObjectProp->setPropertyValue( "Expansion", uno::Any(css::chart::ChartLegendExpansion_CUSTOM)); + xObjectProp->setPropertyValue( u"Expansion"_ustr, uno::Any(css::chart::ChartLegendExpansion_CUSTOM)); chart2::RelativePosition aRelativePosition; chart2::RelativeSize aRelativeSize; Point aAnchor = aObjectRect.TopLeft(); @@ -110,7 +110,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType static_cast< double >( aAnchor.Y()) / static_cast< double >( aPageRect.getOpenHeight()); - xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) ); + xObjectProp->setPropertyValue( u"RelativePosition"_ustr, uno::Any(aRelativePosition) ); aRelativeSize.Primary = static_cast< double >( aObjectRect.getOpenWidth()) / @@ -123,7 +123,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType if (aRelativeSize.Secondary > 1.0) aRelativeSize.Secondary = 1.0; - xObjectProp->setPropertyValue( "RelativeSize", uno::Any(aRelativeSize) ); + xObjectProp->setPropertyValue( u"RelativeSize"_ustr, uno::Any(aRelativeSize) ); } else if(eObjectType==OBJECTTYPE_DIAGRAM || eObjectType==OBJECTTYPE_DIAGRAM_WALL || eObjectType==OBJECTTYPE_DIAGRAM_FLOOR) { @@ -136,7 +136,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType Point aPos = aObjectRect.Center(); aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getOpenWidth()); aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getOpenHeight()); - xObjectProp->setPropertyValue( "RelativePosition", uno::Any(aRelativePosition) ); + xObjectProp->setPropertyValue( u"RelativePosition"_ustr, uno::Any(aRelativePosition) ); //set size: RelativeSize aRelativeSize; @@ -144,7 +144,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType //and in the middle of the page aRelativeSize.Primary = double(aObjectRect.getOpenWidth())/double(aPageRect.getOpenWidth()); aRelativeSize.Secondary = double(aObjectRect.getOpenHeight())/double(aPageRect.getOpenHeight()); - xObjectProp->setPropertyValue( "RelativeSize", uno::Any(aRelativeSize) ); + xObjectProp->setPropertyValue( u"RelativeSize"_ustr, uno::Any(aRelativeSize) ); } else return false; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index e3c1f038b0ac..863436c3bab0 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -69,14 +69,14 @@ void StatusBarCommandDispatch::fireStatusEvent( { uno::Any aArg; aArg <<= ObjectNameProvider::getSelectedObjectText( m_aSelectedOID.getObjectCID(), m_xChartModel ); - fireStatusEventForURL( ".uno:Context", aArg, true, xSingleListener ); + fireStatusEventForURL( u".uno:Context"_ustr, aArg, true, xSingleListener ); } if( bFireModified ) { uno::Any aArg; if( m_bIsModified ) - aArg <<= OUString("*"); - fireStatusEventForURL( ".uno:ModifiedStatus", aArg, true, xSingleListener ); + aArg <<= u"*"_ustr; + fireStatusEventForURL( u".uno:ModifiedStatus"_ustr, aArg, true, xSingleListener ); } } diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx index 17df7c7c8b14..de04e4c91b4d 100644 --- a/chart2/source/controller/main/ToolbarController.cxx +++ b/chart2/source/controller/main/ToolbarController.cxx @@ -97,7 +97,7 @@ void ChartToolbarController::update() OUString ChartToolbarController::getImplementationName() { - return "org.libreoffice.chart2.Chart2ToolboxController"; + return u"org.libreoffice.chart2.Chart2ToolboxController"_ustr; } sal_Bool ChartToolbarController::supportsService(OUString const & ServiceName) @@ -107,7 +107,7 @@ sal_Bool ChartToolbarController::supportsService(OUString const & ServiceName) css::uno::Sequence<OUString> ChartToolbarController::getSupportedServiceNames() { - return { "com.sun.star.frame.ToolbarController" }; + return { u"com.sun.star.frame.ToolbarController"_ustr }; } } diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index c90fac3f4045..1c5c760f93f5 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -75,13 +75,13 @@ void UndoCommandDispatch::fireStatusEvent( aRedoStrings <<= m_xUndoManager->getAllRedoActionTitles(); if( bFireAll || rURL == ".uno:Undo" ) - fireStatusEventForURL( ".uno:Undo", aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener ); + fireStatusEventForURL( u".uno:Undo"_ustr, aUndoState, m_xUndoManager->isUndoPossible(), xSingleListener ); if( bFireAll || rURL == ".uno:Redo" ) - fireStatusEventForURL( ".uno:Redo", aRedoState, m_xUndoManager->isRedoPossible(), xSingleListener ); + fireStatusEventForURL( u".uno:Redo"_ustr, aRedoState, m_xUndoManager->isRedoPossible(), xSingleListener ); if( bFireAll || rURL == ".uno:GetUndoStrings" ) - fireStatusEventForURL( ".uno:GetUndoStrings", aUndoStrings, true, xSingleListener ); + fireStatusEventForURL( u".uno:GetUndoStrings"_ustr, aUndoStrings, true, xSingleListener ); if( bFireAll || rURL == ".uno:GetRedoStrings" ) - fireStatusEventForURL( ".uno:GetRedoStrings", aRedoStrings, true, xSingleListener ); + fireStatusEventForURL( u".uno:GetRedoStrings"_ustr, aRedoStrings, true, xSingleListener ); } // ____ XDispatch ____ diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx index 081322b09408..a0483a22b6ed 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx @@ -56,9 +56,9 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement ( try { const ::comphelper::NamedValueCollection aArguments (rArguments); - Reference<css::frame::XFrame> xFrame (aArguments.getOrDefault("Frame", Reference<css::frame::XFrame>())); - Reference<css::awt::XWindow> xParentWindow (aArguments.getOrDefault("ParentWindow", Reference<css::awt::XWindow>())); - Reference<css::frame::XController> xController (aArguments.getOrDefault("Controller", Reference<css::frame::XController>())); + Reference<css::frame::XFrame> xFrame (aArguments.getOrDefault(u"Frame"_ustr, Reference<css::frame::XFrame>())); + Reference<css::awt::XWindow> xParentWindow (aArguments.getOrDefault(u"ParentWindow"_ustr, Reference<css::awt::XWindow>())); + Reference<css::frame::XController> xController (aArguments.getOrDefault(u"Controller"_ustr, Reference<css::frame::XController>())); weld::Widget* pParent(nullptr); if (weld::TransportAsXWindow* pTunnel = dynamic_cast<weld::TransportAsXWindow*>(xParentWindow.get())) @@ -66,21 +66,21 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement ( if (!pParent) throw RuntimeException( - "PanelFactory::createUIElement called without ParentWindow", + u"PanelFactory::createUIElement called without ParentWindow"_ustr, nullptr); if ( ! xFrame.is()) throw RuntimeException( - "PanelFactory::createUIElement called without Frame", + u"PanelFactory::createUIElement called without Frame"_ustr, nullptr); if (!xController.is()) throw RuntimeException( - "ChartPanelFactory::createUIElement called without Controller", + u"ChartPanelFactory::createUIElement called without Controller"_ustr, nullptr); ChartController* pController = dynamic_cast<ChartController*>(xController.get()); if (!pController) throw RuntimeException( - "ChartPanelFactory::createUIElement called without valid ChartController", + u"ChartPanelFactory::createUIElement called without valid ChartController"_ustr, nullptr); std::unique_ptr<PanelLayout> xPanel; @@ -114,7 +114,7 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement ( { css::uno::Any anyEx = cppu::getCaughtException(); throw css::lang::WrappedTargetRuntimeException( - "ChartPanelFactory::createUIElement exception", + u"ChartPanelFactory::createUIElement exception"_ustr, nullptr, anyEx ); } @@ -123,7 +123,7 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement ( OUString ChartPanelFactory::getImplementationName() { - return "org.libreoffice.comp.chart2.sidebar.ChartPanelFactory"; + return u"org.libreoffice.comp.chart2.sidebar.ChartPanelFactory"_ustr; } sal_Bool ChartPanelFactory::supportsService(OUString const & ServiceName) @@ -133,7 +133,7 @@ sal_Bool ChartPanelFactory::supportsService(OUString const & ServiceName) css::uno::Sequence<OUString> ChartPanelFactory::getSupportedServiceNames() { - return { "com.sun.star.ui.UIElementFactory" }; + return { u"com.sun.star.ui.UIElementFactory"_ustr }; } } // end of namespace chart::sidebar diff --git a/chart2/source/controller/sidebar/ChartAreaPanel.cxx b/chart2/source/controller/sidebar/ChartAreaPanel.cxx index cb660661c140..189ed77fd762 100644 --- a/chart2/source/controller/sidebar/ChartAreaPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAreaPanel.cxx @@ -36,7 +36,7 @@ namespace { SvxColorToolBoxControl* getColorToolBoxControl(const ToolbarUnoDispatcher& rColorDispatch) { - css::uno::Reference<css::frame::XToolbarController> xController = rColorDispatch.GetControllerForCommand(".uno:FillColor"); + css::uno::Reference<css::frame::XToolbarController> xController = rColorDispatch.GetControllerForCommand(u".uno:FillColor"_ustr); SvxColorToolBoxControl* pToolBoxColorControl = dynamic_cast<SvxColorToolBoxControl*>(xController.get()); return pToolBoxColorControl; } @@ -123,7 +123,7 @@ XFillGradientItem getXGradientForName(const css::uno::Reference<css::frame::XMod { css::uno::Reference<css::lang::XMultiServiceFactory> xFact(xModel, css::uno::UNO_QUERY); css::uno::Reference<css::container::XNameAccess> xNameAccess( - xFact->createInstance("com.sun.star.drawing.GradientTable"), css::uno::UNO_QUERY); + xFact->createInstance(u"com.sun.star.drawing.GradientTable"_ustr), css::uno::UNO_QUERY); if (!xNameAccess.is()) return XFillGradientItem(); @@ -145,7 +145,7 @@ XFillFloatTransparenceItem getXTransparencyGradientForName(const css::uno::Refer { css::uno::Reference<css::lang::XMultiServiceFactory> xFact(xModel, css::uno::UNO_QUERY); css::uno::Reference<css::container::XNameAccess> xNameAccess( - xFact->createInstance("com.sun.star.drawing.TransparencyGradientTable"), css::uno::UNO_QUERY); + xFact->createInstance(u"com.sun.star.drawing.TransparencyGradientTable"_ustr), css::uno::UNO_QUERY); if (!xNameAccess.is()) return XFillFloatTransparenceItem(); @@ -262,9 +262,9 @@ std::unique_ptr<PanelLayout> ChartAreaPanel::Create( ChartController* pController) { if (pParent == nullptr) - throw css::lang::IllegalArgumentException("no parent Window given to ChartAxisPanel::Create", nullptr, 0); + throw css::lang::IllegalArgumentException(u"no parent Window given to ChartAxisPanel::Create"_ustr, nullptr, 0); if (!rxFrame.is()) - throw css::lang::IllegalArgumentException("no XFrame given to ChartAxisPanel::Create", nullptr, 1); + throw css::lang::IllegalArgumentException(u"no XFrame given to ChartAxisPanel::Create"_ustr, nullptr, 1); return std::make_unique<ChartAreaPanel>(pParent, rxFrame, pController); } @@ -278,7 +278,7 @@ ChartAreaPanel::ChartAreaPanel(weld::Widget* pParent, mxSelectionListener(new ChartSidebarSelectionListener(this)), mbUpdate(true), mbModelValid(true), - maFillColorWrapper(mxModel, getColorToolBoxControl(*mxColorDispatch), "FillColor") + maFillColorWrapper(mxModel, getColorToolBoxControl(*mxColorDispatch), u"FillColor"_ustr) { std::vector<ObjectType> aAcceptedTypes { OBJECTTYPE_PAGE, OBJECTTYPE_DIAGRAM, OBJECTTYPE_DATA_SERIES, OBJECTTYPE_DATA_POINT, @@ -313,7 +313,7 @@ void ChartAreaPanel::setFillTransparence(const XFillTransparenceItem& rItem) if (!xPropSet.is()) return; - xPropSet->setPropertyValue("FillTransparence", css::uno::Any(rItem.GetValue())); + xPropSet->setPropertyValue(u"FillTransparence"_ustr, css::uno::Any(rItem.GetValue())); } void ChartAreaPanel::setFillFloatTransparence( @@ -326,7 +326,7 @@ void ChartAreaPanel::setFillFloatTransparence( if (!rItem.IsEnabled()) { - xPropSet->setPropertyValue("FillTransparenceGradientName", css::uno::Any(OUString())); + xPropSet->setPropertyValue(u"FillTransparenceGradientName"_ustr, css::uno::Any(OUString())); return; } @@ -334,7 +334,7 @@ void ChartAreaPanel::setFillFloatTransparence( css::uno::Any aGradientVal; rItem.QueryValue(aGradientVal, MID_FILLGRADIENT); OUString aNewName = PropertyHelper::addTransparencyGradientUniqueNameToTable(aGradientVal, mxModel, aName); - xPropSet->setPropertyValue("FillTransparenceGradientName", css::uno::Any(aNewName)); + xPropSet->setPropertyValue(u"FillTransparenceGradientName"_ustr, css::uno::Any(aNewName)); } void ChartAreaPanel::setFillStyle(const XFillStyleItem& rItem) @@ -344,7 +344,7 @@ void ChartAreaPanel::setFillStyle(const XFillStyleItem& rItem) if (!xPropSet.is()) return; - xPropSet->setPropertyValue("FillStyle", css::uno::Any(rItem.GetValue())); + xPropSet->setPropertyValue(u"FillStyle"_ustr, css::uno::Any(rItem.GetValue())); } void ChartAreaPanel::setFillStyleAndColor(const XFillStyleItem* pStyleItem, @@ -355,8 +355,8 @@ void ChartAreaPanel::setFillStyleAndColor(const XFillStyleItem* pStyleItem, return; if (pStyleItem) - xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue())); - xPropSet->setPropertyValue("FillColor", css::uno::Any(rColorItem.GetValue())); + xPropSet->setPropertyValue(u"FillStyle"_ustr, css::uno::Any(pStyleItem->GetValue())); + xPropSet->setPropertyValue(u"FillColor"_ustr, css::uno::Any(rColorItem.GetValue())); } void ChartAreaPanel::setFillStyleAndGradient(const XFillStyleItem* pStyleItem, @@ -368,13 +368,13 @@ void ChartAreaPanel::setFillStyleAndGradient(const XFillStyleItem* pStyleItem, return; if (pStyleItem) - xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue())); + xPropSet->setPropertyValue(u"FillStyle"_ustr, css::uno::Any(pStyleItem->GetValue())); const OUString& aName = rGradientItem.GetName(); css::uno::Any aGradientVal; rGradientItem.QueryValue(aGradientVal, MID_FILLGRADIENT); OUString aNewName = PropertyHelper::addGradientUniqueNameToTable(aGradientVal, mxModel, aName); - xPropSet->setPropertyValue("FillGradientName", css::uno::Any(aNewName)); + xPropSet->setPropertyValue(u"FillGradientName"_ustr, css::uno::Any(aNewName)); } void ChartAreaPanel::setFillStyleAndHatch(const XFillStyleItem* pStyleItem, @@ -386,8 +386,8 @@ void ChartAreaPanel::setFillStyleAndHatch(const XFillStyleItem* pStyleItem, return; if (pStyleItem) - xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue())); - xPropSet->setPropertyValue("FillHatchName", css::uno::Any(rHatchItem.GetValue())); + xPropSet->setPropertyValue(u"FillStyle"_ustr, css::uno::Any(pStyleItem->GetValue())); + xPropSet->setPropertyValue(u"FillHatchName"_ustr, css::uno::Any(rHatchItem.GetValue())); } void ChartAreaPanel::setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, @@ -399,13 +399,13 @@ void ChartAreaPanel::setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, return; if (pStyleItem) - xPropSet->setPropertyValue("FillStyle", css::uno::Any(pStyleItem->GetValue())); + xPropSet->setPropertyValue(u"FillStyle"_ustr, css::uno::Any(pStyleItem->GetValue())); css::uno::Any aBitmap; rBitmapItem.QueryValue(aBitmap, MID_BITMAP); const OUString& aPreferredName = rBitmapItem.GetName(); aBitmap <<= PropertyHelper::addBitmapUniqueNameToTable(aBitmap, mxModel, aPreferredName); - xPropSet->setPropertyValue("FillBitmapName", aBitmap); + xPropSet->setPropertyValue(u"FillBitmapName"_ustr, aBitmap); } void ChartAreaPanel::setFillUseBackground(const XFillStyleItem* pStyleItem, @@ -428,43 +428,43 @@ void ChartAreaPanel::updateData() return; SolarMutexGuard aGuard; - if (xInfo->hasPropertyByName("FillStyle")) + if (xInfo->hasPropertyByName(u"FillStyle"_ustr)) { css::drawing::FillStyle eFillStyle = css::drawing::FillStyle_SOLID; - xPropSet->getPropertyValue("FillStyle") >>= eFillStyle; + xPropSet->getPropertyValue(u"FillStyle"_ustr) >>= eFillStyle; XFillStyleItem aFillStyleItem(eFillStyle); updateFillStyle(false, true, &aFillStyleItem); } - if (xInfo->hasPropertyByName("FillTransparence")) + if (xInfo->hasPropertyByName(u"FillTransparence"_ustr)) { sal_uInt16 nFillTransparence = 0; - xPropSet->getPropertyValue("FillTransparence") >>= nFillTransparence; + xPropSet->getPropertyValue(u"FillTransparence"_ustr) >>= nFillTransparence; SfxUInt16Item aTransparenceItem(0, nFillTransparence); updateFillTransparence(false, true, &aTransparenceItem); } - if (xInfo->hasPropertyByName("FillGradientName")) + if (xInfo->hasPropertyByName(u"FillGradientName"_ustr)) { OUString aGradientName; - xPropSet->getPropertyValue("FillGradientName") >>= aGradientName; + xPropSet->getPropertyValue(u"FillGradientName"_ustr) >>= aGradientName; XFillGradientItem aGradientItem = getXGradientForName(mxModel, aGradientName); updateFillGradient(false, true, &aGradientItem); } - if (xInfo->hasPropertyByName("FillHatchName")) + if (xInfo->hasPropertyByName(u"FillHatchName"_ustr)) { OUString aHatchName; - xPropSet->getPropertyValue("FillHatchName") >>= aHatchName; + xPropSet->getPropertyValue(u"FillHatchName"_ustr) >>= aHatchName; XHatch aHatch = getXHatchFromName(mxModel, aHatchName); XFillHatchItem aHatchItem(aHatchName, aHatch); updateFillHatch(false, true, &aHatchItem); } - if (xInfo->hasPropertyByName("FillBitmapName")) + if (xInfo->hasPropertyByName(u"FillBitmapName"_ustr)) { OUString aBitmapName; - xPropSet->getPropertyValue("FillBitmapName") >>= aBitmapName; + xPropSet->getPropertyValue(u"FillBitmapName"_ustr) >>= aBitmapName; GraphicObject aBitmap = getXBitmapFromName(mxModel, aBitmapName); XFillBitmapItem aBitmapItem(aBitmapName, aBitmap); std::unique_ptr<XFillBitmapItem> pBitmapItem; @@ -482,21 +482,21 @@ void ChartAreaPanel::updateData() updateFillBitmap(false, true, pBitmapItem ? pBitmapItem.get() : &aBitmapItem); } - if (xInfo->hasPropertyByName("FillTransparenceGradientName")) + if (xInfo->hasPropertyByName(u"FillTransparenceGradientName"_ustr)) { OUString aFillFloatTransparenceName; - xPropSet->getPropertyValue("FillTransparenceGradientName") >>= aFillFloatTransparenceName; + xPropSet->getPropertyValue(u"FillTransparenceGradientName"_ustr) >>= aFillFloatTransparenceName; XFillFloatTransparenceItem aFillFloatTransparenceItem = getXTransparencyGradientForName(mxModel, aFillFloatTransparenceName); updateFillFloatTransparence(false, true, &aFillFloatTransparenceItem); maFillColorWrapper.updateData(); } - if (xInfo->hasPropertyByName("FillColor")) + if (xInfo->hasPropertyByName(u"FillColor"_ustr)) { sal_uInt32 nFillColor = 0; - xPropSet->getPropertyValue("FillColor") >>= nFillColor; - XFillColorItem aFillColorItem("", Color(ColorTransparency, nFillColor)); + xPropSet->getPropertyValue(u"FillColor"_ustr) >>= nFillColor; + XFillColorItem aFillColorItem(u""_ustr, Color(ColorTransparency, nFillColor)); updateFillColor(true, &aFillColorItem); } } diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index 48a4620684b3..7554d164f11f 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -43,7 +43,7 @@ bool isLabelShown(const rtl::Reference<::chart::ChartModel>& xModel, if (!xAxis.is()) return false; - uno::Any aAny = xAxis->getPropertyValue("DisplayLabels"); + uno::Any aAny = xAxis->getPropertyValue(u"DisplayLabels"_ustr); if (!aAny.hasValue()) return false; @@ -60,7 +60,7 @@ void setLabelShown(const rtl::Reference<::chart::ChartModel>& xModel, if (!xAxis.is()) return; - xAxis->setPropertyValue("DisplayLabels", css::uno::Any(bVisible)); + xAxis->setPropertyValue(u"DisplayLabels"_ustr, css::uno::Any(bVisible)); } struct AxisLabelPosMap @@ -84,7 +84,7 @@ sal_Int32 getLabelPosition(const rtl::Reference<::chart::ChartModel>& xModel, if (!xAxis.is()) return 0; - uno::Any aAny = xAxis->getPropertyValue("LabelPosition"); + uno::Any aAny = xAxis->getPropertyValue(u"LabelPosition"_ustr); if (!aAny.hasValue()) return 0; @@ -114,7 +114,7 @@ void setLabelPosition(const rtl::Reference<::chart::ChartModel>& xModel, ePos = i.ePos; } - xAxis->setPropertyValue("LabelPosition", css::uno::Any(ePos)); + xAxis->setPropertyValue(u"LabelPosition"_ustr, css::uno::Any(ePos)); } bool isReverse(const rtl::Reference<::chart::ChartModel>& xModel, @@ -178,7 +178,7 @@ void setAxisRotation(const rtl::Reference<::chart::ChartModel>& xModel, if (!xAxis.is()) return; - xAxis->setPropertyValue("TextRotation", css::uno::Any(nVal)); + xAxis->setPropertyValue(u"TextRotation"_ustr, css::uno::Any(nVal)); } double getAxisRotation(const rtl::Reference<::chart::ChartModel>& xModel, @@ -190,7 +190,7 @@ double getAxisRotation(const rtl::Reference<::chart::ChartModel>& xModel, if (!xAxis.is()) return 0; - css::uno::Any aAny = xAxis->getPropertyValue("TextRotation"); + css::uno::Any aAny = xAxis->getPropertyValue(u"TextRotation"_ustr); double nVal = 0; aAny >>= nVal; return nVal; @@ -201,12 +201,12 @@ double getAxisRotation(const rtl::Reference<::chart::ChartModel>& xModel, ChartAxisPanel::ChartAxisPanel( weld::Widget* pParent, ChartController* pController) - : PanelLayout(pParent, "ChartAxisPanel", "modules/schart/ui/sidebaraxis.ui") - , mxCBShowLabel(m_xBuilder->weld_check_button("checkbutton_show_label")) - , mxCBReverse(m_xBuilder->weld_check_button("checkbutton_reverse")) - , mxLBLabelPos(m_xBuilder->weld_combo_box("comboboxtext_label_position")) - , mxGridLabel(m_xBuilder->weld_widget("label_props")) - , mxNFRotation(m_xBuilder->weld_metric_spin_button("spinbutton1", FieldUnit::DEGREE)) + : PanelLayout(pParent, u"ChartAxisPanel"_ustr, u"modules/schart/ui/sidebaraxis.ui"_ustr) + , mxCBShowLabel(m_xBuilder->weld_check_button(u"checkbutton_show_label"_ustr)) + , mxCBReverse(m_xBuilder->weld_check_button(u"checkbutton_reverse"_ustr)) + , mxLBLabelPos(m_xBuilder->weld_combo_box(u"comboboxtext_label_position"_ustr)) + , mxGridLabel(m_xBuilder->weld_widget(u"label_props"_ustr)) + , mxNFRotation(m_xBuilder->weld_metric_spin_button(u"spinbutton1"_ustr, FieldUnit::DEGREE)) , mxModel(pController->getChartModel()) , mxModifyListener(new ChartSidebarModifyListener(this)) , mxSelectionListener(new ChartSidebarSelectionListener(this, OBJECTTYPE_AXIS)) @@ -272,7 +272,7 @@ std::unique_ptr<PanelLayout> ChartAxisPanel::Create ( ChartController* pController) { if (pParent == nullptr) - throw lang::IllegalArgumentException("no parent Window given to ChartAxisPanel::Create", nullptr, 0); + throw lang::IllegalArgumentException(u"no parent Window given to ChartAxisPanel::Create"_ustr, nullptr, 0); return std::make_unique<ChartAxisPanel>(pParent, pController); } diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx index f5c79133434c..5e6e60d9017f 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx @@ -157,7 +157,7 @@ namespace { css::uno::Reference<css::lang::XMultiServiceFactory> xFact(xModel, css::uno::UNO_QUERY); css::uno::Reference<css::container::XNameAccess> xNameAccess( - xFact->createInstance("com.sun.star.drawing.DashTable"), + xFact->createInstance(u"com.sun.star.drawing.DashTable"_ustr), css::uno::UNO_QUERY ); if(xNameAccess.is()) { @@ -184,12 +184,12 @@ void ChartLineStyleWrapper::updateData() aEvent.IsEnabled = true; aEvent.FeatureURL = aUrl; - aEvent.State = xPropSet->getPropertyValue("LineStyle"); + aEvent.State = xPropSet->getPropertyValue(u"LineStyle"_ustr); mpControl->statusChanged(aEvent); aUrl.Complete = ".uno:LineDash"; - auto aLineDashName = xPropSet->getPropertyValue("LineDashName"); + auto aLineDashName = xPropSet->getPropertyValue(u"LineDashName"_ustr); OUString aDashName; aLineDashName >>= aDashName; css::uno::Any aLineDash = getLineDash(mxModel, aDashName); @@ -213,7 +213,7 @@ bool ChartLineStyleWrapper::operator()(std::u16string_view rCommand, const css:: if (rCommand == u".uno:XLineStyle") { - xPropSet->setPropertyValue("LineStyle", rValue); + xPropSet->setPropertyValue(u"LineStyle"_ustr, rValue); return true; } else if (rCommand == u".uno:LineDash") @@ -224,9 +224,9 @@ bool ChartLineStyleWrapper::operator()(std::u16string_view rCommand, const css:: aDashItem.QueryValue(aAny, MID_LINEDASH); OUString aDashName = PropertyHelper::addLineDashUniqueNameToTable(aAny, mxModel, - ""); - xPropSet->setPropertyValue("LineDash", aAny); - xPropSet->setPropertyValue("LineDashName", css::uno::Any(aDashName)); + u""_ustr); + xPropSet->setPropertyValue(u"LineDash"_ustr, aAny); + xPropSet->setPropertyValue(u"LineDashName"_ustr, css::uno::Any(aDashName)); return true; } return false; diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index 1e5e6e9403fa..3e64c0c4b8f8 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -79,7 +79,7 @@ bool isLegendVisible(const css::uno::Reference<css::frame::XModel>& xModel) try { bool bShow = false; - if( xLegendProp->getPropertyValue( "Show") >>= bShow ) + if( xLegendProp->getPropertyValue( u"Show"_ustr) >>= bShow ) { return bShow; } @@ -116,7 +116,7 @@ bool isLegendOverlay(const css::uno::Reference<css::frame::XModel>& xModel) try { bool bOverlay = false; - if(xLegendProp->getPropertyValue("Overlay") >>= bOverlay) + if(xLegendProp->getPropertyValue(u"Overlay"_ustr) >>= bOverlay) { return bOverlay; } @@ -139,7 +139,7 @@ void setLegendOverlay(const css::uno::Reference<css::frame::XModel>& xModel, boo if (!xLegendProp.is()) return; - xLegendProp->setPropertyValue("Overlay", css::uno::Any(bOverlay)); + xLegendProp->setPropertyValue(u"Overlay"_ustr, css::uno::Any(bOverlay)); } bool isTitleVisible(const rtl::Reference<::chart::ChartModel>& xModel, TitleHelper::eTitleType eTitle) @@ -148,7 +148,7 @@ bool isTitleVisible(const rtl::Reference<::chart::ChartModel>& xModel, TitleHelp if (!xTitle.is()) return false; - css::uno::Any aAny = xTitle->getPropertyValue("Visible"); + css::uno::Any aAny = xTitle->getPropertyValue(u"Visible"_ustr); bool bVisible = aAny.get<bool>(); return bVisible; } @@ -240,7 +240,7 @@ sal_Int32 getLegendPos(const css::uno::Reference<css::frame::XModel>& xModel) return -1; chart2::LegendPosition eLegendPos = chart2::LegendPosition_LINE_END; - xLegendProp->getPropertyValue("AnchorPosition") >>= eLegendPos; + xLegendProp->getPropertyValue(u"AnchorPosition"_ustr) >>= eLegendPos; switch(eLegendPos) { case chart2::LegendPosition_LINE_START: @@ -288,42 +288,42 @@ void setLegendPos(const css::uno::Reference<css::frame::XModel>& xModel, sal_Int assert(false); } - xLegendProp->setPropertyValue("AnchorPosition", css::uno::Any(eLegendPos)); - xLegendProp->setPropertyValue("Expansion", css::uno::Any(eExpansion)); - xLegendProp->setPropertyValue("RelativePosition", uno::Any()); + xLegendProp->setPropertyValue(u"AnchorPosition"_ustr, css::uno::Any(eLegendPos)); + xLegendProp->setPropertyValue(u"Expansion"_ustr, css::uno::Any(eExpansion)); + xLegendProp->setPropertyValue(u"RelativePosition"_ustr, uno::Any()); } } ChartElementsPanel::ChartElementsPanel( weld::Widget* pParent, ChartController* pController) - : PanelLayout(pParent, "ChartElementsPanel", "modules/schart/ui/sidebarelements.ui") - , mxCBTitle(m_xBuilder->weld_check_button("checkbutton_title")) - , mxEditTitle(m_xBuilder->weld_entry("edit_title")) - , mxCBSubtitle(m_xBuilder->weld_check_button("checkbutton_subtitle")) - , mxEditSubtitle(m_xBuilder->weld_entry("edit_subtitle")) - , mxCBXAxis(m_xBuilder->weld_check_button("checkbutton_x_axis")) - , mxCBXAxisTitle(m_xBuilder->weld_check_button("checkbutton_x_axis_title")) - , mxCBYAxis(m_xBuilder->weld_check_button("checkbutton_y_axis")) - , mxCBYAxisTitle(m_xBuilder->weld_check_button("checkbutton_y_axis_title")) - , mxCBZAxis(m_xBuilder->weld_check_button("checkbutton_z_axis")) - , mxCBZAxisTitle(m_xBuilder->weld_check_button("checkbutton_z_axis_title")) - , mxCB2ndXAxis(m_xBuilder->weld_check_button("checkbutton_2nd_x_axis")) - , mxCB2ndXAxisTitle(m_xBuilder->weld_check_button("checkbutton_2nd_x_axis_title")) - , mxCB2ndYAxis(m_xBuilder->weld_check_button("checkbutton_2nd_y_axis")) - , mxCB2ndYAxisTitle(m_xBuilder->weld_check_button("checkbutton_2nd_y_axis_title")) - , mxCBLegend(m_xBuilder->weld_check_button("checkbutton_legend")) - , mxCBLegendNoOverlay(m_xBuilder->weld_check_button("checkbutton_no_overlay")) - , mxCBGridVerticalMajor(m_xBuilder->weld_check_button("checkbutton_gridline_vertical_major")) - , mxCBGridHorizontalMajor(m_xBuilder->weld_check_button("checkbutton_gridline_horizontal_major")) - , mxCBGridVerticalMinor(m_xBuilder->weld_check_button("checkbutton_gridline_vertical_minor")) - , mxCBGridHorizontalMinor(m_xBuilder->weld_check_button("checkbutton_gridline_horizontal_minor")) - , mxTextTitle(m_xBuilder->weld_label("text_title")) - , mxTextSubTitle(m_xBuilder->weld_label("text_subtitle")) - , mxLBAxis(m_xBuilder->weld_label("label_axes")) - , mxLBGrid(m_xBuilder->weld_label("label_gri")) - , mxLBLegendPosition(m_xBuilder->weld_combo_box("comboboxtext_legend")) - , mxBoxLegend(m_xBuilder->weld_widget("box_legend")) + : PanelLayout(pParent, u"ChartElementsPanel"_ustr, u"modules/schart/ui/sidebarelements.ui"_ustr) + , mxCBTitle(m_xBuilder->weld_check_button(u"checkbutton_title"_ustr)) + , mxEditTitle(m_xBuilder->weld_entry(u"edit_title"_ustr)) + , mxCBSubtitle(m_xBuilder->weld_check_button(u"checkbutton_subtitle"_ustr)) + , mxEditSubtitle(m_xBuilder->weld_entry(u"edit_subtitle"_ustr)) + , mxCBXAxis(m_xBuilder->weld_check_button(u"checkbutton_x_axis"_ustr)) + , mxCBXAxisTitle(m_xBuilder->weld_check_button(u"checkbutton_x_axis_title"_ustr)) + , mxCBYAxis(m_xBuilder->weld_check_button(u"checkbutton_y_axis"_ustr)) + , mxCBYAxisTitle(m_xBuilder->weld_check_button(u"checkbutton_y_axis_title"_ustr)) + , mxCBZAxis(m_xBuilder->weld_check_button(u"checkbutton_z_axis"_ustr)) + , mxCBZAxisTitle(m_xBuilder->weld_check_button(u"checkbutton_z_axis_title"_ustr)) + , mxCB2ndXAxis(m_xBuilder->weld_check_button(u"checkbutton_2nd_x_axis"_ustr)) + , mxCB2ndXAxisTitle(m_xBuilder->weld_check_button(u"checkbutton_2nd_x_axis_title"_ustr)) + , mxCB2ndYAxis(m_xBuilder->weld_check_button(u"checkbutton_2nd_y_axis"_ustr)) + , mxCB2ndYAxisTitle(m_xBuilder->weld_check_button(u"checkbutton_2nd_y_axis_title"_ustr)) + , mxCBLegend(m_xBuilder->weld_check_button(u"checkbutton_legend"_ustr)) + , mxCBLegendNoOverlay(m_xBuilder->weld_check_button(u"checkbutton_no_overlay"_ustr)) + , mxCBGridVerticalMajor(m_xBuilder->weld_check_button(u"checkbutton_gridline_vertical_major"_ustr)) + , mxCBGridHorizontalMajor(m_xBuilder->weld_check_button(u"checkbutton_gridline_horizontal_major"_ustr)) + , mxCBGridVerticalMinor(m_xBuilder->weld_check_button(u"checkbutton_gridline_vertical_minor"_ustr)) + , mxCBGridHorizontalMinor(m_xBuilder->weld_check_button(u"checkbutton_gridline_horizontal_minor"_ustr)) + , mxTextTitle(m_xBuilder->weld_label(u"text_title"_ustr)) + , mxTextSubTitle(m_xBuilder->weld_label(u"text_subtitle"_ustr)) + , mxLBAxis(m_xBuilder->weld_label(u"label_axes"_ustr)) + , mxLBGrid(m_xBuilder->weld_label(u"label_gri"_ustr)) + , mxLBLegendPosition(m_xBuilder->weld_combo_box(u"comboboxtext_legend"_ustr)) + , mxBoxLegend(m_xBuilder->weld_widget(u"box_legend"_ustr)) , mxModel(pController->getChartModel()) , mxListener(new ChartSidebarModifyListener(this)) , mbModelValid(true) @@ -527,7 +527,7 @@ std::unique_ptr<PanelLayout> ChartElementsPanel::Create ( ChartController* pController) { if (pParent == nullptr) - throw lang::IllegalArgumentException("no parent Window given to ChartElementsPanel::Create", nullptr, 0); + throw lang::IllegalArgumentException(u"no parent Window given to ChartElementsPanel::Create"_ustr, nullptr, 0); return std::make_unique<ChartElementsPanel>(pParent, pController); } diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index c9430791b3c9..87be2b47d185 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -55,7 +55,7 @@ bool showPositiveError(const rtl::Reference<::chart::ChartModel>& xModel, if (!xPropSet.is()) return false; - css::uno::Any aAny = xPropSet->getPropertyValue("ShowPositiveError"); + css::uno::Any aAny = xPropSet->getPropertyValue(u"ShowPositiveError"_ustr); if (!aAny.hasValue()) return false; @@ -74,7 +74,7 @@ bool showNegativeError(const rtl::Reference<::chart::ChartModel>& xModel, if (!xPropSet.is()) return false; - css::uno::Any aAny = xPropSet->getPropertyValue("ShowNegativeError"); + css::uno::Any aAny = xPropSet->getPropertyValue(u"ShowNegativeError"_ustr); if (!aAny.hasValue()) return false; @@ -93,7 +93,7 @@ void setShowPositiveError(const rtl::Reference<::chart::ChartModel>& xModel, if (!xPropSet.is()) return; - xPropSet->setPropertyValue("ShowPositiveError", css::uno::Any(bShow)); + xPropSet->setPropertyValue(u"ShowPositiveError"_ustr, css::uno::Any(bShow)); } void setShowNegativeError(const rtl::Reference<::chart::ChartModel>& xModel, @@ -105,7 +105,7 @@ void setShowNegativeError(const rtl::Reference<::chart::ChartModel>& xModel, if (!xPropSet.is()) return; - xPropSet->setPropertyValue("ShowNegativeError", css::uno::Any(bShow)); + xPropSet->setPropertyValue(u"ShowNegativeError"_ustr, css::uno::Any(bShow)); } struct ErrorBarTypeMap @@ -133,7 +133,7 @@ sal_Int32 getTypePos(const rtl::Reference<::chart::ChartModel>& xModel, if (!xPropSet.is()) return 0; - css::uno::Any aAny = xPropSet->getPropertyValue("ErrorBarStyle"); + css::uno::Any aAny = xPropSet->getPropertyValue(u"ErrorBarStyle"_ustr); if (!aAny.hasValue()) return 0; @@ -166,7 +166,7 @@ void setTypePos(const rtl::Reference<::chart::ChartModel>& xModel, nApi = i.nApi; } - xPropSet->setPropertyValue("ErrorBarStyle", css::uno::Any(nApi)); + xPropSet->setPropertyValue(u"ErrorBarStyle"_ustr, css::uno::Any(nApi)); } double getValue(const rtl::Reference<::chart::ChartModel>& xModel, @@ -178,7 +178,7 @@ double getValue(const rtl::Reference<::chart::ChartModel>& xModel, if (!xPropSet.is()) return 0; - OUString aName = "PositiveError"; + OUString aName = u"PositiveError"_ustr; if (eDir == ErrorBarDirection::NEGATIVE) aName = "NegativeError"; @@ -202,7 +202,7 @@ void setValue(const rtl::Reference<::chart::ChartModel>& xModel, if (!xPropSet.is()) return; - OUString aName = "PositiveError"; + OUString aName = u"PositiveError"_ustr; if (eDir == ErrorBarDirection::NEGATIVE) aName = "NegativeError"; @@ -235,13 +235,13 @@ OUString getCID(const rtl::Reference<::chart::ChartModel>& xModel) } ChartErrorBarPanel::ChartErrorBarPanel(weld::Widget* pParent, ChartController* pController) - : PanelLayout(pParent, "ChartErrorBarPanel", "modules/schart/ui/sidebarerrorbar.ui") - , mxRBPosAndNeg(m_xBuilder->weld_radio_button("radiobutton_positive_negative")) - , mxRBPos(m_xBuilder->weld_radio_button("radiobutton_positive")) - , mxRBNeg(m_xBuilder->weld_radio_button("radiobutton_negative")) - , mxLBType(m_xBuilder->weld_combo_box("comboboxtext_type")) - , mxMFPos(m_xBuilder->weld_spin_button("spinbutton_pos")) - , mxMFNeg(m_xBuilder->weld_spin_button("spinbutton_neg")) + : PanelLayout(pParent, u"ChartErrorBarPanel"_ustr, u"modules/schart/ui/sidebarerrorbar.ui"_ustr) + , mxRBPosAndNeg(m_xBuilder->weld_radio_button(u"radiobutton_positive_negative"_ustr)) + , mxRBPos(m_xBuilder->weld_radio_button(u"radiobutton_positive"_ustr)) + , mxRBNeg(m_xBuilder->weld_radio_button(u"radiobutton_negative"_ustr)) + , mxLBType(m_xBuilder->weld_combo_box(u"comboboxtext_type"_ustr)) + , mxMFPos(m_xBuilder->weld_spin_button(u"spinbutton_pos"_ustr)) + , mxMFNeg(m_xBuilder->weld_spin_button(u"spinbutton_neg"_ustr)) , mxModel(pController->getChartModel()) , mxListener(new ChartSidebarModifyListener(this)) , mbModelValid(true) @@ -341,7 +341,7 @@ std::unique_ptr<PanelLayout> ChartErrorBarPanel::Create ( ChartController* pController) { if (pParent == nullptr) - throw lang::IllegalArgumentException("no parent Window given to ChartErrorBarPanel::Create", nullptr, 0); + throw lang::IllegalArgumentException(u"no parent Window given to ChartErrorBarPanel::Create"_ustr, nullptr, 0); return std::make_unique<ChartErrorBarPanel>(pParent, pController); } diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 46cec9695f4d..daa9f0645cfc 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -33,14 +33,14 @@ namespace { SvxLineStyleToolBoxControl* getLineStyleToolBoxControl(const ToolbarUnoDispatcher& rToolBoxColor) { - css::uno::Reference<css::frame::XToolbarController> xController = rToolBoxColor.GetControllerForCommand(".uno:XLineStyle"); + css::uno::Reference<css::frame::XToolbarController> xController = rToolBoxColor.GetControllerForCommand(u".uno:XLineStyle"_ustr); SvxLineStyleToolBoxControl* pToolBoxLineStyleControl = dynamic_cast<SvxLineStyleToolBoxControl*>(xController.get()); return pToolBoxLineStyleControl; } SvxColorToolBoxControl* getColorToolBoxControl(const ToolbarUnoDispatcher& rToolBoxLineStyle) { - css::uno::Reference<css::frame::XToolbarController> xController = rToolBoxLineStyle.GetControllerForCommand(".uno:XLineColor"); + css::uno::Reference<css::frame::XToolbarController> xController = rToolBoxLineStyle.GetControllerForCommand(u".uno:XLineColor"_ustr); SvxColorToolBoxControl* pToolBoxColorControl = dynamic_cast<SvxColorToolBoxControl*>(xController.get()); return pToolBoxColorControl; } @@ -109,9 +109,9 @@ std::unique_ptr<PanelLayout> ChartLinePanel::Create( ChartController* pController) { if (pParent == nullptr) - throw css::lang::IllegalArgumentException("no parent Window given to ChartAxisPanel::Create", nullptr, 0); + throw css::lang::IllegalArgumentException(u"no parent Window given to ChartAxisPanel::Create"_ustr, nullptr, 0); if (!rxFrame.is()) - throw css::lang::IllegalArgumentException("no XFrame given to ChartAxisPanel::Create", nullptr, 1); + throw css::lang::IllegalArgumentException(u"no XFrame given to ChartAxisPanel::Create"_ustr, nullptr, 1); return std::make_unique<ChartLinePanel>(pParent, rxFrame, pController); } @@ -125,7 +125,7 @@ ChartLinePanel::ChartLinePanel(weld::Widget* pParent, mxSelectionListener(new ChartSidebarSelectionListener(this)), mbUpdate(true), mbModelValid(true), - maLineColorWrapper(mxModel, getColorToolBoxControl(*mxColorDispatch), "LineColor"), + maLineColorWrapper(mxModel, getColorToolBoxControl(*mxColorDispatch), u"LineColor"_ustr), maLineStyleWrapper(mxModel, getLineStyleToolBoxControl(*mxLineStyleDispatch)) { disableArrowHead(); @@ -171,12 +171,12 @@ void ChartLinePanel::updateData() return; sal_uInt16 nLineTransparence = 0; - xPropSet->getPropertyValue("LineTransparence") >>= nLineTransparence; + xPropSet->getPropertyValue(u"LineTransparence"_ustr) >>= nLineTransparence; XLineTransparenceItem aLineTransparenceItem(nLineTransparence); updateLineTransparence(false, true, &aLineTransparenceItem); sal_uInt32 nWidth = 0; - xPropSet->getPropertyValue("LineWidth") >>= nWidth; + xPropSet->getPropertyValue(u"LineWidth"_ustr) >>= nWidth; XLineWidthItem aWidthItem(nWidth); updateLineWidth(false, true, &aWidthItem); @@ -240,7 +240,7 @@ void ChartLinePanel::setLineTransparency(const XLineTransparenceItem& rItem) return; PreventUpdate aPreventUpdate(mbUpdate); - xPropSet->setPropertyValue("LineTransparence", css::uno::Any(rItem.GetValue())); + xPropSet->setPropertyValue(u"LineTransparence"_ustr, css::uno::Any(rItem.GetValue())); } void ChartLinePanel::setLineWidth(const XLineWidthItem& rItem) @@ -252,7 +252,7 @@ void ChartLinePanel::setLineWidth(const XLineWidthItem& rItem) return; PreventUpdate aPreventUpdate(mbUpdate); - xPropSet->setPropertyValue("LineWidth", css::uno::Any(rItem.GetValue())); + xPropSet->setPropertyValue(u"LineWidth"_ustr, css::uno::Any(rItem.GetValue())); } void ChartLinePanel::updateLineWidth(bool bDisabled, bool bSetOrDefault, const SfxPoolItem* pItem) diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 9e94ac005ecb..bfa8bb73b268 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -93,7 +93,7 @@ sal_Int32 getDataLabelPlacement(const rtl::Reference<::chart::ChartModel>& xMode if (!xSeries.is()) return 0; - css::uno::Any aAny = xSeries->getPropertyValue("LabelPlacement"); + css::uno::Any aAny = xSeries->getPropertyValue(u"LabelPlacement"_ustr); if (!aAny.hasValue()) return 0; @@ -128,7 +128,7 @@ void setDataLabelPlacement(const rtl::Reference<::chart::ChartModel>& xModel, } } - xSeries->setPropertyValue("LabelPlacement", css::uno::Any(nApi)); + xSeries->setPropertyValue(u"LabelPlacement"_ustr, css::uno::Any(nApi)); } bool isTrendlineVisible(const rtl::Reference<::chart::ChartModel>& xModel, @@ -274,17 +274,17 @@ OUString getCID(const css::uno::Reference<css::frame::XModel>& xModel) ChartSeriesPanel::ChartSeriesPanel( weld::Widget* pParent, ChartController* pController) - : PanelLayout(pParent, "ChartSeriesPanel", "modules/schart/ui/sidebarseries.ui") - , mxCBLabel(m_xBuilder->weld_check_button("checkbutton_label")) - , mxCBTrendline(m_xBuilder->weld_check_button("checkbutton_trendline")) - , mxCBXError(m_xBuilder->weld_check_button("checkbutton_x_error")) - , mxCBYError(m_xBuilder->weld_check_button("checkbutton_y_error")) - , mxRBPrimaryAxis(m_xBuilder->weld_radio_button("radiobutton_primary_axis")) - , mxRBSecondaryAxis(m_xBuilder->weld_radio_button("radiobutton_secondary_axis")) - , mxBoxLabelPlacement(m_xBuilder->weld_widget("datalabel_box")) - , mxLBLabelPlacement(m_xBuilder->weld_combo_box("comboboxtext_label")) - , mxFTSeriesName(m_xBuilder->weld_label("label_series_name")) - , mxFTSeriesTemplate(m_xBuilder->weld_label("label_series_tmpl")) + : PanelLayout(pParent, u"ChartSeriesPanel"_ustr, u"modules/schart/ui/sidebarseries.ui"_ustr) + , mxCBLabel(m_xBuilder->weld_check_button(u"checkbutton_label"_ustr)) + , mxCBTrendline(m_xBuilder->weld_check_button(u"checkbutton_trendline"_ustr)) + , mxCBXError(m_xBuilder->weld_check_button(u"checkbutton_x_error"_ustr)) + , mxCBYError(m_xBuilder->weld_check_button(u"checkbutton_y_error"_ustr)) + , mxRBPrimaryAxis(m_xBuilder->weld_radio_button(u"radiobutton_primary_axis"_ustr)) + , mxRBSecondaryAxis(m_xBuilder->weld_radio_button(u"radiobutton_secondary_axis"_ustr)) + , mxBoxLabelPlacement(m_xBuilder->weld_widget(u"datalabel_box"_ustr)) + , mxLBLabelPlacement(m_xBuilder->weld_combo_box(u"comboboxtext_label"_ustr)) + , mxFTSeriesName(m_xBuilder->weld_label(u"label_series_name"_ustr)) + , mxFTSeriesTemplate(m_xBuilder->weld_label(u"label_series_tmpl"_ustr)) , mxModel(pController->getChartModel()) , mxListener(new ChartSidebarModifyListener(this)) , mxSelectionListener(new ChartSidebarSelectionListener(this, OBJECTTYPE_DATA_SERIES)) @@ -370,7 +370,7 @@ std::unique_ptr<PanelLayout> ChartSeriesPanel::Create ( ChartController* pController) { if (pParent == nullptr) - throw lang::IllegalArgumentException("no parent Window given to ChartSeriesPanel::Create", nullptr, 0); + throw lang::IllegalArgumentException(u"no parent Window given to ChartSeriesPanel::Create"_ustr, nullptr, 0); return std::make_unique<ChartSeriesPanel>(pParent, pController); } diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx index 40423aa62ea1..2328298d8ba2 100644 --- a/chart2/source/controller/sidebar/ChartTypePanel.cxx +++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx @@ -38,7 +38,7 @@ using namespace css::uno; namespace chart::sidebar { ChartTypePanel::ChartTypePanel(weld::Widget* pParent, ::chart::ChartController* pController) - : PanelLayout(pParent, "ChartTypePanel", "modules/schart/ui/sidebartype.ui") + : PanelLayout(pParent, u"ChartTypePanel"_ustr, u"modules/schart/ui/sidebartype.ui"_ustr) , mxListener(new ChartSidebarModifyListener(this)) , mbModelValid(true) , m_pDim3DLookResourceGroup(new Dim3DLookResourceGroup(m_xBuilder.get())) @@ -52,9 +52,9 @@ ChartTypePanel::ChartTypePanel(weld::Widget* pParent, ::chart::ChartController* , m_pCurrentMainType(nullptr) , m_nChangingCalls(0) , m_aTimerTriggeredControllerLock(m_xChartModel) - , m_xMainTypeList(m_xBuilder->weld_combo_box("cmb_chartType")) - , m_xSubTypeList(new ValueSet(m_xBuilder->weld_scrolled_window("subtypewin", true))) - , m_xSubTypeListWin(new weld::CustomWeld(*m_xBuilder, "subtype", *m_xSubTypeList)) + , m_xMainTypeList(m_xBuilder->weld_combo_box(u"cmb_chartType"_ustr)) + , m_xSubTypeList(new ValueSet(m_xBuilder->weld_scrolled_window(u"subtypewin"_ustr, true))) + , m_xSubTypeListWin(new weld::CustomWeld(*m_xBuilder, u"subtype"_ustr, *m_xSubTypeList)) { Size aSize(m_xSubTypeList->GetDrawingArea()->get_ref_device().LogicToPixel( Size(120, 40), MapMode(MapUnit::MapAppFont))); @@ -75,7 +75,7 @@ ChartTypePanel::ChartTypePanel(weld::Widget* pParent, ::chart::ChartController* { try { - xProps->getPropertyValue("EnableComplexChartTypes") >>= bEnableComplexChartTypes; + xProps->getPropertyValue(u"EnableComplexChartTypes"_ustr) >>= bEnableComplexChartTypes; } catch (const uno::Exception&) { @@ -103,7 +103,7 @@ ChartTypePanel::ChartTypePanel(weld::Widget* pParent, ::chart::ChartController* for (auto const& elem : m_aChartTypeDialogControllerList) { - m_xMainTypeList->append("", elem->getName(), elem->getImage()); + m_xMainTypeList->append(u""_ustr, elem->getName(), elem->getImage()); elem->setChangeListener(this); } diff --git a/chart2/source/controller/uitest/uiobject.cxx b/chart2/source/controller/uitest/uiobject.cxx index c75f15c3885c..2f10a38412f7 100644 --- a/chart2/source/controller/uitest/uiobject.cxx +++ b/chart2/source/controller/uitest/uiobject.cxx @@ -33,7 +33,7 @@ ChartUIObject::ChartUIObject(const VclPtr<chart::ChartWindow>& xChartWindow, StringMap ChartUIObject::get_state() { StringMap aMap; - aMap["CID"] = maCID; + aMap[u"CID"_ustr] = maCID; return aMap; } @@ -46,7 +46,7 @@ void ChartUIObject::execute(const OUString& rAction, std::unique_ptr<UIObject> pWindow = mxChartWindow->GetUITestFactory()(mxChartWindow.get()); StringMap aParams; - aParams["NAME"] = maCID; + aParams[u"NAME"_ustr] = maCID; pWindow->execute(rAction, aParams); } else if (rAction == "COMMAND") @@ -55,12 +55,12 @@ void ChartUIObject::execute(const OUString& rAction, std::unique_ptr<UIObject> pWindow = mxChartWindow->GetUITestFactory()(mxChartWindow.get()); StringMap aParams; - aParams["NAME"] = maCID; - pWindow->execute("SELECT", aParams); + aParams[u"NAME"_ustr] = maCID; + pWindow->execute(u"SELECT"_ustr, aParams); - auto itr = rParameters.find("COMMAND"); + auto itr = rParameters.find(u"COMMAND"_ustr); if (itr == rParameters.end()) - throw css::uno::RuntimeException("missing COMMAND parameter"); + throw css::uno::RuntimeException(u"missing COMMAND parameter"_ustr); maCommands.emplace_back(new OUString(itr->second)); OUString* pCommand = maCommands.rbegin()->get(); @@ -92,7 +92,7 @@ std::set<OUString> ChartUIObject::get_children() const OUString ChartUIObject::get_type() const { - return "ChartUIObject for type: "; + return u"ChartUIObject for type: "_ustr; } bool ChartUIObject::equals(const UIObject& rOther) const @@ -119,7 +119,7 @@ StringMap ChartWindowUIObject::get_state() css::uno::Any aAny = pController->getSelection(); OUString aSelectedObject; aAny >>= aSelectedObject; - aMap["SelectedObject"] = aSelectedObject; + aMap[u"SelectedObject"_ustr] = aSelectedObject; } return aMap; @@ -130,9 +130,9 @@ void ChartWindowUIObject::execute(const OUString& rAction, { if (rAction == "SELECT") { - auto itr = rParameters.find("NAME"); + auto itr = rParameters.find(u"NAME"_ustr); if (itr == rParameters.end()) - throw css::uno::RuntimeException("Missing Parameter 'NAME' for action 'SELECT'"); + throw css::uno::RuntimeException(u"Missing Parameter 'NAME' for action 'SELECT'"_ustr); const OUString& rName = itr->second; @@ -151,7 +151,7 @@ std::unique_ptr<UIObject> ChartWindowUIObject::get_child(const OUString& rID) if (chart::ObjectIdentifier::isCID(rID)) return std::unique_ptr<UIObject>(new ChartUIObject(mxChartWindow, rID)); - throw css::uno::RuntimeException("unknown child"); + throw css::uno::RuntimeException(u"unknown child"_ustr); } namespace { @@ -202,7 +202,7 @@ std::unique_ptr<UIObject> ChartWindowUIObject::create(vcl::Window* pWindow) OUString ChartWindowUIObject::get_name() const { - return "ChartWindowUIObject"; + return u"ChartWindowUIObject"_ustr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index b5a485dc4c86..0422216fe9fd 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -112,10 +112,10 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage( uno::Reference<beans::XPropertySet> xProp(xStorage,uno::UNO_QUERY); OUString aMediaType; if ( ! xProp.is() || - ! ( xProp->getPropertyValue( "MediaType") >>= aMediaType ) || + ! ( xProp->getPropertyValue( u"MediaType"_ustr) >>= aMediaType ) || ( aMediaType.isEmpty() )) { - xProp->setPropertyValue( "MediaType", uno::Any( _sMediaType )); + xProp->setPropertyValue( u"MediaType"_ustr, uno::Any( _sMediaType )); } } catch (const uno::Exception&) @@ -267,7 +267,7 @@ ErrCode XMLFilter::impl_Import( try { Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW ); - if( ! xServInfo->supportsService( "com.sun.star.chart2.ChartDocument")) + if( ! xServInfo->supportsService( u"com.sun.star.chart2.ChartDocument"_ustr)) { OSL_FAIL( "Import: No ChartDocument" ); return ERRCODE_SFX_GENERAL; @@ -291,7 +291,7 @@ ErrCode XMLFilter::impl_Import( uno::Sequence<uno::Any> aArgs{ uno::Any(xStorage) }; xGraphicStorageHandler.set( xServiceFactory->createInstanceWithArguments( - "com.sun.star.comp.Svx.GraphicImportHelper", aArgs), uno::UNO_QUERY); + u"com.sun.star.comp.Svx.GraphicImportHelper"_ustr, aArgs), uno::UNO_QUERY); } // create XPropertySet with extra information for the filter @@ -299,14 +299,14 @@ ErrCode XMLFilter::impl_Import( static comphelper::PropertyMapEntry const aImportInfoMap[] = { // necessary properties for XML progress bar at load time - { OUString("ProgressRange"), 0, cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressMax"), 0, cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("ProgressCurrent"), 0, cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("PrivateData"), 0, cppu::UnoType<XInterface>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("BaseURI"), 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath"), 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName"), 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("BuildId"), 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"ProgressRange"_ustr, 0, cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { u"ProgressMax"_ustr, 0, cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { u"ProgressCurrent"_ustr, 0, cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0}, + { u"PrivateData"_ustr, 0, cppu::UnoType<XInterface>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"BaseURI"_ustr, 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"StreamRelPath"_ustr, 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"StreamName"_ustr, 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"BuildId"_ustr, 0, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::MAYBEVOID, 0 }, }; uno::Reference< beans::XPropertySet > xImportInfo( comphelper::GenericPropertySet_CreateInstance( @@ -336,24 +336,24 @@ ErrCode XMLFilter::impl_Import( // needed for relative URLs, but in clipboard copy/paste there may be none SAL_INFO_IF(aBaseUri.isEmpty(), "chart2", "chart::XMLFilter: no base URL"); if( !aBaseUri.isEmpty() ) - xImportInfo->setPropertyValue( "BaseURI", uno::Any( aBaseUri ) ); + xImportInfo->setPropertyValue( u"BaseURI"_ustr, uno::Any( aBaseUri ) ); if( !aHierarchName.isEmpty() ) - xImportInfo->setPropertyValue( "StreamRelPath", uno::Any( aHierarchName ) ); + xImportInfo->setPropertyValue( u"StreamRelPath"_ustr, uno::Any( aHierarchName ) ); // import meta information if( bOasis ) nWarning = impl_ImportStream( sXML_metaStreamName, - "com.sun.star.comp.Chart.XMLOasisMetaImporter", + u"com.sun.star.comp.Chart.XMLOasisMetaImporter"_ustr, xStorage, xFactory, xGraphicStorageHandler, xImportInfo ); // import styles ErrCode nTmpErr = impl_ImportStream( sXML_styleStreamName, bOasis - ? OUString("com.sun.star.comp.Chart.XMLOasisStylesImporter") - : OUString("com.sun.star.comp.Chart.XMLStylesImporter"), + ? u"com.sun.star.comp.Chart.XMLOasisStylesImporter"_ustr + : u"com.sun.star.comp.Chart.XMLStylesImporter"_ustr, xStorage, xFactory, xGraphicStorageHandler, xImportInfo ); nWarning = nWarning != ERRCODE_NONE ? nWarning : nTmpErr; @@ -361,8 +361,8 @@ ErrCode XMLFilter::impl_Import( ErrCode nContentWarning = impl_ImportStream( sXML_contentStreamName, bOasis - ? OUString("com.sun.star.comp.Chart.XMLOasisContentImporter") - : OUString("com.sun.star.comp.Chart.XMLContentImporter"), + ? u"com.sun.star.comp.Chart.XMLOasisContentImporter"_ustr + : u"com.sun.star.comp.Chart.XMLContentImporter"_ustr, xStorage, xFactory, xGraphicStorageHandler, xImportInfo ); nWarning = nWarning != ERRCODE_NONE ? nWarning : nContentWarning; } @@ -392,7 +392,7 @@ ErrCode XMLFilter::impl_ImportStream( return ERRCODE_NONE; if( xImportInfo.is() ) - xImportInfo->setPropertyValue( "StreamName", uno::Any( rStreamName ) ); + xImportInfo->setPropertyValue( u"StreamName"_ustr, uno::Any( rStreamName ) ); if( xStorage.is() && xStorage->isStreamElement( rStreamName ) ) @@ -436,8 +436,8 @@ ErrCode XMLFilter::impl_ImportStream( try { uno::Sequence< uno::Any > aArgs{ - uno::Any(beans::NamedValue("DocumentHandler", uno::Any(xFilter))), - uno::Any(beans::NamedValue("Model", uno::Any(m_xTargetDoc))) + uno::Any(beans::NamedValue(u"DocumentHandler"_ustr, uno::Any(xFilter))), + uno::Any(beans::NamedValue(u"Model"_ustr, uno::Any(m_xTargetDoc))) }; xFilter = xFactory->createInstanceWithArgumentsAndContext(m_sDocumentHandler,aArgs,m_xContext); @@ -508,7 +508,7 @@ ErrCode XMLFilter::impl_Export( try { Reference< lang::XServiceInfo > xServInfo( xDocumentComp, uno::UNO_QUERY_THROW ); - if( ! xServInfo->supportsService( "com.sun.star.chart2.ChartDocument")) + if( ! xServInfo->supportsService( u"com.sun.star.chart2.ChartDocument"_ustr)) { OSL_FAIL( "Export: No ChartDocument" ); return ERRCODE_SFX_GENERAL; @@ -539,8 +539,8 @@ ErrCode XMLFilter::impl_Export( try { uno::Sequence< uno::Any > aArgs{ - uno::Any(beans::NamedValue("DocumentHandler", uno::Any(xDocHandler))), - uno::Any(beans::NamedValue("Model", uno::Any(xDocumentComp))) + uno::Any(beans::NamedValue(u"DocumentHandler"_ustr, uno::Any(xDocHandler))), + uno::Any(beans::NamedValue(u"Model"_ustr, uno::Any(xDocumentComp))) }; xDocHandler.set(xServiceFactory->createInstanceWithArguments(m_sDocumentHandler,aArgs), uno::UNO_QUERY ); @@ -558,20 +558,20 @@ ErrCode XMLFilter::impl_Export( // property map for export info set static comphelper::PropertyMapEntry const aExportInfoMap[] = { - { OUString("UsePrettyPrinting"), 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, - { OUString("BaseURI"), 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamRelPath"), 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("StreamName"), 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, - { OUString("ExportTableNumberList"), 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"UsePrettyPrinting"_ustr, 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0}, + { u"BaseURI"_ustr, 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"StreamRelPath"_ustr, 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"StreamName"_ustr, 0, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, + { u"ExportTableNumberList"_ustr, 0, cppu::UnoType<bool>::get(), beans::PropertyAttribute::MAYBEVOID, 0 }, }; uno::Reference< beans::XPropertySet > xInfoSet = comphelper::GenericPropertySet_CreateInstance( new comphelper::PropertySetInfo( aExportInfoMap ) ); bool bUsePrettyPrinting( officecfg::Office::Common::Save::Document::PrettyPrinting::get() ); - xInfoSet->setPropertyValue( "UsePrettyPrinting", uno::Any( bUsePrettyPrinting ) ); + xInfoSet->setPropertyValue( u"UsePrettyPrinting"_ustr, uno::Any( bUsePrettyPrinting ) ); if( ! bOasis ) - xInfoSet->setPropertyValue( "ExportTableNumberList", uno::Any( true )); + xInfoSet->setPropertyValue( u"ExportTableNumberList"_ustr, uno::Any( true )); sal_Int32 nArgs = 2; if( xGraphicStorageHandler.is()) @@ -591,15 +591,15 @@ ErrCode XMLFilter::impl_Export( if( bOasis ) nWarning = impl_ExportStream( sXML_metaStreamName, - "com.sun.star.comp.Chart.XMLOasisMetaExporter", + u"com.sun.star.comp.Chart.XMLOasisMetaExporter"_ustr, xStorage, xSaxWriter, xServiceFactory, aFilterProperties ); // export styles ErrCode nTmp = impl_ExportStream( sXML_styleStreamName, bOasis - ? OUString("com.sun.star.comp.Chart.XMLOasisStylesExporter") - : OUString("com.sun.star.comp.Chart.XMLStylesExporter"), // soffice 6/7 + ? u"com.sun.star.comp.Chart.XMLOasisStylesExporter"_ustr + : u"com.sun.star.comp.Chart.XMLStylesExporter"_ustr, // soffice 6/7 xStorage, xSaxWriter, xServiceFactory, aFilterProperties ); nWarning = nWarning != ERRCODE_NONE ? nWarning : nTmp; @@ -607,8 +607,8 @@ ErrCode XMLFilter::impl_Export( ErrCode nContentWarning = impl_ExportStream( sXML_contentStreamName, bOasis - ? OUString("com.sun.star.comp.Chart.XMLOasisContentExporter") - : OUString("com.sun.star.comp.Chart.XMLContentExporter"), + ? u"com.sun.star.comp.Chart.XMLOasisContentExporter"_ustr + : u"com.sun.star.comp.Chart.XMLContentExporter"_ustr, xStorage, xSaxWriter, xServiceFactory, aFilterProperties ); nWarning = nWarning != ERRCODE_NONE ? nWarning : nContentWarning; @@ -659,9 +659,9 @@ ErrCode XMLFilter::impl_ExportStream( uno::Reference< beans::XPropertySet > xStreamProp( xOutputStream, uno::UNO_QUERY ); if(xStreamProp.is()) try { - xStreamProp->setPropertyValue( "MediaType", uno::Any( OUString("text/xml") ) ); - xStreamProp->setPropertyValue( "Compressed", uno::Any( true ) );//@todo? - xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", uno::Any( true ) ); + xStreamProp->setPropertyValue( u"MediaType"_ustr, uno::Any( u"text/xml"_ustr ) ); + xStreamProp->setPropertyValue( u"Compressed"_ustr, uno::Any( true ) );//@todo? + xStreamProp->setPropertyValue( u"UseCommonStoragePasswordEncryption"_ustr, uno::Any( true ) ); } catch (const uno::Exception&) { @@ -677,7 +677,7 @@ ErrCode XMLFilter::impl_ExportStream( rFilterProperties[0] >>= xInfoSet; OSL_ENSURE( xInfoSet.is(), "missing infoset for export" ); if( xInfoSet.is() ) - xInfoSet->setPropertyValue( "StreamName", uno::Any( rStreamName ) ); + xInfoSet->setPropertyValue( u"StreamName"_ustr, uno::Any( rStreamName ) ); } Reference< XExporter > xExporter( xServiceFactory->createInstanceWithArguments( @@ -713,7 +713,7 @@ OUString XMLFilter::getMediaType(bool _bOasis) OUString SAL_CALL XMLFilter::getImplementationName() { - return "com.sun.star.comp.chart2.XMLFilter"; + return u"com.sun.star.comp.chart2.XMLFilter"_ustr; } sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName ) @@ -724,8 +724,8 @@ sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL XMLFilter::getSupportedServiceNames() { return { - "com.sun.star.document.ImportFilter", - "com.sun.star.document.ExportFilter" + u"com.sun.star.document.ImportFilter"_ustr, + u"com.sun.star.document.ExportFilter"_ustr }; // todo: services are incomplete. Missing: // XInitialization, XNamed diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 12c28ad40e79..941ea2c62134 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -138,13 +138,13 @@ protected: virtual OUString SAL_CALL getImplementationName() override { - return "com.sun.star.comp.chart2.report.XMLFilter"; + return u"com.sun.star.comp.chart2.report.XMLFilter"_ustr; } // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& Document ) override { - setDocumentHandler( "com.sun.star.comp.report.ImportDocumentHandler" ); + setDocumentHandler( u"com.sun.star.comp.report.ImportDocumentHandler"_ustr ); XMLFilter::setTargetDocument(Document); } @@ -152,7 +152,7 @@ protected: virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& Document ) override { - setDocumentHandler( "com.sun.star.comp.report.ExportDocumentHandler" ); + setDocumentHandler( u"com.sun.star.comp.report.ExportDocumentHandler"_ustr ); XMLFilter::setSourceDocument(Document); } diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 3d7cfc6267b8..394e51ce9bb0 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -573,7 +573,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Axis::getImplementationName() { - return "com.sun.star.comp.chart2.Axis"; + return u"com.sun.star.comp.chart2.Axis"_ustr; } sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName ) @@ -584,8 +584,8 @@ sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames() { return { - "com.sun.star.chart2.Axis", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.Axis"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } } // namespace chart diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 8af32fa09678..31473161e54e 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -266,7 +266,7 @@ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChar if( std::find( m_aChartTypes.begin(), m_aChartTypes.end(), pChartType ) != m_aChartTypes.end()) - throw lang::IllegalArgumentException("type not found", static_cast<cppu::OWeakObject*>(this), 1); + throw lang::IllegalArgumentException(u"type not found"_ustr, static_cast<cppu::OWeakObject*>(this), 1); m_aChartTypes.push_back( pChartType ); ModifyListenerHelper::addListener( aChartType, m_xModifyEventForwarder ); @@ -280,7 +280,7 @@ void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XC auto aIt( std::find( m_aChartTypes.begin(), m_aChartTypes.end(), pChartType )); if( aIt == m_aChartTypes.end()) throw container::NoSuchElementException( - "The given chart type is no element of the container", + u"The given chart type is no element of the container"_ustr, static_cast< uno::XWeak * >( this )); m_aChartTypes.erase( aIt ); diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index 1f1320d8ae69..a655ee14aa7a 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -72,7 +72,7 @@ uno::Reference< util::XCloneable > SAL_CALL CartesianCoordinateSystem::createClo // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem::getImplementationName() { - return "com.sun.star.comp.chart.CartesianCoordinateSystem"; + return u"com.sun.star.comp.chart.CartesianCoordinateSystem"_ustr; } sal_Bool SAL_CALL CartesianCoordinateSystem::supportsService( const OUString& rServiceName ) @@ -97,7 +97,7 @@ CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d() // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem2d::getImplementationName() { - return "com.sun.star.comp.chart2.CartesianCoordinateSystem2d"; + return u"com.sun.star.comp.chart2.CartesianCoordinateSystem2d"_ustr; } sal_Bool SAL_CALL CartesianCoordinateSystem2d::supportsService( const OUString& rServiceName ) @@ -109,7 +109,7 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupporte { return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME, - "com.sun.star.chart2.CartesianCoordinateSystem2d" + u"com.sun.star.chart2.CartesianCoordinateSystem2d"_ustr }; } @@ -125,7 +125,7 @@ CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d() // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem3d::getImplementationName() { - return "com.sun.star.comp.chart2.CartesianCoordinateSystem3d"; + return u"com.sun.star.comp.chart2.CartesianCoordinateSystem3d"_ustr; } sal_Bool SAL_CALL CartesianCoordinateSystem3d::supportsService( const OUString& rServiceName ) @@ -137,7 +137,7 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupporte { return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME, - "com.sun.star.chart2.CartesianCoordinateSystem3d" + u"com.sun.star.chart2.CartesianCoordinateSystem3d"_ustr }; } diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index c0627abf7bbd..4e97f9c99820 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -270,7 +270,7 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV return; uno::Reference< drawing::XShapes > xShapes; - xProperties->getPropertyValue( "AdditionalShapes" ) >>= xShapes; + xProperties->getPropertyValue( u"AdditionalShapes"_ustr ) >>= xShapes; if ( !xShapes.is() ) return; @@ -316,8 +316,8 @@ css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames() { return { CHART_MODEL_SERVICE_NAME, - "com.sun.star.document.OfficeDocument", - "com.sun.star.chart.ChartDocument" + u"com.sun.star.document.OfficeDocument"_ustr, + u"com.sun.star.chart.ChartDocument"_ustr }; } @@ -464,7 +464,7 @@ uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) throw lang::DisposedException( - "getCurrentController was called on an already disposed or closed model", + u"getCurrentController was called on an already disposed or closed model"_ustr, static_cast< ::cppu::OWeakObject* >(this) ); return impl_getCurrentController(); @@ -475,13 +475,13 @@ void SAL_CALL ChartModel::setCurrentController( const uno::Reference< frame::XCo LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) throw lang::DisposedException( - "setCurrentController was called on an already disposed or closed model", + u"setCurrentController was called on an already disposed or closed model"_ustr, static_cast< ::cppu::OWeakObject* >(this) ); //OSL_ENSURE( impl_isControllerConnected(xController), "setCurrentController is called with a Controller which is not connected" ); if(!impl_isControllerConnected(xController)) throw container::NoSuchElementException( - "setCurrentController is called with a Controller which is not connected", + u"setCurrentController is called with a Controller which is not connected"_ustr, static_cast< ::cppu::OWeakObject* >(this) ); m_xCurrentController = xController; @@ -499,7 +499,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) throw lang::DisposedException( - "getCurrentSelection was called on an already disposed or closed model", + u"getCurrentSelection was called on an already disposed or closed model"_ustr, static_cast< ::cppu::OWeakObject* >(this) ); uno::Reference< uno::XInterface > xReturn; @@ -633,7 +633,7 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership ) //check whether we self can close { util::CloseVetoException aVetoException( - "the model itself could not be closed", + u"the model itself could not be closed"_ustr, static_cast< ::cppu::OWeakObject* >(this) ); m_aLifeTimeManager.g_close_isNeedToCancelLongLastingCalls( bDeliverOwnership, aVetoException ); @@ -715,13 +715,13 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData() { //init internal dataprovider { - beans::NamedValue aParam( "CreateDefaultData" ,uno::Any(true) ); + beans::NamedValue aParam( u"CreateDefaultData"_ustr ,uno::Any(true) ); uno::Sequence< uno::Any > aArgs{ uno::Any(aParam) }; m_xInternalDataProvider->initialize(aArgs); } //create data uno::Sequence<beans::PropertyValue> aArgs( comphelper::InitPropertySequence({ - { "CellRangeRepresentation", uno::Any( OUString("all") ) }, + { "CellRangeRepresentation", uno::Any( u"all"_ustr ) }, { "HasCategories", uno::Any( true ) }, { "FirstCellAsLabel", uno::Any( true ) }, { "DataRowSource", uno::Any( css::chart::ChartDataRowSource_COLUMNS ) } @@ -792,7 +792,7 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data try { bool bIncludeHiddenCells = ChartModelHelper::isIncludeHiddenCells( this ); - xProp->setPropertyValue("IncludeHiddenCells", uno::Any(bIncludeHiddenCells)); + xProp->setPropertyValue(u"IncludeHiddenCells"_ustr, uno::Any(bIncludeHiddenCells)); } catch (const beans::UnknownPropertyException&) { @@ -907,7 +907,7 @@ rtl::Reference< ::chart::ChartTypeTemplate > ChartModel::impl_createDefaultChart { rtl::Reference< ::chart::ChartTypeTemplate > xTemplate; if( m_xChartTypeManager.is() ) - xTemplate = m_xChartTypeManager->createTemplate( "com.sun.star.chart2.template.Column" ); + xTemplate = m_xChartTypeManager->createTemplate( u"com.sun.star.chart2.template.Column"_ustr ); return xTemplate; } @@ -1050,7 +1050,7 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio if( xTransferable.is() ) { datatransfer::DataFlavor aDataFlavor( lcl_aGDIMetaFileMIMEType, - "GDIMetaFile", + u"GDIMetaFile"_ustr, cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ); uno::Any aData( xTransferable->getTransferData( aDataFlavor ) ); @@ -1107,7 +1107,7 @@ uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& a Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors() { return { datatransfer::DataFlavor( lcl_aGDIMetaFileMIMETypeHighContrast, - "GDIMetaFile", + u"GDIMetaFile"_ustr, cppu::UnoType<uno::Sequence< sal_Int8 >>::get() ) }; } diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 8d9e6076078a..3c3481420069 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -96,7 +96,7 @@ void lcl_addStorageToMediaDescriptor( { rOutMD.realloc( rOutMD.getLength() + 1 ); rOutMD.getArray()[rOutMD.getLength() - 1] = beans::PropertyValue( - "Storage", -1, uno::Any( xStorage ), beans::PropertyState_DIRECT_VALUE ); + u"Storage"_ustr, -1, uno::Any( xStorage ), beans::PropertyState_DIRECT_VALUE ); } Reference< embed::XStorage > lcl_createStorage( @@ -146,7 +146,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( // find FilterName in MediaDescriptor OUString aFilterName( - lcl_getProperty< OUString >( rMediaDescriptor, "FilterName" ) ); + lcl_getProperty< OUString >( rMediaDescriptor, u"FilterName"_ustr ) ); // if FilterName was found, get Filter from factory if( !aFilterName.isEmpty() ) @@ -155,7 +155,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( { Reference< container::XNameAccess > xFilterFact( m_xContext->getServiceManager()->createInstanceWithContext( - "com.sun.star.document.FilterFactory", m_xContext ), + u"com.sun.star.document.FilterFactory"_ustr, m_xContext ), uno::UNO_QUERY_THROW ); uno::Any aFilterProps( xFilterFact->getByName( aFilterName )); Sequence< beans::PropertyValue > aProps; @@ -164,7 +164,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( (aFilterProps >>= aProps)) { OUString aFilterServiceName( - lcl_getProperty< OUString >( aProps, "FilterService" ) ); + lcl_getProperty< OUString >( aProps, u"FilterService"_ustr ) ); if( !aFilterServiceName.isEmpty()) { @@ -230,10 +230,10 @@ void SAL_CALL ChartModel::store() OUString aLocation = m_aResource; if( aLocation.isEmpty() ) - throw io::IOException( "no location specified", static_cast< ::cppu::OWeakObject* >(this)); + throw io::IOException( u"no location specified"_ustr, static_cast< ::cppu::OWeakObject* >(this)); //@todo check whether aLocation is something like private:factory... if( m_bReadOnly ) - throw io::IOException( "document is read only", static_cast< ::cppu::OWeakObject* >(this)); + throw io::IOException( u"document is read only"_ustr, static_cast< ::cppu::OWeakObject* >(this)); aGuard.clear(); @@ -355,7 +355,7 @@ void ChartModel::impl_store( try { xPropSet->setPropertyValue( - "SavedObject", + u"SavedObject"_ustr, uno::Any( aMDHelper.HierarchicalDocumentName ) ); } catch ( const uno::Exception& ) @@ -381,7 +381,7 @@ void ChartModel::insertDefaultChart() bool bSupportsCategories = xTemplate->supportsCategories(); if( bSupportsCategories ) { - aParam = { beans::PropertyValue( "HasCategories", -1, uno::Any( true ), + aParam = { beans::PropertyValue( u"HasCategories"_ustr, -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ) }; } @@ -396,21 +396,21 @@ void ChartModel::insertDefaultChart() // create and attach legend rtl::Reference< Legend > xLegend = new Legend(); - xLegend->setPropertyValue( "FillStyle", uno::Any( drawing::FillStyle_NONE )); - xLegend->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE )); - xLegend->setPropertyValue( "LineColor", uno::Any( static_cast< sal_Int32 >( 0xb3b3b3 ) )); // gray30 - xLegend->setPropertyValue( "FillColor", uno::Any( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 + xLegend->setPropertyValue( u"FillStyle"_ustr, uno::Any( drawing::FillStyle_NONE )); + xLegend->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_NONE )); + xLegend->setPropertyValue( u"LineColor"_ustr, uno::Any( static_cast< sal_Int32 >( 0xb3b3b3 ) )); // gray30 + xLegend->setPropertyValue( u"FillColor"_ustr, uno::Any( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 if( bIsRTL ) - xLegend->setPropertyValue( "AnchorPosition", uno::Any( chart2::LegendPosition_LINE_START )); + xLegend->setPropertyValue( u"AnchorPosition"_ustr, uno::Any( chart2::LegendPosition_LINE_START )); if(xDiagram.is()) xDiagram->setLegend( xLegend ); // set simple 3D look if( xDiagram.is() ) { - xDiagram->setPropertyValue( "RightAngledAxes", uno::Any( true )); - xDiagram->setPropertyValue( "D3DScenePerspective", uno::Any( drawing::ProjectionMode_PARALLEL )); + xDiagram->setPropertyValue( u"RightAngledAxes"_ustr, uno::Any( true )); + xDiagram->setPropertyValue( u"D3DScenePerspective"_ustr, uno::Any( drawing::ProjectionMode_PARALLEL )); xDiagram->setScheme( ThreeDLookScheme::ThreeDLookScheme_Realistic ); } @@ -420,18 +420,18 @@ void ChartModel::insertDefaultChart() Reference< beans::XPropertySet > xWall( xDiagram->getWall() ); if( xWall.is() ) { - xWall->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) ); - xWall->setPropertyValue( "FillStyle", uno::Any( drawing::FillStyle_NONE ) ); - xWall->setPropertyValue( "LineColor", uno::Any( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 - xWall->setPropertyValue( "FillColor", uno::Any( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 + xWall->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_SOLID ) ); + xWall->setPropertyValue( u"FillStyle"_ustr, uno::Any( drawing::FillStyle_NONE ) ); + xWall->setPropertyValue( u"LineColor"_ustr, uno::Any( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 + xWall->setPropertyValue( u"FillColor"_ustr, uno::Any( static_cast< sal_Int32 >( 0xe6e6e6 ) ) ); // gray10 } Reference< beans::XPropertySet > xFloor( xDiagram->getFloor() ); if( xFloor.is() ) { - xFloor->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) ); - xFloor->setPropertyValue( "FillStyle", uno::Any( drawing::FillStyle_SOLID ) ); - xFloor->setPropertyValue( "LineColor", uno::Any( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 - xFloor->setPropertyValue( "FillColor", uno::Any( static_cast< sal_Int32 >( 0xcccccc ) ) ); // gray20 + xFloor->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); + xFloor->setPropertyValue( u"FillStyle"_ustr, uno::Any( drawing::FillStyle_SOLID ) ); + xFloor->setPropertyValue( u"LineColor"_ustr, uno::Any( static_cast< sal_Int32 >( 0xb3b3b3 ) ) ); // gray30 + xFloor->setPropertyValue( u"FillColor"_ustr, uno::Any( static_cast< sal_Int32 >( 0xcccccc ) ) ); // gray20 } } @@ -568,7 +568,7 @@ void ChartModel::impl_loadGraphics( try { const Reference< embed::XStorage >& xGraphicsStorage( - xStorage->openStorageElement( "Pictures", + xStorage->openStorageElement( u"Pictures"_ustr, embed::ElementModes::READ ) ); if( xGraphicsStorage.is() ) @@ -696,7 +696,7 @@ void SAL_CALL ChartModel::modified( const lang::EventObject& rEvenObject) try { uno::Sequence<beans::PropertyValue> aArguments = - DataSourceHelper::createArguments("PivotChart", uno::Sequence<sal_Int32>(), true, true, true); + DataSourceHelper::createArguments(u"PivotChart"_ustr, uno::Sequence<sal_Int32>(), true, true, true); Reference<chart2::data::XDataSource> xDataSource(xDataProvider->createDataSource(aArguments)); rtl::Reference< ::chart::ChartTypeManager > xChartTypeManager = getTypeManager(); diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index d6c8a9e2ac3b..b83d5a40752d 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -232,7 +232,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertyS // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DataPoint::getImplementationName() { - return "com.sun.star.comp.chart.DataPoint" ; + return u"com.sun.star.comp.chart.DataPoint"_ustr ; } sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName ) @@ -243,10 +243,10 @@ sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL DataPoint::getSupportedServiceNames() { return { - "com.sun.star.drawing.FillProperties", - "com.sun.star.chart2.DataPoint", - "com.sun.star.chart2.DataPointProperties", - "com.sun.star.beans.PropertySet" + u"com.sun.star.drawing.FillProperties"_ustr, + u"com.sun.star.chart2.DataPoint"_ustr, + u"com.sun.star.chart2.DataPointProperties"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index c27407c98fca..d86128b7593e 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -529,7 +529,7 @@ void DataPointProperties::AddDefaultsToMap( )); PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_TEXT_WORD_WRAP, false ); - PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, OUString(" ") ); + PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, u" "_ustr ); PropertyHelper::setPropertyValueDefault(rOutMap, PROP_DATAPOINT_LABEL_BORDER_STYLE, drawing::LineStyle_NONE); PropertyHelper::setEmptyPropertyValueDefault(rOutMap, PROP_DATAPOINT_LABEL_BORDER_COLOR); PropertyHelper::setEmptyPropertyValueDefault(rOutMap, PROP_DATAPOINT_LABEL_FILL_STYLE); diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 38f2c474b47a..cc207badd19d 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -303,7 +303,7 @@ Reference< beans::XPropertySet > } std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aValuesSeries( - DataSeriesHelper::getAllDataSequencesByRole( aSequences , "values" ) ); + DataSeriesHelper::getAllDataSequencesByRole( aSequences , u"values"_ustr ) ); if (aValuesSeries.empty()) throw lang::IndexOutOfBoundsException(); @@ -435,7 +435,7 @@ void SAL_CALL DataSeries::addRegressionCurve( xModifyEventForwarder = m_xModifyEventForwarder; if( std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), pRegressionCurve ) != m_aRegressionCurves.end()) - throw lang::IllegalArgumentException("curve not found", static_cast<cppu::OWeakObject*>(this), 1); + throw lang::IllegalArgumentException(u"curve not found"_ustr, static_cast<cppu::OWeakObject*>(this), 1); m_aRegressionCurves.push_back( pRegressionCurve ); } ModifyListenerHelper::addListener( rtl::Reference<RegressionCurveModel>(pRegressionCurve), xModifyEventForwarder ); @@ -458,7 +458,7 @@ void SAL_CALL DataSeries::removeRegressionCurve( std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), pRegressionCurve ) ); if( aIt == m_aRegressionCurves.end()) throw container::NoSuchElementException( - "The given regression curve is no element of this series", + u"The given regression curve is no element of this series"_ustr, static_cast< uno::XWeak * >( this )); m_aRegressionCurves.erase( aIt ); } @@ -538,7 +538,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DataSeries::getImplementationName() { - return "com.sun.star.comp.chart.DataSeries"; + return u"com.sun.star.comp.chart.DataSeries"_ustr; } sal_Bool SAL_CALL DataSeries::supportsService( const OUString& rServiceName ) @@ -549,9 +549,9 @@ sal_Bool SAL_CALL DataSeries::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames() { return { - "com.sun.star.chart2.DataSeries", - "com.sun.star.chart2.DataPointProperties", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.DataSeries"_ustr, + u"com.sun.star.chart2.DataPointProperties"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } static Reference< chart2::data::XLabeledDataSequence > lcl_findLSequenceWithOnlyLabel( @@ -694,7 +694,7 @@ static bool lcl_SequenceHasUnhiddenData( const uno::Reference< chart2::data::XDa uno::Sequence< sal_Int32 > aHiddenValues; try { - xProp->getPropertyValue( "HiddenValues" ) >>= aHiddenValues; + xProp->getPropertyValue( u"HiddenValues"_ustr ) >>= aHiddenValues; if( !aHiddenValues.hasElements() ) return true; } diff --git a/chart2/source/model/main/DataTable.cxx b/chart2/source/model/main/DataTable.cxx index 6cec190615bd..01aa023ed977 100644 --- a/chart2/source/model/main/DataTable.cxx +++ b/chart2/source/model/main/DataTable.cxx @@ -179,7 +179,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL DataTable::getPropertySetInfo() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DataTable::getImplementationName() { - return "com.sun.star.comp.chart2.DataTable"; + return u"com.sun.star.comp.chart2.DataTable"_ustr; } sal_Bool SAL_CALL DataTable::supportsService(const OUString& rServiceName) @@ -189,9 +189,10 @@ sal_Bool SAL_CALL DataTable::supportsService(const OUString& rServiceName) uno::Sequence<OUString> SAL_CALL DataTable::getSupportedServiceNames() { - return { "com.sun.star.chart2.DataTable", "com.sun.star.beans.PropertySet", - "com.sun.star.drawing.FillProperties", "com.sun.star.drawing.LineProperties", - "com.sun.star.style.CharacterProperties" }; + return { u"com.sun.star.chart2.DataTable"_ustr, u"com.sun.star.beans.PropertySet"_ustr, + u"com.sun.star.drawing.FillProperties"_ustr, + u"com.sun.star.drawing.LineProperties"_ustr, + u"com.sun.star.style.CharacterProperties"_ustr }; } IMPLEMENT_FORWARD_XINTERFACE2(DataTable, DataTable_Base, ::property::OPropertySet) diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index a963e2a25c07..3979f0bcf34c 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -425,7 +425,7 @@ void SAL_CALL Diagram::setDiagramData( Diagram::tTemplateWithServiceName aTemplateAndService = getTemplate( xChartTypeManager ); rtl::Reference< ::chart::ChartTypeTemplate > xTemplate( aTemplateAndService.xChartTypeTemplate ); if( !xTemplate.is() ) - xTemplate = xChartTypeManager->createTemplate( "com.sun.star.chart2.template.Column" ); + xTemplate = xChartTypeManager->createTemplate( u"com.sun.star.chart2.template.Column"_ustr ); if(!xTemplate.is()) return; xTemplate->changeDiagramData( rtl::Reference< ::chart::Diagram >(this), xDataSource, aArguments ); @@ -458,8 +458,8 @@ void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& x // ____ X3DDefaultSetter ____ void SAL_CALL Diagram::set3DSettingsToDefault() { - setPropertyToDefault( "D3DSceneDistance"); - setPropertyToDefault( "D3DSceneFocalLength"); + setPropertyToDefault( u"D3DSceneDistance"_ustr); + setPropertyToDefault( u"D3DSceneFocalLength"_ustr); setDefaultRotation(); setDefaultIllumination(); } @@ -582,7 +582,7 @@ void SAL_CALL Diagram::addCoordinateSystem( MutexGuard aGuard( m_aMutex ); if( std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), pCoordSys ) != m_aCoordSystems.end()) - throw lang::IllegalArgumentException("coordsys not found", static_cast<cppu::OWeakObject*>(this), 1); + throw lang::IllegalArgumentException(u"coordsys not found"_ustr, static_cast<cppu::OWeakObject*>(this), 1); if( !m_aCoordSystems.empty() ) { @@ -605,7 +605,7 @@ void SAL_CALL Diagram::removeCoordinateSystem( auto aIt = std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), pCoordSys ); if( aIt == m_aCoordSystems.end()) throw container::NoSuchElementException( - "The given coordinate-system is no element of the container", + u"The given coordinate-system is no element of the container"_ustr, static_cast< uno::XWeak * >( this )); m_aCoordSystems.erase( aIt ); } @@ -833,7 +833,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySe // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Diagram::getImplementationName() { - return "com.sun.star.comp.chart2.Diagram"; + return u"com.sun.star.comp.chart2.Diagram"_ustr; } sal_Bool SAL_CALL Diagram::supportsService( const OUString& rServiceName ) @@ -844,9 +844,9 @@ sal_Bool SAL_CALL Diagram::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames() { return { - "com.sun.star.chart2.Diagram", - "com.sun.star.layout.LayoutElement", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.Diagram"_ustr, + u"com.sun.star.layout.LayoutElement"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } DiagramPositioningMode Diagram::getDiagramPositioningMode() @@ -901,7 +901,7 @@ void Diagram::setGeometry3D( sal_Int32 nNewGeometry ) for (auto const& series : aSeriesVec) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( - series, "Geometry3D", uno::Any( nNewGeometry )); + series, u"Geometry3D"_ustr, uno::Any( nNewGeometry )); } } @@ -921,7 +921,7 @@ sal_Int32 Diagram::getGeometry3D( bool& rbFound, bool& rbAmbiguous ) try { sal_Int32 nGeom = 0; - if( series->getPropertyValue( "Geometry3D") >>= nGeom ) + if( series->getPropertyValue( u"Geometry3D"_ustr) >>= nGeom ) { if( ! rbFound ) { @@ -1273,7 +1273,7 @@ uno::Reference< chart2::data::XLabeledDataSequence > Diagram::getCategories() { try { - xProp->setPropertyValue( "Role", uno::Any( OUString("categories") ) ); + xProp->setPropertyValue( u"Role"_ustr, uno::Any( u"categories"_ustr ) ); } catch( const uno::Exception & ) { @@ -1437,7 +1437,7 @@ bool Diagram::attachSeriesToAxis( bool bAttachToMainAxis { try { - xDataSeries->setPropertyValue( "AttachedAxisIndex", uno::Any( nNewAxisIndex ) ); + xDataSeries->setPropertyValue( u"AttachedAxisIndex"_ustr, uno::Any( nNewAxisIndex ) ); bChanged = true; } catch( const uno::Exception & ) @@ -1612,7 +1612,7 @@ void Diagram::setStackMode( StackMode eStackMode ) //iterate through all series in this chart type for( rtl::Reference< DataSeries > const & dataSeries : xChartType->getDataSeries2() ) { - dataSeries->setPropertyValue( "StackingDirection", aNewDirection ); + dataSeries->setPropertyValue( u"StackingDirection"_ustr, aNewDirection ); } } } @@ -1664,12 +1664,12 @@ void Diagram::setVertical( bool bVertical /* = true */ ) { bool bChanged = false; bool bOldSwap = false; - if( !(xCooSys->getPropertyValue("SwapXAndYAxis") >>= bOldSwap) + if( !(xCooSys->getPropertyValue(u"SwapXAndYAxis"_ustr) >>= bOldSwap) || bVertical != bOldSwap ) bChanged = true; if( bChanged ) - xCooSys->setPropertyValue("SwapXAndYAxis", aValue); + xCooSys->setPropertyValue(u"SwapXAndYAxis"_ustr, aValue); const sal_Int32 nDimensionCount = xCooSys->getDimension(); sal_Int32 nDimIndex = 0; @@ -1691,7 +1691,7 @@ void Diagram::setVertical( bool bVertical /* = true */ ) continue; double fAngleDegree = 0.0; - xTitleProps->getPropertyValue("TextRotation") >>= fAngleDegree; + xTitleProps->getPropertyValue(u"TextRotation"_ustr) >>= fAngleDegree; if (fAngleDegree != 0.0 && !rtl::math::approxEqual(fAngleDegree, 90.0)) continue; @@ -1702,7 +1702,7 @@ void Diagram::setVertical( bool bVertical /* = true */ ) else if( bVertical && nDimIndex == 0 ) fNewAngleDegree = 90.0; - xTitleProps->setPropertyValue("TextRotation", uno::Any(fNewAngleDegree)); + xTitleProps->setPropertyValue(u"TextRotation"_ustr, uno::Any(fNewAngleDegree)); } } } @@ -1722,7 +1722,7 @@ bool Diagram::getVertical( bool& rbFound, bool& rbAmbiguous ) for (rtl::Reference<BaseCoordinateSystem> const & coords : getBaseCoordinateSystems()) { bool bCurrent = false; - if (coords->getPropertyValue("SwapXAndYAxis") >>= bCurrent) + if (coords->getPropertyValue(u"SwapXAndYAxis"_ustr) >>= bCurrent) { if (!rbFound) { diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index dbd5876b978a..8e1842559c7b 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -248,7 +248,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL FormattedString::getImplementationName() { - return "com.sun.star.comp.chart.FormattedString"; + return u"com.sun.star.comp.chart.FormattedString"_ustr; } sal_Bool SAL_CALL FormattedString::supportsService( const OUString& rServiceName ) @@ -259,9 +259,9 @@ sal_Bool SAL_CALL FormattedString::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceNames() { return { - "com.sun.star.chart2.DataPointCustomLabelField", - "com.sun.star.chart2.FormattedString", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.DataPointCustomLabelField"_ustr, + u"com.sun.star.chart2.FormattedString"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } } // namespace chart diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index a495f631f7e2..f308150f3b70 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -168,7 +168,7 @@ void GridProperties::firePropertyChangeEvent() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL GridProperties::getImplementationName() { - return "com.sun.star.comp.chart2.GridProperties"; + return u"com.sun.star.comp.chart2.GridProperties"_ustr; } sal_Bool SAL_CALL GridProperties::supportsService( const OUString& rServiceName ) @@ -179,8 +179,8 @@ sal_Bool SAL_CALL GridProperties::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL GridProperties::getSupportedServiceNames() { return { - "com.sun.star.chart2.GridProperties", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.GridProperties"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } // needed by MSC compiler diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index f72868b58cb5..5f6ee67ccaa0 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -237,7 +237,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Legend::getImplementationName() { - return "com.sun.star.comp.chart2.Legend"; + return u"com.sun.star.comp.chart2.Legend"_ustr; } sal_Bool SAL_CALL Legend::supportsService( const OUString& rServiceName ) @@ -248,12 +248,12 @@ sal_Bool SAL_CALL Legend::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL Legend::getSupportedServiceNames() { return { - "com.sun.star.chart2.Legend", - "com.sun.star.beans.PropertySet", - "com.sun.star.drawing.FillProperties", - "com.sun.star.drawing.LineProperties", - "com.sun.star.style.CharacterProperties", - "com.sun.star.layout.LayoutElement" + u"com.sun.star.chart2.Legend"_ustr, + u"com.sun.star.beans.PropertySet"_ustr, + u"com.sun.star.drawing.FillProperties"_ustr, + u"com.sun.star.drawing.LineProperties"_ustr, + u"com.sun.star.style.CharacterProperties"_ustr, + u"com.sun.star.layout.LayoutElement"_ustr }; } diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index deae689d7a2b..2bddc6214ca1 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -172,7 +172,7 @@ void PageBackground::firePropertyChangeEvent() OUString SAL_CALL PageBackground::getImplementationName() { - return "com.sun.star.comp.chart2.PageBackground"; + return u"com.sun.star.comp.chart2.PageBackground"_ustr; } sal_Bool SAL_CALL PageBackground::supportsService( const OUString& rServiceName ) @@ -183,8 +183,8 @@ sal_Bool SAL_CALL PageBackground::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL PageBackground::getSupportedServiceNames() { return { - "com.sun.star.chart2.PageBackground", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.PageBackground"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } using impl::PageBackground_Base; diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index 0807415dac24..e2581c0a55f2 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -72,7 +72,7 @@ uno::Reference< util::XCloneable > SAL_CALL PolarCoordinateSystem::createClone() // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem::getImplementationName() { - return "com.sun.star.comp.chart.PolarCoordinateSystem"; + return u"com.sun.star.comp.chart.PolarCoordinateSystem"_ustr; } sal_Bool SAL_CALL PolarCoordinateSystem::supportsService( const OUString& rServiceName ) @@ -97,7 +97,7 @@ PolarCoordinateSystem2d::~PolarCoordinateSystem2d() // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem2d::getImplementationName() { - return "com.sun.star.comp.chart2.PolarCoordinateSystem2d" ; + return u"com.sun.star.comp.chart2.PolarCoordinateSystem2d"_ustr ; } sal_Bool SAL_CALL PolarCoordinateSystem2d::supportsService( const OUString& rServiceName ) @@ -109,7 +109,7 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem2d::getSupportedSer { return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME, - "com.sun.star.chart2.PolarCoordinateSystem2d" }; + u"com.sun.star.chart2.PolarCoordinateSystem2d"_ustr }; } // ==== PolarCoordinateSystem3d ==== @@ -124,7 +124,7 @@ PolarCoordinateSystem3d::~PolarCoordinateSystem3d() // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem3d::getImplementationName() { - return "com.sun.star.comp.chart2.PolarCoordinateSystem3d"; + return u"com.sun.star.comp.chart2.PolarCoordinateSystem3d"_ustr; } sal_Bool SAL_CALL PolarCoordinateSystem3d::supportsService( const OUString& rServiceName ) @@ -136,7 +136,7 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedSer { return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME, - "com.sun.star.chart2.PolarCoordinateSystem3d" }; + u"com.sun.star.chart2.PolarCoordinateSystem3d"_ustr }; } } // namespace chart diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 10551ce6e318..d882304d43d3 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -311,7 +311,7 @@ void Title::fireModifyEvent() OUString SAL_CALL Title::getImplementationName() { - return "com.sun.star.comp.chart2.Title"; + return u"com.sun.star.comp.chart2.Title"_ustr; } sal_Bool SAL_CALL Title::supportsService( const OUString& rServiceName ) @@ -322,10 +322,10 @@ sal_Bool SAL_CALL Title::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL Title::getSupportedServiceNames() { return { - "com.sun.star.chart2.Title", - "com.sun.star.style.ParagraphProperties", - "com.sun.star.beans.PropertySet", - "com.sun.star.layout.LayoutElement" }; + u"com.sun.star.chart2.Title"_ustr, + u"com.sun.star.style.ParagraphProperties"_ustr, + u"com.sun.star.beans.PropertySet"_ustr, + u"com.sun.star.layout.LayoutElement"_ustr }; } // needed by MSC compiler diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index b0581ddc8837..6d1dd578b0fe 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -57,7 +57,7 @@ OUString SAL_CALL AreaChartType::getChartType() OUString SAL_CALL AreaChartType::getImplementationName() { - return "com.sun.star.comp.chart.AreaChartType"; + return u"com.sun.star.comp.chart.AreaChartType"_ustr; } sal_Bool SAL_CALL AreaChartType::supportsService( const OUString& rServiceName ) @@ -69,7 +69,7 @@ css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames( { return { CHART2_SERVICE_NAME_CHARTTYPE_AREA, - "com.sun.star.chart2.ChartType" }; + u"com.sun.star.chart2.ChartType"_ustr }; } } // namespace chart diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index 2ffad2a416fc..71bbac8b3a19 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -148,7 +148,7 @@ void AreaChartTypeTemplate::applyStyle2( ::sal_Int32 nSeriesCount ) { ChartTypeTemplate::applyStyle2( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"BorderStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); } void AreaChartTypeTemplate::resetStyles2( const rtl::Reference< ::chart::Diagram >& xDiagram ) @@ -159,9 +159,9 @@ void AreaChartTypeTemplate::resetStyles2( const rtl::Reference< ::chart::Diagram uno::Any aLineStyleAny( drawing::LineStyle_NONE ); for (auto const& series : aSeriesVec) { - if( series->getPropertyValue( "BorderStyle") == aLineStyleAny ) + if( series->getPropertyValue( u"BorderStyle"_ustr) == aLineStyleAny ) { - series->setPropertyToDefault( "BorderStyle"); + series->setPropertyToDefault( u"BorderStyle"_ustr); } } } diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 2a94db82ba2a..7bd27a943238 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -58,12 +58,12 @@ OUString SAL_CALL BarChartType::getChartType() uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles() { - return { "FillColor", "BorderColor" }; + return { u"FillColor"_ustr, u"BorderColor"_ustr }; } OUString SAL_CALL BarChartType::getImplementationName() { - return "com.sun.star.comp.chart.BarChartType"; + return u"com.sun.star.comp.chart.BarChartType"_ustr; } sal_Bool SAL_CALL BarChartType::supportsService( const OUString& rServiceName ) @@ -75,7 +75,7 @@ css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames() { return { CHART2_SERVICE_NAME_CHARTTYPE_BAR, - "com.sun.star.chart2.ChartType" }; + u"com.sun.star.chart2.ChartType"_ustr }; } } // namespace chart diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 2b649ec43364..1c37019509d1 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -200,7 +200,7 @@ void BarChartTypeTemplate::applyStyle2( ::sal_Int32 nSeriesCount ) { ChartTypeTemplate::applyStyle2( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"BorderStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); if( getDimension() != 3 ) return; @@ -209,7 +209,7 @@ void BarChartTypeTemplate::applyStyle2( //apply Geometry3D uno::Any aAGeometry3D; getFastPropertyValue( aAGeometry3D, PROP_BAR_TEMPLATE_GEOMETRY3D ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Geometry3D", aAGeometry3D ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"Geometry3D"_ustr, aAGeometry3D ); } catch( const uno::Exception & ) { @@ -227,10 +227,10 @@ void BarChartTypeTemplate::resetStyles2( for (auto const& series : aSeriesVec) { if( getDimension() == 3 ) - series->setPropertyToDefault( "Geometry3D"); - if( series->getPropertyValue( "BorderStyle") == aLineStyleAny ) + series->setPropertyToDefault( u"Geometry3D"_ustr); + if( series->getPropertyValue( u"BorderStyle"_ustr) == aLineStyleAny ) { - series->setPropertyToDefault( "BorderStyle"); + series->setPropertyToDefault( u"BorderStyle"_ustr); } } diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index bd8bf287d96a..76abecfe27ef 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -114,17 +114,17 @@ OUString SAL_CALL BubbleChartType::getChartType() uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() { - return { "label", "values-x", "values-y", "values-size" }; + return { u"label"_ustr, u"values-x"_ustr, u"values-y"_ustr, u"values-size"_ustr }; } uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedPropertyRoles() { - return { "FillColor", "BorderColor" }; + return { u"FillColor"_ustr, u"BorderColor"_ustr }; } OUString SAL_CALL BubbleChartType::getRoleOfSequenceForSeriesLabel() { - return "values-size"; + return u"values-size"_ustr; } // ____ OPropertySet ____ @@ -154,7 +154,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertyS OUString SAL_CALL BubbleChartType::getImplementationName() { - return "com.sun.star.comp.chart.BubbleChartType"; + return u"com.sun.star.comp.chart.BubbleChartType"_ustr; } sal_Bool SAL_CALL BubbleChartType::supportsService( const OUString& rServiceName ) @@ -166,8 +166,8 @@ css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceName { return { CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE, - "com.sun.star.chart2.ChartType", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.ChartType"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } } // namespace chart diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 55f39ef0669b..00baa80a35f6 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -107,7 +107,7 @@ void BubbleChartTypeTemplate::applyStyle2( ::sal_Int32 nSeriesCount ) { ChartTypeTemplate::applyStyle2( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"BorderStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); } // ____ XChartTypeTemplate ____ diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index bb468fd9723d..f2d653acf91e 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -80,7 +80,7 @@ InterpretedData BubbleDataInterpreter::interpretDataSource( xCategories = aData[nDataIdx]; if( xCategories.is()) { - SetRole( xCategories->getValues(), "categories"); + SetRole( xCategories->getValues(), u"categories"_ustr); if( bUseCategoriesAsX ) { bSetXValues = false; @@ -93,20 +93,20 @@ InterpretedData BubbleDataInterpreter::interpretDataSource( { xValuesX = aData[nDataIdx]; if( xValuesX.is()) - SetRole( xValuesX->getValues(), "values-x"); + SetRole( xValuesX->getValues(), u"values-x"_ustr); } else if( bNextIsYValues ) { aYValuesVector.push_back( aData[nDataIdx] ); if( aData[nDataIdx].is()) - SetRole( aData[nDataIdx]->getValues(), "values-y"); + SetRole( aData[nDataIdx]->getValues(), u"values-y"_ustr); bNextIsYValues = false; } else if( !bNextIsYValues ) { aSizeValuesVector.push_back( aData[nDataIdx] ); if( aData[nDataIdx].is()) - SetRole( aData[nDataIdx]->getValues(), "values-size"); + SetRole( aData[nDataIdx]->getValues(), u"values-size"_ustr); bNextIsYValues = (nDataSeqCount-(nDataIdx+1)) >= 2;//two or more left } } @@ -166,11 +166,11 @@ InterpretedData BubbleDataInterpreter::reinterpretDataSeries( std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aNewSequences; uno::Reference< chart2::data::XLabeledDataSequence > xValuesSize( - DataSeriesHelper::getDataSequenceByRole( aSeries[i], "values-size" )); + DataSeriesHelper::getDataSequenceByRole( aSeries[i], u"values-size"_ustr )); uno::Reference< chart2::data::XLabeledDataSequence > xValuesY( - DataSeriesHelper::getDataSequenceByRole( aSeries[i], "values-y" )); + DataSeriesHelper::getDataSequenceByRole( aSeries[i], u"values-y"_ustr )); uno::Reference< chart2::data::XLabeledDataSequence > xValuesX( - DataSeriesHelper::getDataSequenceByRole( aSeries[i], "values-x" )); + DataSeriesHelper::getDataSequenceByRole( aSeries[i], u"values-x"_ustr )); if( ! xValuesX.is() || ! xValuesY.is() || @@ -178,7 +178,7 @@ InterpretedData BubbleDataInterpreter::reinterpretDataSeries( { std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aValueSeqVec( DataSeriesHelper::getAllDataSequencesByRole( - aSeries[i]->getDataSequences2(), "values" )); + aSeries[i]->getDataSequences2(), u"values"_ustr )); if( xValuesX.is()) aValueSeqVec.erase( find( aValueSeqVec.begin(), aValueSeqVec.end(), xValuesX )); if( xValuesY.is()) @@ -193,7 +193,7 @@ InterpretedData BubbleDataInterpreter::reinterpretDataSeries( { xValuesSize = aValueSeqVec[nIndex++]; if( xValuesSize.is()) - SetRole( xValuesSize->getValues(), "values-size"); + SetRole( xValuesSize->getValues(), u"values-size"_ustr); } if( ! xValuesY.is() && @@ -201,7 +201,7 @@ InterpretedData BubbleDataInterpreter::reinterpretDataSeries( { xValuesY = aValueSeqVec[nIndex++]; if( xValuesY.is()) - SetRole( xValuesY->getValues(), "values-y"); + SetRole( xValuesY->getValues(), u"values-y"_ustr); } if( ! xValuesX.is() && @@ -209,7 +209,7 @@ InterpretedData BubbleDataInterpreter::reinterpretDataSeries( { xValuesX = aValueSeqVec[nIndex++]; if( xValuesX.is()) - SetRole( xValuesY->getValues(), "values-x"); + SetRole( xValuesY->getValues(), u"values-x"_ustr); } } if( xValuesSize.is()) diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 247a68406808..1ba2a597b291 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -215,7 +215,7 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() OUString SAL_CALL CandleStickChartType::getRoleOfSequenceForSeriesLabel() { - return "values-last"; + return u"values-last"_ustr; } // ____ OPropertySet ____ @@ -281,7 +281,7 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( OUString SAL_CALL CandleStickChartType::getImplementationName() { - return "com.sun.star.comp.chart.CandleStickChartType" ; + return u"com.sun.star.comp.chart.CandleStickChartType"_ustr ; } sal_Bool SAL_CALL CandleStickChartType::supportsService( const OUString& rServiceName ) @@ -293,8 +293,8 @@ css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServic { return { CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK, - "com.sun.star.chart2.ChartType", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.ChartType"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } } // namespace chart diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 9448a766071c..7e6d0bf86a5c 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -105,7 +105,7 @@ rtl::Reference< BaseCoordinateSystem > Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles() { - return { "label", "values-y" }; + return { u"label"_ustr, u"values-y"_ustr }; } Sequence< OUString > SAL_CALL ChartType::getSupportedOptionalRoles() @@ -120,7 +120,7 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedPropertyRoles() OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel() { - return "values-y"; + return u"values-y"_ustr; } void ChartType::impl_addDataSeriesWithoutNotification( @@ -128,7 +128,7 @@ void ChartType::impl_addDataSeriesWithoutNotification( { if( std::find( m_aDataSeries.begin(), m_aDataSeries.end(), xDataSeries ) != m_aDataSeries.end()) - throw lang::IllegalArgumentException("dataseries not found", static_cast<cppu::OWeakObject*>(this), 1); + throw lang::IllegalArgumentException(u"dataseries not found"_ustr, static_cast<cppu::OWeakObject*>(this), 1); m_aDataSeries.push_back( xDataSeries ); ModifyListenerHelper::addListener( xDataSeries, m_xModifyEventForwarder ); @@ -168,7 +168,7 @@ void ChartType::removeDataSeries( const rtl::Reference< DataSeries >& xDataSerie if( aIt == m_aDataSeries.end()) throw container::NoSuchElementException( - "The given series is no element of this charttype", + u"The given series is no element of this charttype"_ustr, static_cast< uno::XWeak * >( this )); ModifyListenerHelper::removeListener( xDataSeries, m_xModifyEventForwarder ); diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 2e6753444d99..cd13bc38cdeb 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -556,7 +556,7 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() if( xEnumAcc.is()) { uno::Reference< container::XEnumeration > xEnum( - xEnumAcc->createContentEnumeration( "com.sun.star.chart2.ChartTypeTemplate" )); + xEnumAcc->createContentEnumeration( u"com.sun.star.chart2.ChartTypeTemplate"_ustr )); if( xEnum.is()) { uno::Reference< uno::XInterface > xFactIntf; @@ -579,7 +579,7 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() // ____ XServiceInfo ____ OUString SAL_CALL ChartTypeManager::getImplementationName() { - return "com.sun.star.comp.chart.ChartTypeManager"; + return u"com.sun.star.comp.chart.ChartTypeManager"_ustr; } sal_Bool SAL_CALL ChartTypeManager::supportsService( const OUString& rServiceName ) @@ -590,8 +590,8 @@ sal_Bool SAL_CALL ChartTypeManager::supportsService( const OUString& rServiceNam css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNames() { return { - "com.sun.star.chart2.ChartTypeManager", - "com.sun.star.lang.MultiServiceFactory" }; + u"com.sun.star.chart2.ChartTypeManager"_ustr, + u"com.sun.star.lang.MultiServiceFactory"_ustr }; } } // namespace chart diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 79ed5c7f4c90..a0a607802677 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -66,7 +66,7 @@ void lcl_applyDefaultStyle( Reference< chart2::XColorScheme > xColorScheme( xDiagram->getDefaultColorScheme()); if( xColorScheme.is() ) xSeries->setPropertyValue( - "Color", + u"Color"_ustr, uno::Any( xColorScheme->getColorByIndex( nIndex ))); } } @@ -74,7 +74,7 @@ void lcl_applyDefaultStyle( void lcl_ensureCorrectLabelPlacement( const Reference< beans::XPropertySet >& xProp, const uno::Sequence < sal_Int32 >& rAvailablePlacements ) { sal_Int32 nLabelPlacement=0; - if( !(xProp.is() && (xProp->getPropertyValue( "LabelPlacement" ) >>= nLabelPlacement)) ) + if( !(xProp.is() && (xProp->getPropertyValue( u"LabelPlacement"_ustr ) >>= nLabelPlacement)) ) return; bool bValid = false; @@ -92,7 +92,7 @@ void lcl_ensureCorrectLabelPlacement( const Reference< beans::XPropertySet >& xP //otherwise use the first supported one if( rAvailablePlacements.hasElements() ) aNewValue <<=rAvailablePlacements[0]; - xProp->setPropertyValue( "LabelPlacement", aNewValue ); + xProp->setPropertyValue( u"LabelPlacement"_ustr, aNewValue ); } } @@ -100,10 +100,10 @@ void lcl_resetLabelPlacementIfDefault( const Reference< beans::XPropertySet >& x { sal_Int32 nLabelPlacement=0; - if( xProp.is() && (xProp->getPropertyValue( "LabelPlacement" ) >>= nLabelPlacement) ) + if( xProp.is() && (xProp->getPropertyValue( u"LabelPlacement"_ustr ) >>= nLabelPlacement) ) { if( nDefaultPlacement == nLabelPlacement ) - xProp->setPropertyValue( "LabelPlacement", uno::Any() ); + xProp->setPropertyValue( u"LabelPlacement"_ustr, uno::Any() ); } } @@ -115,9 +115,9 @@ void lcl_ensureCorrectMissingValueTreatment( const rtl::Reference< ::chart::Diag ::chart::ChartTypeHelper::getSupportedMissingValueTreatments( xChartType ) ); if( aAvailableMissingValueTreatment.hasElements() ) - xDiagram->setPropertyValue( "MissingValueTreatment", uno::Any( aAvailableMissingValueTreatment[0] ) ); + xDiagram->setPropertyValue( u"MissingValueTreatment"_ustr, uno::Any( aAvailableMissingValueTreatment[0] ) ); else - xDiagram->setPropertyValue( "MissingValueTreatment", uno::Any() ); + xDiagram->setPropertyValue( u"MissingValueTreatment"_ustr, uno::Any() ); } } @@ -208,7 +208,7 @@ void ChartTypeTemplate::changeDiagram( const rtl::Reference< Diagram >& xDiagram Sequence< beans::PropertyValue > aParam; if( aData.Categories.is()) { - aParam = { beans::PropertyValue( "HasCategories", -1, uno::Any( true ), + aParam = { beans::PropertyValue( u"HasCategories"_ustr, -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ) }; } aData = xInterpreter->interpretDataSource( xSource, aParam, aFlatSeriesSeq ); @@ -371,7 +371,7 @@ void ChartTypeTemplate::applyStyle2( : (eStackMode == StackMode::ZStacked ) ? chart2::StackingDirection_Z_STACKING : chart2::StackingDirection_NO_STACKING ); - xSeries->setPropertyValue( "StackingDirection", aPropValue ); + xSeries->setPropertyValue( u"StackingDirection"_ustr, aPropValue ); //ensure valid label placement { diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index cc351e77512b..378ed35e59d7 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -104,7 +104,7 @@ OUString SAL_CALL ColumnChartType::getChartType() uno::Sequence< OUString > ColumnChartType::getSupportedPropertyRoles() { - return { "FillColor", "BorderColor" }; + return { u"FillColor"_ustr, u"BorderColor"_ustr }; } // ____ OPropertySet ____ @@ -141,7 +141,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertyS OUString SAL_CALL ColumnChartType::getImplementationName() { - return "com.sun.star.comp.chart.ColumnChartType"; + return u"com.sun.star.comp.chart.ColumnChartType"_ustr; } sal_Bool SAL_CALL ColumnChartType::supportsService( const OUString& rServiceName ) @@ -153,7 +153,7 @@ css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceName { return { CHART2_SERVICE_NAME_CHARTTYPE_COLUMN, - "com.sun.star.chart2.ChartType" }; + u"com.sun.star.chart2.ChartType"_ustr }; } } // namespace chart diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 7e0117cca295..30eb42d2ce03 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -68,7 +68,7 @@ enum []() { std::vector< css::beans::Property > aProperties { - { "NumberOfLines", + { u"NumberOfLines"_ustr, PROP_COL_LINE_NUMBER_OF_LINES, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND @@ -211,7 +211,7 @@ void ColumnLineChartTypeTemplate::applyStyle2( if( nChartTypeIndex==0 ) // columns { - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"BorderStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); } else if( nChartTypeIndex==1 ) // lines { diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 0f5cebc3bbec..33dc9739def8 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -83,14 +83,14 @@ InterpretedData DataInterpreter::interpretDataSource( { xCategories = labeledData; if( xCategories.is()) - SetRole( xCategories->getValues(), "categories"); + SetRole( xCategories->getValues(), u"categories"_ustr); bCategoriesUsed = true; } else { aSequencesVec.push_back( labeledData ); if( labeledData.is()) - SetRole( labeledData->getValues(), "values-y"); + SetRole( labeledData->getValues(), u"values-y"_ustr); } } catch( const uno::Exception & ) @@ -138,14 +138,14 @@ InterpretedData DataInterpreter::reinterpretDataSeries( // values-y uno::Reference< data::XLabeledDataSequence > xValuesY = - DataSeriesHelper::getDataSequenceByRole( aSeries[i], "values-y" ); + DataSeriesHelper::getDataSequenceByRole( aSeries[i], u"values-y"_ustr ); // re-use values-... as values-y if( ! xValuesY.is()) { xValuesY = - DataSeriesHelper::getDataSequenceByRole( aSeries[i], "values", true ); + DataSeriesHelper::getDataSequenceByRole( aSeries[i], u"values"_ustr, true ); if( xValuesY.is()) - SetRole( xValuesY->getValues(), "values-y"); + SetRole( xValuesY->getValues(), u"values-y"_ustr); } if( xValuesY.is()) { @@ -301,7 +301,7 @@ OUString DataInterpreter::GetRole( const Reference< data::XDataSequence > & xSeq try { Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); - xProp->getPropertyValue( "Role") >>= aResult; + xProp->getPropertyValue( u"Role"_ustr) >>= aResult; } catch( const uno::Exception & ) { @@ -317,7 +317,7 @@ void DataInterpreter::SetRole( const Reference< data::XDataSequence > & xSeq, co try { Reference< beans::XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); - xProp->setPropertyValue( "Role", uno::Any( rRole )); + xProp->setPropertyValue( u"Role"_ustr, uno::Any( rRole )); } catch( const uno::Exception & ) { @@ -362,7 +362,7 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & OUString SAL_CALL DataInterpreter::getImplementationName() { - return "com.sun.star.comp.chart2.DataInterpreter"; + return u"com.sun.star.comp.chart2.DataInterpreter"_ustr; } sal_Bool SAL_CALL DataInterpreter::supportsService( const OUString& rServiceName ) @@ -372,7 +372,7 @@ sal_Bool SAL_CALL DataInterpreter::supportsService( const OUString& rServiceName css::uno::Sequence< OUString > SAL_CALL DataInterpreter::getSupportedServiceNames() { - return { "com.sun.star.chart2.DataInterpreter" }; + return { u"com.sun.star.chart2.DataInterpreter"_ustr }; } std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > DataInterpreter::getDataSequences( diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 60672259b905..5d44dc95d46a 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -60,7 +60,7 @@ OUString SAL_CALL FilledNetChartType::getChartType() OUString SAL_CALL FilledNetChartType::getImplementationName() { - return "com.sun.star.comp.chart.FilledNetChartType"; + return u"com.sun.star.comp.chart.FilledNetChartType"_ustr; } sal_Bool SAL_CALL FilledNetChartType::supportsService( const OUString& rServiceName ) @@ -72,8 +72,8 @@ css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceN { return { CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET, - "com.sun.star.chart2.ChartType", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.ChartType"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } } // namespace chart diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index e9d7cf808e53..4d75a029b944 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -155,7 +155,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySet OUString SAL_CALL LineChartType::getImplementationName() { - return "com.sun.star.comp.chart.LineChartType"; + return u"com.sun.star.comp.chart.LineChartType"_ustr; } sal_Bool SAL_CALL LineChartType::supportsService( const OUString& rServiceName ) @@ -167,8 +167,8 @@ css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames( { return { CHART2_SERVICE_NAME_CHARTTYPE_LINE, - "com.sun.star.chart2.ChartType", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.ChartType"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } } // namespace chart diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index e4d347960f18..4f99151471e7 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -189,7 +189,7 @@ bool LineChartTypeTemplate::matchesTemplate2( chart2::Symbol aSymbProp; drawing::LineStyle eLineStyle; - bool bCurrentHasSymbol = (series->getPropertyValue( "Symbol") >>= aSymbProp) && + bool bCurrentHasSymbol = (series->getPropertyValue( u"Symbol"_ustr) >>= aSymbProp) && (aSymbProp.Style != chart2::SymbolStyle_NONE); if( bCurrentHasSymbol ) @@ -201,7 +201,7 @@ bool LineChartTypeTemplate::matchesTemplate2( break; } - bool bCurrentHasLine = (series->getPropertyValue( "LineStyle") >>= eLineStyle) && + bool bCurrentHasLine = (series->getPropertyValue( u"LineStyle"_ustr) >>= eLineStyle) && ( eLineStyle != drawing::LineStyle_NONE ); if( bCurrentHasLine ) diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index cb4512c74884..b1bed1b605ca 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -53,7 +53,7 @@ rtl::Reference< ::chart::BaseCoordinateSystem > { if( DimensionCount != 2 ) throw lang::IllegalArgumentException( - "NetChart must be two-dimensional", + u"NetChart must be two-dimensional"_ustr, static_cast< ::cppu::OWeakObject* >( this ), 0 ); rtl::Reference< PolarCoordinateSystem > xResult = @@ -147,7 +147,7 @@ OUString SAL_CALL NetChartType::getChartType() OUString SAL_CALL NetChartType::getImplementationName() { - return "com.sun.star.comp.chart.NetChartType"; + return u"com.sun.star.comp.chart.NetChartType"_ustr; } sal_Bool SAL_CALL NetChartType::supportsService( const OUString& rServiceName ) @@ -159,8 +159,8 @@ css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames() { return { CHART2_SERVICE_NAME_CHARTTYPE_NET, - "com.sun.star.chart2.ChartType", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.ChartType"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } } // namespace chart diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 0acd07d7b928..3be8633c329f 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -108,7 +108,7 @@ bool NetChartTypeTemplate::matchesTemplate2( chart2::Symbol aSymbProp; drawing::LineStyle eLineStyle; - bool bCurrentHasSymbol = (series->getPropertyValue( "Symbol") >>= aSymbProp) && + bool bCurrentHasSymbol = (series->getPropertyValue( u"Symbol"_ustr) >>= aSymbProp) && (aSymbProp.Style != chart2::SymbolStyle_NONE); if( bCurrentHasSymbol ) @@ -120,7 +120,7 @@ bool NetChartTypeTemplate::matchesTemplate2( break; } - bool bCurrentHasLine = (series->getPropertyValue( "LineStyle") >>= eLineStyle) && + bool bCurrentHasLine = (series->getPropertyValue( u"LineStyle"_ustr) >>= eLineStyle) && ( eLineStyle != drawing::LineStyle_NONE ); if( bCurrentHasLine ) diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index a835f6357f6c..63d43587d935 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -58,16 +58,16 @@ namespace []() { std::vector< css::beans::Property > aProperties { - { "UseRings", + { u"UseRings"_ustr, ::chart::PROP_PIECHARTTYPE_USE_RINGS, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT }, - { "3DRelativeHeight", + { u"3DRelativeHeight"_ustr, ::chart::PROP_PIECHARTTYPE_3DRELATIVEHEIGHT, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::MAYBEVOID }, - { "SubPieType", + { u"SubPieType"_ustr, ::chart::PROP_PIECHARTTYPE_SUBTYPE, cppu::UnoType<chart2::PieChartSubType>::get(), beans::PropertyAttribute::MAYBEDEFAULT } @@ -158,7 +158,7 @@ rtl::Reference< ::chart::BaseCoordinateSystem > uno::Sequence< OUString > PieChartType::getSupportedPropertyRoles() { - return { "FillColor", "BorderColor" }; + return { u"FillColor"_ustr, u"BorderColor"_ustr }; } // ____ OPropertySet ____ @@ -186,7 +186,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetI OUString SAL_CALL PieChartType::getImplementationName() { - return "com.sun.star.comp.chart.PieChartType"; + return u"com.sun.star.comp.chart.PieChartType"_ustr; } sal_Bool SAL_CALL PieChartType::supportsService( const OUString& rServiceName ) @@ -198,8 +198,8 @@ css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames() { return { CHART2_SERVICE_NAME_CHARTTYPE_PIE, - "com.sun.star.chart2.ChartType", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.ChartType"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } } // namespace chart diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index df97c53aaef9..2fa609d0d84e 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -79,27 +79,27 @@ enum []() { std::vector< css::beans::Property > aProperties { - { "OffsetMode", + { u"OffsetMode"_ustr, PROP_PIE_TEMPLATE_OFFSET_MODE, cppu::UnoType<chart2::PieChartOffsetMode>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT }, - { "DefaultOffset", + { u"DefaultOffset"_ustr, PROP_PIE_TEMPLATE_DEFAULT_OFFSET, cppu::UnoType<double>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT }, - { "Dimension", + { u"Dimension"_ustr, PROP_PIE_TEMPLATE_DIMENSION, cppu::UnoType<sal_Int32>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT }, - { "UseRings", + { u"UseRings"_ustr, PROP_PIE_TEMPLATE_USE_RINGS, cppu::UnoType<bool>::get(), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::MAYBEDEFAULT }, - { "SubPieType", + { u"SubPieType"_ustr, PROP_PIE_TEMPLATE_SUB_PIE_TYPE, cppu::UnoType<chart2::PieChartSubType>::get(), beans::PropertyAttribute::BOUND @@ -317,7 +317,7 @@ bool PieChartTypeTemplate::matchesTemplate2( { //@todo in future this will depend on Orientation of the radius axis scale rtl::Reference< DataSeries > xSeries( aSeriesVec[nOuterSeriesIndex] ); - xSeries->getPropertyValue( "Offset") >>= fOffset; + xSeries->getPropertyValue( u"Offset"_ustr) >>= fOffset; // "AttributedDataPoints" uno::Sequence< sal_Int32 > aAttributedDataPointIndexList; @@ -329,7 +329,7 @@ bool PieChartTypeTemplate::matchesTemplate2( if(xPointProp.is()) { double fPointOffset=0.0; - if( xSeries->getPropertyValue( "Offset") >>= fPointOffset ) + if( xSeries->getPropertyValue( u"Offset"_ustr) >>= fPointOffset ) { if( ! ::rtl::math::approxEqual( fPointOffset, fOffset ) ) { @@ -507,7 +507,7 @@ void PieChartTypeTemplate::applyStyle2( } // line style - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"BorderStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); // vary colors by point xSeries->setFastPropertyValue( PROP_DATASERIES_VARY_COLORS_BY_POINT, uno::Any( true )); // "VaryColorsByPoint" @@ -564,10 +564,10 @@ void PieChartTypeTemplate::resetStyles2( const rtl::Reference< ::chart::Diagram uno::Any aLineStyleAny( drawing::LineStyle_NONE ); for (auto const& series : aSeriesVec) { - series->setPropertyToDefault( "VaryColorsByPoint"); - if( series->getPropertyValue( "BorderStyle") == aLineStyleAny ) + series->setPropertyToDefault( u"VaryColorsByPoint"_ustr); + if( series->getPropertyValue( u"BorderStyle"_ustr) == aLineStyleAny ) { - series->setPropertyToDefault( "BorderStyle"); + series->setPropertyToDefault( u"BorderStyle"_ustr); } } diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index cee026913b7f..47698f448f24 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -165,7 +165,7 @@ OUString SAL_CALL ScatterChartType::getChartType() uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles() { - return { "label", "values-x", "values-y" }; + return { u"label"_ustr, u"values-x"_ustr, u"values-y"_ustr }; } // ____ OPropertySet ____ @@ -193,7 +193,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getProperty OUString SAL_CALL ScatterChartType::getImplementationName() { - return "com.sun.star.comp.chart.ScatterChartType"; + return u"com.sun.star.comp.chart.ScatterChartType"_ustr; } sal_Bool SAL_CALL ScatterChartType::supportsService( const OUString& rServiceName ) @@ -205,8 +205,8 @@ css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNam { return { CHART2_SERVICE_NAME_CHARTTYPE_SCATTER, - "com.sun.star.chart2.ChartType", - "com.sun.star.beans.PropertySet" }; + u"com.sun.star.chart2.ChartType"_ustr, + u"com.sun.star.beans.PropertySet"_ustr }; } } // namespace chart diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 3457bfa00126..36fd995d9fab 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -179,7 +179,7 @@ void ScatterChartTypeTemplate::applyStyle2( DataSeriesHelper::switchLinesOnOrOff( xSeries, m_bHasLines ); DataSeriesHelper::makeLinesThickOrThin( xSeries, m_nDim==2 ); if( m_nDim==3 ) - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"BorderStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); } catch( const uno::Exception & ) { @@ -217,7 +217,7 @@ bool ScatterChartTypeTemplate::matchesTemplate2( chart2::Symbol aSymbProp; drawing::LineStyle eLineStyle; - bool bCurrentHasSymbol = (series->getPropertyValue( "Symbol") >>= aSymbProp) && + bool bCurrentHasSymbol = (series->getPropertyValue( u"Symbol"_ustr) >>= aSymbProp) && (aSymbProp.Style != chart2::SymbolStyle_NONE); if( bCurrentHasSymbol ) @@ -229,7 +229,7 @@ bool ScatterChartTypeTemplate::matchesTemplate2( break; } - bool bCurrentHasLine = (series->getPropertyValue( "LineStyle") >>= eLineStyle) && + bool bCurrentHasLine = (series->getPropertyValue( u"LineStyle"_ustr) >>= eLineStyle) && ( eLineStyle != drawing::LineStyle_NONE ); if( bCurrentHasLine ) diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index b0ff53d2a2c3..0c1f4ebcee3c 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -199,20 +199,20 @@ void StockChartTypeTemplate::applyStyle2( if( bHasVolume && nChartTypeIndex != 0 ) nNewAxisIndex = 1; - xSeries->setPropertyValue( "AttachedAxisIndex", uno::Any( nNewAxisIndex ) ); + xSeries->setPropertyValue( u"AttachedAxisIndex"_ustr, uno::Any( nNewAxisIndex ) ); if( bHasVolume && nChartTypeIndex==0 ) { //switch lines off for volume bars - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::Any( drawing::LineStyle_NONE ) ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"BorderStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); } else { //ensure that lines are on drawing::LineStyle eStyle = drawing::LineStyle_NONE; - xSeries->getPropertyValue( "LineStyle" ) >>= eStyle; + xSeries->getPropertyValue( u"LineStyle"_ustr ) >>= eStyle; if( eStyle == drawing::LineStyle_NONE ) - xSeries->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID )); + xSeries->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_SOLID )); } } @@ -232,7 +232,7 @@ void StockChartTypeTemplate::resetStyles2( xDiagram->getDataSeries(); for (auto const& series : aSeriesVec) { - series->setPropertyValue( "AttachedAxisIndex", uno::Any( sal_Int32(0) ) ); + series->setPropertyValue( u"AttachedAxisIndex"_ustr, uno::Any( sal_Int32(0) ) ); } } @@ -304,9 +304,9 @@ void StockChartTypeTemplate::createChartTypes( rtl::Reference< ChartType > xCT = new CandleStickChartType(); aChartTypeVec.push_back( xCT ); - xCT->setPropertyValue( "Japanese", uno::Any( bJapaneseStyle )); - xCT->setPropertyValue( "ShowFirst", uno::Any( bShowFirst )); - xCT->setPropertyValue( "ShowHighLow", uno::Any( bShowHighLow )); + xCT->setPropertyValue( u"Japanese"_ustr, uno::Any( bJapaneseStyle )); + xCT->setPropertyValue( u"ShowFirst"_ustr, uno::Any( bShowFirst )); + xCT->setPropertyValue( u"ShowHighLow"_ustr, uno::Any( bShowHighLow )); if( aSeriesSeq.size() > nSeriesIndex && !aSeriesSeq[ nSeriesIndex ].empty() ) @@ -381,12 +381,12 @@ bool StockChartTypeTemplate::matchesTemplate2( // check for japanese style bool bJapaneseProp = false; - xCandleStickChartType->getPropertyValue( "Japanese") >>= bJapaneseProp; + xCandleStickChartType->getPropertyValue( u"Japanese"_ustr) >>= bJapaneseProp; bResult = bResult && ( bHasJapaneseStyle == bJapaneseProp ); // in old chart japanese == showFirst bool bShowFirstProp = false; - xCandleStickChartType->getPropertyValue( "ShowFirst") >>= bShowFirstProp; + xCandleStickChartType->getPropertyValue( u"ShowFirst"_ustr) >>= bShowFirstProp; bResult = bResult && ( bHasOpenValue == bShowFirstProp ); } } diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index 1575bba1b223..9284a524c60b 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -128,7 +128,7 @@ InterpretedData StockDataInterpreter::interpretDataSource( pBarGroup[nLabeledSeqIdx].resize( 1 ); pBarGroup[nLabeledSeqIdx][0] = aData[nSourceIndex]; if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), "values-y"); + SetRole( aData[nSourceIndex]->getValues(), u"values-y"_ustr); ++nSourceIndex; } @@ -138,7 +138,7 @@ InterpretedData StockDataInterpreter::interpretDataSource( pCandleStickGroup[nLabeledSeqIdx].resize( 4 ); pCandleStickGroup[nLabeledSeqIdx][nSeqIdx] = aData[nSourceIndex]; if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), "values-first"); + SetRole( aData[nSourceIndex]->getValues(), u"values-first"_ustr); ++nSourceIndex; ++nSeqIdx; } @@ -148,19 +148,19 @@ InterpretedData StockDataInterpreter::interpretDataSource( pLabeledSeq[nSeqIdx] = aData[nSourceIndex]; if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), "values-min"); + SetRole( aData[nSourceIndex]->getValues(), u"values-min"_ustr); ++nSourceIndex; ++nSeqIdx; pLabeledSeq[nSeqIdx] = aData[nSourceIndex]; if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), "values-max"); + SetRole( aData[nSourceIndex]->getValues(), u"values-max"_ustr); ++nSourceIndex; ++nSeqIdx; pLabeledSeq[nSeqIdx] = aData[nSourceIndex]; if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), "values-last"); + SetRole( aData[nSourceIndex]->getValues(), u"values-last"_ustr); ++nSourceIndex; ++nSeqIdx; } @@ -172,7 +172,7 @@ InterpretedData StockDataInterpreter::interpretDataSource( pBarGroup[nVolumeSeries - 1].resize( 1 ); OSL_ASSERT( nDataCount > nSourceIndex ); if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), "values-y"); + SetRole( aData[nSourceIndex]->getValues(), u"values-y"_ustr); pBarGroup[nVolumeSeries - 1][0] = aData[nSourceIndex]; ++nSourceIndex; --nRemaining; @@ -192,7 +192,7 @@ InterpretedData StockDataInterpreter::interpretDataSource( sal_Int32 nSeqIdx( 0 ); pLabeledSeq[nSeqIdx] = aData[nSourceIndex]; if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), "values-min"); + SetRole( aData[nSourceIndex]->getValues(), u"values-min"_ustr); ++nSourceIndex; ++nSeqIdx; @@ -201,7 +201,7 @@ InterpretedData StockDataInterpreter::interpretDataSource( { pLabeledSeq[nSeqIdx] = aData[nSourceIndex]; if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), "values-max"); + SetRole( aData[nSourceIndex]->getValues(), u"values-max"_ustr); ++nSourceIndex; ++nSeqIdx; } @@ -212,7 +212,7 @@ InterpretedData StockDataInterpreter::interpretDataSource( { pLabeledSeq[nSeqIdx] = aData[nSourceIndex]; if( aData[nSourceIndex].is()) - SetRole( aData[nSourceIndex]->getValues(), "values-last"); + SetRole( aData[nSourceIndex]->getValues(), u"values-last"_ustr); ++nSourceIndex; ++nSeqIdx; } diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index 1fc053f14c24..f3c5afcededc 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -76,7 +76,7 @@ InterpretedData XYDataInterpreter::interpretDataSource( xCategories = labelData; if( xCategories.is()) { - SetRole( xCategories->getValues(), "categories"); + SetRole( xCategories->getValues(), u"categories"_ustr); if( bUseCategoriesAsX ) bSetXValues = false; } @@ -86,13 +86,13 @@ InterpretedData XYDataInterpreter::interpretDataSource( { xValuesX = labelData; if( xValuesX.is()) - SetRole( xValuesX->getValues(), "values-x"); + SetRole( xValuesX->getValues(), u"values-x"_ustr); } else { aSequencesVec.push_back( labelData ); if( labelData.is()) - SetRole( labelData->getValues(), "values-y"); + SetRole( labelData->getValues(), u"values-y"_ustr); } } catch( const uno::Exception & ) @@ -151,16 +151,16 @@ InterpretedData XYDataInterpreter::reinterpretDataSeries( // values-y uno::Reference< chart2::data::XLabeledDataSequence > xValuesY( - DataSeriesHelper::getDataSequenceByRole( aSeries[i], "values-y" )); + DataSeriesHelper::getDataSequenceByRole( aSeries[i], u"values-y"_ustr )); uno::Reference< chart2::data::XLabeledDataSequence > xValuesX( - DataSeriesHelper::getDataSequenceByRole( aSeries[i], "values-x" )); + DataSeriesHelper::getDataSequenceByRole( aSeries[i], u"values-x"_ustr )); // re-use values-... as values-x/values-y if( ! xValuesX.is() || ! xValuesY.is()) { std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aValueSeqVec( DataSeriesHelper::getAllDataSequencesByRole( - aSeries[i]->getDataSequences2(), "values" )); + aSeries[i]->getDataSequences2(), u"values"_ustr )); if( xValuesX.is()) aValueSeqVec.erase( find( aValueSeqVec.begin(), aValueSeqVec.end(), xValuesX )); if( xValuesY.is()) @@ -172,7 +172,7 @@ InterpretedData XYDataInterpreter::reinterpretDataSeries( { xValuesY = aValueSeqVec[nIndex++]; if( xValuesY.is()) - SetRole( xValuesY->getValues(), "values-y"); + SetRole( xValuesY->getValues(), u"values-y"_ustr); } if( ! xValuesX.is() && @@ -180,7 +180,7 @@ InterpretedData XYDataInterpreter::reinterpretDataSeries( { xValuesX = aValueSeqVec[nIndex++]; if( xValuesX.is()) - SetRole( xValuesY->getValues(), "values-x"); + SetRole( xValuesY->getValues(), u"values-x"_ustr); } } if( xValuesY.is()) diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index b48fd313a91c..bd87f95b195e 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -191,7 +191,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( if( xSource.is() ) { std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aXValues( - DataSeriesHelper::getAllDataSequencesByRole( xSource->getDataSequences(), "values-x" ) ); + DataSeriesHelper::getAllDataSequencesByRole( xSource->getDataSequences(), u"values-x"_ustr ) ); if( aXValues.empty() ) { uno::Reference< chart2::data::XLabeledDataSequence > xCategories( xDiagram->getCategories() ); @@ -348,12 +348,12 @@ rtl::Reference< Axis > AxisHelper::createAxis( //ensure that the second axis is not placed on the main axis css::chart::ChartAxisPosition eMainAxisPos( css::chart::ChartAxisPosition_ZERO ); - xMainAxis->getPropertyValue("CrossoverPosition") >>= eMainAxisPos; + xMainAxis->getPropertyValue(u"CrossoverPosition"_ustr) >>= eMainAxisPos; if( eMainAxisPos == css::chart::ChartAxisPosition_END ) eNewAxisPos = css::chart::ChartAxisPosition_START; } - xAxis->setPropertyValue("CrossoverPosition", uno::Any(eNewAxisPos) ); + xAxis->setPropertyValue(u"CrossoverPosition"_ustr, uno::Any(eNewAxisPos) ); } try @@ -440,9 +440,9 @@ void AxisHelper::makeAxisVisible( const rtl::Reference< Axis >& xAxis ) { if( xAxis.is() ) { - xAxis->setPropertyValue( "Show", uno::Any( true ) ); + xAxis->setPropertyValue( u"Show"_ustr, uno::Any( true ) ); LinePropertiesHelper::SetLineVisible( xAxis ); - xAxis->setPropertyValue( "DisplayLabels", uno::Any( true ) ); + xAxis->setPropertyValue( u"DisplayLabels"_ustr, uno::Any( true ) ); } } @@ -450,7 +450,7 @@ void AxisHelper::makeGridVisible( const rtl::Reference< GridProperties >& xGridP { if( xGridProperties.is() ) { - xGridProperties->setPropertyValue( "Show", uno::Any( true ) ); + xGridProperties->setPropertyValue( u"Show"_ustr, uno::Any( true ) ); LinePropertiesHelper::SetLineVisible( xGridProperties ); } } @@ -465,7 +465,7 @@ void AxisHelper::makeAxisInvisible( const rtl::Reference< Axis >& xAxis ) { if( xAxis.is() ) { - xAxis->setPropertyValue( "Show", uno::Any( false ) ); + xAxis->setPropertyValue( u"Show"_ustr, uno::Any( false ) ); } } @@ -515,7 +515,7 @@ void AxisHelper::makeGridInvisible( const rtl::Reference< ::chart::GridPropertie { if( xGridProperties.is() ) { - xGridProperties->setPropertyValue( "Show", uno::Any( false ) ); + xGridProperties->setPropertyValue( u"Show"_ustr, uno::Any( false ) ); } } @@ -599,7 +599,7 @@ rtl::Reference< Axis > AxisHelper::getCrossingMainAxis( const rtl::Reference< Ax { nDimensionIndex=1; bool bSwapXY = false; - if( (xCooSys->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXY) && bSwapXY ) + if( (xCooSys->getPropertyValue( u"SwapXAndYAxis"_ustr ) >>= bSwapXY) && bSwapXY ) nDimensionIndex=0; } else if( nDimensionIndex==1 ) @@ -641,7 +641,7 @@ bool AxisHelper::isAxisVisible( const rtl::Reference< Axis >& xAxis ) if( xAxis.is() ) { - xAxis->getPropertyValue( "Show" ) >>= bRet; + xAxis->getPropertyValue( u"Show"_ustr ) >>= bRet; bRet = bRet && ( LinePropertiesHelper::IsLineVisible( xAxis ) || areAxisLabelsVisible( xAxis ) ); } @@ -654,7 +654,7 @@ bool AxisHelper::areAxisLabelsVisible( const rtl::Reference< Axis >& xAxis ) bool bRet = false; if( xAxis.is() ) { - xAxis->getPropertyValue( "DisplayLabels" ) >>= bRet; + xAxis->getPropertyValue( u"DisplayLabels"_ustr ) >>= bRet; } return bRet; } @@ -665,7 +665,7 @@ bool AxisHelper::isGridVisible( const rtl::Reference< ::chart::GridProperties >& if( xGridproperties.is() ) { - xGridproperties->getPropertyValue( "Show" ) >>= bRet; + xGridproperties->getPropertyValue( u"Show"_ustr ) >>= bRet; bRet = bRet && LinePropertiesHelper::IsLineVisible( xGridproperties ); } @@ -784,7 +784,7 @@ std::vector< rtl::Reference< Axis > > AxisHelper::getAllAxesOfCoordinateSystem( bool bAddAxis = true; if( bOnlyVisible ) { - if( !(xAxis->getPropertyValue( "Show") >>= bAddAxis) ) + if( !(xAxis->getPropertyValue( u"Show"_ustr) >>= bAddAxis) ) bAddAxis = false; } if( bAddAxis ) @@ -876,7 +876,7 @@ bool AxisHelper::isSecondaryYAxisNeeded( const rtl::Reference< BaseCoordinateSys for( sal_Int32 nS = aSeriesList.size(); nS-- ; ) { sal_Int32 nAttachedAxisIndex = 0; - if( ( aSeriesList[nS]->getPropertyValue( "AttachedAxisIndex" ) >>= nAttachedAxisIndex ) && + if( ( aSeriesList[nS]->getPropertyValue( u"AttachedAxisIndex"_ustr ) >>= nAttachedAxisIndex ) && nAttachedAxisIndex>0 ) return true; } @@ -1022,7 +1022,7 @@ void AxisHelper::setRTLAxisLayout( const rtl::Reference< BaseCoordinateSystem >& return; bool bVertical = false; - xCooSys->getPropertyValue( "SwapXAndYAxis" ) >>= bVertical; + xCooSys->getPropertyValue( u"SwapXAndYAxis"_ustr ) >>= bVertical; sal_Int32 nHorizontalAxisDimension = bVertical ? 1 : 0; sal_Int32 nVerticalAxisDimension = bVertical ? 0 : 1; diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 152b48cf9bd8..54b2d42eece4 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -99,13 +99,13 @@ CachedDataSequence::~CachedDataSequence() void CachedDataSequence::registerProperties() { - registerProperty( "NumberFormatKey", + registerProperty( u"NumberFormatKey"_ustr, PROP_NUMBERFORMAT_KEY, 0, // PropertyAttributes & m_nNumberFormatKey, cppu::UnoType<decltype(m_nNumberFormatKey)>::get() ); - registerProperty( "Role", + registerProperty( u"Role"_ustr, PROP_PROPOSED_ROLE, 0, // PropertyAttributes & m_sRole, @@ -187,9 +187,9 @@ css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceN { return { lcl_aServiceName, - "com.sun.star.chart2.data.DataSequence", - "com.sun.star.chart2.data.NumericalDataSequence", - "com.sun.star.chart2.data.TextualDataSequence" + u"com.sun.star.chart2.data.DataSequence"_ustr, + u"com.sun.star.chart2.data.NumericalDataSequence"_ustr, + u"com.sun.star.chart2.data.TextualDataSequence"_ustr }; } @@ -257,17 +257,17 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) { ::comphelper::SequenceAsHashMap aMap(_aArguments); - m_aNumericalSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aNumericalSequence); + m_aNumericalSequence = aMap.getUnpackedValueOrDefault( u"DataSequence"_ustr ,m_aNumericalSequence); if ( m_aNumericalSequence.hasElements() ) m_eCurrentDataType = NUMERICAL; else { - m_aTextualSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aTextualSequence); + m_aTextualSequence = aMap.getUnpackedValueOrDefault( u"DataSequence"_ustr ,m_aTextualSequence); if ( m_aTextualSequence.hasElements() ) m_eCurrentDataType = TEXTUAL; else { - m_aMixedSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aMixedSequence); + m_aMixedSequence = aMap.getUnpackedValueOrDefault( u"DataSequence"_ustr ,m_aMixedSequence); if ( m_aMixedSequence.hasElements() ) m_eCurrentDataType = MIXED; } diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx index bf44c6a4c08f..e407b7efeecb 100644 --- a/chart2/source/tools/CharacterProperties.cxx +++ b/chart2/source/tools/CharacterProperties.cxx @@ -424,17 +424,17 @@ awt::FontDescriptor CharacterProperties::createFontDescriptorFromPropertySet( awt::FontDescriptor aResult; // Note: keep this sorted! uno::Sequence< OUString > aPropNameSeq{ - "CharFontCharSet", // CharSet - "CharFontFamily", // Family - "CharFontName", // Name - "CharFontPitch", // Pitch - "CharFontStyleName", // StyleName - "CharHeight", // Height - "CharPosture", // Slant - "CharStrikeout", // Strikeout - "CharUnderline", // Underline - "CharWeight", // Weight - "CharWordMode"}; // WordLineMode + u"CharFontCharSet"_ustr, // CharSet + u"CharFontFamily"_ustr, // Family + u"CharFontName"_ustr, // Name + u"CharFontPitch"_ustr, // Pitch + u"CharFontStyleName"_ustr, // StyleName + u"CharHeight"_ustr, // Height + u"CharPosture"_ustr, // Slant + u"CharStrikeout"_ustr, // Strikeout + u"CharUnderline"_ustr, // Underline + u"CharWeight"_ustr, // Weight + u"CharWordMode"_ustr}; // WordLineMode uno::Sequence< uno::Any > aValues( xMultiPropSet->getPropertyValues( aPropNameSeq )); sal_Int32 i=0; diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index 6c2420e7bd7c..70a5accd2eff 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -63,7 +63,7 @@ rtl::Reference< InternalDataProvider > ChartModelHelper::createInternalDataProvi { css::chart::ChartDataRowSource aDataRowSource(css::chart::ChartDataRowSource_COLUMNS); - xProp->getPropertyValue( "DataRowSource" ) >>= aDataRowSource; + xProp->getPropertyValue( u"DataRowSource"_ustr ) >>= aDataRowSource; bDefaultDataInColumns = (aDataRowSource == css::chart::ChartDataRowSource_COLUMNS); } @@ -144,7 +144,7 @@ bool ChartModelHelper::isIncludeHiddenCells( const rtl::Reference<::chart::Chart try { - xDiagram->getPropertyValue("IncludeHiddenCells") >>= bIncluded; + xDiagram->getPropertyValue(u"IncludeHiddenCells"_ustr) >>= bIncluded; } catch( const beans::UnknownPropertyException& ) { @@ -164,7 +164,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod if (xDiagramProperties.is()) { bool bOldValue = bIncludeHiddenCells; - xDiagramProperties->getPropertyValue( "IncludeHiddenCells" ) >>= bOldValue; + xDiagramProperties->getPropertyValue( u"IncludeHiddenCells"_ustr ) >>= bOldValue; if( bOldValue == bIncludeHiddenCells ) bChanged = true; @@ -176,7 +176,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod { uno::Reference< beans::XPropertySet > xDataProviderProperties( rModel.getDataProvider(), uno::UNO_QUERY ); if( xDataProviderProperties.is() ) - xDataProviderProperties->setPropertyValue("IncludeHiddenCells", aNewValue ); + xDataProviderProperties->setPropertyValue(u"IncludeHiddenCells"_ustr, aNewValue ); } catch( const beans::UnknownPropertyException& ) { @@ -194,10 +194,10 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod { xProp.set( uno::Reference< beans::XPropertySet >( labeledData->getValues(), uno::UNO_QUERY ) ); if(xProp.is()) - xProp->setPropertyValue("IncludeHiddenCells", aNewValue ); + xProp->setPropertyValue(u"IncludeHiddenCells"_ustr, aNewValue ); xProp.set( uno::Reference< beans::XPropertySet >( labeledData->getLabel(), uno::UNO_QUERY ) ); if(xProp.is()) - xProp->setPropertyValue("IncludeHiddenCells", aNewValue ); + xProp->setPropertyValue(u"IncludeHiddenCells"_ustr, aNewValue ); } } } @@ -206,7 +206,7 @@ bool ChartModelHelper::setIncludeHiddenCells( bool bIncludeHiddenCells, ChartMod //the property is optional! } - xDiagramProperties->setPropertyValue( "IncludeHiddenCells", aNewValue); + xDiagramProperties->setPropertyValue( u"IncludeHiddenCells"_ustr, aNewValue); } } catch (const uno::Exception&) diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index b8df30edfbd5..f49a45ad4162 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -680,7 +680,7 @@ bool ChartTypeHelper::isSeriesInFrontOfAxisLine( const rtl::Reference< ChartType OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const rtl::Reference< ChartType >& xChartType ) { - OUString aRet( "values-y" ); + OUString aRet( u"values-y"_ustr ); if( !xChartType.is() ) return aRet; OUString aChartTypeName = xChartType->getChartType(); @@ -691,7 +691,7 @@ OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::Reference< ChartType >& xChartType ) { - OUString aRet( "values-y" ); + OUString aRet( u"values-y"_ustr ); if( !xChartType.is() ) return aRet; OUString aChartTypeName = xChartType->getChartType(); diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx index bced72bb473a..7fcdbfaeda64 100644 --- a/chart2/source/tools/ColorPerPointHelper.cxx +++ b/chart2/source/tools/ColorPerPointHelper.cxx @@ -50,7 +50,7 @@ bool ColorPerPointHelper::hasPointOwnColor( if( !xPointState.is() ) return false; - return (xPointState->getPropertyState( "Color") != beans::PropertyState_DEFAULT_VALUE ); + return (xPointState->getPropertyState( u"Color"_ustr) != beans::PropertyState_DEFAULT_VALUE ); } return false; diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 6ea26d99c5fb..997c677d0145 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -61,7 +61,7 @@ private: }; ChartConfigItem::ChartConfigItem( ConfigColorScheme & rListener ) : - ::utl::ConfigItem( "Office.Chart/DefaultColor" ), + ::utl::ConfigItem( u"Office.Chart/DefaultColor"_ustr ), m_rListener( rListener ) { EnableNotification( { aSeriesPropName } ); @@ -151,7 +151,7 @@ void ConfigColorScheme::notify() OUString SAL_CALL ConfigColorScheme::getImplementationName() { - return "com.sun.star.comp.chart2.ConfigDefaultColorScheme" ; + return u"com.sun.star.comp.chart2.ConfigDefaultColorScheme"_ustr ; } sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceName ) @@ -161,7 +161,7 @@ sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceNa css::uno::Sequence< OUString > SAL_CALL ConfigColorScheme::getSupportedServiceNames() { - return { "com.sun.star.chart2.ColorScheme" }; + return { u"com.sun.star.chart2.ColorScheme"_ustr }; } } // namespace chart diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 45f235cd2810..202b67395c83 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -72,11 +72,11 @@ public: if( m_bMatchPrefix ) return ( xProp.is() && - (xProp->getPropertyValue( "Role" ) >>= aRole ) && + (xProp->getPropertyValue( u"Role"_ustr ) >>= aRole ) && aRole.match( m_aRole )); return ( xProp.is() && - (xProp->getPropertyValue( "Role" ) >>= aRole ) && + (xProp->getPropertyValue( u"Role"_ustr ) >>= aRole ) && m_aRole == aRole ); } @@ -170,7 +170,7 @@ OUString getRole( const uno::Reference< chart2::data::XLabeledDataSequence >& xL { Reference< beans::XPropertySet > xProp( xLabeledDataSequence->getValues(), uno::UNO_QUERY ); if( xProp.is() ) - xProp->getPropertyValue( "Role" ) >>= aRet; + xProp->getPropertyValue( u"Role"_ustr ) >>= aRet; } return aRet; } @@ -265,10 +265,10 @@ void setStackModeAtSeries( { if( dataSeries.is() ) { - dataSeries->setPropertyValue( "StackingDirection", aPropValue ); + dataSeries->setPropertyValue( u"StackingDirection"_ustr, aPropValue ); sal_Int32 nAxisIndex = 0; - dataSeries->getPropertyValue( "AttachedAxisIndex" ) >>= nAxisIndex; + dataSeries->getPropertyValue( u"AttachedAxisIndex"_ustr ) >>= nAxisIndex; aAxisIndexSet.insert(nAxisIndex); } } @@ -398,7 +398,7 @@ void switchSymbolsOnOrOff( const rtl::Reference< DataSeries > & xSeries, return; chart2::Symbol aSymbProp; - if( xSeries->getPropertyValue( "Symbol") >>= aSymbProp ) + if( xSeries->getPropertyValue( u"Symbol"_ustr) >>= aSymbProp ) { if( !bSymbolsOn ) aSymbProp.Style = chart2::SymbolStyle_NONE; @@ -407,7 +407,7 @@ void switchSymbolsOnOrOff( const rtl::Reference< DataSeries > & xSeries, aSymbProp.Style = chart2::SymbolStyle_STANDARD; aSymbProp.StandardSymbol = nSeriesIndex; } - xSeries->setPropertyValue( "Symbol", uno::Any( aSymbProp )); + xSeries->setPropertyValue( u"Symbol"_ustr, uno::Any( aSymbProp )); } //todo: check attributed data points } @@ -421,14 +421,14 @@ void switchLinesOnOrOff( const rtl::Reference< DataSeries > & xSeries, bool bLin { // keep line-styles that are not NONE drawing::LineStyle eLineStyle; - if( (xSeries->getPropertyValue( "LineStyle") >>= eLineStyle ) && + if( (xSeries->getPropertyValue( u"LineStyle"_ustr) >>= eLineStyle ) && eLineStyle == drawing::LineStyle_NONE ) { - xSeries->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) ); + xSeries->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_SOLID ) ); } } else - xSeries->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) ); + xSeries->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); } void makeLinesThickOrThin( const rtl::Reference< ::chart::DataSeries > & xSeries, bool bThick ) @@ -438,11 +438,11 @@ void makeLinesThickOrThin( const rtl::Reference< ::chart::DataSeries > & xSeries sal_Int32 nNewValue = bThick ? 80 : 0; sal_Int32 nOldValue = 0; - if( (xSeries->getPropertyValue( "LineWidth") >>= nOldValue ) && + if( (xSeries->getPropertyValue( u"LineWidth"_ustr) >>= nOldValue ) && nOldValue != nNewValue ) { if( !(bThick && nOldValue>0)) - xSeries->setPropertyValue( "LineWidth", uno::Any( nNewValue ) ); + xSeries->setPropertyValue( u"LineWidth"_ustr, uno::Any( nNewValue ) ); } } @@ -465,8 +465,8 @@ void setPropertyAlsoToAllAttributedDataPoints( const rtl::Reference< ::chart::Da xPointProp->setPropertyValue( rPropertyName, rPropertyValue ); if( rPropertyName == "LabelPlacement" ) { - xPointProp->setPropertyValue("CustomLabelPosition", uno::Any()); - xPointProp->setPropertyValue("CustomLabelSize", uno::Any()); + xPointProp->setPropertyValue(u"CustomLabelPosition"_ustr, uno::Any()); + xPointProp->setPropertyValue(u"CustomLabelSize"_ustr, uno::Any()); } } } @@ -511,7 +511,7 @@ sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Refere if( xProp.is()) { Sequence<sal_Int32> aHiddenIndicesSeq; - xProp->getPropertyValue( "HiddenValues" ) >>= aHiddenIndicesSeq; + xProp->getPropertyValue( u"HiddenValues"_ustr ) >>= aHiddenIndicesSeq; if( aHiddenIndicesSeq.hasElements() ) { auto aHiddenIndices( comphelper::sequenceToContainer<std::vector< sal_Int32 >>( aHiddenIndicesSeq ) ); diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index c74687c1485a..8bf1cd2bc792 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -63,7 +63,7 @@ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLab OUString SAL_CALL DataSource::getImplementationName() { - return "com.sun.star.comp.chart.DataSource"; + return u"com.sun.star.comp.chart.DataSource"_ustr; } sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName ) @@ -73,7 +73,7 @@ sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName ) css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames() { - return { "com.sun.star.chart2.data.DataSource" }; + return { u"com.sun.star.chart2.data.DataSource"_ustr }; } } // namespace chart diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx index dc6c1b9c87f1..3084ec14ab8a 100644 --- a/chart2/source/tools/DataSourceHelper.cxx +++ b/chart2/source/tools/DataSourceHelper.cxx @@ -85,7 +85,7 @@ void lcl_addErrorBarRanges( xErrorBarProp.is()) { sal_Int32 eStyle = css::chart::ErrorBarStyle::NONE; - if( ( xErrorBarProp->getPropertyValue( "ErrorBarStyle") >>= eStyle ) && + if( ( xErrorBarProp->getPropertyValue( u"ErrorBarStyle"_ustr) >>= eStyle ) && eStyle == css::chart::ErrorBarStyle::FROM_DATA ) { uno::Reference< data::XDataSource > xErrorBarDataSource( xErrorBarProp, uno::UNO_QUERY ); @@ -97,7 +97,7 @@ void lcl_addErrorBarRanges( if( ( xDataSeries->getPropertyValue(CHART_UNONAME_ERRORBAR_X) >>= xErrorBarProp ) && xErrorBarProp.is()) { sal_Int32 eStyle = css::chart::ErrorBarStyle::NONE; - if( ( xErrorBarProp->getPropertyValue("ErrorBarStyle") >>= eStyle ) && + if( ( xErrorBarProp->getPropertyValue(u"ErrorBarStyle"_ustr) >>= eStyle ) && eStyle == css::chart::ErrorBarStyle::FROM_DATA ) { uno::Reference< data::XDataSource > xErrorBarDataSource( xErrorBarProp, uno::UNO_QUERY ); @@ -151,9 +151,9 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( return { - { "DataRowSource", -1, uno::Any( eRowSource), beans::PropertyState_DIRECT_VALUE }, - { "FirstCellAsLabel", -1, uno::Any( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE }, - { "HasCategories", -1, uno::Any( bHasCategories ), beans::PropertyState_DIRECT_VALUE } + { u"DataRowSource"_ustr, -1, uno::Any( eRowSource), beans::PropertyState_DIRECT_VALUE }, + { u"FirstCellAsLabel"_ustr, -1, uno::Any( bFirstCellAsLabel ), beans::PropertyState_DIRECT_VALUE }, + { u"HasCategories"_ustr, -1, uno::Any( bHasCategories ), beans::PropertyState_DIRECT_VALUE } }; } @@ -165,14 +165,14 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments( uno::Sequence< beans::PropertyValue > aArguments( createArguments( bUseColumns, bFirstCellAsLabel, bHasCategories )); aArguments.realloc( aArguments.getLength() + 1 ); aArguments.getArray()[aArguments.getLength() - 1] = - beans::PropertyValue( "CellRangeRepresentation" + beans::PropertyValue( u"CellRangeRepresentation"_ustr , -1, uno::Any( rRangeRepresentation ) , beans::PropertyState_DIRECT_VALUE ); if( rSequenceMapping.hasElements() ) { aArguments.realloc( aArguments.getLength() + 1 ); aArguments.getArray()[aArguments.getLength() - 1] = - beans::PropertyValue( "SequenceMapping" + beans::PropertyValue( u"SequenceMapping"_ustr , -1, uno::Any( rSequenceMapping ) , beans::PropertyState_DIRECT_VALUE ); } @@ -233,7 +233,7 @@ rtl::Reference< DataSource > DataSourceHelper::pressUsedDataIntoRectangularForma //the first x-values is always the next sequence //todo ... other x-values get lost for old format Reference< chart2::data::XLabeledDataSequence > xXValues( - DataSeriesHelper::getDataSequenceByRole( xSeriesSource, "values-x" ) ); + DataSeriesHelper::getDataSequenceByRole( xSeriesSource, u"values-x"_ustr ) ); if( xXValues.is() ) aResultVector.push_back( xXValues ); diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 38aa97265396..fb2643743e1e 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -89,7 +89,7 @@ StackMode DiagramHelper::getStackModeFromChartType( rbFound = true; chart2::StackingDirection eCurrentDirection = eCommonDirection; // property is not MAYBEVOID - bool bSuccess = ( aSeries[i]->getPropertyValue( "StackingDirection" ) >>= eCurrentDirection ); + bool bSuccess = ( aSeries[i]->getPropertyValue( u"StackingDirection"_ustr ) >>= eCurrentDirection ); OSL_ASSERT( bSuccess ); if( ! bDirectionInitialized ) { @@ -257,7 +257,7 @@ void lcl_switchToDateCategories( const rtl::Reference< ChartModel >& xChartDoc, } sal_Int32 nType = util::NumberFormat::UNDEFINED; if( xKeyProps.is() ) - xKeyProps->getPropertyValue( "Type" ) >>= nType; + xKeyProps->getPropertyValue( u"Type"_ustr ) >>= nType; if( !( nType & util::NumberFormat::DATE ) ) { //set a date format to the axis @@ -334,7 +334,7 @@ bool DiagramHelper::isDateNumberFormat( sal_Int32 nNumberFormat, const Reference if( xKeyProps.is() ) { sal_Int32 nType = util::NumberFormat::UNDEFINED; - xKeyProps->getPropertyValue( "Type" ) >>= nType; + xKeyProps->getPropertyValue( u"Type"_ustr ) >>= nType; bIsDate = nType & util::NumberFormat::DATE; } return bIsDate; @@ -452,8 +452,8 @@ bool DiagramHelper::setDiagramPositioning( const rtl::Reference<::chart::ChartMo RelativePosition aOldPos; RelativeSize aOldSize; - xDiagram->getPropertyValue("RelativePosition" ) >>= aOldPos; - xDiagram->getPropertyValue("RelativeSize" ) >>= aOldSize; + xDiagram->getPropertyValue(u"RelativePosition"_ustr ) >>= aOldPos; + xDiagram->getPropertyValue(u"RelativeSize"_ustr ) >>= aOldSize; RelativePosition aNewPos; aNewPos.Anchor = drawing::Alignment_TOP_LEFT; @@ -473,8 +473,8 @@ bool DiagramHelper::setDiagramPositioning( const rtl::Reference<::chart::ChartMo if( (aNewPos.Secondary + aNewSize.Secondary) > 1.0 ) aNewPos.Secondary = 1.0 - aNewSize.Secondary; - xDiagram->setPropertyValue( "RelativePosition", uno::Any(aNewPos) ); - xDiagram->setPropertyValue( "RelativeSize", uno::Any(aNewSize) ); + xDiagram->setPropertyValue( u"RelativePosition"_ustr, uno::Any(aNewPos) ); + xDiagram->setPropertyValue( u"RelativeSize"_ustr, uno::Any(aNewSize) ); bChanged = (aOldPos.Anchor!=aNewPos.Anchor) || (aOldPos.Primary!=aNewPos.Primary) || @@ -496,8 +496,8 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const rtl::Reference RelativePosition aRelPos; RelativeSize aRelSize; - xDiagram->getPropertyValue("RelativePosition" ) >>= aRelPos; - xDiagram->getPropertyValue("RelativeSize" ) >>= aRelSize; + xDiagram->getPropertyValue(u"RelativePosition"_ustr ) >>= aRelPos; + xDiagram->getPropertyValue(u"RelativeSize"_ustr ) >>= aRelSize; awt::Size aAbsSize( static_cast< sal_Int32 >( aRelSize.Primary * aPageSize.Width ), diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 3d049a44527f..03a35391c21e 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -161,7 +161,7 @@ void ErrorBar::setPropertyValue( const OUString& rPropName, const uno::Any& rAny else if(rPropName == "ShowNegativeError") rAny >>= mbShowNegativeError; else if(rPropName == "ErrorBarRangePositive" || rPropName == "ErrorBarRangeNegative") - throw beans::UnknownPropertyException("read-only property", static_cast< uno::XWeak*>(this)); + throw beans::UnknownPropertyException(u"read-only property"_ustr, static_cast< uno::XWeak*>(this)); else if(rPropName == "LineDashName") rAny >>= maDashName; else if(rPropName == "LineDash") @@ -199,7 +199,7 @@ OUString getSourceRangeStrFromLabeledSequences( const uno::Sequence< uno::Refere uno::Reference< chart2::data::XDataSequence > xSequence( labeledData->getValues()); uno::Reference< beans::XPropertySet > xSeqProp( xSequence, uno::UNO_QUERY_THROW ); OUString aRole; - if( ( xSeqProp->getPropertyValue( "Role" ) >>= aRole ) && + if( ( xSeqProp->getPropertyValue( u"Role"_ustr ) >>= aRole ) && aRole.match( "error-bars" ) && aRole.indexOf(aDirection) >= 0 ) { return xSequence->getSourceRangeRepresentation(); @@ -450,7 +450,7 @@ css::uno::Sequence< OUString > SAL_CALL ErrorBar::getSupportedServiceNames() { return { lcl_aServiceName, - "com.sun.star.chart2.ErrorBar" + u"com.sun.star.chart2.ErrorBar"_ustr }; } diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 5b95b0a719be..22f3e84a5802 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -774,19 +774,19 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( { Sequence< beans::PropertyValue > aArguments{ beans::PropertyValue( - "CellRangeRepresentation", -1, uno::Any( lcl_aCompleteRange ), + u"CellRangeRepresentation"_ustr, -1, uno::Any( lcl_aCompleteRange ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( - "DataRowSource", -1, uno::Any( + u"DataRowSource"_ustr, -1, uno::Any( m_bDataInColumns ? css::chart::ChartDataRowSource_COLUMNS : css::chart::ChartDataRowSource_ROWS ), beans::PropertyState_DIRECT_VALUE ), // internal data always contains labels and categories beans::PropertyValue( - "FirstCellAsLabel", -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ), + u"FirstCellAsLabel"_ustr, -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ), beans::PropertyValue( - "HasCategories", -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ) + u"HasCategories"_ustr, -1, uno::Any( true ), beans::PropertyState_DIRECT_VALUE ) }; // #i85913# Sequence Mapping is not needed for internal data, as it is // applied to the data when the data source is created. @@ -1081,7 +1081,7 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 } // notify change to all affected ranges - tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); + tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( u"0"_ustr)); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep ))); std::for_each( aBegin, aEnd, lcl_setModified()); @@ -1104,7 +1104,7 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 } // notify change to all affected ranges - tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); + tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( u"0"_ustr)); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep ))); std::for_each( aBegin, aEnd, lcl_setModified()); @@ -1123,7 +1123,7 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s : m_aInternalData.getRowCount()); // notify change to all affected ranges - tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0")); + tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( u"0"_ustr)); tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep ))); std::for_each( aBegin, aEnd, lcl_setModified()); @@ -1220,7 +1220,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXM // <https://bugs.documentfoundation.org/show_bug.cgi?id=112783> "PIVOT CHARTS: Save produces // invalid file because of invalid cell address": if (aXMLRange == "PivotChart") { - return ""; + return u""_ustr; } static constexpr OUString aPivotTableID(u"PT@"_ustr); @@ -1468,7 +1468,7 @@ sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber ) void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) { comphelper::SequenceAsHashMap aArgs(_aArguments); - if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData", false ) ) + if ( aArgs.getUnpackedValueOrDefault( u"CreateDefaultData"_ustr, false ) ) m_aInternalData.createDefaultData(); } @@ -1481,7 +1481,7 @@ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone() OUString SAL_CALL InternalDataProvider::getImplementationName() { // note: in xmloff this name is used to indicate usage of own data - return "com.sun.star.comp.chart.InternalDataProvider"; + return u"com.sun.star.comp.chart.InternalDataProvider"_ustr; } sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServiceName ) @@ -1491,7 +1491,7 @@ sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServic css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServiceNames() { - return { "com.sun.star.chart2.data.DataProvider" }; + return { u"com.sun.star.chart2.data.DataProvider"_ustr }; } } // namespace chart diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index bf7b13443d1d..16afb3a6076c 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -152,7 +152,7 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util:: OUString SAL_CALL LabeledDataSequence::getImplementationName() { - return "com.sun.star.comp.chart2.LabeledDataSequence"; + return u"com.sun.star.comp.chart2.LabeledDataSequence"_ustr; } sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rServiceName ) @@ -162,7 +162,7 @@ sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rService css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedServiceNames() { - return { "com.sun.star.chart2.data.LabeledDataSequence" }; + return { u"com.sun.star.chart2.data.LabeledDataSequence"_ustr }; } } // namespace chart diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index 2c52f136398d..05609541d4ef 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -39,24 +39,24 @@ rtl::Reference< Legend > LegendHelper::showLegend( ChartModel& rModel rtl::Reference< Legend > xLegend = LegendHelper::getLegend( rModel, xContext, true ); if( xLegend.is()) { - xLegend->setPropertyValue( "Show", uno::Any(true) ); + xLegend->setPropertyValue( u"Show"_ustr, uno::Any(true) ); chart2::RelativePosition aRelativePosition; - if( !(xLegend->getPropertyValue( "RelativePosition") >>= aRelativePosition) ) + if( !(xLegend->getPropertyValue( u"RelativePosition"_ustr) >>= aRelativePosition) ) { chart2::LegendPosition ePos = chart2::LegendPosition_LINE_END; - if( !(xLegend->getPropertyValue( "AnchorPosition") >>= ePos ) ) - xLegend->setPropertyValue( "AnchorPosition", uno::Any( ePos )); + if( !(xLegend->getPropertyValue( u"AnchorPosition"_ustr) >>= ePos ) ) + xLegend->setPropertyValue( u"AnchorPosition"_ustr, uno::Any( ePos )); css::chart::ChartLegendExpansion eExpansion = ( ePos == chart2::LegendPosition_LINE_END || ePos == chart2::LegendPosition_LINE_START ) ? css::chart::ChartLegendExpansion_HIGH : css::chart::ChartLegendExpansion_WIDE; - if( !(xLegend->getPropertyValue( "Expansion") >>= eExpansion ) ) - xLegend->setPropertyValue( "Expansion", uno::Any( eExpansion )); + if( !(xLegend->getPropertyValue( u"Expansion"_ustr) >>= eExpansion ) ) + xLegend->setPropertyValue( u"Expansion"_ustr, uno::Any( eExpansion )); - xLegend->setPropertyValue( "RelativePosition", uno::Any()); + xLegend->setPropertyValue( u"RelativePosition"_ustr, uno::Any()); } } @@ -68,7 +68,7 @@ void LegendHelper::hideLegend( ChartModel& rModel ) rtl::Reference< Legend > xLegend = LegendHelper::getLegend( rModel, nullptr ); if( xLegend.is()) { - xLegend->setPropertyValue( "Show", uno::Any(false) ); + xLegend->setPropertyValue( u"Show"_ustr, uno::Any(false) ); } } @@ -111,7 +111,7 @@ bool LegendHelper::hasLegend( const rtl::Reference< Diagram > & xDiagram ) { uno::Reference< beans::XPropertySet > xLegendProp( xDiagram->getLegend(), uno::UNO_QUERY ); if( xLegendProp.is()) - xLegendProp->getPropertyValue( "Show") >>= bReturn; + xLegendProp->getPropertyValue( u"Show"_ustr) >>= bReturn; } return bReturn; diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx index b3c5fc6ccf53..8b9598c7461c 100644 --- a/chart2/source/tools/LinePropertiesHelper.cxx +++ b/chart2/source/tools/LinePropertiesHelper.cxx @@ -109,11 +109,11 @@ bool LinePropertiesHelper::IsLineVisible( const css::uno::Reference< if( xLineProperties.is() ) { drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); - xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle; + xLineProperties->getPropertyValue( u"LineStyle"_ustr ) >>= aLineStyle; if( aLineStyle != drawing::LineStyle_NONE ) { sal_Int16 nLineTransparence=0; - xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence; + xLineProperties->getPropertyValue( u"LineTransparence"_ustr ) >>= nLineTransparence; if(nLineTransparence!=100) { bRet = true; @@ -136,14 +136,14 @@ void LinePropertiesHelper::SetLineVisible( const css::uno::Reference< if( xLineProperties.is() ) { drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); - xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle; + xLineProperties->getPropertyValue( u"LineStyle"_ustr ) >>= aLineStyle; if( aLineStyle == drawing::LineStyle_NONE ) - xLineProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) ); + xLineProperties->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_SOLID ) ); sal_Int16 nLineTransparence=0; - xLineProperties->getPropertyValue( "LineTransparence" ) >>= nLineTransparence; + xLineProperties->getPropertyValue( u"LineTransparence"_ustr ) >>= nLineTransparence; if(nLineTransparence==100) - xLineProperties->setPropertyValue( "LineTransparence", uno::Any( sal_Int16(0) ) ); + xLineProperties->setPropertyValue( u"LineTransparence"_ustr, uno::Any( sal_Int16(0) ) ); } } catch( const uno::Exception & ) @@ -160,9 +160,9 @@ void LinePropertiesHelper::SetLineInvisible( const css::uno::Reference< if( xLineProperties.is() ) { drawing::LineStyle aLineStyle(drawing::LineStyle_SOLID); - xLineProperties->getPropertyValue( "LineStyle" ) >>= aLineStyle; + xLineProperties->getPropertyValue( u"LineStyle"_ustr ) >>= aLineStyle; if( aLineStyle != drawing::LineStyle_NONE ) - xLineProperties->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ) ); + xLineProperties->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_NONE ) ); } } catch( const uno::Exception & ) @@ -178,7 +178,7 @@ void LinePropertiesHelper::SetLineColor( const css::uno::Reference< { if( xLineProperties.is() ) { - xLineProperties->setPropertyValue( "LineColor", uno::Any( nColor ) ); + xLineProperties->setPropertyValue( u"LineColor"_ustr, uno::Any( nColor ) ); } } catch( const uno::Exception & ) diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index ac67a12e5e9b..b9bfd1a303a7 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -112,7 +112,7 @@ OUString MeanValueRegressionCurveCalculator::ImplGetRepresentation( { *pFormulaLength -= aBuf.getLength(); if ( *pFormulaLength <= 0 ) - return "###"; + return u"###"_ustr; } return ( aBuf + getFormattedString( xNumFormatter, nNumberFormatKey, m_fMeanValue, pFormulaLength ) ); } diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx index f71262f738b9..6d3f2b01d6fc 100644 --- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx @@ -159,7 +159,7 @@ OUString MovingAverageRegressionCurveCalculator::ImplGetRepresentation( { OUString aRet = SchResId( STR_OBJECT_MOVING_AVERAGE_WITH_PARAMETERS ); // change text for Moving Average - OUString aWildcard( "%PERIOD" ); + OUString aWildcard( u"%PERIOD"_ustr ); sal_Int32 nIndex = aRet.indexOf( aWildcard ); if( nIndex != -1 ) { // replace period diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx index 1cc79a8eaec0..da21b751a6df 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -49,7 +49,7 @@ NameContainer::~NameContainer() //XServiceInfo OUString SAL_CALL NameContainer::getImplementationName() { - return "com.sun.star.comp.chart.XMLNameSpaceMap"; + return u"com.sun.star.comp.chart.XMLNameSpaceMap"_ustr; } sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) @@ -59,7 +59,7 @@ sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() { - return { "com.sun.star.xml.NamespaceMap" }; + return { u"com.sun.star.xml.NamespaceMap"_ustr }; } // XNameContainer diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index e00df1fae04e..9687fd60e161 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -53,7 +53,7 @@ NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference< util::XNum { uno::Reference<beans::XPropertySet> xProp(m_xNumberFormatsSupplier,uno::UNO_QUERY); - OUString sNullDate( "NullDate" ); + OUString sNullDate( u"NullDate"_ustr ); if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sNullDate) ) m_aNullDate = xProp->getPropertyValue(sNullDate); SvNumberFormatsSupplierObj* pSupplierObj = comphelper::getFromUnoTunnel<SvNumberFormatsSupplierObj>( xSupplier ); diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index 29e7298974da..b35584e12171 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -364,7 +364,7 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle ) { if( ! SetStyle( xStyle )) throw lang::IllegalArgumentException( - "Empty Style", + u"Empty Style"_ustr, static_cast< beans::XPropertySet * >( this ), 0 ); } diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index d5b2f068c8a0..712ca15796ce 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -459,7 +459,7 @@ OUString ObjectIdentifier::createClassifiedIdentifierForParticles( OUString ObjectIdentifier::createParticleForDiagram() { //TODO: if more than one diagram is implemented, add the correct diagram index here - return "D=0"; + return u"D=0"_ustr; } OUString ObjectIdentifier::createParticleForCoordinateSystem( @@ -1238,14 +1238,14 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( { rtl::Reference<ChartType> xChartType( lcl_getFirstStockChartType( xChartModel ) ); if(xChartType.is()) - xChartType->getPropertyValue( "BlackDay" ) >>= xObjectProperties; + xChartType->getPropertyValue( u"BlackDay"_ustr ) >>= xObjectProperties; } break; case OBJECTTYPE_DATA_STOCK_GAIN: { rtl::Reference<ChartType> xChartType( lcl_getFirstStockChartType( xChartModel ) ); if(xChartType.is()) - xChartType->getPropertyValue( "WhiteDay" ) >>= xObjectProperties; + xChartType->getPropertyValue( u"WhiteDay"_ustr ) >>= xObjectProperties; } break; case OBJECTTYPE_DATA_TABLE: diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx index 48e21eccaf25..60c2b950a970 100644 --- a/chart2/source/tools/PropertyHelper.cxx +++ b/chart2/source/tools/PropertyHelper.cxx @@ -198,11 +198,11 @@ OUString addLineDashUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( "com.sun.star.drawing.DashTable"), + xFact->createInstance( u"com.sun.star.drawing.DashTable"_ustr), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, "ChartDash ", rPreferredName ); + rValue, xNameCnt, u"ChartDash "_ustr, rPreferredName ); } return OUString(); } @@ -215,11 +215,11 @@ OUString addGradientUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( "com.sun.star.drawing.GradientTable"), + xFact->createInstance( u"com.sun.star.drawing.GradientTable"_ustr), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, "ChartGradient ", rPreferredName ); + rValue, xNameCnt, u"ChartGradient "_ustr, rPreferredName ); } return OUString(); } @@ -232,11 +232,11 @@ OUString addTransparencyGradientUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( "com.sun.star.drawing.TransparencyGradientTable"), + xFact->createInstance( u"com.sun.star.drawing.TransparencyGradientTable"_ustr), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, "ChartTransparencyGradient ", rPreferredName ); + rValue, xNameCnt, u"ChartTransparencyGradient "_ustr, rPreferredName ); } return OUString(); } @@ -249,11 +249,11 @@ OUString addHatchUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( "com.sun.star.drawing.HatchTable"), + xFact->createInstance( u"com.sun.star.drawing.HatchTable"_ustr), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, "ChartHatch ", rPreferredName ); + rValue, xNameCnt, u"ChartHatch "_ustr, rPreferredName ); } return OUString(); } @@ -266,11 +266,11 @@ OUString addBitmapUniqueNameToTable( if( xFact.is()) { Reference< container::XNameContainer > xNameCnt( - xFact->createInstance( "com.sun.star.drawing.BitmapTable"), + xFact->createInstance( u"com.sun.star.drawing.BitmapTable"_ustr), uno::UNO_QUERY ); if( xNameCnt.is()) return lcl_addNamedPropertyUniqueNameToTable( - rValue, xNameCnt, "ChartBitmap ", rPreferredName ); + rValue, xNameCnt, u"ChartBitmap "_ustr, rPreferredName ); } return OUString(); } diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 1b2ae9153fcd..eb3dffb2bdcc 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -229,7 +229,7 @@ void RangeHighlighter::fillRangesForErrorBars( sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; bUsesRangesAsErrorBars = ( xErrorBar.is() && - (xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle) && + (xErrorBar->getPropertyValue( u"ErrorBarStyle"_ustr) >>= nStyle) && nStyle == css::chart::ErrorBarStyle::FROM_DATA ); } catch( const uno::Exception & ) diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 714fa83b425c..57c2015ad23b 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -67,7 +67,7 @@ void ReferenceSizeProvider::setValuesAtTitle( Reference< beans::XPropertySet > xTitleProp( xTitle, uno::UNO_QUERY_THROW ); awt::Size aOldRefSize; bool bHasOldRefSize( - xTitleProp->getPropertyValue( "ReferencePageSize") >>= aOldRefSize ); + xTitleProp->getPropertyValue( u"ReferencePageSize"_ustr) >>= aOldRefSize ); // set from auto-resize on to off -> adapt font sizes at XFormattedStrings if( bHasOldRefSize && ! useAutoScale()) @@ -172,7 +172,7 @@ void ReferenceSizeProvider::getAutoResizeFromPropSet( { try { - if( xProp->getPropertyValue( "ReferencePageSize" ).hasValue()) + if( xProp->getPropertyValue( u"ReferencePageSize"_ustr ).hasValue()) eSingleState = AUTO_RESIZE_YES; else eSingleState = AUTO_RESIZE_NO; diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 8f22f9834bdc..36cb6c4c621a 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -42,8 +42,8 @@ RegressionCurveCalculator::RegressionCurveCalculator() , mForceIntercept(false) , mInterceptValue(std::numeric_limits<double>::quiet_NaN()) , mPeriod(2) - , mXName("x") - , mYName("f(x)") + , mXName(u"x"_ustr) + , mYName(u"f(x)"_ustr) , mnMovingType(0) { } @@ -76,7 +76,7 @@ void RegressionCurveCalculator::setRegressionProperties( sal_Int32 nMovingType ) { if( aPeriod < 0 ) - throw lang::IllegalArgumentException("aPeriod may not be < 0", static_cast<cppu::OWeakObject*>(this), 3); + throw lang::IllegalArgumentException(u"aPeriod may not be < 0"_ustr, static_cast<cppu::OWeakObject*>(this), 3); mDegree = aDegree; mForceIntercept = aForceIntercept; mInterceptValue = aInterceptValue; @@ -90,12 +90,12 @@ OUString RegressionCurveCalculator::getFormattedString( double fNumber, const sal_Int32* pStringLength /* = nullptr */ ) { if ( pStringLength && *pStringLength <= 0 ) - return "###"; + return u"###"_ustr; OUString aResult; if( xNumFormatter.is() ) { - bool bStandard = ::cppu::any2bool( ::comphelper::getNumberFormatProperty( xNumFormatter, nNumberFormatKey, "StandardFormat" ) ); + bool bStandard = ::cppu::any2bool( ::comphelper::getNumberFormatProperty( xNumFormatter, nNumberFormatKey, u"StandardFormat"_ustr ) ); if( pStringLength && bStandard ) { // round fNumber to *pStringLength characters const sal_Int32 nMinDigit = 6; // minimum significant digits for General format @@ -131,7 +131,7 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa sal_Bool /* bMaySkipPointsInCalculation */ ) { if( nPointCount < 2 ) - throw lang::IllegalArgumentException("too few points", static_cast<cppu::OWeakObject*>(this), 2); + throw lang::IllegalArgumentException(u"too few points"_ustr, static_cast<cppu::OWeakObject*>(this), 2); // determine if scaling and inverse scaling for x-values work bool bDoXScaling( xScalingX.is()); @@ -205,11 +205,11 @@ void RegressionCurveCalculator::addStringToEquation( void SAL_CALL RegressionCurveCalculator::setXYNames( const OUString& aXName, const OUString& aYName ) { if ( aXName.isEmpty() ) - mXName = OUString ("x"); + mXName = u"x"_ustr; else mXName = aXName; if ( aYName.isEmpty() ) - mYName = OUString ("f(x)"); + mYName = u"f(x)"_ustr; else mYName = aYName; } diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index efb6bea5c3aa..193a525737d9 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -193,7 +193,7 @@ void RegressionCurveHelper::initializeCurveCalculator( Reference< data::XDataSequence > xSeq( aDataSeqs[i]->getValues()); Reference< XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW ); OUString aRole; - if( xProp->getPropertyValue( "Role" ) >>= aRole ) + if( xProp->getPropertyValue( u"Role"_ustr ) >>= aRole ) { if( bUseXValuesIfAvailable && !bXValuesFound && aRole == "values-x" ) { @@ -372,8 +372,8 @@ void RegressionCurveHelper::addMeanValueLine( uno::Reference< XPropertySet > xProp( xCurve, uno::UNO_QUERY ); if( xProp.is()) { - xProp->setPropertyValue( "LineColor", - xSeriesProp->getPropertyValue( "Color")); + xProp->setPropertyValue( u"LineColor"_ustr, + xSeriesProp->getPropertyValue( u"Color"_ustr)); } } } @@ -392,8 +392,8 @@ void RegressionCurveHelper::addMeanValueLine( if( xSeriesProp.is()) { - xCurve->setPropertyValue( "LineColor", - xSeriesProp->getPropertyValue( "Color")); + xCurve->setPropertyValue( u"LineColor"_ustr, + xSeriesProp->getPropertyValue( u"Color"_ustr)); } } @@ -486,8 +486,8 @@ rtl::Reference< RegressionCurveModel > RegressionCurveHelper::addRegressionCurve uno::Reference< XPropertySet > xSeriesProp( xRegressionCurveContainer, uno::UNO_QUERY ); if( xSeriesProp.is()) { - xCurve->setPropertyValue( "LineColor", - xSeriesProp->getPropertyValue( "Color")); + xCurve->setPropertyValue( u"LineColor"_ustr, + xSeriesProp->getPropertyValue( u"Color"_ustr)); } } } @@ -526,8 +526,8 @@ rtl::Reference< RegressionCurveModel > RegressionCurveHelper::addRegressionCurve comphelper::copyProperties( xPropertySource, xCurve ); else { - xCurve->setPropertyValue( "LineColor", - xRegressionCurveContainer->getPropertyValue( "Color")); + xCurve->setPropertyValue( u"LineColor"_ustr, + xRegressionCurveContainer->getPropertyValue( u"Color"_ustr)); } } xRegressionCurveContainer->addRegressionCurve( xCurve ); @@ -584,10 +584,10 @@ void RegressionCurveHelper::removeEquations( uno::Reference< beans::XPropertySet > xEqProp( curve->getEquationProperties() ) ; if( xEqProp.is()) { - xEqProp->setPropertyValue( "ShowEquation", uno::Any( false )); - xEqProp->setPropertyValue( "XName", uno::Any( OUString("x") )); - xEqProp->setPropertyValue( "YName", uno::Any( OUString("f(x) ") )); - xEqProp->setPropertyValue( "ShowCorrelationCoefficient", uno::Any( false )); + xEqProp->setPropertyValue( u"ShowEquation"_ustr, uno::Any( false )); + xEqProp->setPropertyValue( u"XName"_ustr, uno::Any( u"x"_ustr )); + xEqProp->setPropertyValue( u"YName"_ustr, uno::Any( u"f(x) "_ustr )); + xEqProp->setPropertyValue( u"ShowCorrelationCoefficient"_ustr, uno::Any( false )); } } } @@ -827,7 +827,7 @@ OUString RegressionCurveHelper::getRegressionCurveSpecificName(const Reference< if(!xProperties.is()) return aResult; - xProperties->getPropertyValue("CurveName") >>= aResult; + xProperties->getPropertyValue(u"CurveName"_ustr) >>= aResult; return aResult; } @@ -887,8 +887,8 @@ bool RegressionCurveHelper::hasEquation( const Reference< chart2::XRegressionCur { bool bShowEquation = false; bool bShowCoefficient = false; - xEquationProp->getPropertyValue( "ShowEquation") >>= bShowEquation; - xEquationProp->getPropertyValue( "ShowCorrelationCoefficient") >>= bShowCoefficient; + xEquationProp->getPropertyValue( u"ShowEquation"_ustr) >>= bShowEquation; + xEquationProp->getPropertyValue( u"ShowCorrelationCoefficient"_ustr) >>= bShowCoefficient; bHasEquation = bShowEquation || bShowCoefficient; } } @@ -903,7 +903,7 @@ bool RegressionCurveHelper::MayHaveCorrelationCoefficient( const Reference< char uno::Reference< beans::XPropertySet > xEquationProp( xCurve->getEquationProperties() ); if( xEquationProp.is() ) { - xEquationProp->getPropertyValue( "MayHaveCorrelationCoefficient") >>= bMayHaveCorrelationCoefficient; + xEquationProp->getPropertyValue( u"MayHaveCorrelationCoefficient"_ustr) >>= bMayHaveCorrelationCoefficient; } } return bMayHaveCorrelationCoefficient; diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 06be003ef106..7bc16f64fc96 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -193,7 +193,7 @@ void RegressionCurveModel::setPropertyMayHaveR2() { if( m_xEquationProperties.is()) { bool bMayHaveR2 = m_eRegressionCurveType != CURVE_TYPE_MOVING_AVERAGE; - m_xEquationProperties->setPropertyValue( "MayHaveCorrelationCoefficient", uno::Any( bMayHaveR2 ) ); + m_xEquationProperties->setPropertyValue( u"MayHaveCorrelationCoefficient"_ustr, uno::Any( bMayHaveR2 ) ); } } @@ -203,19 +203,19 @@ OUString SAL_CALL RegressionCurveModel::getServiceName() switch( m_eRegressionCurveType ) { case CURVE_TYPE_MEAN_VALUE: - return "com.sun.star.chart2.MeanValueRegressionCurve"; + return u"com.sun.star.chart2.MeanValueRegressionCurve"_ustr; case CURVE_TYPE_LINEAR: - return "com.sun.star.chart2.LinearRegressionCurve"; + return u"com.sun.star.chart2.LinearRegressionCurve"_ustr; case CURVE_TYPE_LOGARITHM: - return "com.sun.star.chart2.LogarithmicRegressionCurve"; + return u"com.sun.star.chart2.LogarithmicRegressionCurve"_ustr; case CURVE_TYPE_EXPONENTIAL: - return "com.sun.star.chart2.ExponentialRegressionCurve"; + return u"com.sun.star.chart2.ExponentialRegressionCurve"_ustr; case CURVE_TYPE_POWER: - return "com.sun.star.chart2.PotentialRegressionCurve"; + return u"com.sun.star.chart2.PotentialRegressionCurve"_ustr; case CURVE_TYPE_POLYNOMIAL: - return "com.sun.star.chart2.PolynomialRegressionCurve"; + return u"com.sun.star.chart2.PolynomialRegressionCurve"_ustr; case CURVE_TYPE_MOVING_AVERAGE: - return "com.sun.star.chart2.MovingAverageRegressionCurve"; + return u"com.sun.star.chart2.MovingAverageRegressionCurve"_ustr; } return OUString(); @@ -298,7 +298,7 @@ MeanValueRegressionCurve::~MeanValueRegressionCurve() OUString SAL_CALL MeanValueRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.MeanValueRegressionCurve"; + return u"com.sun.star.comp.chart2.MeanValueRegressionCurve"_ustr; } sal_Bool SAL_CALL MeanValueRegressionCurve::supportsService( const OUString& rServiceName ) @@ -308,7 +308,7 @@ sal_Bool SAL_CALL MeanValueRegressionCurve::supportsService( const OUString& rSe css::uno::Sequence< OUString > SAL_CALL MeanValueRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.MeanValueRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.MeanValueRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClone() @@ -328,7 +328,7 @@ LinearRegressionCurve::~LinearRegressionCurve() OUString SAL_CALL LinearRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.LinearRegressionCurve"; + return u"com.sun.star.comp.chart2.LinearRegressionCurve"_ustr; } sal_Bool SAL_CALL LinearRegressionCurve::supportsService( const OUString& rServiceName ) @@ -338,7 +338,7 @@ sal_Bool SAL_CALL LinearRegressionCurve::supportsService( const OUString& rServi css::uno::Sequence< OUString > SAL_CALL LinearRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.LinearRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.LinearRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone() @@ -358,7 +358,7 @@ LogarithmicRegressionCurve::~LogarithmicRegressionCurve() OUString SAL_CALL LogarithmicRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.LogarithmicRegressionCurve"; + return u"com.sun.star.comp.chart2.LogarithmicRegressionCurve"_ustr; } sal_Bool SAL_CALL LogarithmicRegressionCurve::supportsService( const OUString& rServiceName ) @@ -368,7 +368,7 @@ sal_Bool SAL_CALL LogarithmicRegressionCurve::supportsService( const OUString& r css::uno::Sequence< OUString > SAL_CALL LogarithmicRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.LogarithmicRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.LogarithmicRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createClone() @@ -388,7 +388,7 @@ ExponentialRegressionCurve::~ExponentialRegressionCurve() OUString SAL_CALL ExponentialRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.ExponentialRegressionCurve"; + return u"com.sun.star.comp.chart2.ExponentialRegressionCurve"_ustr; } sal_Bool SAL_CALL ExponentialRegressionCurve::supportsService( const OUString& rServiceName ) @@ -398,7 +398,7 @@ sal_Bool SAL_CALL ExponentialRegressionCurve::supportsService( const OUString& r css::uno::Sequence< OUString > SAL_CALL ExponentialRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.ExponentialRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.ExponentialRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createClone() @@ -418,7 +418,7 @@ PotentialRegressionCurve::~PotentialRegressionCurve() OUString SAL_CALL PotentialRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.PotentialRegressionCurve"; + return u"com.sun.star.comp.chart2.PotentialRegressionCurve"_ustr; } sal_Bool SAL_CALL PotentialRegressionCurve::supportsService( const OUString& rServiceName ) @@ -428,7 +428,7 @@ sal_Bool SAL_CALL PotentialRegressionCurve::supportsService( const OUString& rSe css::uno::Sequence< OUString > SAL_CALL PotentialRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.PotentialRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.PotentialRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClone() @@ -448,7 +448,7 @@ PolynomialRegressionCurve::~PolynomialRegressionCurve() OUString SAL_CALL PolynomialRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.PolynomialRegressionCurve"; + return u"com.sun.star.comp.chart2.PolynomialRegressionCurve"_ustr; } sal_Bool SAL_CALL PolynomialRegressionCurve::supportsService( const OUString& rServiceName ) @@ -458,7 +458,7 @@ sal_Bool SAL_CALL PolynomialRegressionCurve::supportsService( const OUString& rS css::uno::Sequence< OUString > SAL_CALL PolynomialRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.PolynomialRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.PolynomialRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClone() @@ -478,7 +478,7 @@ MovingAverageRegressionCurve::~MovingAverageRegressionCurve() OUString SAL_CALL MovingAverageRegressionCurve::getImplementationName() { - return "com.sun.star.comp.chart2.MovingAverageRegressionCurve"; + return u"com.sun.star.comp.chart2.MovingAverageRegressionCurve"_ustr; } sal_Bool SAL_CALL MovingAverageRegressionCurve::supportsService( const OUString& rServiceName ) @@ -488,7 +488,7 @@ sal_Bool SAL_CALL MovingAverageRegressionCurve::supportsService( const OUString& css::uno::Sequence< OUString > SAL_CALL MovingAverageRegressionCurve::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionCurve", "com.sun.star.chart2.MovingAverageRegressionCurve" }; + return { u"com.sun.star.chart2.RegressionCurve"_ustr, u"com.sun.star.chart2.MovingAverageRegressionCurve"_ustr }; } uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::createClone() diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 34bbd6b491d9..e487ec6d5242 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -121,8 +121,8 @@ void lcl_AddPropertiesToVector( ::chart::CharacterProperties::AddDefaultsToMap( aOutMap ); ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_SHOW, false ); - ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_XNAME, OUString("x") ); - ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_YNAME, OUString("f(x)") ); + ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_XNAME, u"x"_ustr ); + ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_YNAME, u"f(x)"_ustr ); ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_SHOW_CORRELATION_COEFF, false ); ::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_MAY_HAVE_CORRELATION_COEFF, true ); //::chart::PropertyHelper::setPropertyValueDefault( aOutMap, PROP_EQUATION_SEPARATOR, OUString( '\n' )); @@ -268,7 +268,7 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< OUString SAL_CALL RegressionEquation::getImplementationName() { - return "com.sun.star.comp.chart2.RegressionEquation"; + return u"com.sun.star.comp.chart2.RegressionEquation"_ustr; } sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceName ) @@ -278,11 +278,11 @@ sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceN css::uno::Sequence< OUString > SAL_CALL RegressionEquation::getSupportedServiceNames() { - return { "com.sun.star.chart2.RegressionEquation", - "com.sun.star.beans.PropertySet", - "com.sun.star.drawing.FillProperties", - "com.sun.star.drawing.LineProperties", - "com.sun.star.style.CharacterProperties" }; + return { u"com.sun.star.chart2.RegressionEquation"_ustr, + u"com.sun.star.beans.PropertySet"_ustr, + u"com.sun.star.drawing.FillProperties"_ustr, + u"com.sun.star.drawing.LineProperties"_ustr, + u"com.sun.star.style.CharacterProperties"_ustr }; } using impl::RegressionEquation_Base; diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index b7179537c43b..940fe7e92521 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -160,7 +160,7 @@ uno::Reference< XScaling > SAL_CALL { // ToDo: ApproxEqual ? if( m_fSlope == 0 ) - throw uno::RuntimeException("Divide by zero exception"); + throw uno::RuntimeException(u"Divide by zero exception"_ustr); return new LinearScaling( 1.0 / m_fSlope, m_fOffset / m_fSlope ); } @@ -208,7 +208,7 @@ uno::Reference< XScaling > SAL_CALL { // ToDo: ApproxEqual ? if( m_fExponent == 0 ) - throw uno::RuntimeException("Divide by zero exception"); + throw uno::RuntimeException(u"Divide by zero exception"_ustr); return new PowerScaling( 1.0 / m_fExponent ); } diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index 5f3bbdf802d6..618236d7efbd 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -112,7 +112,7 @@ void lcl_setRole( { Reference< beans::XPropertySet > xSeqProp( xNewSequence, uno::UNO_QUERY ); if( xSeqProp.is()) - xSeqProp->setPropertyValue( "Role", uno::Any( rRole )); + xSeqProp->setPropertyValue( u"Role"_ustr, uno::Any( rRole )); } void lcl_addSequenceToDataSource( @@ -299,7 +299,7 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars( OSL_ASSERT( xErrorBar.is()); if( xErrorBar.is()) { - xErrorBar->setPropertyValue( "ErrorBarStyle", uno::Any( nStyle )); + xErrorBar->setPropertyValue( u"ErrorBarStyle"_ustr, uno::Any( nStyle )); } xDataSeries->setPropertyValue( aPropName, uno::Any( xErrorBar )); @@ -329,7 +329,7 @@ bool StatisticsHelper::hasErrorBars( sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; return ( xErrorBar.is() && - ( xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && + ( xErrorBar->getPropertyValue( u"ErrorBarStyle"_ustr) >>= nStyle ) && nStyle != css::chart::ErrorBarStyle::NONE ); } @@ -339,7 +339,7 @@ void StatisticsHelper::removeErrorBars( { Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError )); if ( xErrorBar.is()) - xErrorBar->setPropertyValue( "ErrorBarStyle", uno::Any( + xErrorBar->setPropertyValue( u"ErrorBarStyle"_ustr, uno::Any( css::chart::ErrorBarStyle::NONE )); } @@ -351,7 +351,7 @@ bool StatisticsHelper::usesErrorBarRanges( sal_Int32 nStyle = css::chart::ErrorBarStyle::NONE; return ( xErrorBar.is() && - ( xErrorBar->getPropertyValue( "ErrorBarStyle") >>= nStyle ) && + ( xErrorBar->getPropertyValue( u"ErrorBarStyle"_ustr) >>= nStyle ) && nStyle == css::chart::ErrorBarStyle::FROM_DATA ); } diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx index 47fa8bb49317..f8bb84a26f06 100644 --- a/chart2/source/tools/ThreeDHelper.cxx +++ b/chart2/source/tools/ThreeDHelper.cxx @@ -48,7 +48,7 @@ bool lcl_isRightAngledAxesSetAndSupported( const rtl::Reference< Diagram >& xDia if( xDiagram.is() ) { bool bRightAngledAxes = false; - xDiagram->getPropertyValue( "RightAngledAxes") >>= bRightAngledAxes; + xDiagram->getPropertyValue( u"RightAngledAxes"_ustr) >>= bRightAngledAxes; if(bRightAngledAxes) { if( ChartTypeHelper::isSupportingRightAngledAxes( @@ -665,8 +665,8 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines( xDiagram->getDataSeries(); sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() ); - OUString aPercentDiagonalPropertyName( "PercentDiagonal" ); - OUString aBorderStylePropertyName( "BorderStyle" ); + OUString aPercentDiagonalPropertyName( u"PercentDiagonal"_ustr ); + OUString aBorderStylePropertyName( u"BorderStyle"_ustr ); for( sal_Int32 nS = 0; nS < nSeriesCount; ++nS ) { @@ -765,10 +765,10 @@ void ThreeDHelper::setRoundedEdgesAndObjectLines( for( auto const& xSeries : aSeriesList) { if( nRoundedEdges>=0 && nRoundedEdges<=100 ) - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "PercentDiagonal", aARoundedEdges ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"PercentDiagonal"_ustr, aARoundedEdges ); if( nObjectLines==0 || nObjectLines==1 ) - DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", aALineStyle ); + DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, u"BorderStyle"_ustr, aALineStyle ); } } diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index e9f76c619985..3cbfe810e1b1 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -185,7 +185,7 @@ rtl::Reference< Title > TitleHelper::createOrShowTitle( rtl::Reference< Title > xTitled( TitleHelper::getTitle( eTitleType, xModel ) ); if( xTitled.is()) { - xTitled->setPropertyValue("Visible",css::uno::Any(true)); + xTitled->setPropertyValue(u"Visible"_ustr,css::uno::Any(true)); return xTitled; } else @@ -221,7 +221,7 @@ rtl::Reference< Title > TitleHelper::createTitle( } if( xAxis.is() ) { - xAxis->setPropertyValue( "Show", uno::Any( false ) ); + xAxis->setPropertyValue( u"Show"_ustr, uno::Any( false ) ); xTitled = lcl_getTitleParent( eTitleType, xModel ); } } @@ -279,7 +279,7 @@ rtl::Reference< Title > TitleHelper::createTitle( || (!bIsVertical && eTitleType == TitleHelper::SECONDARY_Y_AXIS_TITLE) || (bIsVertical && eTitleType == TitleHelper::SECONDARY_X_AXIS_TITLE) ) { - xTitle->setPropertyValue( "TextRotation", uno::Any( 90.0 )); + xTitle->setPropertyValue( u"TextRotation"_ustr, uno::Any( 90.0 )); } } catch( const uno::Exception & ) @@ -334,7 +334,7 @@ void TitleHelper::setFormattedString( const rtl::Reference< Title >& xTitle, return; bool bStacked = false; - xTitle->getPropertyValue("StackCharacters") >>= bStacked; + xTitle->getPropertyValue(u"StackCharacters"_ustr) >>= bStacked; if (bStacked) { @@ -358,7 +358,7 @@ void TitleHelper::setCompleteString( const OUString& rNewText bool bStacked = false; if( xTitle.is() ) - xTitle->getPropertyValue( "StackCharacters" ) >>= bStacked; + xTitle->getPropertyValue( u"StackCharacters"_ustr ) >>= bStacked; OUString aNewText = rNewText; if( bStacked ) @@ -399,9 +399,9 @@ void TitleHelper::setCompleteString( const OUString& rNewText try { uno::Any aFontSize( *pDefaultCharHeight ); - xFormattedString->setPropertyValue( "CharHeight", aFontSize ); - xFormattedString->setPropertyValue( "CharHeightAsian", aFontSize ); - xFormattedString->setPropertyValue( "CharHeightComplex", aFontSize ); + xFormattedString->setPropertyValue( u"CharHeight"_ustr, aFontSize ); + xFormattedString->setPropertyValue( u"CharHeightAsian"_ustr, aFontSize ); + xFormattedString->setPropertyValue( u"CharHeightComplex"_ustr, aFontSize ); } catch( const uno::Exception & ) { @@ -450,7 +450,7 @@ void TitleHelper::hideTitle( TitleHelper::eTitleType nTitleIndex if( xTitled.is()) { css::uno::Reference<css::beans::XPropertySet> xProps(xTitled, css::uno::UNO_QUERY_THROW); - xProps->setPropertyValue("Visible",css::uno::Any(false)); + xProps->setPropertyValue(u"Visible"_ustr,css::uno::Any(false)); } } diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index b7929719df02..f718b051f655 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -93,19 +93,19 @@ UncachedDataSequence::~UncachedDataSequence() void UncachedDataSequence::registerProperties() { - registerProperty( "NumberFormatKey", + registerProperty( u"NumberFormatKey"_ustr, PROP_NUMBERFORMAT_KEY, 0, // PropertyAttributes & m_nNumberFormatKey, cppu::UnoType<decltype(m_nNumberFormatKey)>::get() ); - registerProperty( "Role", + registerProperty( u"Role"_ustr, PROP_PROPOSED_ROLE, 0, // PropertyAttributes & m_sRole, cppu::UnoType<decltype(m_sRole)>::get() ); - registerProperty( "CachedXMLRange", + registerProperty( u"CachedXMLRange"_ustr, PROP_XML_RANGE, 0, // PropertyAttributes & m_aXMLRange, @@ -151,9 +151,9 @@ css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServic { return { lcl_aServiceName, - "com.sun.star.chart2.data.DataSequence", - "com.sun.star.chart2.data.NumericalDataSequence", - "com.sun.star.chart2.data.TextualDataSequence" + u"com.sun.star.chart2.data.DataSequence"_ustr, + u"com.sun.star.chart2.data.NumericalDataSequence"_ustr, + u"com.sun.star.chart2.data.TextualDataSequence"_ustr }; } diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 4e62dca5bd10..170aaa5b2e52 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -70,12 +70,12 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ) { - rList.emplace_back( new WrappedIgnoreProperty( "LineStyle", uno::Any( drawing::LineStyle_SOLID ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "LineDashName", uno::Any( OUString() ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "LineColor", uno::Any( sal_Int32(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "LineTransparence", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "LineWidth", uno::Any( sal_Int32(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "LineJoint", uno::Any( drawing::LineJoint_ROUND ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_SOLID ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineDashName"_ustr, uno::Any( OUString() ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineColor"_ustr, uno::Any( sal_Int32(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineTransparence"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineWidth"_ustr, uno::Any( sal_Int32(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"LineJoint"_ustr, uno::Any( drawing::LineJoint_ROUND ) ) ); } void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ) @@ -86,26 +86,26 @@ void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< std::unique_ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ) { - rList.emplace_back( new WrappedIgnoreProperty( "FillStyle", uno::Any( drawing::FillStyle_SOLID ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillColor", uno::Any( sal_Int32(-1) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillTransparence", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::Any( OUString() ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillGradientName", uno::Any( OUString() ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillHatchName", uno::Any( OUString() ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBackground", uno::Any( false ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillStyle"_ustr, uno::Any( drawing::FillStyle_SOLID ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillColor"_ustr, uno::Any( sal_Int32(-1) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillTransparence"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillTransparenceGradientName"_ustr, uno::Any( OUString() ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillGradientName"_ustr, uno::Any( OUString() ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillHatchName"_ustr, uno::Any( OUString() ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBackground"_ustr, uno::Any( false ) ) ); } void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( std::vector< std::unique_ptr<WrappedProperty> >& rList ) { - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapOffsetX", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapOffsetY", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetY", uno::Any( sal_Int16(0) ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapRectanglePoint", uno::Any( drawing::RectanglePoint_LEFT_TOP ) ) ); - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapLogicalSize", uno::Any( false ) ) );//todo correct default? - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapSizeX", uno::Any( sal_Int32(10) ) ) );//todo which default? - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapSizeY", uno::Any( sal_Int32(10) ) ) );//todo which default? - rList.emplace_back( new WrappedIgnoreProperty( "FillBitmapMode", uno::Any( drawing::BitmapMode_REPEAT ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapOffsetX"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapOffsetY"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapPositionOffsetX"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapPositionOffsetY"_ustr, uno::Any( sal_Int16(0) ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapRectanglePoint"_ustr, uno::Any( drawing::RectanglePoint_LEFT_TOP ) ) ); + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapLogicalSize"_ustr, uno::Any( false ) ) );//todo correct default? + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapSizeX"_ustr, uno::Any( sal_Int32(10) ) ) );//todo which default? + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapSizeY"_ustr, uno::Any( sal_Int32(10) ) ) );//todo which default? + rList.emplace_back( new WrappedIgnoreProperty( u"FillBitmapMode"_ustr, uno::Any( drawing::BitmapMode_REPEAT ) ) ); } } //namespace chart diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 30aead187dcb..6578a3d5d092 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -138,7 +138,7 @@ bool VAxisBase::isAnythingToDraw() if( m_aAxisProperties.m_xAxisModel.is() ) { bool bShow = false; - m_aAxisProperties.m_xAxisModel->getPropertyValue( "Show" ) >>= bShow; + m_aAxisProperties.m_xAxisModel->getPropertyValue( u"Show"_ustr ) >>= bShow; if( !bShow ) return false; } @@ -182,7 +182,7 @@ bool VAxisBase::prepareShapeCreation() return true; //create named group shape - m_xGroupShape_Shapes = createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : ""); + m_xGroupShape_Shapes = createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : u""_ustr); if (m_aAxisProperties.m_bDisplayLabels) m_xTextTarget = ShapeFactory::createGroup2D( m_xFinalTarget, m_aCID ); diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index a69508cec77a..11456dc412ea 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -211,11 +211,11 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty { if( AxisHelper::isAxisPositioningEnabled() ) { - xAxisProp->getPropertyValue("CrossoverPosition") >>= m_eCrossoverType; + xAxisProp->getPropertyValue(u"CrossoverPosition"_ustr) >>= m_eCrossoverType; if( m_eCrossoverType == css::chart::ChartAxisPosition_VALUE ) { double fValue = 0.0; - xAxisProp->getPropertyValue("CrossoverValue") >>= fValue; + xAxisProp->getPropertyValue(u"CrossoverValue"_ustr) >>= fValue; if( m_bCrossingAxisIsCategoryAxes ) fValue = ::rtl::math::round(fValue); @@ -224,8 +224,8 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty else if( m_eCrossoverType == css::chart::ChartAxisPosition_ZERO ) m_pfMainLinePositionAtOtherAxis = 0.0; - xAxisProp->getPropertyValue("LabelPosition") >>= m_eLabelPos; - xAxisProp->getPropertyValue("MarkPosition") >>= m_eTickmarkPos; + xAxisProp->getPropertyValue(u"LabelPosition"_ustr) >>= m_eLabelPos; + xAxisProp->getPropertyValue(u"MarkPosition"_ustr) >>= m_eTickmarkPos; } else { @@ -304,16 +304,16 @@ void AxisProperties::init( bool bCartesian ) m_aLineProperties.initFromPropertySet( m_xAxisModel ); //init display labels - m_xAxisModel->getPropertyValue( "DisplayLabels" ) >>= m_bDisplayLabels; + m_xAxisModel->getPropertyValue( u"DisplayLabels"_ustr ) >>= m_bDisplayLabels; // Init layout strategy hint for axis labels. // Compatibility option: starting from LibreOffice 5.1 the rotated // layout is preferred to staggering for axis labels. - m_xAxisModel->getPropertyValue( "TryStaggeringFirst" ) >>= m_bTryStaggeringFirst; + m_xAxisModel->getPropertyValue( u"TryStaggeringFirst"_ustr ) >>= m_bTryStaggeringFirst; //init TickmarkProperties - m_xAxisModel->getPropertyValue( "MajorTickmarks" ) >>= m_nMajorTickmarks; - m_xAxisModel->getPropertyValue( "MinorTickmarks" ) >>= m_nMinorTickmarks; + m_xAxisModel->getPropertyValue( u"MajorTickmarks"_ustr ) >>= m_nMajorTickmarks; + m_xAxisModel->getPropertyValue( u"MinorTickmarks"_ustr ) >>= m_nMinorTickmarks; sal_Int32 nMaxDepth = 0; if(m_nMinorTickmarks!=0) @@ -366,13 +366,13 @@ void AxisLabelProperties::init( const rtl::Reference< Axis >& xAxisModel ) try { - xAxisModel->getPropertyValue( "TextBreak" ) >>= m_bLineBreakAllowed; - xAxisModel->getPropertyValue( "TextOverlap" ) >>= m_bOverlapAllowed; - xAxisModel->getPropertyValue( "StackCharacters" ) >>= m_bStackCharacters; - xAxisModel->getPropertyValue( "TextRotation" ) >>= m_fRotationAngleDegree; + xAxisModel->getPropertyValue( u"TextBreak"_ustr ) >>= m_bLineBreakAllowed; + xAxisModel->getPropertyValue( u"TextOverlap"_ustr ) >>= m_bOverlapAllowed; + xAxisModel->getPropertyValue( u"StackCharacters"_ustr ) >>= m_bStackCharacters; + xAxisModel->getPropertyValue( u"TextRotation"_ustr ) >>= m_fRotationAngleDegree; css::chart::ChartAxisArrangeOrderType eArrangeOrder; - xAxisModel->getPropertyValue( "ArrangeOrder" ) >>= eArrangeOrder; + xAxisModel->getPropertyValue( u"ArrangeOrder"_ustr ) >>= eArrangeOrder; switch(eArrangeOrder) { case css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE: diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 3b40602660f1..81fc3dbee032 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -1855,7 +1855,7 @@ void VCartesianAxis::updatePositions() //set new position try { - xShape2DText->SvxShape::setPropertyValue( "Transformation", aATransformation ); + xShape2DText->SvxShape::setPropertyValue( u"Transformation"_ustr, aATransformation ); } catch( const uno::Exception& ) { @@ -1992,7 +1992,7 @@ void VCartesianAxis::createShapes() m_xGroupShape_Shapes, aPoints , &m_aAxisProperties.m_aLineProperties ); //because of this name this line will be used for marking the axis - ::chart::ShapeFactory::setShapeName( xShape, "MarkHandles" ); + ::chart::ShapeFactory::setShapeName( xShape, u"MarkHandles"_ustr ); } //create an additional line at NULL if( !AxisHelper::isAxisPositioningEnabled() ) diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 9916ebac0be4..ef00c97f14b5 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -262,7 +262,7 @@ void VCartesianGrid::createShapes() aHandleLineProperties.LineStyle <<= drawing::LineStyle_NONE; rtl::Reference<SvxShapePolyPolygon> xHandleShape = ShapeFactory::createLine2D( xTarget, aHandlesPoints, &aHandleLineProperties ); - ::chart::ShapeFactory::setShapeName( xHandleShape, "HandlesOnly" ); + ::chart::ShapeFactory::setShapeName( xHandleShape, u"HandlesOnly"_ustr ); } else //if(2!=m_nDimension) { diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 41ec23d307f3..86d9c485fec7 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -547,7 +547,7 @@ bool VCoordinateSystem::getPropertySwapXAndYAxis() const bool bSwapXAndY = false; if( m_xCooSysModel.is()) try { - m_xCooSysModel->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXAndY; + m_xCooSysModel->getPropertyValue( u"SwapXAndYAxis"_ustr ) >>= bSwapXAndY; } catch( const uno::Exception& ) { diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 6c3f0790a573..4779d49390d4 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -193,7 +193,7 @@ void VPolarAngleAxis::createShapes() rtl::Reference<SvxShapePolyPolygon> xShape = ShapeFactory::createLine2D( m_xGroupShape_Shapes, aPoints, &m_aAxisProperties.m_aLineProperties ); //because of this name this line will be used for marking the axis - ::chart::ShapeFactory::setShapeName( xShape, "MarkHandles" ); + ::chart::ShapeFactory::setShapeName( xShape, u"MarkHandles"_ustr ); //create labels createLabels(); diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index 7c49842640a7..44d4ec1381b6 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -211,7 +211,7 @@ void VPolarGrid::create2DRadiusGrid( const rtl::Reference<SvxShapeGroupAnyD>& xL rtl::Reference<SvxShapePolyPolygon> xShape = ShapeFactory::createLine2D( xTarget, aAllPoints, &rLinePropertiesList[nDepth] ); //because of this name this line will be used for marking - ::chart::ShapeFactory::setShapeName( xShape, "MarkHandles" ); + ::chart::ShapeFactory::setShapeName( xShape, u"MarkHandles"_ustr ); } } diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 3bab48585148..13aaa7d16f3f 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -394,7 +394,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); //because of this name this line will be used for marking - ::chart::ShapeFactory::setShapeName(xShape, "MarkHandles"); + ::chart::ShapeFactory::setShapeName(xShape, u"MarkHandles"_ustr); } return true; } @@ -470,7 +470,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); //because of this name this line will be used for marking - ::chart::ShapeFactory::setShapeName(xShape, "MarkHandles"); + ::chart::ShapeFactory::setShapeName(xShape, u"MarkHandles"_ustr); return true; } @@ -771,8 +771,8 @@ void AreaChart::createShapes() { bool bShowPositive = false; bool bShowNegative = false; - xErrorBarProp->getPropertyValue("ShowPositiveError") >>= bShowPositive; - xErrorBarProp->getPropertyValue("ShowNegativeError") >>= bShowNegative; + xErrorBarProp->getPropertyValue(u"ShowPositiveError"_ustr) >>= bShowPositive; + xErrorBarProp->getPropertyValue(u"ShowNegativeError"_ustr) >>= bShowNegative; bCreateYErrorBar = bShowPositive || bShowNegative; } @@ -781,8 +781,8 @@ void AreaChart::createShapes() { bool bShowPositive = false; bool bShowNegative = false; - xErrorBarProp->getPropertyValue("ShowPositiveError") >>= bShowPositive; - xErrorBarProp->getPropertyValue("ShowNegativeError") >>= bShowNegative; + xErrorBarProp->getPropertyValue(u"ShowPositiveError"_ustr) >>= bShowPositive; + xErrorBarProp->getPropertyValue(u"ShowNegativeError"_ustr) >>= bShowNegative; bCreateXErrorBar = bShowPositive || bShowNegative; } } diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index fcc969b898ad..8babf67271fd 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -54,8 +54,8 @@ BarChart::BarChart( const rtl::Reference<ChartType>& xChartTypeModel { if( m_xChartTypeModel.is() ) { - m_xChartTypeModel->getPropertyValue( "OverlapSequence" ) >>= m_aOverlapSequence; - m_xChartTypeModel->getPropertyValue( "GapwidthSequence" ) >>= m_aGapwidthSequence; + m_xChartTypeModel->getPropertyValue( u"OverlapSequence"_ustr ) >>= m_aOverlapSequence; + m_xChartTypeModel->getPropertyValue( u"GapwidthSequence"_ustr ) >>= m_aGapwidthSequence; } } catch( const uno::Exception& ) @@ -303,7 +303,7 @@ rtl::Reference< SvxShape > BarChart::createDataPoint3D_Bar( if( xObjectProperties.is() ) { sal_Int16 nPercentDiagonal = 0; - xObjectProperties->getPropertyValue( "PercentDiagonal" ) >>= nPercentDiagonal; + xObjectProperties->getPropertyValue( u"PercentDiagonal"_ustr ) >>= nPercentDiagonal; if( nPercentDiagonal < 5 ) bRoundedEdges = false; } @@ -654,7 +654,7 @@ void BarChart::doXSlot( if(!pSeries) continue; - bool bHasFillColorMapping = pSeries->hasPropertyMapping("FillColor"); + bool bHasFillColorMapping = pSeries->hasPropertyMapping(u"FillColor"_ustr); bool bOnlyConnectionLinesForThisPoint = false; @@ -750,7 +750,7 @@ void BarChart::doXSlot( sal_Int32 nGeometry3D = DataPointGeometry3D::CUBOID; if(m_nDimension==3) try { - xDataPointProperties->getPropertyValue( "Geometry3D") >>= nGeometry3D; + xDataPointProperties->getPropertyValue( u"Geometry3D"_ustr) >>= nGeometry3D; } catch( const uno::Exception& ) { @@ -911,10 +911,10 @@ void BarChart::doXSlot( if(bHasFillColorMapping) { - double nPropVal = pSeries->getValueByProperty(nPointIndex, "FillColor"); + double nPropVal = pSeries->getValueByProperty(nPointIndex, u"FillColor"_ustr); if(!std::isnan(nPropVal)) { - xShape->setPropertyValue("FillColor", uno::Any(static_cast<sal_Int32>(nPropVal))); + xShape->setPropertyValue(u"FillColor"_ustr, uno::Any(static_cast<sal_Int32>(nPropVal))); } } //set name/classified ObjectID (CID) diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index d5bd2c3a16fc..fb7b3fe6f33d 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -202,8 +202,8 @@ void BubbleChart::createShapes() if(!pSeries) continue; - bool bHasFillColorMapping = pSeries->hasPropertyMapping("FillColor"); - bool bHasBorderColorMapping = pSeries->hasPropertyMapping("LineColor"); + bool bHasFillColorMapping = pSeries->hasPropertyMapping(u"FillColor"_ustr); + bool bHasBorderColorMapping = pSeries->hasPropertyMapping(u"LineColor"_ustr); rtl::Reference<SvxShapeGroupAnyD> xSeriesGroupShape_Shapes = getSeriesGroupShape(pSeries.get(), xSeriesTarget); @@ -276,22 +276,22 @@ void BubbleChart::createShapes() if(bHasFillColorMapping) { - double nPropVal = pSeries->getValueByProperty(nIndex, "FillColor"); + double nPropVal = pSeries->getValueByProperty(nIndex, u"FillColor"_ustr); if(!std::isnan(nPropVal)) { - xShape->SvxShape::setPropertyValue("FillColor", uno::Any(static_cast<sal_Int32>(nPropVal))); + xShape->SvxShape::setPropertyValue(u"FillColor"_ustr, uno::Any(static_cast<sal_Int32>(nPropVal))); } } if(bHasBorderColorMapping) { - double nPropVal = pSeries->getValueByProperty(nIndex, "LineColor"); + double nPropVal = pSeries->getValueByProperty(nIndex, u"LineColor"_ustr); if(!std::isnan(nPropVal)) { - xShape->SvxShape::setPropertyValue("LineColor", uno::Any(static_cast<sal_Int32>(nPropVal))); + xShape->SvxShape::setPropertyValue(u"LineColor"_ustr, uno::Any(static_cast<sal_Int32>(nPropVal))); } } - ::chart::ShapeFactory::setShapeName( xShape, "MarkHandles" ); + ::chart::ShapeFactory::setShapeName( xShape, u"MarkHandles"_ustr ); //create data point label if( pSeries->getDataPointLabelIfLabel(nIndex) ) diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 5f3a19582e12..d7e338017905 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -105,13 +105,13 @@ void CandleStickChart::createShapes() { if( m_xChartTypeModel.is() ) { - m_xChartTypeModel->getPropertyValue( "ShowFirst" ) >>= bShowFirst; + m_xChartTypeModel->getPropertyValue( u"ShowFirst"_ustr ) >>= bShowFirst; uno::Reference< beans::XPropertySet > xWhiteDayProps; uno::Reference< beans::XPropertySet > xBlackDayProps; - m_xChartTypeModel->getPropertyValue( "Japanese" ) >>= bJapaneseStyle; - m_xChartTypeModel->getPropertyValue( "WhiteDay" ) >>= xWhiteDayProps; - m_xChartTypeModel->getPropertyValue( "BlackDay" ) >>= xBlackDayProps; + m_xChartTypeModel->getPropertyValue( u"Japanese"_ustr ) >>= bJapaneseStyle; + m_xChartTypeModel->getPropertyValue( u"WhiteDay"_ustr ) >>= xWhiteDayProps; + m_xChartTypeModel->getPropertyValue( u"BlackDay"_ustr ) >>= xBlackDayProps; tPropertyNameValueMap aWhiteBox_Map; PropertyMapper::getValueMap( aWhiteBox_Map, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xWhiteDayProps ); diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index 5b8f1db34be5..b0e5a4a26c5c 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -158,7 +158,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); //because of this name this line will be used for marking - ::chart::ShapeFactory::setShapeName(xShape, "MarkHandles"); + ::chart::ShapeFactory::setShapeName(xShape, u"MarkHandles"_ustr); } return true; } @@ -229,7 +229,7 @@ bool NetChart::impl_createArea( VDataSeries* pSeries , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); //because of this name this line will be used for marking - ::chart::ShapeFactory::setShapeName(xShape, "MarkHandles"); + ::chart::ShapeFactory::setShapeName(xShape, u"MarkHandles"_ustr); return true; } diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index ff8cf62f133a..d99e3d944af3 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -689,7 +689,7 @@ void PieChart::createTextLabelShape( if (aPieLabelInfo.xTextShape.is()) { sal_Int32 nColor = 0; - aPieLabelInfo.xTextShape->SvxShape::getPropertyValue("CharColor") >>= nColor; + aPieLabelInfo.xTextShape->SvxShape::getPropertyValue(u"CharColor"_ustr) >>= nColor; //automatic font color does not work for lines -> fallback to black if (nColor != -1) aVLineProperties.Color <<= nColor; @@ -740,7 +740,7 @@ double PieChart::getMaxOffset() return m_fMaxOffset; double fExplodePercentage=0.0; - xSeries->getPropertyValue( "Offset") >>= fExplodePercentage; + xSeries->getPropertyValue( u"Offset"_ustr) >>= fExplodePercentage; if(fExplodePercentage>m_fMaxOffset) m_fMaxOffset=fExplodePercentage; @@ -756,7 +756,7 @@ double PieChart::getMaxOffset() if(xPointProp.is()) { fExplodePercentage=0.0; - xPointProp->getPropertyValue( "Offset") >>= fExplodePercentage; + xPointProp->getPropertyValue( u"Offset"_ustr) >>= fExplodePercentage; if(fExplodePercentage>m_fMaxOffset) m_fMaxOffset=fExplodePercentage; } @@ -1108,7 +1108,7 @@ void PieChart::createOneRing( const PieDataSrcBase *pDataSrc, sal_Int32 n3DRelativeHeight) { - bool bHasFillColorMapping = pSeries->hasPropertyMapping("FillColor"); + bool bHasFillColorMapping = pSeries->hasPropertyMapping(u"FillColor"_ustr); sal_Int32 nRingPtCnt = pDataSrc->getNPoints(pSeries, eType); @@ -1193,7 +1193,7 @@ void PieChart::createOneRing( bool bDoExplode = ( nExplodeableSlot == static_cast< std::vector< VDataSeriesGroup >::size_type >(fSlotX) ); if(bDoExplode) try { - xPointProperties->getPropertyValue( "Offset") >>= aParam.mfExplodePercentage; + xPointProperties->getPropertyValue( u"Offset"_ustr) >>= aParam.mfExplodePercentage; } catch( const uno::Exception& ) { @@ -1224,17 +1224,17 @@ void PieChart::createOneRing( ///point color: if (!pSeries->hasPointOwnColor(nPropIdx) && m_xColorScheme.is()) { - xPointShape->setPropertyValue("FillColor", + xPointShape->setPropertyValue(u"FillColor"_ustr, uno::Any(m_xColorScheme->getColorByIndex( nPropIdx ))); } if(bHasFillColorMapping) { - double nPropVal = pSeries->getValueByProperty(nPropIdx, "FillColor"); + double nPropVal = pSeries->getValueByProperty(nPropIdx, u"FillColor"_ustr); if(!std::isnan(nPropVal)) { - xPointShape->setPropertyValue("FillColor", uno::Any(static_cast<sal_Int32>( nPropVal))); + xPointShape->setPropertyValue(u"FillColor"_ustr, uno::Any(static_cast<sal_Int32>( nPropVal))); } } @@ -1292,7 +1292,7 @@ void PieChart::createOneBar( const PieDataSrcBase *pDataSrc, sal_Int32 n3DRelativeHeight) { - bool bHasFillColorMapping = pSeries->hasPropertyMapping("FillColor"); + bool bHasFillColorMapping = pSeries->hasPropertyMapping(u"FillColor"_ustr); sal_Int32 nBarPtCnt = pDataSrc->getNPoints(pSeries, eType); @@ -1337,17 +1337,17 @@ void PieChart::createOneBar( ///point color: if (!pSeries->hasPointOwnColor(nPropIdx) && m_xColorScheme.is()) { - xPointShape->setPropertyValue("FillColor", + xPointShape->setPropertyValue(u"FillColor"_ustr, uno::Any(m_xColorScheme->getColorByIndex( nPropIdx ))); } if(bHasFillColorMapping) { - double nPropVal = pSeries->getValueByProperty(nPropIdx, "FillColor"); + double nPropVal = pSeries->getValueByProperty(nPropIdx, u"FillColor"_ustr); if(!std::isnan(nPropVal)) { - xPointShape->setPropertyValue("FillColor", uno::Any(static_cast<sal_Int32>( nPropVal))); + xPointShape->setPropertyValue(u"FillColor"_ustr, uno::Any(static_cast<sal_Int32>( nPropVal))); } } @@ -1763,7 +1763,7 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi if( labelInfo.xTextShape.is() ) { sal_Int32 nColor = 0; - labelInfo.xTextShape->SvxShape::getPropertyValue("CharColor") >>= nColor; + labelInfo.xTextShape->SvxShape::getPropertyValue(u"CharColor"_ustr) >>= nColor; if( nColor != -1 )//automatic font color does not work for lines -> fallback to black aVLineProperties.Color <<= nColor; } diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index b9773494d785..84491047696a 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -443,7 +443,7 @@ rtl::Reference<SvxShapeText> VSeriesPlotter::createDataLabel( const rtl::Referen { uno::Reference< beans::XPropertySet > xProps( rDataSeries.getPropertiesOfPoint( nPointIndex ) ); if( xProps.is() ) - xProps->getPropertyValue( "CharHeight") >>= fViewFontSize; + xProps->getPropertyValue( u"CharHeight"_ustr) >>= fViewFontSize; fViewFontSize = convertPointToMm100(fViewFontSize); } @@ -469,18 +469,18 @@ rtl::Reference<SvxShapeText> VSeriesPlotter::createDataLabel( const rtl::Referen //prepare text bool bTextWrap = false; - OUString aSeparator(" "); + OUString aSeparator(u" "_ustr); double fRotationDegrees = 0.0; try { uno::Reference< beans::XPropertySet > xPointProps( rDataSeries.getPropertiesOfPoint( nPointIndex ) ); if(xPointProps.is()) { - xPointProps->getPropertyValue( "TextWordWrap" ) >>= bTextWrap; - xPointProps->getPropertyValue( "LabelSeparator" ) >>= aSeparator; + xPointProps->getPropertyValue( u"TextWordWrap"_ustr ) >>= bTextWrap; + xPointProps->getPropertyValue( u"LabelSeparator"_ustr ) >>= aSeparator; // Extract the optional text rotation through the // "TextRotation" property attached to the passed data point. - xPointProps->getPropertyValue( "TextRotation" ) >>= fRotationDegrees; + xPointProps->getPropertyValue( u"TextRotation"_ustr ) >>= fRotationDegrees; } } catch( const uno::Exception& ) @@ -680,7 +680,7 @@ rtl::Reference<SvxShapeText> VSeriesPlotter::createDataLabel( const rtl::Referen // set maximum text width uno::Any aTextMaximumFrameWidth( nTextWidth ); - xTextShape->SvxShape::setPropertyValue( "TextMaximumFrameWidth", aTextMaximumFrameWidth ); + xTextShape->SvxShape::setPropertyValue( u"TextMaximumFrameWidth"_ustr, aTextMaximumFrameWidth ); // compute the total lines of text aTextSize = xTextShape->getSize(); @@ -692,7 +692,7 @@ rtl::Reference<SvxShapeText> VSeriesPlotter::createDataLabel( const rtl::Referen if( fRotationDegrees != 0.0 ) { const double fDegreesPi( -basegfx::deg2rad(fRotationDegrees) ); - xTextShape->SvxShape::setPropertyValue( "Transformation", ShapeFactory::makeTransformation( aScreenPosition2D, fDegreesPi ) ); + xTextShape->SvxShape::setPropertyValue( u"Transformation"_ustr, ShapeFactory::makeTransformation( aScreenPosition2D, fDegreesPi ) ); LabelPositionHelper::correctPositionForRotation( xTextShape, eAlignment, fRotationDegrees, true /*bRotateAroundCenter*/ ); } @@ -803,8 +803,8 @@ double lcl_getErrorBarLogicLength( { double fPercent = 0; if( xProp->getPropertyValue( bPositive - ? OUString("PositiveError") - : OUString("NegativeError") ) >>= fPercent ) + ? u"PositiveError"_ustr + : u"NegativeError"_ustr ) >>= fPercent ) { if( nIndex >=0 && nIndex < rData.getLength() && ! std::isnan( rData[nIndex] ) && @@ -817,16 +817,16 @@ double lcl_getErrorBarLogicLength( break; case css::chart::ErrorBarStyle::ABSOLUTE: xProp->getPropertyValue( bPositive - ? OUString("PositiveError") - : OUString("NegativeError") ) >>= fResult; + ? u"PositiveError"_ustr + : u"NegativeError"_ustr ) >>= fResult; break; case css::chart::ErrorBarStyle::ERROR_MARGIN: { // todo: check if this is really what's called error-margin double fPercent = 0; if( xProp->getPropertyValue( bPositive - ? OUString("PositiveError") - : OUString("NegativeError") ) >>= fPercent ) + ? u"PositiveError"_ustr + : u"NegativeError"_ustr ) >>= fPercent ) { double fMaxValue = -std::numeric_limits<double>::infinity(); for(double d : rData) @@ -958,9 +958,9 @@ void VSeriesPlotter::createErrorBar( bool bShowNegative = false; sal_Int32 nErrorBarStyle = css::chart::ErrorBarStyle::VARIANCE; - xErrorBarProperties->getPropertyValue( "ShowPositiveError") >>= bShowPositive; - xErrorBarProperties->getPropertyValue( "ShowNegativeError") >>= bShowNegative; - xErrorBarProperties->getPropertyValue( "ErrorBarStyle") >>= nErrorBarStyle; + xErrorBarProperties->getPropertyValue( u"ShowPositiveError"_ustr) >>= bShowPositive; + xErrorBarProperties->getPropertyValue( u"ShowNegativeError"_ustr) >>= bShowNegative; + xErrorBarProperties->getPropertyValue( u"ErrorBarStyle"_ustr) >>= nErrorBarStyle; if(!bShowPositive && !bShowNegative) return; @@ -1153,15 +1153,15 @@ void VSeriesPlotter::createErrorRectangle( if ( bUseXErrorData ) { - xErrorBorderPropX->getPropertyValue( "ErrorBarStyle" ) >>= nErrorBorderStyleX; - xErrorBorderPropX->getPropertyValue( "ShowPositiveError") >>= bShowXPositive; - xErrorBorderPropX->getPropertyValue( "ShowNegativeError") >>= bShowXNegative; + xErrorBorderPropX->getPropertyValue( u"ErrorBarStyle"_ustr ) >>= nErrorBorderStyleX; + xErrorBorderPropX->getPropertyValue( u"ShowPositiveError"_ustr) >>= bShowXPositive; + xErrorBorderPropX->getPropertyValue( u"ShowNegativeError"_ustr) >>= bShowXNegative; } if ( bUseYErrorData ) { - xErrorBorderPropY->getPropertyValue( "ErrorBarStyle" ) >>= nErrorBorderStyleY; - xErrorBorderPropY->getPropertyValue( "ShowPositiveError") >>= bShowYPositive; - xErrorBorderPropY->getPropertyValue( "ShowNegativeError") >>= bShowYNegative; + xErrorBorderPropY->getPropertyValue( u"ErrorBarStyle"_ustr ) >>= nErrorBorderStyleY; + xErrorBorderPropY->getPropertyValue( u"ShowPositiveError"_ustr) >>= bShowYPositive; + xErrorBorderPropY->getPropertyValue( u"ShowNegativeError"_ustr) >>= bShowYNegative; } if ( bUseXErrorData && nErrorBorderStyleX == css::chart::ErrorBarStyle::NONE ) @@ -1330,14 +1330,14 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries const & rVDataSer if ( !bAverageLine ) { - rCurve->getPropertyValue( "PolynomialDegree") >>= aDegree; - rCurve->getPropertyValue( "MovingAveragePeriod") >>= aPeriod; - rCurve->getPropertyValue( "MovingAverageType") >>= aMovingAverageType; - rCurve->getPropertyValue( "ExtrapolateForward") >>= aExtrapolateForward; - rCurve->getPropertyValue( "ExtrapolateBackward") >>= aExtrapolateBackward; - rCurve->getPropertyValue( "ForceIntercept") >>= bForceIntercept; + rCurve->getPropertyValue( u"PolynomialDegree"_ustr) >>= aDegree; + rCurve->getPropertyValue( u"MovingAveragePeriod"_ustr) >>= aPeriod; + rCurve->getPropertyValue( u"MovingAverageType"_ustr) >>= aMovingAverageType; + rCurve->getPropertyValue( u"ExtrapolateForward"_ustr) >>= aExtrapolateForward; + rCurve->getPropertyValue( u"ExtrapolateBackward"_ustr) >>= aExtrapolateBackward; + rCurve->getPropertyValue( u"ForceIntercept"_ustr) >>= bForceIntercept; if (bForceIntercept) - rCurve->getPropertyValue( "InterceptValue") >>= aInterceptValue; + rCurve->getPropertyValue( u"InterceptValue"_ustr) >>= aInterceptValue; } double fChartMinX = m_pPosHelper->getLogicMinX(); @@ -1436,7 +1436,7 @@ void VSeriesPlotter::createRegressionCurvesShapes( VDataSeries const & rVDataSer createGroupShape( xTarget, rVDataSeries.getDataCurveCID( nN, bAverageLine ) ); rtl::Reference<SvxShapePolyPolygon> xShape = ShapeFactory::createLine2D( xRegressionGroupShapes, PolyToPointSequence( aRegressionPoly ), &aVLineProperties ); - ShapeFactory::setShapeName( xShape, "MarkHandles" ); + ShapeFactory::setShapeName( xShape, u"MarkHandles"_ustr ); aDefaultPos = xShape->getPosition(); } @@ -1484,8 +1484,8 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( bool bShowEquation = false; bool bShowCorrCoeff = false; - if(!(( xEquationProperties->getPropertyValue( "ShowEquation") >>= bShowEquation ) && - ( xEquationProperties->getPropertyValue( "ShowCorrelationCoefficient") >>= bShowCorrCoeff ))) + if(!(( xEquationProperties->getPropertyValue( u"ShowEquation"_ustr) >>= bShowEquation ) && + ( xEquationProperties->getPropertyValue( u"ShowCorrelationCoefficient"_ustr) >>= bShowCorrCoeff ))) return; if( ! (bShowEquation || bShowCorrCoeff)) @@ -1500,10 +1500,10 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( if ( bShowEquation ) { OUString aXName, aYName; - if ( !(xEquationProperties->getPropertyValue( "XName" ) >>= aXName) ) - aXName = OUString( "x" ); - if ( !(xEquationProperties->getPropertyValue( "YName" ) >>= aYName) ) - aYName = OUString( "f(x)" ); + if ( !(xEquationProperties->getPropertyValue( u"XName"_ustr ) >>= aXName) ) + aXName = u"x"_ustr; + if ( !(xEquationProperties->getPropertyValue( u"YName"_ustr ) >>= aYName) ) + aYName = u"f(x)"_ustr; xRegressionCurveCalculator->setXYNames( aXName, aYName ); } @@ -1555,7 +1555,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( awt::Point aScreenPosition2D; chart2::RelativePosition aRelativePosition; - if( xEquationProperties->getPropertyValue( "RelativePosition") >>= aRelativePosition ) + if( xEquationProperties->getPropertyValue( u"RelativePosition"_ustr) >>= aRelativePosition ) { //@todo decide whether x is primary or secondary double fX = aRelativePosition.Primary*m_aPageReferenceSize.Width; @@ -2466,7 +2466,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries( try { - xCooSys->getPropertyValue( "SwapXAndYAxis" ) >>= bSwapXAndY; + xCooSys->getPropertyValue( u"SwapXAndYAxis"_ustr ) >>= bSwapXAndY; } catch( const uno::Exception& ) { @@ -2581,7 +2581,7 @@ bool lcl_HasVisibleLine( const uno::Reference< beans::XPropertySet >& xProps, bo bool bHasVisibleLine = false; rbHasDashedLine = false; drawing::LineStyle aLineStyle = drawing::LineStyle_NONE; - if( xProps.is() && ( xProps->getPropertyValue( "LineStyle") >>= aLineStyle ) ) + if( xProps.is() && ( xProps->getPropertyValue( u"LineStyle"_ustr) >>= aLineStyle ) ) { if( aLineStyle != drawing::LineStyle_NONE ) bHasVisibleLine = true; @@ -2732,7 +2732,7 @@ rtl::Reference< SvxShapeGroup > VSeriesPlotter::createLegendSymbolForPoint( OSL_ASSERT( xPointSet.is()); xPointSet->setPropertyValue( - "Color", uno::Any( m_xColorScheme->getColorByIndex( nPointIndex ))); + u"Color"_ustr, uno::Any( m_xColorScheme->getColorByIndex( nPointIndex ))); } } @@ -2851,7 +2851,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries( } // label - aLabelText = rSeries.getModel()->getLabelForRole( m_xChartTypeModel.is() ? m_xChartTypeModel->getRoleOfSequenceForSeriesLabel() : "values-y"); + aLabelText = rSeries.getModel()->getLabelForRole( m_xChartTypeModel.is() ? m_xChartTypeModel->getRoleOfSequenceForSeriesLabel() : u"values-y"_ustr); aEntry.xLabel = FormattedStringHelper::createFormattedString( aLabelText, xTextProperties ); aResult.push_back(aEntry); diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index ff660a485d04..4a4ec0428dbc 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -59,7 +59,7 @@ VDiagram::VDiagram( m_xDiagram->getChartTypeByIndex( 0 ) ) ) { if(xDiagram.is()) - xDiagram->getPropertyValue("RightAngledAxes") >>= m_bRightAngledAxes; + xDiagram->getPropertyValue(u"RightAngledAxes"_ustr) >>= m_bRightAngledAxes; if( m_bRightAngledAxes ) { ThreeDHelper::adaptRadAnglesForRightAngledAxes( m_fXAnglePi, m_fYAnglePi ); @@ -138,10 +138,10 @@ void VDiagram::createShapes_2d() rtl::Reference<SvxShapeGroupAnyD> xOuterGroup_Shapes = ShapeFactory::createGroup2D(m_xTarget); m_xOuterGroupShape = xOuterGroup_Shapes; - rtl::Reference<SvxShapeGroupAnyD> xGroupForWall( ShapeFactory::createGroup2D(xOuterGroup_Shapes,"PlotAreaExcludingAxes") ); + rtl::Reference<SvxShapeGroupAnyD> xGroupForWall( ShapeFactory::createGroup2D(xOuterGroup_Shapes,u"PlotAreaExcludingAxes"_ustr) ); //create independent group shape as container for datapoints and such things - m_xCoordinateRegionShape = ShapeFactory::createGroup2D(xOuterGroup_Shapes,"testonly;CooContainer=XXX_CID"); + m_xCoordinateRegionShape = ShapeFactory::createGroup2D(xOuterGroup_Shapes,u"testonly;CooContainer=XXX_CID"_ustr); bool bAddFloorAndWall = m_xDiagram->isSupportingFloorAndWall(); @@ -432,7 +432,7 @@ void VDiagram::createShapes_3d() return; //create shape - rtl::Reference<Svx3DSceneObject> xShapes = ShapeFactory::createGroup3D( m_xTarget, "PlotAreaExcludingAxes" ); + rtl::Reference<Svx3DSceneObject> xShapes = ShapeFactory::createGroup3D( m_xTarget, u"PlotAreaExcludingAxes"_ustr ); m_xOuterGroupShape = xShapes; rtl::Reference<SvxShapeGroupAnyD> xOuterGroup_Shapes = m_xOuterGroupShape; @@ -598,7 +598,7 @@ void VDiagram::createShapes_3d() //create an additional scene for the smaller inner coordinate region: { - rtl::Reference<Svx3DSceneObject> xShapes2 = ShapeFactory::createGroup3D( xOuterGroup_Shapes,"testonly;CooContainer=XXX_CID" ); + rtl::Reference<Svx3DSceneObject> xShapes2 = ShapeFactory::createGroup3D( xOuterGroup_Shapes,u"testonly;CooContainer=XXX_CID"_ustr ); m_xCoordinateRegionShape = xShapes2; try diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index e28bb97f81db..1a46a041fb17 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -59,7 +59,7 @@ static ItemInfoPackage& getItemInfoPackageChart() { SCHATTR_DATADESCR_SHOW_CATEGORY, new SfxBoolItem(SCHATTR_DATADESCR_SHOW_CATEGORY), 0, SFX_ITEMINFOFLAG_NONE }, { SCHATTR_DATADESCR_SHOW_SYMBOL, new SfxBoolItem(SCHATTR_DATADESCR_SHOW_SYMBOL), 0, SFX_ITEMINFOFLAG_NONE }, { SCHATTR_DATADESCR_WRAP_TEXT, new SfxBoolItem(SCHATTR_DATADESCR_WRAP_TEXT), 0, SFX_ITEMINFOFLAG_NONE }, - { SCHATTR_DATADESCR_SEPARATOR, new SfxStringItem(SCHATTR_DATADESCR_SEPARATOR," "), 0, SFX_ITEMINFOFLAG_NONE }, + { SCHATTR_DATADESCR_SEPARATOR, new SfxStringItem(SCHATTR_DATADESCR_SEPARATOR,u" "_ustr), 0, SFX_ITEMINFOFLAG_NONE }, { SCHATTR_DATADESCR_PLACEMENT, new SfxInt32Item(SCHATTR_DATADESCR_PLACEMENT,0), 0, SFX_ITEMINFOFLAG_NONE }, { SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, std::vector < sal_Int32 >() ), 0, SFX_ITEMINFOFLAG_NONE }, { SCHATTR_DATADESCR_NO_PERCENTVALUE, new SfxBoolItem(SCHATTR_DATADESCR_NO_PERCENTVALUE), 0, SFX_ITEMINFOFLAG_NONE }, @@ -172,8 +172,8 @@ static ItemInfoPackage& getItemInfoPackageChart() { SCHATTR_REGRESSION_SET_INTERCEPT, new SfxBoolItem(SCHATTR_REGRESSION_SET_INTERCEPT, false), 0, SFX_ITEMINFOFLAG_NONE }, { SCHATTR_REGRESSION_INTERCEPT_VALUE, new SvxDoubleItem(0.0, SCHATTR_REGRESSION_INTERCEPT_VALUE), 0, SFX_ITEMINFOFLAG_NONE }, { SCHATTR_REGRESSION_CURVE_NAME, new SfxStringItem(SCHATTR_REGRESSION_CURVE_NAME, OUString()), 0, SFX_ITEMINFOFLAG_NONE }, - { SCHATTR_REGRESSION_XNAME, new SfxStringItem(SCHATTR_REGRESSION_XNAME, "x"), 0, SFX_ITEMINFOFLAG_NONE }, - { SCHATTR_REGRESSION_YNAME, new SfxStringItem(SCHATTR_REGRESSION_YNAME, "f(x)"), 0, SFX_ITEMINFOFLAG_NONE }, + { SCHATTR_REGRESSION_XNAME, new SfxStringItem(SCHATTR_REGRESSION_XNAME, u"x"_ustr), 0, SFX_ITEMINFOFLAG_NONE }, + { SCHATTR_REGRESSION_YNAME, new SfxStringItem(SCHATTR_REGRESSION_YNAME, u"f(x)"_ustr), 0, SFX_ITEMINFOFLAG_NONE }, { SCHATTR_REGRESSION_MOVING_TYPE, new SfxInt32Item(SCHATTR_REGRESSION_MOVING_TYPE, css::chart2::MovingAverageType::Prior), 0, SFX_ITEMINFOFLAG_NONE }, { SCHATTR_DATA_TABLE_HORIZONTAL_BORDER, new SfxBoolItem(SCHATTR_DATA_TABLE_HORIZONTAL_BORDER, false), 0, SFX_ITEMINFOFLAG_NONE }, @@ -196,7 +196,7 @@ static ItemInfoPackage& getItemInfoPackageChart() } ChartItemPool::ChartItemPool() -: SfxItemPool("ChartItemPool") +: SfxItemPool(u"ChartItemPool"_ustr) { registerItemInfoPackage(getItemInfoPackageChart()); } diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index dc09a83f810a..5d2c2bf6cc90 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -240,21 +240,21 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre uno::Reference< drawing::XGraphicExportFilter > xExporter = drawing::GraphicExportFilter::create( m_xCC ); uno::Sequence< beans::PropertyValue > aFilterData{ - comphelper::makePropertyValue("ExportOnlyBackground", false), - comphelper::makePropertyValue("HighContrast", bUseHighContrast), - comphelper::makePropertyValue("Version", sal_Int32(SOFFICE_FILEFORMAT_50)), - comphelper::makePropertyValue("CurrentPage", uno::Reference< uno::XInterface >( static_cast<cppu::OWeakObject*>(m_xDrawPage.get()), uno::UNO_QUERY )), + comphelper::makePropertyValue(u"ExportOnlyBackground"_ustr, false), + comphelper::makePropertyValue(u"HighContrast"_ustr, bUseHighContrast), + comphelper::makePropertyValue(u"Version"_ustr, sal_Int32(SOFFICE_FILEFORMAT_50)), + comphelper::makePropertyValue(u"CurrentPage"_ustr, uno::Reference< uno::XInterface >( static_cast<cppu::OWeakObject*>(m_xDrawPage.get()), uno::UNO_QUERY )), //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100% - comphelper::makePropertyValue("ScaleXNumerator", m_nScaleXNumerator), - comphelper::makePropertyValue("ScaleXDenominator", m_nScaleXDenominator), - comphelper::makePropertyValue("ScaleYNumerator", m_nScaleYNumerator), - comphelper::makePropertyValue("ScaleYDenominator", m_nScaleYDenominator) + comphelper::makePropertyValue(u"ScaleXNumerator"_ustr, m_nScaleXNumerator), + comphelper::makePropertyValue(u"ScaleXDenominator"_ustr, m_nScaleXDenominator), + comphelper::makePropertyValue(u"ScaleYNumerator"_ustr, m_nScaleYNumerator), + comphelper::makePropertyValue(u"ScaleYDenominator"_ustr, m_nScaleYDenominator) }; uno::Sequence< beans::PropertyValue > aProps{ - comphelper::makePropertyValue("FilterName", OUString("SVM")), - comphelper::makePropertyValue("OutputStream", xOutStream), - comphelper::makePropertyValue("FilterData", aFilterData) + comphelper::makePropertyValue(u"FilterName"_ustr, u"SVM"_ustr), + comphelper::makePropertyValue(u"OutputStream"_ustr, xOutStream), + comphelper::makePropertyValue(u"FilterData"_ustr, aFilterData) }; xExporter->setSourceDocument( m_xDrawPage ); @@ -295,8 +295,8 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla { return { - { lcl_aGDIMetaFileMIMEType, "GDIMetaFile", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() }, - { lcl_aGDIMetaFileMIMETypeHighContrast, "GDIMetaFile", cppu::UnoType<uno::Sequence< sal_Int8 >>::get() } + { lcl_aGDIMetaFileMIMEType, u"GDIMetaFile"_ustr, cppu::UnoType<uno::Sequence< sal_Int8 >>::get() }, + { lcl_aGDIMetaFileMIMETypeHighContrast, u"GDIMetaFile"_ustr, cppu::UnoType<uno::Sequence< sal_Int8 >>::get() } }; } sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) @@ -361,20 +361,20 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw uno::Reference< container::XNameAccess > xStylesFamilies( xStyleFamiliesSupplier->getStyleFamilies() ); if( xStylesFamilies.is() ) { - if( !xStylesFamilies->hasByName( "PageStyles" ) ) + if( !xStylesFamilies->hasByName( u"PageStyles"_ustr ) ) { //draw/impress is parent document uno::Reference< lang::XMultiServiceFactory > xFatcory( xParentProps, uno::UNO_QUERY ); if( xFatcory.is() ) { - uno::Reference< beans::XPropertySet > xDrawDefaults( xFatcory->createInstance( "com.sun.star.drawing.Defaults" ), uno::UNO_QUERY ); + uno::Reference< beans::XPropertySet > xDrawDefaults( xFatcory->createInstance( u"com.sun.star.drawing.Defaults"_ustr ), uno::UNO_QUERY ); if( xDrawDefaults.is() ) - xDrawDefaults->getPropertyValue( "WritingMode" ) >>= nWritingMode; + xDrawDefaults->getPropertyValue( u"WritingMode"_ustr ) >>= nWritingMode; } } else { - uno::Reference< container::XNameAccess > xPageStyles( xStylesFamilies->getByName( "PageStyles" ), uno::UNO_QUERY ); + uno::Reference< container::XNameAccess > xPageStyles( xStylesFamilies->getByName( u"PageStyles"_ustr ), uno::UNO_QUERY ); if( xPageStyles.is() ) { OUString aPageStyle; @@ -401,7 +401,7 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw { static OUString aChartCLSID = SvGlobalName( SO3_SCH_CLASSID ).GetHexName(); OUString aCLSID; - xEmbeddedProps->getPropertyValue( "CLSID" ) >>= aCLSID; + xEmbeddedProps->getPropertyValue( u"CLSID"_ustr ) >>= aCLSID; if( aCLSID == aChartCLSID ) { uno::Reference< text::XTextContent > xEmbeddedObject( xEmbeddedProps, uno::UNO_QUERY ); @@ -413,14 +413,14 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw uno::Reference< beans::XPropertySet > xAnchorProps( xAnchor, uno::UNO_QUERY ); if( xAnchorProps.is() ) { - xAnchorProps->getPropertyValue( "WritingMode" ) >>= nWritingMode; + xAnchorProps->getPropertyValue( u"WritingMode"_ustr ) >>= nWritingMode; } uno::Reference< text::XText > xText( xAnchor->getText() ); if( xText.is() ) { uno::Reference< beans::XPropertySet > xTextCursorProps( xText->createTextCursor(), uno::UNO_QUERY ); if( xTextCursorProps.is() ) - xTextCursorProps->getPropertyValue( "PageStyleName" ) >>= aPageStyle; + xTextCursorProps->getPropertyValue( u"PageStyleName"_ustr ) >>= aPageStyle; } } } @@ -437,7 +437,7 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw { uno::Reference< beans::XPropertySet > xTextCursorProps( xText->createTextCursor(), uno::UNO_QUERY ); if( xTextCursorProps.is() ) - xTextCursorProps->getPropertyValue( "PageStyleName" ) >>= aPageStyle; + xTextCursorProps->getPropertyValue( u"PageStyleName"_ustr ) >>= aPageStyle; } } if(aPageStyle.isEmpty()) @@ -447,9 +447,9 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw { //Calc is parent document Reference< com::sun::star::beans::XPropertySetInfo > xInfo = xParentProps->getPropertySetInfo(); - if (xInfo->hasPropertyByName("PageStyle")) + if (xInfo->hasPropertyByName(u"PageStyle"_ustr)) { - xParentProps->getPropertyValue( "PageStyle" ) >>= aPageStyle; + xParentProps->getPropertyValue( u"PageStyle"_ustr ) >>= aPageStyle; } if(aPageStyle.isEmpty()) aPageStyle = "Default"; @@ -458,10 +458,10 @@ void lcl_setDefaultWritingMode( const std::shared_ptr< DrawModelWrapper >& pDraw { uno::Reference< beans::XPropertySet > xPageStyle( xPageStyles->getByName( aPageStyle ), uno::UNO_QUERY ); Reference< com::sun::star::beans::XPropertySetInfo > xInfo = xPageStyle->getPropertySetInfo(); - if (xInfo->hasPropertyByName("WritingMode")) + if (xInfo->hasPropertyByName(u"WritingMode"_ustr)) { if( xPageStyle.is() ) - xPageStyle->getPropertyValue( "WritingMode" ) >>= nWritingMode; + xPageStyle->getPropertyValue( u"WritingMode"_ustr ) >>= nWritingMode; } } } @@ -740,7 +740,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D if(bSnapRectToUsedArea) { if (rParam.mbUseFixedInnerSize) - m_aResultingDiagramRectangleExcludingAxes = getRectangleOfObject( "PlotAreaExcludingAxes" ); + m_aResultingDiagramRectangleExcludingAxes = getRectangleOfObject( u"PlotAreaExcludingAxes"_ustr ); else { ::basegfx::B2IRectangle aConsumedInnerRect = aVDiagram.getCurrentRectangle(); @@ -764,7 +764,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D awt::Size aSize(rParam.maRemainingSpace.Width, rParam.maRemainingSpace.Height); bool bPosSizeExcludeAxesProperty = true; - xDiagram->getPropertyValue("PosSizeExcludeAxes") >>= bPosSizeExcludeAxesProperty; + xDiagram->getPropertyValue(u"PosSizeExcludeAxes"_ustr) >>= bPosSizeExcludeAxesProperty; if (rParam.mbUseFixedInnerSize || bPosSizeExcludeAxesProperty) { aPos = awt::Point( m_aResultingDiagramRectangleExcludingAxes.X, m_aResultingDiagramRectangleExcludingAxes.Y ); @@ -877,7 +877,7 @@ awt::Rectangle ChartView::getRectangleOfObject( const OUString& rObjectCID, bool SdrObjList* pRootList = pRootSdrObject->GetSubList(); if( pRootList ) { - OUString aShapeName = "MarkHandles"; + OUString aShapeName = u"MarkHandles"_ustr; if( eObjectType == OBJECTTYPE_DIAGRAM ) aShapeName = "PlotAreaIncludingAxes"; SdrObject* pShape = DrawModelWrapper::getNamedSdrObject( aShapeName, pRootList ); @@ -946,11 +946,11 @@ bool getAvailablePosAndSizeForDiagram( bool bPosSizeExcludeAxes = false; if( xProp.is() ) - xProp->getPropertyValue( "PosSizeExcludeAxes" ) >>= bPosSizeExcludeAxes; + xProp->getPropertyValue( u"PosSizeExcludeAxes"_ustr ) >>= bPosSizeExcludeAxes; //size: css::chart2::RelativeSize aRelativeSize; - if( xProp.is() && (xProp->getPropertyValue( "RelativeSize" )>>=aRelativeSize) ) + if( xProp.is() && (xProp->getPropertyValue( u"RelativeSize"_ustr )>>=aRelativeSize) ) { rParam.maRemainingSpace.Height = static_cast<sal_Int32>(aRelativeSize.Secondary*rPageSize.Height); rParam.maRemainingSpace.Width = static_cast<sal_Int32>(aRelativeSize.Primary*rPageSize.Width); @@ -962,7 +962,7 @@ bool getAvailablePosAndSizeForDiagram( //position: chart2::RelativePosition aRelativePosition; - if( xProp.is() && (xProp->getPropertyValue( "RelativePosition" )>>=aRelativePosition) ) + if( xProp.is() && (xProp->getPropertyValue( u"RelativePosition"_ustr )>>=aRelativePosition) ) { //@todo decide whether x is primary or secondary @@ -1107,7 +1107,7 @@ std::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType rbAutoPosition = true; awt::Point aNewPosition(0,0); chart2::RelativePosition aRelativePosition; - if (xTitle.is() && (xTitle->getPropertyValue("RelativePosition") >>= aRelativePosition)) + if (xTitle.is() && (xTitle->getPropertyValue(u"RelativePosition"_ustr) >>= aRelativePosition)) { rbAutoPosition = false; @@ -1336,11 +1336,11 @@ void ChartView::impl_refreshAddIn() try { uno::Reference< util::XRefreshable > xAddIn; - xProp->getPropertyValue( "AddIn" ) >>= xAddIn; + xProp->getPropertyValue( u"AddIn"_ustr ) >>= xAddIn; if( xAddIn.is() ) { bool bRefreshAddInAllowed = true; - xProp->getPropertyValue( "RefreshAddInAllowed" ) >>= bRefreshAddInAllowed; + xProp->getPropertyValue( u"RefreshAddInAllowed"_ustr ) >>= bRefreshAddInAllowed; if( bRefreshAddInAllowed ) xAddIn->refresh(); } @@ -1462,7 +1462,7 @@ void ChartView::impl_updateView( bool bCheckLockedCtrler ) //m_bRefreshAddIn = false; try { - impl_notifyModeChangeListener("invalid"); + impl_notifyModeChangeListener(u"invalid"_ustr); //prepare draw model { @@ -1508,7 +1508,7 @@ void ChartView::impl_updateView( bool bCheckLockedCtrler ) m_pDrawModelWrapper->unlockControllers(); } - impl_notifyModeChangeListener("valid"); + impl_notifyModeChangeListener(u"valid"_ustr); //m_bRefreshAddIn = bOldRefreshAddIn; } @@ -1520,7 +1520,7 @@ void SAL_CALL ChartView::modified( const lang::EventObject& /* aEvent */ ) if( m_bInViewUpdate ) m_bViewUpdatePending = true; - impl_notifyModeChangeListener("dirty"); + impl_notifyModeChangeListener(u"dirty"_ustr); } //SfxListener @@ -1661,7 +1661,7 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName { awt::Size aNewResolution; if( ! (rValue >>= aNewResolution) ) - throw lang::IllegalArgumentException( "Property 'Resolution' requires value of type awt::Size", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property 'Resolution' requires value of type awt::Size"_ustr, nullptr, 0 ); if( m_aPageResolution.Width!=aNewResolution.Width || m_aPageResolution.Height!=aNewResolution.Height ) { @@ -1679,7 +1679,7 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100% uno::Sequence< beans::PropertyValue > aZoomFactors; if( ! (rValue >>= aZoomFactors) ) - throw lang::IllegalArgumentException( "Property 'ZoomFactors' requires value of type Sequence< PropertyValue >", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property 'ZoomFactors' requires value of type Sequence< PropertyValue >"_ustr, nullptr, 0 ); for (auto& propval : aZoomFactors) { @@ -1697,7 +1697,7 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName { //#i77362 change notification for changes on additional shapes are missing if( ! (rValue >>= m_bSdrViewIsInEditMode) ) - throw lang::IllegalArgumentException( "Property 'SdrViewIsInEditMode' requires value of type sal_Bool", nullptr, 0 ); + throw lang::IllegalArgumentException( u"Property 'SdrViewIsInEditMode' requires value of type sal_Bool"_ustr, nullptr, 0 ); } else throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard " + rPropertyName, nullptr ); @@ -1802,12 +1802,12 @@ Reference< uno::XInterface > ChartView::createInstanceWithArguments( const OUStr uno::Sequence< OUString > ChartView::getAvailableServiceNames() { - uno::Sequence< OUString > aServiceNames{ "com.sun.star.drawing.DashTable", - "com.sun.star.drawing.GradientTable", - "com.sun.star.drawing.HatchTable", - "com.sun.star.drawing.BitmapTable", - "com.sun.star.drawing.TransparencyGradientTable", - "com.sun.star.drawing.MarkerTable" }; + uno::Sequence< OUString > aServiceNames{ u"com.sun.star.drawing.DashTable"_ustr, + u"com.sun.star.drawing.GradientTable"_ustr, + u"com.sun.star.drawing.HatchTable"_ustr, + u"com.sun.star.drawing.BitmapTable"_ustr, + u"com.sun.star.drawing.TransparencyGradientTable"_ustr, + u"com.sun.star.drawing.MarkerTable"_ustr }; return aServiceNames; } @@ -1890,7 +1890,7 @@ void ChartView::createShapes2D( const awt::Size& rPageSize ) //create the group shape for diagram and axes first to have title and legends on top of it rtl::Reference< Diagram > xDiagram( mrChartModel.getFirstChartDiagram() ); bool bHasRelativeSize = false; - if( xDiagram.is() && xDiagram->getPropertyValue("RelativeSize").hasValue() ) + if( xDiagram.is() && xDiagram->getPropertyValue(u"RelativeSize"_ustr).hasValue() ) bHasRelativeSize = true; OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::number( 0 ) ) );//todo: other index if more than one diagram is possible @@ -1899,11 +1899,11 @@ void ChartView::createShapes2D( const awt::Size& rPageSize ) aParam.mxMarkHandles = ShapeFactory::createInvisibleRectangle( xDiagramPlusAxesPlusMarkHandlesGroup_Shapes, awt::Size(0,0)); - ShapeFactory::setShapeName(aParam.mxMarkHandles, "MarkHandles"); + ShapeFactory::setShapeName(aParam.mxMarkHandles, u"MarkHandles"_ustr); aParam.mxPlotAreaWithAxes = ShapeFactory::createInvisibleRectangle( xDiagramPlusAxesPlusMarkHandlesGroup_Shapes, awt::Size(0, 0)); - ShapeFactory::setShapeName(aParam.mxPlotAreaWithAxes, "PlotAreaIncludingAxes"); + ShapeFactory::setShapeName(aParam.mxPlotAreaWithAxes, u"PlotAreaIncludingAxes"_ustr); aParam.mxDiagramWithAxesShapes = ShapeFactory::createGroup2D(xDiagramPlusAxesPlusMarkHandlesGroup_Shapes); diff --git a/chart2/source/view/main/DataTableView.cxx b/chart2/source/view/main/DataTableView.cxx index eacd91a6a651..147643d0c2d3 100644 --- a/chart2/source/view/main/DataTableView.cxx +++ b/chart2/source/view/main/DataTableView.cxx @@ -42,16 +42,17 @@ namespace { void setTopCell(uno::Reference<beans::XPropertySet>& xPropertySet) { - xPropertySet->setPropertyValue("FillColor", uno::Any(Color(0xFFFFFF))); - xPropertySet->setPropertyValue("TextVerticalAdjust", uno::Any(drawing::TextVerticalAdjust_TOP)); - xPropertySet->setPropertyValue("ParaAdjust", uno::Any(style::ParagraphAdjust_CENTER)); + xPropertySet->setPropertyValue(u"FillColor"_ustr, uno::Any(Color(0xFFFFFF))); + xPropertySet->setPropertyValue(u"TextVerticalAdjust"_ustr, + uno::Any(drawing::TextVerticalAdjust_TOP)); + xPropertySet->setPropertyValue(u"ParaAdjust"_ustr, uno::Any(style::ParagraphAdjust_CENTER)); table::BorderLine2 aBorderLine; aBorderLine.LineWidth = 0; aBorderLine.Color = 0x000000; - xPropertySet->setPropertyValue("TopBorder", uno::Any(aBorderLine)); - xPropertySet->setPropertyValue("LeftBorder", uno::Any(aBorderLine)); + xPropertySet->setPropertyValue(u"TopBorder"_ustr, uno::Any(aBorderLine)); + xPropertySet->setPropertyValue(u"LeftBorder"_ustr, uno::Any(aBorderLine)); } void copyProperty(uno::Reference<beans::XPropertySet>& xOut, @@ -103,77 +104,78 @@ void DataTableView::setCellCharAndParagraphProperties( { uno::Reference<beans::XPropertySet> xDataTableProperties(m_xDataTableModel); - copyProperty(xPropertySet, xDataTableProperties, "CharColor"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontFamily"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontFamilyAsian"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontFamilyComplex"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontCharSet"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontCharSetAsian"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontCharSetComplex"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontName"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontNameAsian"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontNameComplex"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontPitch"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontPitchAsian"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontPitchComplex"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontStyleName"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontStyleNameAsian"); - copyProperty(xPropertySet, xDataTableProperties, "CharFontStyleNameComplex"); - - copyProperty(xPropertySet, xDataTableProperties, "CharHeight"); - copyProperty(xPropertySet, xDataTableProperties, "CharHeightAsian"); - copyProperty(xPropertySet, xDataTableProperties, "CharHeightComplex"); - copyProperty(xPropertySet, xDataTableProperties, "CharKerning"); - copyProperty(xPropertySet, xDataTableProperties, "CharLocale"); - copyProperty(xPropertySet, xDataTableProperties, "CharLocaleAsian"); - copyProperty(xPropertySet, xDataTableProperties, "CharLocaleComplex"); - copyProperty(xPropertySet, xDataTableProperties, "CharPosture"); - copyProperty(xPropertySet, xDataTableProperties, "CharPostureAsian"); - copyProperty(xPropertySet, xDataTableProperties, "CharPostureComplex"); - copyProperty(xPropertySet, xDataTableProperties, "CharRelief"); - copyProperty(xPropertySet, xDataTableProperties, "CharShadowed"); - copyProperty(xPropertySet, xDataTableProperties, "CharStrikeout"); - copyProperty(xPropertySet, xDataTableProperties, "CharUnderline"); - copyProperty(xPropertySet, xDataTableProperties, "CharUnderlineColor"); - copyProperty(xPropertySet, xDataTableProperties, "CharUnderlineHasColor"); - copyProperty(xPropertySet, xDataTableProperties, "CharOverline"); - copyProperty(xPropertySet, xDataTableProperties, "CharOverlineColor"); - copyProperty(xPropertySet, xDataTableProperties, "CharOverlineHasColor"); - copyProperty(xPropertySet, xDataTableProperties, "CharWeight"); - copyProperty(xPropertySet, xDataTableProperties, "CharWeightAsian"); - copyProperty(xPropertySet, xDataTableProperties, "CharWeightComplex"); - copyProperty(xPropertySet, xDataTableProperties, "CharWordMode"); + copyProperty(xPropertySet, xDataTableProperties, u"CharColor"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontFamily"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontFamilyAsian"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontFamilyComplex"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontCharSet"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontCharSetAsian"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontCharSetComplex"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontName"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontNameAsian"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontNameComplex"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontPitch"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontPitchAsian"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontPitchComplex"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontStyleName"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontStyleNameAsian"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharFontStyleNameComplex"_ustr); + + copyProperty(xPropertySet, xDataTableProperties, u"CharHeight"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharHeightAsian"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharHeightComplex"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharKerning"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharLocale"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharLocaleAsian"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharLocaleComplex"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharPosture"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharPostureAsian"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharPostureComplex"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharRelief"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharShadowed"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharStrikeout"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharUnderline"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharUnderlineColor"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharUnderlineHasColor"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharOverline"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharOverlineColor"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharOverlineHasColor"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharWeight"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharWeightAsian"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharWeightComplex"_ustr); + copyProperty(xPropertySet, xDataTableProperties, u"CharWordMode"_ustr); drawing::FillStyle eFillStyle = drawing::FillStyle_NONE; - xDataTableProperties->getPropertyValue("FillStyle") >>= eFillStyle; + xDataTableProperties->getPropertyValue(u"FillStyle"_ustr) >>= eFillStyle; if (eFillStyle == drawing::FillStyle_SOLID) { sal_Int32 aColor = 0; - if (xDataTableProperties->getPropertyValue("FillColor") >>= aColor) - xPropertySet->setPropertyValue("CharBackColor", uno::Any(aColor)); + if (xDataTableProperties->getPropertyValue(u"FillColor"_ustr) >>= aColor) + xPropertySet->setPropertyValue(u"CharBackColor"_ustr, uno::Any(aColor)); } - xPropertySet->setPropertyValue("ParaAdjust", uno::Any(style::ParagraphAdjust_CENTER)); + xPropertySet->setPropertyValue(u"ParaAdjust"_ustr, uno::Any(style::ParagraphAdjust_CENTER)); } void DataTableView::setCellProperties(css::uno::Reference<beans::XPropertySet>& xPropertySet, bool bLeft, bool bTop, bool bRight, bool bBottom) { - xPropertySet->setPropertyValue("FillColor", uno::Any(Color(0xFFFFFF))); + xPropertySet->setPropertyValue(u"FillColor"_ustr, uno::Any(Color(0xFFFFFF))); uno::Reference<beans::XPropertySet> xDataTableProperties(m_xDataTableModel); float fFontHeight = 0.0; - xDataTableProperties->getPropertyValue("CharHeight") >>= fFontHeight; + xDataTableProperties->getPropertyValue(u"CharHeight"_ustr) >>= fFontHeight; fFontHeight = o3tl::convert(fFontHeight, o3tl::Length::pt, o3tl::Length::mm100); sal_Int32 nXDistance = std::round(fFontHeight * 0.18f); sal_Int32 nYDistance = std::round(fFontHeight * 0.30f); - xPropertySet->setPropertyValue("TextLeftDistance", uno::Any(nXDistance)); - xPropertySet->setPropertyValue("TextRightDistance", uno::Any(nXDistance)); - xPropertySet->setPropertyValue("TextUpperDistance", uno::Any(nYDistance)); - xPropertySet->setPropertyValue("TextLowerDistance", uno::Any(nYDistance)); + xPropertySet->setPropertyValue(u"TextLeftDistance"_ustr, uno::Any(nXDistance)); + xPropertySet->setPropertyValue(u"TextRightDistance"_ustr, uno::Any(nXDistance)); + xPropertySet->setPropertyValue(u"TextUpperDistance"_ustr, uno::Any(nYDistance)); + xPropertySet->setPropertyValue(u"TextLowerDistance"_ustr, uno::Any(nYDistance)); - xPropertySet->setPropertyValue("TextVerticalAdjust", uno::Any(drawing::TextVerticalAdjust_TOP)); + xPropertySet->setPropertyValue(u"TextVerticalAdjust"_ustr, + uno::Any(drawing::TextVerticalAdjust_TOP)); drawing::LineStyle eStyle = drawing::LineStyle_NONE; m_aLineProperties.LineStyle >>= eStyle; @@ -199,7 +201,7 @@ void DataTableView::setCellProperties(css::uno::Reference<beans::XPropertySet>& if (!aDashName.isEmpty() && m_xChartModel.is()) { uno::Reference<container::XNameContainer> xDashTable( - m_xChartModel->createInstance("com.sun.star.drawing.DashTable"), + m_xChartModel->createInstance(u"com.sun.star.drawing.DashTable"_ustr), uno::UNO_QUERY); if (xDashTable.is() && xDashTable->hasByName(aDashName)) { @@ -223,13 +225,13 @@ void DataTableView::setCellProperties(css::uno::Reference<beans::XPropertySet>& } if (bLeft) - xPropertySet->setPropertyValue("LeftBorder", uno::Any(aBorderLine)); + xPropertySet->setPropertyValue(u"LeftBorder"_ustr, uno::Any(aBorderLine)); if (bTop) - xPropertySet->setPropertyValue("TopBorder", uno::Any(aBorderLine)); + xPropertySet->setPropertyValue(u"TopBorder"_ustr, uno::Any(aBorderLine)); if (bRight) - xPropertySet->setPropertyValue("RightBorder", uno::Any(aBorderLine)); + xPropertySet->setPropertyValue(u"RightBorder"_ustr, uno::Any(aBorderLine)); if (bBottom) - xPropertySet->setPropertyValue("BottomBorder", uno::Any(aBorderLine)); + xPropertySet->setPropertyValue(u"BottomBorder"_ustr, uno::Any(aBorderLine)); } } @@ -252,7 +254,7 @@ void DataTableView::createShapes(basegfx::B2DVector const& rStart, basegfx::B2DV try { - m_xTableShape->getPropertyValue("Model") >>= m_xTable; + m_xTableShape->getPropertyValue(u"Model"_ustr) >>= m_xTable; } catch (const uno::Exception&) { @@ -279,10 +281,10 @@ void DataTableView::createShapes(basegfx::B2DVector const& rStart, basegfx::B2DV std::vector<ViewLegendSymbol> aSymbols; - m_xDataTableModel->getPropertyValue("HBorder") >>= bHBorder; - m_xDataTableModel->getPropertyValue("VBorder") >>= bVBorder; - m_xDataTableModel->getPropertyValue("Outline") >>= bOutline; - m_xDataTableModel->getPropertyValue("Keys") >>= bKeys; + m_xDataTableModel->getPropertyValue(u"HBorder"_ustr) >>= bHBorder; + m_xDataTableModel->getPropertyValue(u"VBorder"_ustr) >>= bVBorder; + m_xDataTableModel->getPropertyValue(u"Outline"_ustr) >>= bOutline; + m_xDataTableModel->getPropertyValue(u"Keys"_ustr) >>= bKeys; // set the data table row and column size sal_Int32 nColumnCount = m_aXValues.size(); @@ -349,7 +351,7 @@ void DataTableView::createShapes(basegfx::B2DVector const& rStart, basegfx::B2DV { uno::Reference<beans::XPropertySet> xDataTableProperties(m_xDataTableModel); float fFontHeight = 0.0; - xDataTableProperties->getPropertyValue("CharHeight") >>= fFontHeight; + xDataTableProperties->getPropertyValue(u"CharHeight"_ustr) >>= fFontHeight; fFontHeight = o3tl::convert(fFontHeight, o3tl::Length::pt, o3tl::Length::mm100); sal_Int32 nSymbolHeight = sal_Int32(fFontHeight * 0.6); @@ -402,11 +404,13 @@ void DataTableView::createShapes(basegfx::B2DVector const& rStart, basegfx::B2DV setCellCharAndParagraphProperties(xTextPropertySet); setCellProperties(xCellPropertySet, bOutline, bTop, bOutline, bBottom); - xCellPropertySet->setPropertyValue("ParaAdjust", uno::Any(style::ParagraphAdjust_LEFT)); + xCellPropertySet->setPropertyValue(u"ParaAdjust"_ustr, + uno::Any(style::ParagraphAdjust_LEFT)); if (bKeys) { xCellPropertySet->setPropertyValue( - "ParaLeftMargin", uno::Any(nMaxSymbolWidth + sal_Int32(2 * constSymbolMargin))); + u"ParaLeftMargin"_ustr, + uno::Any(nMaxSymbolWidth + sal_Int32(2 * constSymbolMargin))); } } nRow++; @@ -472,7 +476,7 @@ void DataTableView::createShapes(basegfx::B2DVector const& rStart, basegfx::B2DV for (sal_Int32 i = 1; i < xTableColumns->getCount(); ++i) { xPropertySet.set(xTableColumns->getByIndex(i), uno::UNO_QUERY); - xPropertySet->setPropertyValue("Width", uno::Any(nColumnWidth)); + xPropertySet->setPropertyValue(u"Width"_ustr, uno::Any(nColumnWidth)); } // force recalculation of row heights in the table shape @@ -489,7 +493,7 @@ void DataTableView::createShapes(basegfx::B2DVector const& rStart, basegfx::B2DV { xPropertySet.set(xTableRows->getByIndex(i), uno::UNO_QUERY); sal_Int32 nHeight = 0; - xPropertySet->getPropertyValue("Height") >>= nHeight; + xPropertySet->getPropertyValue(u"Height"_ustr) >>= nHeight; if (i > 0) { auto& rSymbol = aSymbols[nSymbolIndex].xSymbol; @@ -514,7 +518,7 @@ void DataTableView::changePosition(sal_Int32 x, sal_Int32 y) uno::Reference<beans::XPropertySet> xPropertySet(xTableColumns->getByIndex(0), uno::UNO_QUERY); sal_Int32 nWidth = 0; - xPropertySet->getPropertyValue("Width") >>= nWidth; + xPropertySet->getPropertyValue(u"Width"_ustr) >>= nWidth; m_xTarget->setPosition({ x - nWidth, y }); } diff --git a/chart2/source/view/main/ExplicitValueProvider.cxx b/chart2/source/view/main/ExplicitValueProvider.cxx index 52f259d341c9..da35cf539708 100644 --- a/chart2/source/view/main/ExplicitValueProvider.cxx +++ b/chart2/source/view/main/ExplicitValueProvider.cxx @@ -52,7 +52,7 @@ bool lcl_getPropertySwapXAndYAxis(const rtl::Reference<Diagram>& xDiagram) { try { - aCooSysList[0]->getPropertyValue("SwapXAndYAxis") >>= bSwapXAndY; + aCooSysList[0]->getPropertyValue(u"SwapXAndYAxis"_ustr) >>= bSwapXAndY; } catch (const uno::Exception&) { @@ -102,7 +102,7 @@ sal_Int32 ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabe sal_Int32 nFormat = 0; if (!xSeriesOrPointProp.is()) return nFormat; - if (!(xSeriesOrPointProp->getPropertyValue("PercentageNumberFormat") >>= nFormat)) + if (!(xSeriesOrPointProp->getPropertyValue(u"PercentageNumberFormat"_ustr) >>= nFormat)) { nFormat = DiagramHelper::getPercentNumberFormat(xNumberFormatsSupplier); } diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index 3112c591243d..4b3079ce7225 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -97,7 +97,7 @@ void LabelPositionHelper::doDynamicFontResize( tAnySequence& rPropValues { //handle dynamic font resize: awt::Size aOldReferenceSize; - if( xAxisModelProps->getPropertyValue( "ReferencePageSize") >>= aOldReferenceSize ) + if( xAxisModelProps->getPropertyValue( u"ReferencePageSize"_ustr) >>= aOldReferenceSize ) { uno::Any* pAOldAndNewFontHeightAny = PropertyMapper::getValuePointer( rPropValues, rPropNames, u"CharHeight" ); lcl_doDynamicFontResize( pAOldAndNewFontHeightAny, aOldReferenceSize, rNewReferenceSize ); diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 79206624f436..bd0b557d4e78 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -258,7 +258,7 @@ uno::Any* PropertyMapper::getValuePointerForLimitedSpace( tAnySequence& rPropVal , bool bLimitedHeight) { return PropertyMapper::getValuePointer( rPropValues, rPropNames - , bLimitedHeight ? OUString("TextMaximumFrameHeight") : OUString("TextMaximumFrameWidth") ); + , bLimitedHeight ? u"TextMaximumFrameHeight"_ustr : u"TextMaximumFrameWidth"_ustr ); } const tPropertyNameMap& PropertyMapper::getPropertyNameMapForCharacterProperties() @@ -552,7 +552,7 @@ void PropertyMapper::getPreparedTextShapePropertyLists( // use a line-joint showing the border of thick lines like two rectangles // filled in between. - aValueMap["LineJoint"] <<= drawing::LineJoint_ROUND; + aValueMap[u"LineJoint"_ustr] <<= drawing::LineJoint_ROUND; PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap ); } diff --git a/chart2/source/view/main/SeriesPlotterContainer.cxx b/chart2/source/view/main/SeriesPlotterContainer.cxx index afca7efbc463..557bbdae3c11 100644 --- a/chart2/source/view/main/SeriesPlotterContainer.cxx +++ b/chart2/source/view/main/SeriesPlotterContainer.cxx @@ -157,16 +157,16 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(ChartModel& rChart try { xDiagram->getPropertyValue(CHART_UNONAME_SORT_BY_XVALUES) >>= bSortByXValues; - xDiagram->getPropertyValue("ConnectBars") >>= bConnectBars; - xDiagram->getPropertyValue("GroupBarsPerAxis") >>= bGroupBarsPerAxis; - xDiagram->getPropertyValue("IncludeHiddenCells") >>= bIncludeHiddenCells; - xDiagram->getPropertyValue("StartingAngle") >>= nStartingAngle; + xDiagram->getPropertyValue(u"ConnectBars"_ustr) >>= bConnectBars; + xDiagram->getPropertyValue(u"GroupBarsPerAxis"_ustr) >>= bGroupBarsPerAxis; + xDiagram->getPropertyValue(u"IncludeHiddenCells"_ustr) >>= bIncludeHiddenCells; + xDiagram->getPropertyValue(u"StartingAngle"_ustr) >>= nStartingAngle; if (nDimensionCount == 3) { - xDiagram->getPropertyValue("3DRelativeHeight") >>= n3DRelativeHeight; + xDiagram->getPropertyValue(u"3DRelativeHeight"_ustr) >>= n3DRelativeHeight; } - xDiagram->getPropertyValue("SubPieType") >>= ePieChartSubType; + xDiagram->getPropertyValue(u"SubPieType"_ustr) >>= ePieChartSubType; } catch (const uno::Exception&) { @@ -196,7 +196,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(ChartModel& rChart if (xCooSys->getMaximumAxisIndexByDimension(1) > 0) { rtl::Reference<Axis> xAxisProp = xCooSys->getAxisByDimension2(1, 1); - xAxisProp->getPropertyValue("Show") >>= bSecondaryYaxisVisible; + xAxisProp->getPropertyValue(u"Show"_ustr) >>= bSecondaryYaxisVisible; } } catch (const lang::IndexOutOfBoundsException&) @@ -692,11 +692,12 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries(ChartModel& { css::chart::ChartAxisPosition eCrossingMainAxisPos( css::chart::ChartAxisPosition_ZERO); - xCrossingMainAxis->getPropertyValue("CrossoverPosition") >>= eCrossingMainAxisPos; + xCrossingMainAxis->getPropertyValue(u"CrossoverPosition"_ustr) + >>= eCrossingMainAxisPos; if (eCrossingMainAxisPos == css::chart::ChartAxisPosition_VALUE) { double fValue = 0.0; - xCrossingMainAxis->getPropertyValue("CrossoverValue") >>= fValue; + xCrossingMainAxis->getPropertyValue(u"CrossoverValue"_ustr) >>= fValue; aExplicitScale.Origin = fValue; } else if (eCrossingMainAxisPos == css::chart::ChartAxisPosition_ZERO) diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index c681c581a7b3..635dd85cbea8 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -124,7 +124,7 @@ rtl::Reference<SvxShapeGroupAnyD> ShapeFactory::getOrCreateChartRootShape( // cast to resolve ambiguity in converting to XShape xDrawPage->addBottom(static_cast<SvxShape*>(xShapeGroup.get())); - setShapeName(xShapeGroup, "com.sun.star.chart2.shapes"); + setShapeName(xShapeGroup, u"com.sun.star.chart2.shapes"_ustr); xShapeGroup->setSize(awt::Size(0,0)); return xShapeGroup; @@ -402,7 +402,7 @@ rtl::Reference<Svx3DExtrudeObject> if( xSourceProp.is() ) { drawing::LineStyle aLineStyle; - xSourceProp->getPropertyValue( "BorderStyle" ) >>= aLineStyle; + xSourceProp->getPropertyValue( u"BorderStyle"_ustr ) >>= aLineStyle; if( aLineStyle == drawing::LineStyle_SOLID ) bRounded = false; } @@ -918,7 +918,7 @@ rtl::Reference<SvxShapePolyPolygon> basegfx::deg2rad(fUnitCircleWidthAngleDegree), aTransformationFromUnitCircle, fAngleSubdivisionRadian); - xShape->SvxShape::setPropertyValue( "PolyPolygonBezier", uno::Any( aCoords ) ); + xShape->SvxShape::setPropertyValue( u"PolyPolygonBezier"_ustr, uno::Any( aCoords ) ); } catch( const uno::Exception& ) { @@ -1597,7 +1597,7 @@ rtl::Reference<SvxGraphicObject> } try { - xShape->SvxShape::setPropertyValue( "Graphic", uno::Any( xGraphic )); + xShape->SvxShape::setPropertyValue( u"Graphic"_ustr, uno::Any( xGraphic )); } catch( const uno::Exception& ) { @@ -1883,7 +1883,7 @@ rtl::Reference<SvxShapePolyPolygon> //LineDashName if(pLineProperties->DashName.hasValue()) - xShape->SvxShape::setPropertyValue( "LineDashName" + xShape->SvxShape::setPropertyValue( u"LineDashName"_ustr , pLineProperties->DashName ); //LineCap @@ -1948,7 +1948,7 @@ rtl::Reference<SvxShapePolyPolygon> //LineDashName if(pLineProperties->DashName.hasValue()) - xShape->SvxShape::setPropertyValue( "LineDashName" + xShape->SvxShape::setPropertyValue( u"LineDashName"_ustr , pLineProperties->DashName ); //LineCap @@ -2068,7 +2068,7 @@ rtl::Reference<SvxShapeText> try { if (rATransformation.hasValue()) - xShape->SvxShape::setPropertyValue( "Transformation", rATransformation ); + xShape->SvxShape::setPropertyValue( u"Transformation"_ustr, rATransformation ); else SAL_INFO("chart2", "No rATransformation value is given to ShapeFactory::createText()"); @@ -2155,7 +2155,7 @@ rtl::Reference<SvxShapeText> //the matrix needs to be set at the end behind autogrow and such position influencing properties try { - xShape->SvxShape::setPropertyValue( "Transformation", rATransformation ); + xShape->SvxShape::setPropertyValue( u"Transformation"_ustr, rATransformation ); } catch( const uno::Exception& ) { @@ -2221,7 +2221,7 @@ rtl::Reference<SvxShapeText> bool bStackCharacters(false); try { - xTextProperties->getPropertyValue( "StackCharacters" ) >>= bStackCharacters; + xTextProperties->getPropertyValue( u"StackCharacters"_ustr ) >>= bStackCharacters; } catch( const uno::Exception& ) { @@ -2262,7 +2262,7 @@ rtl::Reference<SvxShapeText> // adapt font size according to page size awt::Size aOldRefSize; - if( xTextProperties->getPropertyValue( "ReferencePageSize") >>= aOldRefSize ) + if( xTextProperties->getPropertyValue( u"ReferencePageSize"_ustr) >>= aOldRefSize ) { RelativeSizeHelper::adaptFontSizes( *xShape, aOldRefSize, rSize ); } @@ -2297,7 +2297,7 @@ rtl::Reference<SvxShapeText> { // adapt font size according to page size awt::Size aOldRefSize; - if( xTextProperties->getPropertyValue("ReferencePageSize") >>= aOldRefSize ) + if( xTextProperties->getPropertyValue(u"ReferencePageSize"_ustr) >>= aOldRefSize ) { RelativeSizeHelper::adaptFontSizes( *xShape, aOldRefSize, rSize ); } @@ -2306,15 +2306,15 @@ rtl::Reference<SvxShapeText> // #i109336# Improve auto positioning in chart float fFontHeight = 0.0; - if ( xShape->SvxShape::getPropertyValue( "CharHeight" ) >>= fFontHeight ) + if ( xShape->SvxShape::getPropertyValue( u"CharHeight"_ustr ) >>= fFontHeight ) { fFontHeight = convertPointToMm100(fFontHeight); sal_Int32 nXDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * 0.18f ) ); sal_Int32 nYDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * 0.30f ) ); - xShape->SvxShape::setPropertyValue( "TextLeftDistance", uno::Any( nXDistance ) ); - xShape->SvxShape::setPropertyValue( "TextRightDistance", uno::Any( nXDistance ) ); - xShape->SvxShape::setPropertyValue( "TextUpperDistance", uno::Any( nYDistance ) ); - xShape->SvxShape::setPropertyValue( "TextLowerDistance", uno::Any( nYDistance ) ); + xShape->SvxShape::setPropertyValue( u"TextLeftDistance"_ustr, uno::Any( nXDistance ) ); + xShape->SvxShape::setPropertyValue( u"TextRightDistance"_ustr, uno::Any( nXDistance ) ); + xShape->SvxShape::setPropertyValue( u"TextUpperDistance"_ustr, uno::Any( nYDistance ) ); + xShape->SvxShape::setPropertyValue( u"TextLowerDistance"_ustr, uno::Any( nYDistance ) ); } sal_Int32 nXPos = rPos.X; sal_Int32 nYPos = rPos.Y; @@ -2324,9 +2324,9 @@ rtl::Reference<SvxShapeText> ::basegfx::B2DHomMatrix aM; aM.rotate( -basegfx::deg2rad(nRotation) );//#i78696#->#i80521# aM.translate( nXPos, nYPos ); - xShape->SvxShape::setPropertyValue( "Transformation", uno::Any( B2DHomMatrixToHomogenMatrix3(aM) ) ); + xShape->SvxShape::setPropertyValue( u"Transformation"_ustr, uno::Any( B2DHomMatrixToHomogenMatrix3(aM) ) ); - xShape->SvxShape::setPropertyValue( "ParaAdjust", uno::Any( style::ParagraphAdjust_CENTER ) ); + xShape->SvxShape::setPropertyValue( u"ParaAdjust"_ustr, uno::Any( style::ParagraphAdjust_CENTER ) ); } catch( const uno::Exception& ) { @@ -2364,8 +2364,8 @@ void ShapeFactory::makeShapeInvisible( const rtl::Reference< SvxShape >& xShape { try { - xShape->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE )); - xShape->setPropertyValue( "FillStyle", uno::Any( drawing::FillStyle_NONE )); + xShape->setPropertyValue( u"LineStyle"_ustr, uno::Any( drawing::LineStyle_NONE )); + xShape->setPropertyValue( u"FillStyle"_ustr, uno::Any( drawing::FillStyle_NONE )); } catch( const uno::Exception& ) { diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx index 25a770fb04bc..cfa689f7ceab 100644 --- a/chart2/source/view/main/VButton.cxx +++ b/chart2/source/view/main/VButton.cxx @@ -69,11 +69,11 @@ rtl::Reference<SvxShapePolyPolygon> VButton::createTriangle(awt::Size aSize) pInnerSequenceY[2] = 0.0; pInnerSequenceZ[2] = 0.0; - xShape->SvxShape::setPropertyValue("Name", uno::Any(m_sCID)); + xShape->SvxShape::setPropertyValue(u"Name"_ustr, uno::Any(m_sCID)); xShape->SvxShape::setPropertyValue(UNO_NAME_POLYPOLYGON, uno::Any(PolyToPointSequence(aPolyPolygon))); - xShape->SvxShape::setPropertyValue("LineStyle", uno::Any(drawing::LineStyle_NONE)); - xShape->SvxShape::setPropertyValue("FillColor", uno::Any(m_nArrowColor)); + xShape->SvxShape::setPropertyValue(u"LineStyle"_ustr, uno::Any(drawing::LineStyle_NONE)); + xShape->SvxShape::setPropertyValue(u"FillColor"_ustr, uno::Any(m_nArrowColor)); return xShape; } @@ -92,20 +92,20 @@ void VButton::createShapes(const uno::Reference<beans::XPropertySet>& xTextProp) rtl::Reference<SvxShapeGroupAnyD> xContainer = m_xShape; tPropertyNameValueMap aTextValueMap; - aTextValueMap["CharHeight"] <<= 10.0f; - aTextValueMap["CharHeightAsian"] <<= 10.0f; - aTextValueMap["CharHeightComplex"] <<= 10.0f; - aTextValueMap["FillColor"] <<= m_nBGColor; - aTextValueMap["FillStyle"] <<= drawing::FillStyle_SOLID; - aTextValueMap["LineColor"] <<= sal_Int32(0xcccccc); - aTextValueMap["LineStyle"] <<= drawing::LineStyle_SOLID; - aTextValueMap["ParaAdjust"] <<= style::ParagraphAdjust_CENTER; - aTextValueMap["TextHorizontalAdjust"] <<= drawing::TextHorizontalAdjust_LEFT; - aTextValueMap["TextVerticalAdjust"] <<= drawing::TextVerticalAdjust_CENTER; - aTextValueMap["ParaLeftMargin"] <<= sal_Int32(100); - aTextValueMap["ParaRightMargin"] <<= sal_Int32(600); - - aTextValueMap["Name"] <<= m_sCID; //CID OUString + aTextValueMap[u"CharHeight"_ustr] <<= 10.0f; + aTextValueMap[u"CharHeightAsian"_ustr] <<= 10.0f; + aTextValueMap[u"CharHeightComplex"_ustr] <<= 10.0f; + aTextValueMap[u"FillColor"_ustr] <<= m_nBGColor; + aTextValueMap[u"FillStyle"_ustr] <<= drawing::FillStyle_SOLID; + aTextValueMap[u"LineColor"_ustr] <<= sal_Int32(0xcccccc); + aTextValueMap[u"LineStyle"_ustr] <<= drawing::LineStyle_SOLID; + aTextValueMap[u"ParaAdjust"_ustr] <<= style::ParagraphAdjust_CENTER; + aTextValueMap[u"TextHorizontalAdjust"_ustr] <<= drawing::TextHorizontalAdjust_LEFT; + aTextValueMap[u"TextVerticalAdjust"_ustr] <<= drawing::TextVerticalAdjust_CENTER; + aTextValueMap[u"ParaLeftMargin"_ustr] <<= sal_Int32(100); + aTextValueMap[u"ParaRightMargin"_ustr] <<= sal_Int32(600); + + aTextValueMap[u"Name"_ustr] <<= m_sCID; //CID OUString PropertyMapper::getMultiPropertyListsFromValueMap(aPropNames, aPropValues, aTextValueMap); diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 4527d4368b2f..cdf5df751ddd 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -176,7 +176,7 @@ VDataSeries::VDataSeries( const rtl::Reference< DataSeries >& xDataSeries ) { try { - uno::Any aARole = xProp->getPropertyValue("Role"); + uno::Any aARole = xProp->getPropertyValue(u"Role"_ustr); OUString aRole; aARole >>= aRole; @@ -527,7 +527,7 @@ double VDataSeries::getBubble_Size( sal_Int32 index ) const bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPercentage ) const { - OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : CHART_UNONAME_NUMFMT; + OUString aPropName = bForPercentage ? u"PercentageNumberFormat"_ustr : CHART_UNONAME_NUMFMT; bool bHasNumberFormat = false; bool bLinkToSource = true; uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( nPointIndex )); @@ -541,7 +541,7 @@ bool VDataSeries::hasExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPerce } sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bForPercentage ) const { - OUString aPropName = bForPercentage ? OUString("PercentageNumberFormat") : CHART_UNONAME_NUMFMT; + OUString aPropName = bForPercentage ? u"PercentageNumberFormat"_ustr : CHART_UNONAME_NUMFMT; sal_Int32 nNumberFormat = -1; uno::Reference< beans::XPropertySet > xPointProp( getPropertiesOfPoint( nPointIndex )); if( xPointProp.is() ) @@ -580,7 +580,7 @@ sal_Int32 VDataSeries::getLabelPlacement( sal_Int32 nPointIndex, const rtl::Refe { uno::Reference< beans::XPropertySet > xPointProps( getPropertiesOfPoint( nPointIndex ) ); if( xPointProps.is() ) - xPointProps->getPropertyValue("LabelPlacement") >>= nLabelPlacement; + xPointProps->getPropertyValue(u"LabelPlacement"_ustr) >>= nLabelPlacement; const uno::Sequence < sal_Int32 > aAvailablePlacements( ChartTypeHelper::getSupportedLabelPlacements( xChartType, bSwapXAndY, m_xDataSeries ) ); @@ -594,7 +594,7 @@ sal_Int32 VDataSeries::getLabelPlacement( sal_Int32 nPointIndex, const rtl::Refe { nLabelPlacement = aAvailablePlacements[0]; if( xPointProps.is() ) - xPointProps->setPropertyValue("LabelPlacement", uno::Any(nLabelPlacement)); + xPointProps->setPropertyValue(u"LabelPlacement"_ustr, uno::Any(nLabelPlacement)); return nLabelPlacement; } @@ -614,7 +614,7 @@ awt::Point VDataSeries::getLabelPosition( awt::Point aTextShapePos, sal_Int32 nP { RelativePosition aCustomLabelPosition; uno::Reference< beans::XPropertySet > xPointProps(getPropertiesOfPoint(nPointIndex)); - if( xPointProps.is() && (xPointProps->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition)) + if( xPointProps.is() && (xPointProps->getPropertyValue(u"CustomLabelPosition"_ustr) >>= aCustomLabelPosition)) { aPos.X = static_cast<sal_Int32>(aCustomLabelPosition.Primary * m_aReferenceSize.Width) + aTextShapePos.X; aPos.Y = static_cast<sal_Int32>(aCustomLabelPosition.Secondary * m_aReferenceSize.Height) + aTextShapePos.Y; @@ -636,7 +636,7 @@ bool VDataSeries::isLabelCustomPos(sal_Int32 nPointIndex) const { uno::Reference< beans::XPropertySet > xPointProps(m_xDataSeries->getDataPointByIndex(nPointIndex)); RelativePosition aCustomLabelPosition; - if( xPointProps.is() && (xPointProps->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition) ) + if( xPointProps.is() && (xPointProps->getPropertyValue(u"CustomLabelPosition"_ustr) >>= aCustomLabelPosition) ) bCustom = true; } } @@ -654,7 +654,7 @@ awt::Size VDataSeries::getLabelCustomSize(sal_Int32 nPointIndex) const { RelativeSize aCustomLabelSize; const uno::Reference<beans::XPropertySet> xPointProps(getPropertiesOfPoint(nPointIndex)); - if (xPointProps.is() && (xPointProps->getPropertyValue("CustomLabelSize") >>= aCustomLabelSize)) + if (xPointProps.is() && (xPointProps->getPropertyValue(u"CustomLabelSize"_ustr) >>= aCustomLabelSize)) { aSize.Width = static_cast<sal_Int32>(aCustomLabelSize.Primary * m_aReferenceSize.Width); aSize.Height = static_cast<sal_Int32>(aCustomLabelSize.Secondary * m_aReferenceSize.Height); @@ -795,10 +795,10 @@ static std::optional<Symbol> getSymbolPropertiesFromPropertySet( const uno::Refe Symbol aSymbolProps; try { - if( xProp->getPropertyValue("Symbol") >>= aSymbolProps ) + if( xProp->getPropertyValue(u"Symbol"_ustr) >>= aSymbolProps ) { //use main color to fill symbols - xProp->getPropertyValue("Color") >>= aSymbolProps.FillColor; + xProp->getPropertyValue(u"Color"_ustr) >>= aSymbolProps.FillColor; // border of symbols always same as fill color aSymbolProps.BorderColor = aSymbolProps.FillColor; } @@ -893,7 +893,7 @@ bool VDataSeries::hasPointOwnColor( sal_Int32 index ) const try { uno::Reference< beans::XPropertyState > xPointState( getPropertiesOfPoint(index), uno::UNO_QUERY_THROW ); - return (xPointState->getPropertyState("Color") != beans::PropertyState_DEFAULT_VALUE ); + return (xPointState->getPropertyState(u"Color"_ustr) != beans::PropertyState_DEFAULT_VALUE ); } catch(const uno::Exception&) { diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 72c0165a69f5..6bb58b4458a5 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -70,13 +70,13 @@ double lcl_CalcViewFontSize( double fResult = 10.0; float fFontHeight( 0.0 ); - if( xProp.is() && ( xProp->getPropertyValue( "CharHeight") >>= fFontHeight )) + if( xProp.is() && ( xProp->getPropertyValue( u"CharHeight"_ustr) >>= fFontHeight )) { fResult = fFontHeight; try { awt::Size aPropRefSize; - if( (xProp->getPropertyValue( "ReferencePageSize") >>= aPropRefSize) && + if( (xProp->getPropertyValue( u"ReferencePageSize"_ustr) >>= aPropRefSize) && (aPropRefSize.Height > 0)) { fResult = ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ); @@ -105,7 +105,7 @@ void lcl_getProperties( ::chart::tPropertyNameValueMap aLineFillValueMap; ::chart::PropertyMapper::getValueMap( aLineFillValueMap, ::chart::PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xLegendProp ); - aLineFillValueMap[ "LineJoint" ] <<= drawing::LineJoint_ROUND; + aLineFillValueMap[ u"LineJoint"_ustr ] <<= drawing::LineJoint_ROUND; ::chart::PropertyMapper::getMultiPropertyListsFromValueMap( rOutLineFillProperties.first, rOutLineFillProperties.second, aLineFillValueMap ); @@ -114,31 +114,31 @@ void lcl_getProperties( ::chart::tPropertyNameValueMap aTextValueMap; ::chart::PropertyMapper::getValueMap( aTextValueMap, ::chart::PropertyMapper::getPropertyNameMapForCharacterProperties(), xLegendProp ); - aTextValueMap[ "TextAutoGrowHeight" ] <<= true; - aTextValueMap[ "TextAutoGrowWidth" ] <<= true; - aTextValueMap[ "TextHorizontalAdjust" ] <<= drawing::TextHorizontalAdjust_LEFT; - aTextValueMap[ "TextMaximumFrameWidth" ] <<= rReferenceSize.Width; //needs to be overwritten by actual available space in the legend + aTextValueMap[ u"TextAutoGrowHeight"_ustr ] <<= true; + aTextValueMap[ u"TextAutoGrowWidth"_ustr ] <<= true; + aTextValueMap[ u"TextHorizontalAdjust"_ustr ] <<= drawing::TextHorizontalAdjust_LEFT; + aTextValueMap[ u"TextMaximumFrameWidth"_ustr ] <<= rReferenceSize.Width; //needs to be overwritten by actual available space in the legend // recalculate font size awt::Size aPropRefSize; float fFontHeight( 0.0 ); - if( (xLegendProp->getPropertyValue( "ReferencePageSize") >>= aPropRefSize) && + if( (xLegendProp->getPropertyValue( u"ReferencePageSize"_ustr) >>= aPropRefSize) && (aPropRefSize.Height > 0) && - (aTextValueMap[ "CharHeight" ] >>= fFontHeight) ) + (aTextValueMap[ u"CharHeight"_ustr ] >>= fFontHeight) ) { - aTextValueMap[ "CharHeight" ] <<= + aTextValueMap[ u"CharHeight"_ustr ] <<= static_cast< float >( ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize )); - if( aTextValueMap[ "CharHeightAsian" ] >>= fFontHeight ) + if( aTextValueMap[ u"CharHeightAsian"_ustr ] >>= fFontHeight ) { - aTextValueMap[ "CharHeightAsian" ] <<= + aTextValueMap[ u"CharHeightAsian"_ustr ] <<= static_cast< float >( ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize )); } - if( aTextValueMap[ "CharHeightComplex" ] >>= fFontHeight ) + if( aTextValueMap[ u"CharHeightComplex"_ustr ] >>= fFontHeight ) { - aTextValueMap[ "CharHeightComplex" ] <<= + aTextValueMap[ u"CharHeightComplex"_ustr ] <<= static_cast< float >( ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize )); } @@ -812,7 +812,7 @@ bool lcl_shouldSymbolsBePlacedOnTheLeftSide( const Reference< beans::XPropertySe if(xLegendProp.is()) { sal_Int16 nWritingMode=-1; - if( xLegendProp->getPropertyValue( "WritingMode" ) >>= nWritingMode ) + if( xLegendProp->getPropertyValue( u"WritingMode"_ustr ) >>= nWritingMode ) { if( nWritingMode == text::WritingMode2::PAGE ) nWritingMode = nDefaultWritingMode; @@ -908,7 +908,7 @@ bool VLegend::isVisible( const rtl::Reference< Legend > & xLegend ) bool bShow = false; try { - xLegend->getPropertyValue( "Show") >>= bShow; + xLegend->getPropertyValue( u"Show"_ustr) >>= bShow; } catch( const uno::Exception & ) { @@ -947,11 +947,11 @@ void VLegend::createShapes( bool bCustom = false; LegendPosition eLegendPosition = LegendPosition_LINE_END; // get Expansion property - m_xLegend->getPropertyValue("Expansion") >>= eExpansion; + m_xLegend->getPropertyValue(u"Expansion"_ustr) >>= eExpansion; if( eExpansion == css::chart::ChartLegendExpansion_CUSTOM ) { RelativeSize aRelativeSize; - if (m_xLegend->getPropertyValue("RelativeSize") >>= aRelativeSize) + if (m_xLegend->getPropertyValue(u"RelativeSize"_ustr) >>= aRelativeSize) { aLegendSize.Width = static_cast<sal_Int32>(::rtl::math::approxCeil( aRelativeSize.Primary * rPageSize.Width )); aLegendSize.Height = static_cast<sal_Int32>(::rtl::math::approxCeil( aRelativeSize.Secondary * rPageSize.Height )); @@ -962,7 +962,7 @@ void VLegend::createShapes( eExpansion = css::chart::ChartLegendExpansion_HIGH; } } - m_xLegend->getPropertyValue("AnchorPosition") >>= eLegendPosition; + m_xLegend->getPropertyValue(u"AnchorPosition"_ustr) >>= eLegendPosition; lcl_getProperties( m_xLegend, aLineFillProperties, aTextProperties, rPageSize ); // create entries @@ -1040,7 +1040,7 @@ void VLegend::createShapes( aLineFillProperties.second, ShapeFactory::StackPosition::Bottom); //because of this name this border will be used for marking the legend - ShapeFactory::setShapeName(xBorder, "MarkHandles"); + ShapeFactory::setShapeName(xBorder, u"MarkHandles"_ustr); } } } @@ -1066,13 +1066,13 @@ void VLegend::changePosition( bool bDefaultLegendSize = rDefaultLegendSize.Width != 0 || rDefaultLegendSize.Height != 0; bool bAutoPosition = - ! (m_xLegend->getPropertyValue( "RelativePosition") >>= aRelativePosition); + ! (m_xLegend->getPropertyValue( u"RelativePosition"_ustr) >>= aRelativePosition); LegendPosition ePos = LegendPosition_LINE_END; - m_xLegend->getPropertyValue( "AnchorPosition") >>= ePos; + m_xLegend->getPropertyValue( u"AnchorPosition"_ustr) >>= ePos; bool bOverlay = false; - m_xLegend->getPropertyValue("Overlay") >>= bOverlay; + m_xLegend->getPropertyValue(u"Overlay"_ustr) >>= bOverlay; //calculate position if( bAutoPosition ) { diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index 0b230ed07f34..2fd20bef89c8 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -128,7 +128,7 @@ rtl::Reference< SvxShapeGroup > VLegendSymbolFactory::createSymbol( if( aSymbol.Style == chart2::SymbolStyle_STANDARD ) { // take series color as fill color - xLegendEntryProperties->getPropertyValue( "Color") >>= aSymbol.FillColor; + xLegendEntryProperties->getPropertyValue( u"Color"_ustr) >>= aSymbol.FillColor; // border of symbols always same as fill color aSymbol.BorderColor = aSymbol.FillColor; diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index 81685337f704..53ff85d109e6 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -45,12 +45,12 @@ void VLineProperties::initFromPropertySet(const uno::Reference<beans::XPropertyS { try { - Color = xProp->getPropertyValue("LineColor"); - LineStyle = xProp->getPropertyValue("LineStyle"); - Transparence = xProp->getPropertyValue("LineTransparence"); - Width = xProp->getPropertyValue("LineWidth"); - DashName = xProp->getPropertyValue("LineDashName"); - LineCap = xProp->getPropertyValue("LineCap"); + Color = xProp->getPropertyValue(u"LineColor"_ustr); + LineStyle = xProp->getPropertyValue(u"LineStyle"_ustr); + Transparence = xProp->getPropertyValue(u"LineTransparence"_ustr); + Width = xProp->getPropertyValue(u"LineWidth"_ustr); + DashName = xProp->getPropertyValue(u"LineDashName"_ustr); + LineCap = xProp->getPropertyValue(u"LineCap"_ustr); } catch (const uno::Exception&) { diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index e251fe95971c..83979fef3a78 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -84,7 +84,7 @@ void VTitle::changePosition( const awt::Point& rPos ) ::basegfx::B2DHomMatrix aM; aM.rotate( basegfx::deg2rad(-m_fRotationAngleDegree) );//#i78696#->#i80521# aM.translate( m_nXPos, m_nYPos); - m_xShape->SvxShape::setPropertyValue( "Transformation", uno::Any( B2DHomMatrixToHomogenMatrix3(aM) ) ); + m_xShape->SvxShape::setPropertyValue( u"Transformation"_ustr, uno::Any( B2DHomMatrixToHomogenMatrix3(aM) ) ); } catch( const uno::Exception& ) { @@ -98,7 +98,7 @@ bool VTitle::isVisible(const rtl::Reference< Title >& xTitle) { } bool bShow = true; try { - xTitle->getPropertyValue("Visible") >>= bShow; + xTitle->getPropertyValue(u"Visible"_ustr) >>= bShow; } catch (const uno::Exception &) { DBG_UNHANDLED_EXCEPTION("chart2"); } @@ -127,7 +127,7 @@ void VTitle::createShapes( try { double fAngleDegree = 0; - xTitleProperties->getPropertyValue( "TextRotation" ) >>= fAngleDegree; + xTitleProperties->getPropertyValue( u"TextRotation"_ustr ) >>= fAngleDegree; m_fRotationAngleDegree += fAngleDegree; } catch( const uno::Exception& ) |