diff options
Diffstat (limited to 'chart2/qa')
79 files changed, 11443 insertions, 5848 deletions
diff --git a/chart2/qa/TestCaseOldAPI.java b/chart2/qa/TestCaseOldAPI.java index 613ba480e7be..f5bc4f571c4c 100644 --- a/chart2/qa/TestCaseOldAPI.java +++ b/chart2/qa/TestCaseOldAPI.java @@ -162,7 +162,7 @@ public class TestCaseOldAPI extends ComplexTestCase { float fHeight = (float)17.0; xTitleProp.setPropertyValue( "String", aTitle ); - xTitleProp.setPropertyValue( "CharHeight", new Float( fHeight ) ); + xTitleProp.setPropertyValue( "CharHeight", Float.valueOf( fHeight ) ); float fNewHeight = AnyConverter.toFloat( xTitleProp.getPropertyValue( "CharHeight" ) ); assure( "Changing CharHeight via old API failed", fNewHeight == fHeight ); @@ -213,8 +213,8 @@ public class TestCaseOldAPI extends ComplexTestCase { float fHeight = (float)14.0; xTitleProp.setPropertyValue( "CharColor", Integer.valueOf( nColor ) ); - xTitleProp.setPropertyValue( "CharWeight", new Float( fWeight )); - xTitleProp.setPropertyValue( "CharHeight", new Float( fHeight ) ); + xTitleProp.setPropertyValue( "CharWeight", Float.valueOf( fWeight )); + xTitleProp.setPropertyValue( "CharHeight", Float.valueOf( fHeight ) ); int nNewColor = AnyConverter.toInt( xTitleProp.getPropertyValue( "CharColor" ) ); assure( "Changing CharColor via old API failed", nNewColor == nColor ); @@ -356,7 +356,7 @@ public class TestCaseOldAPI extends ComplexTestCase { double nNewMax = 12.3; double nNewOrigin = 2.7; - xProp.setPropertyValue( "Max", new Double( nNewMax )); + xProp.setPropertyValue( "Max", Double.valueOf( nNewMax )); assure( "AutoMax is on", ! AnyConverter.toBoolean( xProp.getPropertyValue( "AutoMax" )) ); assure( "Maximum value invalid", @@ -367,7 +367,7 @@ public class TestCaseOldAPI extends ComplexTestCase { xProp.setPropertyValue( "AutoMin", Boolean.TRUE); assure( "AutoMin is off", AnyConverter.toBoolean( xProp.getPropertyValue( "AutoMin" )) ); - xProp.setPropertyValue( "Origin", new Double( nNewOrigin )); + xProp.setPropertyValue( "Origin", Double.valueOf( nNewOrigin )); assure( "Origin invalid", utils.approxEqual( AnyConverter.toDouble( xProp.getPropertyValue( "Origin" )), @@ -390,7 +390,7 @@ public class TestCaseOldAPI extends ComplexTestCase { assure( "Property LineColor", AnyConverter.toInt( xProp.getPropertyValue( "LineColor" )) == nNewColor ); float fNewCharHeight = (float)(16.0); - xProp.setPropertyValue( "CharHeight", new Float( fNewCharHeight )); + xProp.setPropertyValue( "CharHeight", Float.valueOf( fNewCharHeight )); assure( "Property CharHeight", AnyConverter.toFloat( xProp.getPropertyValue( "CharHeight" )) == fNewCharHeight ); @@ -400,7 +400,7 @@ public class TestCaseOldAPI extends ComplexTestCase { AnyConverter.toInt( xProp.getPropertyValue( "TextRotation" )) == nNewTextRotation ); double fStepMain = 10.0; - xProp.setPropertyValue( "StepMain", new Double( fStepMain )); + xProp.setPropertyValue( "StepMain", Double.valueOf( fStepMain )); assure( "Property StepMain", AnyConverter.toDouble( xProp.getPropertyValue( "StepMain" )) == fStepMain ); @@ -408,7 +408,7 @@ public class TestCaseOldAPI extends ComplexTestCase { // internally, the help-step is stored as an integer number of // substeps double fStepHelp = 5.0; - xProp.setPropertyValue( "StepHelp", new Double( fStepHelp )); + xProp.setPropertyValue( "StepHelp", Double.valueOf( fStepHelp )); assure( "Property StepHelp", AnyConverter.toDouble( xProp.getPropertyValue( "StepHelp" )) == fStepHelp ); @@ -444,7 +444,7 @@ public class TestCaseOldAPI extends ComplexTestCase { xLegendProp.getPropertyValue( "Alignment" )) == eNewPos ); float fNewCharHeight = (float)(11.0); - xLegendProp.setPropertyValue( "CharHeight", new Float( fNewCharHeight )); + xLegendProp.setPropertyValue( "CharHeight", Float.valueOf( fNewCharHeight )); assure( "Property CharHeight", AnyConverter.toFloat( xLegendProp.getPropertyValue( "CharHeight" )) == fNewCharHeight ); diff --git a/chart2/qa/extras/PivotChartTest.cxx b/chart2/qa/extras/PivotChartTest.cxx index ee024531e88b..30cd8c656526 100644 --- a/chart2/qa/extras/PivotChartTest.cxx +++ b/chart2/qa/extras/PivotChartTest.cxx @@ -34,7 +34,8 @@ namespace com::sun::star::util { class XNumberFormats; } class PivotChartTest : public ChartTest { public: - PivotChartTest() : ChartTest() + PivotChartTest() + : ChartTest(u"/chart2/qa/extras/data/"_ustr) {} void testRoundtrip(); @@ -54,6 +55,9 @@ public: CPPUNIT_TEST(testPivotChartRowFieldInOutlineMode); CPPUNIT_TEST(testPivotChartWithDateRowField); CPPUNIT_TEST_SUITE_END(); + +private: + uno::Reference<sheet::XDataPilotTable> getPivotTableByName(sal_Int32 nIndex, OUString const & sPivotTableName); }; namespace @@ -71,7 +75,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::makeAny(eOrientation)); + xPropSet->setPropertyValue(u"Orientation"_ustr, uno::Any(eOrientation)); } } @@ -87,7 +91,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::makeAny(eFunction)); + xPropSet->setPropertyValue(u"Function"_ustr, uno::Any(eFunction)); } } @@ -106,7 +110,7 @@ void lclModifyLayoutInfo(uno::Reference<sheet::XDataPilotDescriptor> const & xDe { uno::Any aValue; aValue <<= aLayoutInfo; - xPropSet->setPropertyValue("LayoutInfo", aValue); + xPropSet->setPropertyValue(u"LayoutInfo"_ustr, aValue); } } } @@ -126,7 +130,7 @@ void lclModifySubtotals(uno::Reference<sheet::XDataPilotDescriptor> const & xDes { uno::Any aValue; aValue <<= rSubtotalFunctions; - xPropSet->setPropertyValue("Subtotals", aValue); + xPropSet->setPropertyValue(u"Subtotals"_ustr, aValue); } } } @@ -134,13 +138,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::makeAny(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::makeAny(bTotal)); + xProperties->setPropertyValue(u"RowGrand"_ustr, uno::Any(bTotal)); } void lclCheckSequence(std::vector<double> const & reference, @@ -168,30 +172,11 @@ void lclCheckCategories(std::vector<OUString> const & reference, } } -OUString lclGetLabel(Reference<chart2::XChartDocument> const & xChartDoc, sal_Int32 nSeriesIndex) -{ - Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, nSeriesIndex); - return xLabelDataSequence->getData()[0].get<OUString>(); -} - -uno::Reference<sheet::XDataPilotTable> lclGetPivotTableByName(sal_Int32 nIndex, OUString const & sPivotTableName, - uno::Reference<lang::XComponent> const & xComponent) -{ - uno::Reference<sheet::XSpreadsheetDocument> xDoc(xComponent, UNO_QUERY_THROW); - uno::Reference<container::XIndexAccess> xSheetIndexAccess(xDoc->getSheets(), UNO_QUERY_THROW); - uno::Any aAny = xSheetIndexAccess->getByIndex(nIndex); - uno::Reference<sheet::XSpreadsheet> xSheet; - CPPUNIT_ASSERT(aAny >>= xSheet); - uno::Reference<sheet::XDataPilotTablesSupplier> xDataPilotTablesSupplier(xSheet, uno::UNO_QUERY_THROW); - uno::Reference<sheet::XDataPilotTables> xDataPilotTables = xDataPilotTablesSupplier->getDataPilotTables(); - return uno::Reference<sheet::XDataPilotTable>(xDataPilotTables->getByName(sPivotTableName), UNO_QUERY_THROW); -} - 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(); @@ -233,22 +218,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 @@ -258,7 +243,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; @@ -293,7 +278,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::makeAny(nDateKey)); + xCellProp->setPropertyValue(u"NumberFormat"_ustr, uno::Any(nDateKey)); table::CellRangeAddress sCellRangeAddress; sCellRangeAddress.Sheet = 0; @@ -307,6 +292,18 @@ table::CellRangeAddress lclCreateTestData(uno::Reference<sheet::XSpreadsheetDocu } // end anonymous namespace +uno::Reference<sheet::XDataPilotTable> PivotChartTest::getPivotTableByName(sal_Int32 nIndex, OUString const & sPivotTableName) +{ + uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW); + uno::Reference<container::XIndexAccess> xSheetIndexAccess(xDoc->getSheets(), UNO_QUERY_THROW); + uno::Any aAny = xSheetIndexAccess->getByIndex(nIndex); + uno::Reference<sheet::XSpreadsheet> xSheet; + CPPUNIT_ASSERT(aAny >>= xSheet); + uno::Reference<sheet::XDataPilotTablesSupplier> xDataPilotTablesSupplier(xSheet, uno::UNO_QUERY_THROW); + uno::Reference<sheet::XDataPilotTables> xDataPilotTables = xDataPilotTablesSupplier->getDataPilotTables(); + return uno::Reference<sheet::XDataPilotTable>(xDataPilotTables->getByName(sPivotTableName), UNO_QUERY_THROW); +} + void PivotChartTest::testRoundtrip() { uno::Sequence<uno::Any> xSequence; @@ -316,9 +313,9 @@ void PivotChartTest::testRoundtrip() std::vector<double> aReference2 { 101879.458079, 178636.929704, 314626.484864 }; - load(u"/chart2/qa/extras/data/ods/", "PivotChartRoundTrip.ods"); + loadFromFile(u"ods/PivotChartRoundTrip.ods"); - xChartDoc = getPivotChartDocFromSheet(1, mxComponent); + xChartDoc = getPivotChartDocFromSheet(1); CPPUNIT_ASSERT(xChartDoc.is()); CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getNumberOfDataSeries(xChartDoc)); @@ -327,17 +324,19 @@ void PivotChartTest::testRoundtrip() { xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference1, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Exp."), lclGetLabel(xChartDoc, 0)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"Exp."_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } { xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 1)->getData(); lclCheckSequence(aReference2, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Rev."), lclGetLabel(xChartDoc, 1)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 1); + CPPUNIT_ASSERT_EQUAL(u"Rev."_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // Modify the pivot table { - uno::Reference<sheet::XDataPilotTable> xDataPilotTable = lclGetPivotTableByName(1, "DataPilot1", mxComponent); + uno::Reference<sheet::XDataPilotTable> xDataPilotTable = getPivotTableByName(1, u"DataPilot1"_ustr ); uno::Reference<sheet::XDataPilotDescriptor> xDataPilotDescriptor(xDataPilotTable, UNO_QUERY_THROW); lclModifyOrientation(xDataPilotDescriptor, u"Exp.", sheet::DataPilotFieldOrientation_HIDDEN); } @@ -348,12 +347,13 @@ void PivotChartTest::testRoundtrip() { xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference2, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } - reload("calc8"); + saveAndReload(u"calc8"_ustr); - xChartDoc = getPivotChartDocFromSheet(1, mxComponent); + xChartDoc = getPivotChartDocFromSheet(1 ); CPPUNIT_ASSERT(xChartDoc.is()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getNumberOfDataSeries(xChartDoc)); @@ -362,7 +362,8 @@ void PivotChartTest::testRoundtrip() { xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference2, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } } @@ -371,20 +372,20 @@ void PivotChartTest::testChangePivotTable() uno::Sequence<uno::Any> xSequence; Reference<chart2::XChartDocument> xChartDoc; - load(u"/chart2/qa/extras/data/ods/", "PivotTableExample.ods"); + loadFromFile(u"ods/PivotTableExample.ods"); // Check we have the Pivot Table - OUString sPivotTableName("DataPilot1"); - uno::Reference<sheet::XDataPilotTable> xDataPilotTable = lclGetPivotTableByName(1, sPivotTableName, mxComponent); + OUString sPivotTableName(u"DataPilot1"_ustr); + uno::Reference<sheet::XDataPilotTable> xDataPilotTable = getPivotTableByName(1, sPivotTableName ); CPPUNIT_ASSERT(xDataPilotTable.is()); // Check that we don't have any pivot chart in the document - uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1, mxComponent); + uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1 ); uno::Reference<container::XIndexAccess> xIndexAccess(xTablePivotCharts, UNO_QUERY_THROW); 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 @@ -401,7 +402,8 @@ void PivotChartTest::testChangePivotTable() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Exp."), lclGetLabel(xChartDoc, 0)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"Exp."_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // Check second data series @@ -411,7 +413,8 @@ void PivotChartTest::testChangePivotTable() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 1)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Rev."), lclGetLabel(xChartDoc, 1)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 1); + CPPUNIT_ASSERT_EQUAL(u"Rev."_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // Modify the pivot table, move "Group Segment" to Column fields, @@ -435,7 +438,8 @@ void PivotChartTest::testChangePivotTable() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Big"), lclGetLabel(xChartDoc, 0)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"Big"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // Check the second data series @@ -445,7 +449,8 @@ void PivotChartTest::testChangePivotTable() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 1)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Medium"), lclGetLabel(xChartDoc, 1)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 1); + CPPUNIT_ASSERT_EQUAL(u"Medium"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // Check the third data series @@ -455,7 +460,8 @@ void PivotChartTest::testChangePivotTable() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 2)->getData(); lclCheckSequence(aReference, xSequence, 1E-3); - CPPUNIT_ASSERT_EQUAL(OUString("Small"), lclGetLabel(xChartDoc, 2)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 2); + CPPUNIT_ASSERT_EQUAL(u"Small"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // Remove "Service Month" so row fields are empty - check we handle empty rows @@ -473,27 +479,30 @@ 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)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"Big"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // 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)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 1); + CPPUNIT_ASSERT_EQUAL(u"Medium"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // 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)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 2); + CPPUNIT_ASSERT_EQUAL(u"Small"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // Enable column totals and check the data is still unchanged { uno::Reference<beans::XPropertySet> xProperties(xDataPilotTable, uno::UNO_QUERY_THROW); - xProperties->setPropertyValue("ColumnGrand", uno::makeAny(true)); + xProperties->setPropertyValue(u"ColumnGrand"_ustr, uno::Any(true)); } CPPUNIT_ASSERT_EQUAL(sal_Int32(3), getNumberOfDataSeries(xChartDoc)); @@ -503,21 +512,24 @@ 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)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"Big"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // 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)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 1); + CPPUNIT_ASSERT_EQUAL(u"Medium"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // 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)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 2); + CPPUNIT_ASSERT_EQUAL(u"Small"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } } @@ -528,12 +540,11 @@ void PivotChartTest::testPivotChartWithOneColumnField() // SETUP DATA and PIVOT TABLE - if (!mxComponent.is()) - mxComponent = loadFromDesktop("private:factory/scalc"); + loadFromURL(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); @@ -555,16 +566,16 @@ void PivotChartTest::testPivotChartWithOneColumnField() // Check we have the Pivot Table - uno::Reference<sheet::XDataPilotTable> xDataPilotTable = lclGetPivotTableByName(1, sPivotTableName, mxComponent); + uno::Reference<sheet::XDataPilotTable> xDataPilotTable = getPivotTableByName(1, sPivotTableName ); CPPUNIT_ASSERT(xDataPilotTable.is()); // Check that we don't have any pivot chart in the document - uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1, mxComponent); + uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1 ); uno::Reference<container::XIndexAccess> xIndexAccess(xTablePivotCharts, UNO_QUERY_THROW); 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 +591,8 @@ void PivotChartTest::testPivotChartWithOneColumnField() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("DE"), lclGetLabel(xChartDoc, 0)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"DE"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // Check data series 2 @@ -590,7 +602,8 @@ void PivotChartTest::testPivotChartWithOneColumnField() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 1)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("EN"), lclGetLabel(xChartDoc, 1)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 1); + CPPUNIT_ASSERT_EQUAL(u"EN"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // Check data series 3 { @@ -599,7 +612,8 @@ void PivotChartTest::testPivotChartWithOneColumnField() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 2)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("FR"), lclGetLabel(xChartDoc, 2)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 2); + CPPUNIT_ASSERT_EQUAL(u"FR"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } } @@ -610,12 +624,11 @@ void PivotChartTest::testPivotChartWithOneRowField() // SETUP DATA and PIVOT TABLE - if (!mxComponent.is()) - mxComponent = loadFromDesktop("private:factory/scalc"); + loadFromURL(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); @@ -637,16 +650,16 @@ void PivotChartTest::testPivotChartWithOneRowField() // Check we have the Pivot Table - uno::Reference<sheet::XDataPilotTable> xDataPilotTable = lclGetPivotTableByName(1, sPivotTableName, mxComponent); + uno::Reference<sheet::XDataPilotTable> xDataPilotTable = getPivotTableByName(1, sPivotTableName ); CPPUNIT_ASSERT(xDataPilotTable.is()); // Check that we don't have any pivot chart in the document - uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1, mxComponent); + uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1 ); uno::Reference<container::XIndexAccess> xIndexAccess(xTablePivotCharts, UNO_QUERY_THROW); 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 @@ -662,7 +675,8 @@ void PivotChartTest::testPivotChartWithOneRowField() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } } @@ -670,12 +684,11 @@ void PivotChartTest::testPivotTableDataProvider_PivotTableFields() { // SETUP DATA and PIVOT TABLE - if (!mxComponent.is()) - mxComponent = loadFromDesktop("private:factory/scalc"); + loadFromURL(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); @@ -701,19 +714,19 @@ void PivotChartTest::testPivotTableDataProvider_PivotTableFields() Reference<chart2::XChartDocument> xChartDoc; // Check we have the Pivot Table - uno::Reference<sheet::XDataPilotTable> xDataPilotTable = lclGetPivotTableByName(1, sPivotTableName, mxComponent); + uno::Reference<sheet::XDataPilotTable> xDataPilotTable = getPivotTableByName(1, sPivotTableName ); CPPUNIT_ASSERT(xDataPilotTable.is()); // refetch the XDataPilotDescriptor xDataPilotDescriptor.set(xDataPilotTable, uno::UNO_QUERY_THROW); // Check that we don't have any pivot chart in the document - uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1, mxComponent); + uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1 ); uno::Reference<container::XIndexAccess> xIndexAccess(xTablePivotCharts, UNO_QUERY_THROW); 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 @@ -727,20 +740,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); @@ -758,32 +771,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 - if (!mxComponent.is()) - mxComponent = loadFromDesktop("private:factory/scalc"); + loadFromURL(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); @@ -803,19 +815,19 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode() Reference<chart2::XChartDocument> xChartDoc; // Check we have the Pivot Table - uno::Reference<sheet::XDataPilotTable> xDataPilotTable = lclGetPivotTableByName(1, sPivotTableName, mxComponent); + uno::Reference<sheet::XDataPilotTable> xDataPilotTable = getPivotTableByName(1, sPivotTableName ); CPPUNIT_ASSERT(xDataPilotTable.is()); // refetch the XDataPilotDescriptor xDataPilotDescriptor.set(xDataPilotTable, uno::UNO_QUERY_THROW); // Check that we don't have any pivot chart in the document - uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1, mxComponent); + uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1 ); uno::Reference<container::XIndexAccess> xIndexAccess(xTablePivotCharts, UNO_QUERY_THROW); 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 @@ -833,13 +845,14 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // 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()); } @@ -864,13 +877,14 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // 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()); } @@ -893,13 +907,14 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode() xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)->getData(); lclCheckSequence(aReference, xSequence, 1E-4); - CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0)); + Reference<chart2::data::XDataSequence> xLabelDataSequence = getLabelDataSequenceFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, xLabelDataSequence->getData()[0].get<OUString>()); } // 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()); } } @@ -908,12 +923,11 @@ void PivotChartTest::testPivotChartWithDateRowField() { // SETUP DATA and PIVOT TABLE - if (!mxComponent.is()) - mxComponent = loadFromDesktop("private:factory/scalc"); + loadFromURL(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); @@ -938,19 +952,19 @@ void PivotChartTest::testPivotChartWithDateRowField() Reference<chart2::XChartDocument> xChartDoc; // Check we have the Pivot Table - uno::Reference<sheet::XDataPilotTable> xDataPilotTable = lclGetPivotTableByName(1, sPivotTableName, mxComponent); + uno::Reference<sheet::XDataPilotTable> xDataPilotTable = getPivotTableByName(1, sPivotTableName ); CPPUNIT_ASSERT(xDataPilotTable.is()); // refetch the XDataPilotDescriptor xDataPilotDescriptor.set(xDataPilotTable, uno::UNO_QUERY_THROW); // Check that we don't have any pivot chart in the document - uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1, mxComponent); + uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(1 ); uno::Reference<container::XIndexAccess> xIndexAccess(xTablePivotCharts, UNO_QUERY_THROW); 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 @@ -959,7 +973,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 c13c1666725e..b4f362c0c3c2 100644 --- a/chart2/qa/extras/chart2_trendcalculators.cxx +++ b/chart2/qa/extras/chart2_trendcalculators.cxx @@ -14,22 +14,20 @@ // Define the index of sheets in the test document -#define SHEET_POTENTIAL1 0 -#define SHEET_POTENTIAL2 ( SHEET_POTENTIAL1 + 1) -#define SHEET_POTENTIAL_LAST ( SHEET_POTENTIAL2 ) - -#define SHEET_LINEAR1 ( SHEET_POTENTIAL_LAST + 1 ) -#define SHEET_LINEAR_LAST ( SHEET_LINEAR1 ) - -#define SHEET_POLYNOMIAL1 ( SHEET_LINEAR_LAST + 1 ) -#define SHEET_POLYNOMIAL_LAST ( SHEET_POLYNOMIAL1 ) - -#define SHEET_EXPONENTIAL1 ( SHEET_POLYNOMIAL_LAST + 1 ) -#define SHEET_EXPONENTIAL2 ( SHEET_EXPONENTIAL1 + 1 ) +constexpr sal_Int32 SHEET_POTENTIAL1 = 0; +constexpr sal_Int32 SHEET_POTENTIAL2 = 1; +constexpr sal_Int32 SHEET_LINEAR1 = 2; +constexpr sal_Int32 SHEET_POLYNOMIAL1 = 3; +constexpr sal_Int32 SHEET_EXPONENTIAL1 = 4; +constexpr sal_Int32 SHEET_EXPONENTIAL2 = 5; class Chart2TrendCalculators : public ChartTest { public: + Chart2TrendCalculators() + : ChartTest(u"/chart2/qa/extras/data/"_ustr) + {} + void setUp() override; void tearDown() override; @@ -50,7 +48,6 @@ public: CPPUNIT_TEST_SUITE_END(); private: - Reference<chart2::XRegressionCurve> m_xCurve; Reference< chart2::XRegressionCurveCalculator > m_xRegressionCurveCalculator; @@ -58,13 +55,12 @@ private: void checkCalculator( const Sequence< double >& xValues, const Sequence< double >& yValues, const OUString& sExpectedFormula ); - }; void Chart2TrendCalculators::setUp() { ChartTest::setUp(); - load(u"/chart2/qa/extras/data/ods/", "trend_calculators.ods"); + loadFromFile(u"ods/trend_calculators.ods"); } void Chart2TrendCalculators::tearDown() @@ -76,7 +72,7 @@ void Chart2TrendCalculators::tearDown() void Chart2TrendCalculators::loadCalculatorFromSheet(sal_Int32 nSheet) { - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(nSheet, mxComponent); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(nSheet); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); CPPUNIT_ASSERT(xChartDoc.is()); @@ -121,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 @@ -193,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 bae904d4faf3..b9fb4e455b74 100644 --- a/chart2/qa/extras/chart2dump/chart2dump.cxx +++ b/chart2/qa/extras/chart2dump/chart2dump.cxx @@ -32,7 +32,7 @@ #define DECLARE_DUMP_TEST(TestName, BaseClass, DumpMode) \ class TestName : public BaseClass { \ protected:\ - virtual OUString getTestName() override { return #TestName; } \ + virtual OUString getTestName() override { return u"" #TestName ""_ustr; } \ public:\ TestName() : BaseClass(DumpMode) {}; \ CPPUNIT_TEST_SUITE(TestName); \ @@ -46,7 +46,7 @@ #define CPPUNIT_DUMP_ASSERT_NUMBERS_EQUAL(aActual) \ if(isInDumpMode()) \ - writeActual(OUString::number(aActual), #aActual); \ + writeActual(OUString::number(aActual), u"" #aActual ""_ustr); \ else \ { \ OString sTestFileName = OUStringToOString(getTestFileName(), RTL_TEXTENCODING_UTF8); \ @@ -55,7 +55,7 @@ #define CPPUNIT_DUMP_ASSERT_DOUBLES_EQUAL(aActual, EPS_) \ if(isInDumpMode()) \ - writeActual(OUString::number(aActual), #aActual); \ + writeActual(OUString::number(aActual), u"" #aActual ""_ustr); \ else \ { \ OString sTestFileName = OUStringToOString(getTestFileName(), RTL_TEXTENCODING_UTF8); \ @@ -64,7 +64,7 @@ #define CPPUNIT_DUMP_ASSERT_STRINGS_EQUAL(aActual) \ if(isInDumpMode()) \ - writeActual(aActual, #aActual); \ + writeActual(aActual, u"" #aActual ""_ustr); \ else \ { \ OString sTestFileName = OUStringToOString(getTestFileName(), RTL_TEXTENCODING_UTF8); \ @@ -73,7 +73,7 @@ #define CPPUNIT_DUMP_ASSERT_TRANSFORMATIONS_EQUAL(aActual, EPS_) \ if(isInDumpMode()) \ - writeActualTransformation(aActual, #aActual); \ + writeActualTransformation(aActual, u"" #aActual ""_ustr); \ else \ { \ OUString expectedTransform; \ @@ -88,6 +88,7 @@ class Chart2DumpTest : public ChartTest { protected: Chart2DumpTest(bool bDumpMode) + : ChartTest(u"/chart2/qa/extras/chart2dump/data/"_ustr) { m_bDumpMode = bDumpMode; } @@ -107,7 +108,6 @@ protected: virtual OUString getTestName() { return OUString(); } OUString const & getTestFileName() const { return m_sTestFileName; } - OUString getTestFileDirName() const { return "/chart2/qa/extras/chart2dump/data/"; } OUString getReferenceDirName() { return "/chart2/qa/extras/chart2dump/reference/" + getTestName().toAsciiLowerCase() + "/"; @@ -124,7 +124,7 @@ protected: { if (m_aReferenceFile.is_open()) m_aReferenceFile.close(); - OString sReferenceFile = OUStringToOString(OUStringConcatenation(m_directories.getPathFromSrc(getReferenceDirName()) + sFileName), RTL_TEXTENCODING_UTF8); + OString sReferenceFile = OUStringToOString(Concat2View(m_directories.getPathFromSrc(getReferenceDirName()) + sFileName), RTL_TEXTENCODING_UTF8); m_aReferenceFile.open(sReferenceFile.getStr(), std::ios_base::in); CPPUNIT_ASSERT_MESSAGE(OString("Can't open reference file: " + sReferenceFile).getStr(), m_aReferenceFile.is_open()); } @@ -132,7 +132,7 @@ protected: { if (m_aDumpFile.is_open()) m_aDumpFile.close(); - OString sDumpFile = OUStringToOString(OUStringConcatenation(m_directories.getPathFromSrc(getReferenceDirName()) + sFileName), RTL_TEXTENCODING_UTF8); + OString sDumpFile = OUStringToOString(Concat2View(m_directories.getPathFromSrc(getReferenceDirName()) + sFileName), RTL_TEXTENCODING_UTF8); m_aDumpFile.open(sDumpFile.getStr(), std::ios_base::out | std::ofstream::binary | std::ofstream::trunc); CPPUNIT_ASSERT_MESSAGE(OString("Can't open dump file: " + sDumpFile).getStr(), m_aDumpFile.is_open()); } @@ -157,12 +157,12 @@ protected: return OUString(sTemp.data(), sTemp.length(), RTL_TEXTENCODING_UTF8); } - void writeActual(const OUString& sActualValue, const OUString& sCheck) + void writeActual(std::u16string_view sActualValue, const OUString& sCheck) { assert(m_bDumpMode); assert(m_aDumpFile.is_open()); m_aDumpFile << "// " << sCheck << "\n"; // Add check string to make dump file readable - m_aDumpFile << sActualValue.trim() << "\n"; // Write out the checked value, will be used as reference later + m_aDumpFile << OUString(sActualValue) << "\n"; // Write out the checked value, will be used as reference later } void readNote(std::u16string_view sNote) @@ -202,15 +202,15 @@ protected: // Convert string back to a transformation; drawing::HomogenMatrix3 aExpectedTransform; sal_Int32 nIdx {0}; - aExpectedTransform.Line1.Column1 = rExpectedTransform.getToken(0, ';', nIdx).toDouble(); - aExpectedTransform.Line1.Column2 = rExpectedTransform.getToken(0, ';', nIdx).toDouble(); - aExpectedTransform.Line1.Column3 = rExpectedTransform.getToken(0, ';', nIdx).toDouble(); - aExpectedTransform.Line2.Column1 = rExpectedTransform.getToken(0, ';', nIdx).toDouble(); - aExpectedTransform.Line2.Column2 = rExpectedTransform.getToken(0, ';', nIdx).toDouble(); - aExpectedTransform.Line2.Column3 = rExpectedTransform.getToken(0, ';', nIdx).toDouble(); - aExpectedTransform.Line3.Column1 = rExpectedTransform.getToken(0, ';', nIdx).toDouble(); - aExpectedTransform.Line3.Column2 = rExpectedTransform.getToken(0, ';', nIdx).toDouble(); - aExpectedTransform.Line3.Column3 = rExpectedTransform.getToken(0, ';', nIdx).toDouble(); + aExpectedTransform.Line1.Column1 = o3tl::toDouble(o3tl::getToken(rExpectedTransform, 0, ';', nIdx)); + aExpectedTransform.Line1.Column2 = o3tl::toDouble(o3tl::getToken(rExpectedTransform, 0, ';', nIdx)); + aExpectedTransform.Line1.Column3 = o3tl::toDouble(o3tl::getToken(rExpectedTransform, 0, ';', nIdx)); + aExpectedTransform.Line2.Column1 = o3tl::toDouble(o3tl::getToken(rExpectedTransform, 0, ';', nIdx)); + aExpectedTransform.Line2.Column2 = o3tl::toDouble(o3tl::getToken(rExpectedTransform, 0, ';', nIdx)); + aExpectedTransform.Line2.Column3 = o3tl::toDouble(o3tl::getToken(rExpectedTransform, 0, ';', nIdx)); + aExpectedTransform.Line3.Column1 = o3tl::toDouble(o3tl::getToken(rExpectedTransform, 0, ';', nIdx)); + aExpectedTransform.Line3.Column2 = o3tl::toDouble(o3tl::getToken(rExpectedTransform, 0, ';', nIdx)); + aExpectedTransform.Line3.Column3 = o3tl::toDouble(o3tl::getToken(rExpectedTransform, 0, ';', nIdx)); // Check the equality of the two transformation return (std::abs(aExpectedTransform.Line1.Column1 - rTransform.Line1.Column1) < fEPS && @@ -262,15 +262,15 @@ 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) { setTestFileName(aTestFile); - load(getTestFileDirName(), getTestFileName()); - uno::Reference< chart::XChartDocument > xChartDoc (getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW); + loadFromFile(getTestFileName()); + uno::Reference< chart::XChartDocument > xChartDoc (getChartDocFromSheet(0), UNO_QUERY_THROW); // Check title uno::Reference< chart2::XChartDocument > xChartDoc2(xChartDoc, UNO_QUERY_THROW); @@ -369,20 +369,20 @@ 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) { setTestFileName(aTestFile); - load(getTestFileDirName(), getTestFileName()); + loadFromFile(getTestFileName()); uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW); uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); @@ -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,17 +467,17 @@ 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) { setTestFileName(sTestFile); - load(getTestFileDirName(), getTestFileName()); - uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW); + loadFromFile(getTestFileName()); + uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); @@ -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,16 +539,16 @@ 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) { setTestFileName(sTestFile); - load(getTestFileDirName(), getTestFileName()); + loadFromFile(getTestFileName()); uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW); uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); @@ -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,18 +610,18 @@ 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) { setTestFileName(sTestFile); - load(getTestFileDirName(), getTestFileName()); + loadFromFile(getTestFileName()); uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW); uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); @@ -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,20 +692,20 @@ 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) { setTestFileName(sTestFile); - load(getTestFileDirName(), getTestFileName()); - uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW); + loadFromFile(getTestFileName()); + uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); @@ -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,22 +766,22 @@ 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) { setTestFileName(sTestFile); - load(getTestFileDirName(), getTestFileName()); + loadFromFile(getTestFileName()); uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0, 0), UNO_SET_THROW); uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); 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,20 +809,19 @@ 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); - } } @@ -830,18 +829,18 @@ 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) { setTestFileName(sTestFile); - load(getTestFileDirName(), getTestFileName()); - uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW); + loadFromFile(getTestFileName()); + uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); @@ -886,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 @@ -905,16 +904,16 @@ 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) { setTestFileName(sTestFile); - load(getTestFileDirName(), getTestFileName()); - uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW); + loadFromFile(getTestFileName()); + uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); @@ -950,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 @@ -969,25 +968,25 @@ 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) { setTestFileName(sTestFile); - load(getTestFileDirName(), getTestFileName()); - uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW); + loadFromFile(getTestFileName()); + uno::Reference< chart::XChartDocument > xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); @@ -1017,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 @@ -1029,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); @@ -1059,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 @@ -1077,11 +1076,11 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest, false) DECLARE_DUMP_TEST( PivotChartDataButtonTest, Chart2DumpTest, false ) { - setTestFileName( "pivotchart_data_button.ods" ); - load( getTestFileDirName(), getTestFileName() ); + setTestFileName( u"pivotchart_data_button.ods"_ustr ); + loadFromFile(getTestFileName()); // Check that we have pivot chart in the document - uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet( 1, mxComponent ); + uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet( 1); uno::Reference<container::XIndexAccess> xIndexAccess( xTablePivotCharts, UNO_QUERY_THROW ); CPPUNIT_ASSERT_EQUAL( sal_Int32(1), xIndexAccess->getCount() ); @@ -1096,20 +1095,20 @@ 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"; } ); - CPPUNIT_ASSERT_MESSAGE( OString( "Cannot find Data button shape" ).getStr(), xButton.is() ); + 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"; } ); - CPPUNIT_ASSERT_MESSAGE( OString( "Arrow shape should not be present for the Data button" ).getStr(), !xArrow.is() ); + CPPUNIT_ASSERT_MESSAGE( "Arrow shape should not be present for the Data button", !xArrow.is() ); // Assert the background color of the Data button util::Color aButtonFillColor = 0; diff --git a/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt b/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt index 28a125d7a5ed..ec3bfa72e397 100644 --- a/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt +++ b/chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt @@ -11,7 +11,7 @@ Quarter // sYAxisTitle Income (Ft) // nYAxisNumberFormat -151 +159 // nYAxisNumberType 17 // aColumnLabels.getLength() diff --git a/chart2/qa/extras/chart2dump/reference/piecharttest/donut_chart.txt b/chart2/qa/extras/chart2dump/reference/piecharttest/donut_chart.txt index b2dfd33295a2..c1af41103de5 100644 --- a/chart2/qa/extras/chart2dump/reference/piecharttest/donut_chart.txt +++ b/chart2/qa/extras/chart2dump/reference/piecharttest/donut_chart.txt @@ -35,15 +35,15 @@ 16728590 /// /D=0:CS=0:CT=0:Series=0:Point=2 // aSlicePosition.X -8909 +9033 // aSlicePosition.Y -4532 +4635 // aSliceSize.Height -4689 +4659 // aSliceSize.Width -2544 +2458 // aSliceTransformation -2544;0;8909;0;4689;4532;0;0;1 +2458;0;9033;0;4659;4635;0;0;1 // static_cast<sal_Int32>(aSliceFillStyle) 1 // static_cast<sal_Int32>(aSliceFillColor) diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index a5c2e20cc58c..3f37794e1d10 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -16,232 +16,35 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> +#include <com/sun/star/chart2/PieChartSubType.hpp> using uno::Reference; using beans::XPropertySet; class Chart2ExportTest : public ChartTest { -protected: - - virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override; public: - Chart2ExportTest() : ChartTest() {} - - void testErrorBarXLSX(); - void testErrorBarPropXLSX(); - void testTrendline(); - void testTrendlineOOXML(); - void testTrendlineXLS(); - void testMovingAverage(); - void testStockChart(); - void testBarChart(); - void testCrosses(); - void testScatterChartTextXValues(); - void testScatterXAxisValues(); - void testScatterXAxisCategories(); - void testChartDataTable(); - void testChartExternalData(); - void testEmbeddingsGrabBag(); - void testAreaChartLoad(); - void testUpDownBars(); - void testDoughnutChart(); - void testDisplayUnits(); - // void testFdo74115WallGradientFill(); - void testFdo74115WallBitmapFill(); - void testPieChartWallLineStyle(); - void testBarChartRotation(); - void testShapeFollowedByChart(); - void testPieChartDataLabels(); - void testSeriesIdxOrder(); - void testScatterPlotLabels(); - void testErrorBarDataRangeODS(); - void testChartCrash(); - void testPieChartRotation(); - void testEmbeddingsOleObjectGrabBag(); - void testGapWidthXLSX(); - void testSmoothedLines(); - void testLabelStringODS(); - void testFdo78290LineChartMarkerX(); - void testFdo78290ScatterChartMarkerX(); - void testFdo78290CombinationChartMarkerX(); - void testTdf126115IndividualMarker(); - void testAxisNumberFormatODS(); - void testAxisNumberFormatXLS(); - void testDataLabelBordersDOCX(); - void testDataLabel3DChartDOCX(); - void testDataLabelBarChartDOCX(); - void testDataLabelClusteredBarChartDOCX(); - void testDataLabelRadarChartDOCX(); - void testDataLabelDoughnutChartDOCX(); - void testDataLabelAreaChartDOCX(); - void testDataLabelDefaultLineChartDOCX(); - void testIndividualDataLabelProps(); - void testTdf108107(); - void testTdf114139(); - void testTdf64224(); - void testChartTitlePropertiesColorFillDOCX(); - void testChartTitlePropertiesGradientFillDOCX(); - void testChartTitlePropertiesBitmapFillDOCX(); - void testColorGradientWithTransparencyDOCX(); - void testColorGradientWithTransparencyODS(); - void testColorGradientStopXLSX(); - void testRadialColorGradientDOCX(); - void testBarChartDataPointPropDOCX(); - void testFdo83058dlblPos(); - void testAutoTitleDelXLSX(); - void testDispBlanksAsXLSX(); - void testMarkerColorXLSX(); - void testRoundedCornersXLSX(); - void testAxisNumberFormatXLSX(); - void testDataPointLabelNumberFormatXLSX(); - void testDataLabelDefaultValuesXLSX(); - void testDataLabelFillColor(); - void testTitleOverlayXLSX(); - void testInvertIfNegativeXLSX(); - void testBubble3DXLSX(); - void testNoMarkerXLSX(); - void testTitleManualLayoutXLSX(); - void testPlotAreaManualLayoutXLSX(); - void testLegendManualLayoutXLSX(); - void testChartSubTitle(); - void testChartMainWithSubTitle(); - void testAutoTitleDeleted(); - void testChartTitlePropertiesColorFillXLSX(); - void testChartTitlePropertiesGradientFillXLSX(); - void testChartTitlePropertiesBitmapFillXLSX(); - void testBarChartDataPointPropXLSX(); - void testDataseriesOverlapStackedChartXLSX(); - void testAxisCharacterPropertiesXLSX(); - void testTitleCharacterPropertiesXLSX(); - void testPlotVisOnlyXLSX(); - void testBarChartVaryColorsXLSX(); - void testTdf96161(); - void testMultipleAxisXLSX(); - void testSecondaryAxisXLSX(); - void testBarChartSecondaryAxisXLSX(); - - CPPUNIT_TEST_SUITE(Chart2ExportTest); - CPPUNIT_TEST(testErrorBarXLSX); - CPPUNIT_TEST(testErrorBarPropXLSX); - CPPUNIT_TEST(testTrendline); - CPPUNIT_TEST(testTrendlineOOXML); - CPPUNIT_TEST(testTrendlineXLS); - CPPUNIT_TEST(testMovingAverage); - CPPUNIT_TEST(testStockChart); - CPPUNIT_TEST(testBarChart); - CPPUNIT_TEST(testCrosses); - CPPUNIT_TEST(testScatterChartTextXValues); - CPPUNIT_TEST(testScatterXAxisValues); - CPPUNIT_TEST(testScatterXAxisCategories); - CPPUNIT_TEST(testChartDataTable); - CPPUNIT_TEST(testChartExternalData); - CPPUNIT_TEST(testEmbeddingsGrabBag); - CPPUNIT_TEST(testAreaChartLoad); - CPPUNIT_TEST(testUpDownBars); - CPPUNIT_TEST(testDoughnutChart); - CPPUNIT_TEST(testDisplayUnits); - // CPPUNIT_TEST(testFdo74115WallGradientFill); - CPPUNIT_TEST(testFdo74115WallBitmapFill); - CPPUNIT_TEST(testPieChartWallLineStyle); - CPPUNIT_TEST(testBarChartRotation); - CPPUNIT_TEST(testShapeFollowedByChart); - CPPUNIT_TEST(testPieChartDataLabels); - CPPUNIT_TEST(testSeriesIdxOrder); - CPPUNIT_TEST(testScatterPlotLabels); - CPPUNIT_TEST(testErrorBarDataRangeODS); - CPPUNIT_TEST(testChartCrash); - CPPUNIT_TEST(testPieChartRotation); - CPPUNIT_TEST(testEmbeddingsOleObjectGrabBag); - CPPUNIT_TEST(testGapWidthXLSX); - CPPUNIT_TEST(testSmoothedLines); - CPPUNIT_TEST(testLabelStringODS); - CPPUNIT_TEST(testFdo78290LineChartMarkerX); - CPPUNIT_TEST(testFdo78290ScatterChartMarkerX); - CPPUNIT_TEST(testFdo78290CombinationChartMarkerX); - CPPUNIT_TEST(testTdf126115IndividualMarker); - CPPUNIT_TEST(testAxisNumberFormatODS); - CPPUNIT_TEST(testAxisNumberFormatXLS); - CPPUNIT_TEST(testDataLabelBordersDOCX); - CPPUNIT_TEST(testDataLabel3DChartDOCX); - CPPUNIT_TEST(testDataLabelBarChartDOCX); - CPPUNIT_TEST(testDataLabelClusteredBarChartDOCX); - CPPUNIT_TEST(testDataLabelRadarChartDOCX); - CPPUNIT_TEST(testDataLabelDoughnutChartDOCX); - CPPUNIT_TEST(testDataLabelAreaChartDOCX); - CPPUNIT_TEST(testDataLabelDefaultLineChartDOCX); - CPPUNIT_TEST(testIndividualDataLabelProps); - CPPUNIT_TEST(testTdf108107); - CPPUNIT_TEST(testTdf114139); - CPPUNIT_TEST(testTdf64224); - CPPUNIT_TEST(testChartTitlePropertiesColorFillDOCX); - CPPUNIT_TEST(testChartTitlePropertiesGradientFillDOCX); - CPPUNIT_TEST(testChartTitlePropertiesBitmapFillDOCX); - CPPUNIT_TEST(testColorGradientWithTransparencyDOCX); - CPPUNIT_TEST(testColorGradientWithTransparencyODS); - CPPUNIT_TEST(testColorGradientStopXLSX); - CPPUNIT_TEST(testRadialColorGradientDOCX); - CPPUNIT_TEST(testBarChartDataPointPropDOCX); - CPPUNIT_TEST(testFdo83058dlblPos); - CPPUNIT_TEST(testAutoTitleDelXLSX); - CPPUNIT_TEST(testDispBlanksAsXLSX); - CPPUNIT_TEST(testMarkerColorXLSX); - CPPUNIT_TEST(testRoundedCornersXLSX); - CPPUNIT_TEST(testAxisNumberFormatXLSX); - CPPUNIT_TEST(testDataPointLabelNumberFormatXLSX); - CPPUNIT_TEST(testDataLabelDefaultValuesXLSX); - CPPUNIT_TEST(testDataLabelFillColor); - CPPUNIT_TEST(testTitleOverlayXLSX); - CPPUNIT_TEST(testInvertIfNegativeXLSX); - CPPUNIT_TEST(testBubble3DXLSX); - CPPUNIT_TEST(testNoMarkerXLSX); - CPPUNIT_TEST(testTitleManualLayoutXLSX); - CPPUNIT_TEST(testPlotAreaManualLayoutXLSX); - CPPUNIT_TEST(testLegendManualLayoutXLSX); - CPPUNIT_TEST(testChartSubTitle); - CPPUNIT_TEST(testChartMainWithSubTitle); - CPPUNIT_TEST(testAutoTitleDeleted); - CPPUNIT_TEST(testChartTitlePropertiesColorFillXLSX); - CPPUNIT_TEST(testChartTitlePropertiesGradientFillXLSX); - CPPUNIT_TEST(testChartTitlePropertiesBitmapFillXLSX); - CPPUNIT_TEST(testBarChartDataPointPropXLSX); - CPPUNIT_TEST(testDataseriesOverlapStackedChartXLSX); - CPPUNIT_TEST(testAxisCharacterPropertiesXLSX); - CPPUNIT_TEST(testTitleCharacterPropertiesXLSX); - CPPUNIT_TEST(testPlotVisOnlyXLSX); - CPPUNIT_TEST(testBarChartVaryColorsXLSX); - CPPUNIT_TEST(testTdf96161); - CPPUNIT_TEST(testMultipleAxisXLSX); - CPPUNIT_TEST(testSecondaryAxisXLSX); - CPPUNIT_TEST(testBarChartSecondaryAxisXLSX); - - CPPUNIT_TEST_SUITE_END(); + Chart2ExportTest() : ChartTest(u"/chart2/qa/extras/data/"_ustr) {} }; -void Chart2ExportTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) -{ - XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx); -} - namespace { 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); } @@ -249,27 +52,27 @@ void checkCommonTrendline( Reference<chart2::XRegressionCurve> const & xCurve, double aExpectedExtrapolateForward, double aExpectedExtrapolateBackward, bool aExpectedForceIntercept, double aExpectedInterceptValue, - bool aExpectedShowEquation, bool aExpectedR2) + bool aExpectedShowEquation, bool aExpectedR2, bool aExpectedMayHaveR2) { Reference<XPropertySet> xProperties( xCurve , uno::UNO_QUERY ); 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); } @@ -277,12 +80,16 @@ 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(u"MayHaveCorrelationCoefficient"_ustr) >>= bMayHaveR2); + CPPUNIT_ASSERT_EQUAL(aExpectedMayHaveR2, bMayHaveR2); } void checkNameAndType(Reference<XPropertySet> const & xProperties, const OUString& aExpectedName, const OUString& aExpectedServiceName) @@ -294,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); } @@ -306,13 +113,13 @@ 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, aExpectedExtrapolateForward, aExpectedExtrapolateBackward, /*aExpectedForceIntercept*/false, aExpectedInterceptValue, - /*aExpectedShowEquation*/true, /*aExpectedR2*/false); + /*aExpectedShowEquation*/true, /*aExpectedR2*/false, /*aExpectedMayHaveR2*/true); } void checkPolynomialTrendline( @@ -324,17 +131,17 @@ 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( xCurve, aExpectedExtrapolateForward, aExpectedExtrapolateBackward, /*aExpectedForceIntercept*/true, aExpectedInterceptValue, - /*aExpectedShowEquation*/true, /*aExpectedR2*/true); + /*aExpectedShowEquation*/true, /*aExpectedR2*/true, /*aExpectedMayHaveR2*/true); } void checkMovingAverageTrendline( @@ -343,20 +150,21 @@ 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( + xCurve, + /*aExpectedExtrapolateForward*/0.0, /*aExpectedExtrapolateBackward*/0.0, + /*aExpectedForceIntercept*/false, /*aExpectedInterceptValue*/0.0, + /*aExpectedShowEquation*/false, /*aExpectedR2*/false, /*aExpectedMayHaveR2*/false); } -void checkTrendlinesInChart(uno::Reference< chart2::XChartDocument > const & xChartDoc) +void checkTrendlinesInChart(uno::Reference< chart2::XDataSeries > const & xDataSeries ) { - CPPUNIT_ASSERT(xChartDoc.is()); - - Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 ); - CPPUNIT_ASSERT( xDataSeries.is() ); - Reference< chart2::XRegressionCurveContainer > xRegressionCurveContainer( xDataSeries, UNO_QUERY ); CPPUNIT_ASSERT( xRegressionCurveContainer.is() ); @@ -367,26 +175,26 @@ 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); } } // improve the test -void Chart2ExportTest::testErrorBarXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarXLSX) { - load(u"/chart2/qa/extras/data/ods/", "error_bar.ods"); + loadFromFile(u"ods/error_bar.ods"); { // make sure the ODS import was successful - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); CPPUNIT_ASSERT(xChartDoc.is()); Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 ); @@ -400,9 +208,9 @@ void Chart2ExportTest::testErrorBarXLSX() testErrorBar(xErrorBarYProps); } - reload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); { - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); CPPUNIT_ASSERT(xChartDoc.is()); Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 ); @@ -417,58 +225,59 @@ void Chart2ExportTest::testErrorBarXLSX() } } -void Chart2ExportTest::testErrorBarPropXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarPropXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "testErrorBarProp.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML"); + loadFromFile(u"xlsx/testErrorBarProp.xlsx"); + 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", "val", "y"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln", "w", "12600"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", "ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:errDir", "val", u"y"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln", "w", u"12600"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", u"ff0000"); // test x error bars property - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:errDir", "val", "x"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln", "w", "9360"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", "595959"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:errDir", "val", u"x"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln", "w", u"9360"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", u"595959"); } // This method tests the preservation of properties for trendlines / regression curves // in an export -> import cycle using different file formats - ODS, XLS and XLSX. -void Chart2ExportTest::testTrendline() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendline) { - mbSkipValidation = true; - load(u"/chart2/qa/extras/data/ods/", "trendline.ods"); - checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); - reload("calc8"); - checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); + // Validation fails with + // Error: tag name "chart:symbol-image" is not allowed. Possible tag names are: <label-separator> + skipValidation(); + loadFromFile(u"ods/trendline.ods"); + checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); + saveAndReload(u"calc8"_ustr); + checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); } -void Chart2ExportTest::testTrendlineOOXML() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineOOXML) { - load(u"/chart2/qa/extras/data/ods/", "trendline.ods"); - checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); - reload("Calc Office Open XML"); - checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); + loadFromFile(u"ods/trendline.ods"); + checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); + saveAndReload(u"Calc Office Open XML"_ustr); + checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); } -void Chart2ExportTest::testTrendlineXLS() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineXLS) { - mbSkipValidation = true; - load(u"/chart2/qa/extras/data/ods/", "trendline.ods"); - checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); - reload("MS Excel 97"); - checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent)); + loadFromFile(u"ods/trendline.ods"); + checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); + saveAndReload(u"MS Excel 97"_ustr); + checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0 )); } -void Chart2ExportTest::testMovingAverage() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testMovingAverage) { - mbSkipValidation = true; - load(u"/chart2/qa/extras/data/ods/", "moving-type.ods"); - reload("calc8"); + loadFromFile(u"ods/moving-type.ods"); + saveAndReload(u"calc8"_ustr); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0); CPPUNIT_ASSERT(xChartDoc.is()); Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 ); @@ -487,11 +296,11 @@ void 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); } -void Chart2ExportTest::testStockChart() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testStockChart) { /* For attached file Stock_Chart.docx, in chart1.xml, * <c:stockChart>, there are four types of series as @@ -500,50 +309,54 @@ void Chart2ExportTest::testStockChart() * an attribute val of index should start from 1 and not from 0. * Which was problem area. */ - load(u"/chart2/qa/extras/data/docx/", "testStockChart.docx"); + loadFromFile(u"docx/testStockChart.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + 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", "val", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:order", "val", "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:idx", "val", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:order", "val", u"1"); assertXPathContent( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:stockChart/c:ser[1]/c:tx/c:strRef/c:strCache/c:pt/c:v", - "Open"); + u"Open"); } -void Chart2ExportTest::testBarChart() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChart) { - load(u"/chart2/qa/extras/data/docx/", "testBarChart.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/testBarChart.docx"); + 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", "val", "col"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:barDir", "val", u"col"); } -void Chart2ExportTest::testCrosses() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testCrosses) { // test crosses val="autoZero" with DOCX { - load(u"/chart2/qa/extras/data/docx/", "Bar_horizontal_cone.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/Bar_horizontal_cone.docx"); + 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", "val", "autoZero"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crosses", "val", u"autoZero"); } // tdf#142351: test crossesAt val="-50" with XLSX { - load(u"/chart2/qa/extras/data/xlsx/", "tdf142351.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf142351.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crossesAt", "val", "-50"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:crossesAt", "val", u"-50"); } } -void Chart2ExportTest::testScatterChartTextXValues() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterChartTextXValues) { - load(u"/chart2/qa/extras/data/docx/", "scatter-chart-text-x-values.docx"); + loadFromFile(u"docx/scatter-chart-text-x-values.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -554,9 +367,9 @@ void 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()); @@ -583,76 +396,79 @@ void Chart2ExportTest::testScatterChartTextXValues() CPPUNIT_ASSERT_EQUAL(5.0, aYValues[2][3]); // Test the export. - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + 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]", "1"); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal[1]/c:numRef[1]/c:numCache[1]/c:pt[1]/c:v[1]", u"1"); } -void Chart2ExportTest::testScatterXAxisValues() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterXAxisValues) { - load(u"/chart2/qa/extras/data/odt/", "tdf114657.odt"); + loadFromFile(u"odt/tdf114657.odt"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + 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", "val", "5"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[1]/c:v", "15"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[2]/c:v", "11"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[3]/c:v", "20"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[4]/c:v", "16"); + assertXPath(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:ptCount", "val", u"5"); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[1]/c:v", u"15"); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[2]/c:v", u"11"); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[3]/c:v", u"20"); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser/c:xVal/c:numRef/c:numCache/c:pt[4]/c:v", u"16"); } -void Chart2ExportTest::testScatterXAxisCategories() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterXAxisCategories) { - load(u"/chart2/qa/extras/data/odt/", "tdf131143.odt"); + loadFromFile(u"odt/tdf131143.odt"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + 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", "val", "4"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[1]/c:v", "Row 1"); - assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[2]/c:v", "Row 2"); + assertXPath(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:ptCount", "val", u"4"); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[1]/c:v", u"Row 1"); + assertXPathContent(pXmlDoc, "//c:scatterChart/c:ser[1]/c:xVal/c:strRef/c:strCache/c:pt[2]/c:v", u"Row 2"); } -void Chart2ExportTest::testChartDataTable() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartDataTable) { - load(u"/chart2/qa/extras/data/docx/", "testChartDataTable.docx"); + loadFromFile(u"docx/testChartDataTable.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + 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", "val", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showVertBorder", "val", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showOutline", "val", "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showHorzBorder", "val", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showVertBorder", "val", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dTable/c:showOutline", "val", u"1"); } -void Chart2ExportTest::testChartExternalData() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartExternalData) { - load(u"/chart2/qa/extras/data/docx/", "testMultipleChart.docx"); + loadFromFile(u"docx/testMultipleChart.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - xmlXPathObjectPtr pXmlPathObj = getXPathNode(pXmlDoc, "/c:chartSpace/c:externalData"); - xmlNodeSetPtr pXmlNodes = pXmlPathObj->nodesetval; - CPPUNIT_ASSERT(pXmlNodes); + assertXPath(pXmlDoc, "/c:chartSpace/c:externalData"); } -void Chart2ExportTest::testEmbeddingsGrabBag() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testEmbeddingsGrabBag) { // The problem was that .xlsx files were missing from docx file from embeddings folder // after saving file. // This test case tests whether embeddings files grabbagged properly in correct object. - load(u"/chart2/qa/extras/data/docx/", "testMultiplechartembeddings.docx" ); + loadFromFile(u"docx/testMultiplechartembeddings.docx" ); uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aGrabBag(0); - 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", "word/embeddings/Microsoft_Excel_Worksheet2.xlsx", "word/embeddings/Microsoft_Excel_Worksheet1.xlsx"}; - for(beans::PropertyValue const & prop : std::as_const(aGrabBag)) + for (beans::PropertyValue const& prop : aGrabBag) { if (prop.Name == "OOXEmbeddings") { @@ -675,224 +491,273 @@ void Chart2ExportTest::testEmbeddingsGrabBag() CPPUNIT_ASSERT(bEmbeddings); // Grab Bag has all the expected elements } -void Chart2ExportTest::testAreaChartLoad() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAreaChartLoad) { - load (u"/chart2/qa/extras/data/docx/", "testAreaChartLoad.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + loadFromFile(u"docx/testAreaChartLoad.docx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + 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", "val", "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:showVal", "val", u"1"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLbl", 0); } -void Chart2ExportTest::testUpDownBars() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testUpDownBars) { - /* - load("/chart2/qa/extras/data/docx/", "UpDownBars.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/UpDownBars.docx"); + 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"); - */ + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:upDownBars", 0); } -void Chart2ExportTest::testDoughnutChart() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDoughnutChart) { - load(u"/chart2/qa/extras/data/docx/", "doughnutChart.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/doughnutChart.docx"); + 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"); } -void Chart2ExportTest::testDisplayUnits() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieOfPieChart) { - load(u"/chart2/qa/extras/data/docx/", "DisplayUnits.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"xlsx/pieOfPieChart.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:dispUnits/c:builtInUnit", "val", "billions"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:ofPieType[1]", "val", u"pie"); } -// void Chart2ExportTest::testFdo74115WallGradientFill() -// { -// load("/chart2/qa/extras/data/docx/", "fdo74115_WallGradientFill.docx"); -// xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); -// CPPUNIT_ASSERT(pXmlDoc); -// -// assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill"); -// } +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarOfPieChart) +{ + loadFromFile(u"xlsx/barOfPieChart.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:ofPieType[1]", "val", u"bar"); +} -void Chart2ExportTest::testFdo74115WallBitmapFill() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieOfPieSplitPos) { - load(u"/chart2/qa/extras/data/docx/", "fdo74115_WallBitmapFill.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"xlsx/pieOfPieChart2.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:splitPos[1]", "val", u"4"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarOfPieSplitPos) +{ + loadFromFile(u"xlsx/barOfPieChart2.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:ofPieChart/c:splitPos[1]", "val", u"5"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDisplayUnits) +{ + loadFromFile(u"docx/DisplayUnits.docx"); + 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", "val", u"billions"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallGradientFill) +{ + loadFromFile(u"docx/fdo74115_WallGradientFill.docx"); + 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"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo74115WallBitmapFill) +{ + loadFromFile(u"docx/fdo74115_WallBitmapFill.docx"); + 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"); } -void Chart2ExportTest::testPieChartWallLineStyle() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartWallLineStyle) { - load(u"/chart2/qa/extras/data/odt/", "testPieChartWallLineStyle.odt"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"odt/testPieChartWallLineStyle.odt"); + + // FIXME: validation error in OOXML export: Errors: 9 + skipValidation(); + + 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"); } //The below test case tests the built in marker 'x' for Office 2010 in Line charts -void Chart2ExportTest::testFdo78290LineChartMarkerX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290LineChartMarkerX) { - load(u"/chart2/qa/extras/data/docx/", "fdo78290_Line_Chart_Marker_x.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/fdo78290_Line_Chart_Marker_x.docx"); + 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]","val","x"); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val","7"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val",u"x"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val",u"7"); } // We can also use the built in marker 'x' in scatter chart, hence writing the test case for the same. -void Chart2ExportTest::testFdo78290ScatterChartMarkerX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290ScatterChartMarkerX) { - load(u"/chart2/qa/extras/data/docx/", "fdo78290_Scatter_Chart_Marker_x.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/fdo78290_Scatter_Chart_Marker_x.docx"); + 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]","val","x"); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val","7"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val",u"x"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:scatterChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val",u"7"); } // Also in a combination of charts like a column chart and line chart, we can use the built in marker 'x' // for the line chart too. hence put a test case for the combination chart also. -void Chart2ExportTest::testFdo78290CombinationChartMarkerX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testFdo78290CombinationChartMarkerX) { - load(u"/chart2/qa/extras/data/docx/", "fdo78290_Combination_Chart_Marker_x.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/fdo78290_Combination_Chart_Marker_x.docx"); + 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]","val","x"); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val","7"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:symbol[1]","val",u"x"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val",u"7"); } -void Chart2ExportTest::testTdf126115IndividualMarker() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTdf126115IndividualMarker) { // Check individual marker properties. - load(u"/chart2/qa/extras/data/xlsx/", "tdf126115.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf126115.xlsx"); + 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", "val", "square"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:size", "val", "8"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:symbol", "val", u"square"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:size", "val", u"8"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", u"ff0000"); // 2. series - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:symbol", "val", "x"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:size", "val", "15"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", "7030a0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:symbol", "val", u"x"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:size", "val", u"15"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", u"7030a0"); } -void Chart2ExportTest::testAxisNumberFormatODS() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatODS) { - struct + auto verify = [this]( const Reference<chart2::XChartDocument>& xChartDoc ) { - void check( const Reference<chart2::XChartDocument>& xChartDoc ) - { - 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); - - sal_Int32 nNumFmt = getNumberFormatFromAxis(xAxisX); - sal_Int16 nType = getNumberFormatType(xChartDoc, nNumFmt); - CPPUNIT_ASSERT_MESSAGE("X axis should be percentage format.", (nType & util::NumberFormat::PERCENT)); - - bool bNumFmtLinked = false; - Reference<beans::XPropertySet> xPS(xAxisX, uno::UNO_QUERY_THROW); - xPS->getPropertyValue("LinkNumberFormatToSource") >>= 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); - - nNumFmt = getNumberFormatFromAxis(xAxisY); - nType = getNumberFormatType(xChartDoc, nNumFmt); - CPPUNIT_ASSERT_MESSAGE("Y axis should be a normal number format.", (nType & util::NumberFormat::NUMBER)); - - bNumFmtLinked = true; - xPS.set(xAxisY, uno::UNO_QUERY_THROW); - xPS->getPropertyValue("LinkNumberFormatToSource") >>= bNumFmtLinked; - CPPUNIT_ASSERT_MESSAGE("Y axis should not have its number format linked to source.", !bNumFmtLinked); - } - - } aTest; + Reference<chart2::XAxis> xAxisX = getAxisFromDoc(xChartDoc, 0, 0, 0); + Reference<chart2::XTitled> xTitle(xAxisX, UNO_QUERY_THROW); + OUString aTitleText = getTitleString(xTitle); + CPPUNIT_ASSERT_EQUAL(u"Linked To Source"_ustr, aTitleText); + + sal_Int32 nNumFmt = getNumberFormatFromAxis(xAxisX); + sal_Int16 nType = getNumberFormatType(xChartDoc, nNumFmt); + CPPUNIT_ASSERT_MESSAGE("X axis should be percentage format.", (nType & util::NumberFormat::PERCENT)); + + bool bNumFmtLinked = false; + Reference<beans::XPropertySet> xPS(xAxisX, uno::UNO_QUERY_THROW); + 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(u"Not Linked"_ustr, aTitleText); + + nNumFmt = getNumberFormatFromAxis(xAxisY); + nType = getNumberFormatType(xChartDoc, nNumFmt); + CPPUNIT_ASSERT_MESSAGE("Y axis should be a normal number format.", (nType & util::NumberFormat::NUMBER)); + + bNumFmtLinked = true; + xPS.set(xAxisY, uno::UNO_QUERY_THROW); + xPS->getPropertyValue(u"LinkNumberFormatToSource"_ustr) >>= bNumFmtLinked; + CPPUNIT_ASSERT_MESSAGE("Y axis should not have its number format linked to source.", !bNumFmtLinked); + }; - load(u"/chart2/qa/extras/data/ods/", "axis-numformats-linked.ods"); + loadFromFile(u"ods/axis-numformats-linked.ods"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); - aTest.check(xChartDoc); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); + verify(xChartDoc); // Reload the document and make sure everything remains intact. - reload("calc8"); - xChartDoc = getChartDocFromSheet(0, mxComponent); - aTest.check(xChartDoc); + saveAndReload(u"calc8"_ustr); + xChartDoc = getChartDocFromSheet(0); + verify(xChartDoc); } -void Chart2ExportTest::testAxisNumberFormatXLS() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testAxisNumberFormatXLS) { - struct + auto verify = [this]( const Reference<chart2::XChartDocument>& xChartDoc, bool bNumFmtLinkedActual, sal_Int16 nNumFmtTypeFlag ) { - void check( const Reference<chart2::XChartDocument>& xChartDoc, bool bNumFmtLinkedActual, sal_Int16 nNumFmtTypeFlag ) const + Reference<chart2::XAxis> xAxisY = getAxisFromDoc( xChartDoc, 0, 1, 0 ); + bool bNumFmtLinked = false; + Reference<beans::XPropertySet> xPS( xAxisY, uno::UNO_QUERY_THROW ); + xPS->getPropertyValue( u"LinkNumberFormatToSource"_ustr ) >>= bNumFmtLinked; + + if ( bNumFmtLinkedActual ) + CPPUNIT_ASSERT_MESSAGE( "Y axis should have its number format linked to source.", bNumFmtLinked ); + else { - 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; + CPPUNIT_ASSERT_MESSAGE( "Y axis should not have its number format linked to source.", !bNumFmtLinked ); - if ( bNumFmtLinkedActual ) - CPPUNIT_ASSERT_MESSAGE( "Y axis should have its number format linked to source.", bNumFmtLinked ); + sal_Int32 nNumFmt = getNumberFormatFromAxis( xAxisY ); + sal_Int16 nType = getNumberFormatType( xChartDoc, nNumFmt ); + if ( nNumFmtTypeFlag == util::NumberFormat::PERCENT ) + CPPUNIT_ASSERT_MESSAGE( "Y axis should be percentage format.", ( nType & util::NumberFormat::PERCENT ) ); else - { - CPPUNIT_ASSERT_MESSAGE( "Y axis should not have its number format linked to source.", !bNumFmtLinked ); - - sal_Int32 nNumFmt = getNumberFormatFromAxis( xAxisY ); - sal_Int16 nType = getNumberFormatType( xChartDoc, nNumFmt ); - if ( nNumFmtTypeFlag == util::NumberFormat::PERCENT ) - CPPUNIT_ASSERT_MESSAGE( "Y axis should be percentage format.", ( nType & util::NumberFormat::PERCENT ) ); - else - CPPUNIT_ASSERT_MESSAGE( "Y axis should be number format.", ( nType & util::NumberFormat::NUMBER ) ); - } + CPPUNIT_ASSERT_MESSAGE( "Y axis should be number format.", ( nType & util::NumberFormat::NUMBER ) ); } + }; - void change( const Reference<chart2::XChartDocument>& xChartDoc, sal_Int16 nNumFmtTypeFlag ) - { - 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 ); - - Reference<util::XNumberFormatsSupplier> xNFS( xChartDoc, uno::UNO_QUERY_THROW ); - Reference<util::XNumberFormats> xNumberFormats = xNFS->getNumberFormats(); - CPPUNIT_ASSERT( xNumberFormats.is() ); - lang::Locale aLocale{ "en", "US", "" }; - Sequence<sal_Int32> aNumFmts = xNumberFormats->queryKeys( nNumFmtTypeFlag, aLocale, false ); - CPPUNIT_ASSERT( aNumFmts.hasElements() ); - aAny <<= aNumFmts[0]; - xPS->setPropertyValue( CHART_UNONAME_NUMFMT, aAny ); - } + loadFromFile(u"xls/axis_sourceformatting.xls" ); - } aTest; + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet( 0 ); + verify( xChartDoc, true, util::NumberFormat::PERCENT ); - load( u"/chart2/qa/extras/data/xls/", "axis_sourceformatting.xls" ); + Reference<chart2::XAxis> xAxisY = getAxisFromDoc( xChartDoc, 0, 1, 0 ); + Reference<beans::XPropertySet> xPS( xAxisY, uno::UNO_QUERY_THROW ); + Any aAny( false ); + xPS->setPropertyValue( u"LinkNumberFormatToSource"_ustr, aAny ); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet( 0, mxComponent ); - aTest.check( xChartDoc, true, util::NumberFormat::PERCENT ); + Reference<util::XNumberFormatsSupplier> xNFS( xChartDoc, uno::UNO_QUERY_THROW ); + Reference<util::XNumberFormats> xNumberFormats = xNFS->getNumberFormats(); + CPPUNIT_ASSERT( xNumberFormats.is() ); + lang::Locale aLocale{ u"en"_ustr, u"US"_ustr, u""_ustr }; + Sequence<sal_Int32> aNumFmts = xNumberFormats->queryKeys( util::NumberFormat::NUMBER, aLocale, false ); + CPPUNIT_ASSERT( aNumFmts.hasElements() ); + aAny <<= aNumFmts[0]; + xPS->setPropertyValue( CHART_UNONAME_NUMFMT, aAny ); - aTest.change( xChartDoc, util::NumberFormat::NUMBER ); // Write the document(xls) with changes made close it, load it and check if changes are intact - reload( "MS Excel 97" ); - xChartDoc = getChartDocFromSheet( 0, mxComponent ); - aTest.check( xChartDoc, false, util::NumberFormat::NUMBER ); + saveAndReload( u"MS Excel 97"_ustr ); + xChartDoc = getChartDocFromSheet( 0 ); + verify( xChartDoc, false, util::NumberFormat::NUMBER ); } -void Chart2ExportTest::testDataLabelBordersDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBordersDOCX) { struct Check { @@ -901,72 +766,39 @@ void Chart2ExportTest::testDataLabelBordersDOCX() Color mnColor; }; - struct + auto verify = [this]( const Reference<chart2::XChartDocument>& xChartDoc, sal_Int32 nShape ) { - /** - * Chart 1 has 4 bars of which 1st and 3rd have labels with borders - * around them. - */ - void checkObject1( const Reference<chart2::XChartDocument>& xChartDoc ) - { - CPPUNIT_ASSERT(xChartDoc.is()); + CPPUNIT_ASSERT(xChartDoc.is()); - Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); - CPPUNIT_ASSERT(xDataSeries.is()); + Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); + CPPUNIT_ASSERT(xDataSeries.is()); - // Check to make sure that data points 0 and 2 have local properties. - Reference<beans::XPropertySet> xPropSet(xDataSeries, uno::UNO_QUERY); - CPPUNIT_ASSERT(xPropSet.is()); + // Check to make sure that data points 0 and 2 have local properties. + Reference<beans::XPropertySet> xPropSet(xDataSeries, uno::UNO_QUERY); + CPPUNIT_ASSERT(xPropSet.is()); - Sequence<sal_Int32> aIndices; - xPropSet->getPropertyValue("AttributedDataPoints") >>= 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]); - CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aIndices[1]); - */ - - static const Check aDataPoints[] = - { - { 0, css::drawing::LineStyle_SOLID, 0x00FFFF00 }, // solid yellow - { 2, css::drawing::LineStyle_SOLID, 0x00FF0000 } // solid red - }; - - for (size_t i = 0; i < SAL_N_ELEMENTS(aDataPoints); ++i) - { - xPropSet = xDataSeries->getDataPointByIndex(aDataPoints[i].mnIndex); - CPPUNIT_ASSERT(xPropSet.is()); - - css::drawing::LineStyle eLineStyle = css::drawing::LineStyle_NONE; - xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_STYLE) >>= eLineStyle; - CPPUNIT_ASSERT_EQUAL(aDataPoints[i].meStyle, eLineStyle); - - sal_Int32 nWidth = -1; - xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_WIDTH) >>= nWidth; - CPPUNIT_ASSERT(nWidth > 0); - - Color nColor; - xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_COLOR) >>= nColor; - CPPUNIT_ASSERT_EQUAL_MESSAGE("Border color is wrong.", aDataPoints[i].mnColor, nColor); - } - } + Sequence<sal_Int32> 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]); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aIndices[1]); + */ - /** - * Chart 2 has all its data labels with identical borders. - */ - void checkObject2( const Reference<chart2::XChartDocument>& xChartDoc ) + static const Check aDataPoints[] = { - CPPUNIT_ASSERT(xChartDoc.is()); + { 0, css::drawing::LineStyle_SOLID, 0x00FFFF00 }, // solid yellow + { 2, css::drawing::LineStyle_SOLID, 0x00FF0000 } // solid red + }; - Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); - CPPUNIT_ASSERT(xDataSeries.is()); - - Reference<beans::XPropertySet> xPropSet(xDataSeries, uno::UNO_QUERY); + for (size_t i = 0; i < std::size(aDataPoints); ++i) + { + xPropSet = xDataSeries->getDataPointByIndex(aDataPoints[i].mnIndex); CPPUNIT_ASSERT(xPropSet.is()); css::drawing::LineStyle eLineStyle = css::drawing::LineStyle_NONE; xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_STYLE) >>= eLineStyle; - CPPUNIT_ASSERT_EQUAL(css::drawing::LineStyle_SOLID, eLineStyle); + CPPUNIT_ASSERT_EQUAL(aDataPoints[i].meStyle, eLineStyle); sal_Int32 nWidth = -1; xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_WIDTH) >>= nWidth; @@ -974,45 +806,57 @@ void Chart2ExportTest::testDataLabelBordersDOCX() Color nColor; xPropSet->getPropertyValue(CHART_UNONAME_LABEL_BORDER_COLOR) >>= nColor; - CPPUNIT_ASSERT_EQUAL_MESSAGE("Border color should be green.", COL_LIGHTGREEN, nColor); + if (nShape == 0) + CPPUNIT_ASSERT_EQUAL_MESSAGE("Border color is wrong.", aDataPoints[i].mnColor, nColor); + else + CPPUNIT_ASSERT_EQUAL_MESSAGE("Border color should be green.", COL_LIGHTGREEN, nColor); } + }; - } aTest; - - load(u"/chart2/qa/extras/data/docx/", "data-label-borders.docx"); + loadFromFile(u"docx/data-label-borders.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); // "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.", sal_Int32(0x00FFFFFF), sal_Int32(nColor & 0x00FFFFFF)); // highest 2 bytes are transparency which we ignore here. - aTest.checkObject1(xChartDoc); + // Chart 1 has 4 bars of which 1st and 3rd have labels with borders around them. + verify(xChartDoc, 0); xChartDoc.set(getChartDocFromWriter(1), uno::UNO_QUERY); - aTest.checkObject2(xChartDoc); - reload("Office Open XML Text"); + // Chart 2 has all its data labels with identical borders. + verify(xChartDoc, 1); + + // FIXME: validation error in OOXML export: Errors: 3 + skipValidation(); + + saveAndReload(u"Office Open XML Text"_ustr); xChartDoc.set(getChartDocFromWriter(0), uno::UNO_QUERY); - aTest.checkObject1(xChartDoc); + verify(xChartDoc , 0); xChartDoc.set(getChartDocFromWriter(1), uno::UNO_QUERY); - aTest.checkObject2(xChartDoc); + verify(xChartDoc, 1); } -void Chart2ExportTest::testDataLabel3DChartDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabel3DChartDOCX) { - load(u"/chart2/qa/extras/data/docx/", "3d-bar-label.docx"); + loadFromFile(u"docx/3d-bar-label.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + 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 @@ -1021,43 +865,49 @@ void Chart2ExportTest::testDataLabel3DChartDOCX() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bar3DChart/c:ser/c:dLbls/c:dLbl/c:dLblPos", 0); } -void Chart2ExportTest::testDataLabelBarChartDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBarChartDOCX) { - load(u"/chart2/qa/extras/data/docx/", "bar-chart-labels.docx"); + loadFromFile(u"docx/bar-chart-labels.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + 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", "val", "ctr"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:dLblPos", "val", "inEnd"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:dLblPos", "val", "inBase"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLblPos", "val", u"ctr"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:dLblPos", "val", u"inEnd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:dLblPos", "val", u"inBase"); } -void Chart2ExportTest::testDataLabelClusteredBarChartDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelClusteredBarChartDOCX) { - load(u"/chart2/qa/extras/data/docx/", "clustered-bar-chart-labels.docx"); + loadFromFile(u"docx/clustered-bar-chart-labels.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + // FIXME: validation error in OOXML export: Errors: 9 + skipValidation(); + + 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", "val", "outEnd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:dLbl[2]/c:dLblPos", "val", u"outEnd"); } -void Chart2ExportTest::testDataLabelRadarChartDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelRadarChartDOCX) { - load(u"/chart2/qa/extras/data/docx/", "radar-chart-labels.docx"); + loadFromFile(u"docx/radar-chart-labels.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + 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. @@ -1065,14 +915,18 @@ void Chart2ExportTest::testDataLabelRadarChartDOCX() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:radarChart/c:ser/c:dLbls/c:dLbl/c:dLblPos", 0); } -void Chart2ExportTest::testDataLabelDoughnutChartDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelDoughnutChartDOCX) { - load(u"/chart2/qa/extras/data/docx/", "doughnut-chart-labels.docx"); + loadFromFile(u"docx/doughnut-chart-labels.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + 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. @@ -1080,14 +934,18 @@ void Chart2ExportTest::testDataLabelDoughnutChartDOCX() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:dLbl/c:dLblPos", 0); } -void Chart2ExportTest::testDataLabelAreaChartDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelAreaChartDOCX) { - load(u"/chart2/qa/extras/data/docx/", "area-chart-labels.docx"); + loadFromFile(u"docx/area-chart-labels.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + 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. @@ -1095,185 +953,70 @@ void Chart2ExportTest::testDataLabelAreaChartDOCX() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:areaChart/c:ser/c:dLbls/c:dLbl/c:dLblPos", 0); } -void Chart2ExportTest::testDataLabelDefaultLineChartDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelDefaultLineChartDOCX) { // This file was created by Word 2007, which doesn't provide default data // label position (2010 does). Make sure its default data label position // is RIGHT when exporting. - load(u"/chart2/qa/extras/data/docx/", "line-chart-label-default-placement.docx"); + loadFromFile(u"docx/line-chart-label-default-placement.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - reload("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 ); } -void Chart2ExportTest::testIndividualDataLabelProps() -{ - load(u"/chart2/qa/extras/data/xlsx/", "tdf122915.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr", "b", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr", "sz", "1600"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr", "val", "ff0000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr/a:latin", "typeface", "Times New Roman"); -} - -void Chart2ExportTest::testTdf108107() -{ - load(u"/chart2/qa/extras/data/xlsx/", "tdf108107.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:idx", "val", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr", "b", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr", "sz", "2000"); -} - -void Chart2ExportTest::testTdf114139() -{ - load(u"/chart2/qa/extras/data/xlsx/", "tdf114139.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart", 1); - //no fill - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr", 0); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:solidFill", 0); -} - -void Chart2ExportTest::testTdf64224() -{ - load(u"/chart2/qa/extras/data/ods/", "tdf64224.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - - //no fill - assertXPath(pXmlDoc, "/c:chartSpace/c:spPr/a:noFill", 1); - assertXPath(pXmlDoc, "/c:chartSpace/c:spPr/a:solidFill", 0); -} - -void Chart2ExportTest::testChartTitlePropertiesColorFillDOCX() -{ - load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesColorFill.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); -} - -void Chart2ExportTest::testChartTitlePropertiesGradientFillDOCX() -{ - load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesGradientFill.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "cccccc"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr", "val", "666666"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); -} - -void Chart2ExportTest::testChartTitlePropertiesBitmapFillDOCX() -{ - load(u"/chart2/qa/extras/data/docx/", "testChartTitlePropertiesBitmapFill.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", "rId1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); -} - -void Chart2ExportTest::testColorGradientWithTransparencyDOCX() -{ - // Test color gradient (two color) with gradient transparency - load(u"/chart2/qa/extras/data/docx/", "testColorGradientWithTransparency.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); - CPPUNIT_ASSERT(pXmlDoc); - // Test the transparency of the first color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr/a:alpha", "val", "60000"); - // Test the transparency of the second color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", "90196"); -} - -void Chart2ExportTest::testColorGradientWithTransparencyODS() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testIndividualDataLabelProps) { - // Test color gradient (two color) with simple transparency - load(u"/chart2/qa/extras/data/ods/", "testColorGradientWithTransparency.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - // Test the transparency of the first color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr/a:alpha", "val", "60000"); - // Test the transparency of the second color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", "60000"); -} + loadFromFile(u"xlsx/tdf122915.xlsx"); -void Chart2ExportTest::testColorGradientStopXLSX() -{ - // Test color gradient (two color) stop of the first color - load(u"/chart2/qa/extras/data/xlsx/", "tdf128619.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - // Test the position of the first color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[1]", "pos", "45000"); - // Test the position of the second color - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]", "pos", "100000"); -} + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); -void Chart2ExportTest::testRadialColorGradientDOCX() -{ - load(u"/chart2/qa/extras/data/docx/", "tdf128794.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/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", 0); - // Test the linear gradient angle - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:lin", "ang", "13500000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr", "b", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr", "sz", u"1600"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr", "val", u"ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[3]/c:dLbls/c:dLbl/c:txPr/a:p/a:pPr/a:defRPr/a:latin", "typeface", u"Times New Roman"); } -void Chart2ExportTest::testBarChartDataPointPropDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testBarChartRotation) { - load(u"/chart2/qa/extras/data/docx/", "testBarChartDataPointPropDOCX.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/barChartRotation.docx"); + 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", "val", "0"); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:idx", "val", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "f6f8fc"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr", "val", "c7d5ed"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", "70ad47"); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:idx", "val", "2"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", "000000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX", "val", u"30"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY", "val", u"50"); } -void Chart2ExportTest::testBarChartRotation() -{ - load (u"/chart2/qa/extras/data/docx/", "barChartRotation.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); - CPPUNIT_ASSERT(pXmlDoc); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX", "val", "30"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY", "val", "50"); -} - -void Chart2ExportTest::testShapeFollowedByChart() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testShapeFollowedByChart) { /* If there is a scenario where a chart is followed by a shape which is being exported as an alternate content then, the docPr Id is being repeated, ECMA 20.4.2.5 says that the docPr Id should be unique, ensuring the same here. */ - load(u"/chart2/qa/extras/data/docx/", "FDO74430.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/document", "Office Open XML Text" ); + loadFromFile(u"docx/FDO74430.docx"); + + // FIXME: validation error in OOXML export: Errors: 5 + skipValidation(); + + 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]", "id"); @@ -1282,26 +1025,32 @@ void Chart2ExportTest::testShapeFollowedByChart() CPPUNIT_ASSERT( aValueOfFirstDocPR != aValueOfSecondDocPR ); } -void Chart2ExportTest::testPieChartDataLabels() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartDataLabels) { - load(u"/chart2/qa/extras/data/docx/", "PieChartDataLabels.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/PieChartDataLabels.docx"); + + // FIXME: validation error in OOXML export: Errors: 19 + skipValidation(); + + 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", "val", "outEnd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart/c:ser[1]/c:dLbls/c:dLbl[1]/c:dLblPos", "val", u"outEnd"); } -void Chart2ExportTest::testSeriesIdxOrder() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSeriesIdxOrder) { - load(u"/chart2/qa/extras/data/docx/", "testSeriesIdxOrder.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/testSeriesIdxOrder.docx"); + 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]", "val", "1"); - assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:order[1]", "val", "1"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:idx[1]", "val", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:order[1]", "val", u"1"); } -void Chart2ExportTest::testScatterPlotLabels() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testScatterPlotLabels) { - load(u"/chart2/qa/extras/data/odt/", "scatter-plot-labels.odt"); + loadFromFile(u"odt/scatter-plot-labels.odt"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1311,12 +1060,12 @@ void 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. - reload("writer8"); + saveAndReload(u"writer8"_ustr); xChartDoc.set(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1326,17 +1075,17 @@ void 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>()); } -void Chart2ExportTest::testErrorBarDataRangeODS() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarDataRangeODS) { - load(u"/chart2/qa/extras/data/ods/", "ErrorBarRange.ods"); - reload("calc8"); + loadFromFile(u"ods/ErrorBarRange.ods"); + saveAndReload(u"calc8"_ustr); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); CPPUNIT_ASSERT(xChartDoc.is()); Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 ); @@ -1347,50 +1096,141 @@ void 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(u"calc8"_ustr); + + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, 0 ); + CPPUNIT_ASSERT(xChartType.is()); + + CPPUNIT_ASSERT_EQUAL(u"com.sun.star.chart2.PieChartType"_ustr, + xChartType->getChartType()); + + // Verify that it saves and loads as bar-of-pie + Reference< beans::XPropertySet > xPropSet( xChartType, uno::UNO_QUERY_THROW ); + uno::Any aAny = xPropSet->getPropertyValue(u"SubPieType"_ustr); + CPPUNIT_ASSERT(aAny.hasValue()); + chart2::PieChartSubType subPieType; + aAny >>= subPieType; + CPPUNIT_ASSERT_EQUAL(chart2::PieChartSubType_BAR, subPieType); } -void Chart2ExportTest::testChartCrash() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_pieOfPie) { - load(u"/chart2/qa/extras/data/docx/", "FDO75975.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"ods/tdf50934_pieOfPie.ods"); + saveAndReload(u"calc8"_ustr); + + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, 0 ); + CPPUNIT_ASSERT(xChartType.is()); + + CPPUNIT_ASSERT_EQUAL(u"com.sun.star.chart2.PieChartType"_ustr, + xChartType->getChartType()); + + // Verify that it saves and loads as pie-of-pie + Reference< beans::XPropertySet > xPropSet( xChartType, uno::UNO_QUERY_THROW ); + uno::Any aAny = xPropSet->getPropertyValue(u"SubPieType"_ustr); + CPPUNIT_ASSERT(aAny.hasValue()); + chart2::PieChartSubType subPieType; + aAny >>= subPieType; + CPPUNIT_ASSERT_EQUAL(chart2::PieChartSubType_PIE, subPieType); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf161800_barOfPie_split_pos) +{ + loadFromFile(u"ods/tdf161800_barOfPie_split_pos.ods"); + saveAndReload(u"calc8"_ustr); + + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, 0 ); + CPPUNIT_ASSERT(xChartType.is()); + + // Verify that it saves and loads with the correct split position + Reference< beans::XPropertySet > xPropSet( xChartType, uno::UNO_QUERY_THROW ); + uno::Any aAny = xPropSet->getPropertyValue(u"SplitPos"_ustr); + CPPUNIT_ASSERT(aAny.hasValue()); + double nSplitPos; + aAny >>= nSplitPos; + CPPUNIT_ASSERT_EQUAL(4.0, nSplitPos); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf161800_pieOfPie_split_pos) +{ + loadFromFile(u"ods/tdf161800_pieOfPie_split_pos.ods"); + saveAndReload(u"calc8"_ustr); + + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, 0 ); + CPPUNIT_ASSERT(xChartType.is()); + + CPPUNIT_ASSERT_EQUAL(u"com.sun.star.chart2.PieChartType"_ustr, + xChartType->getChartType()); + + // Verify that it saves and loads with the correct split position + Reference< beans::XPropertySet > xPropSet( xChartType, uno::UNO_QUERY_THROW ); + uno::Any aAny = xPropSet->getPropertyValue(u"SplitPos"_ustr); + CPPUNIT_ASSERT(aAny.hasValue()); + double nSplitPos; + aAny >>= nSplitPos; + CPPUNIT_ASSERT_EQUAL(3.0, nSplitPos); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testChartCrash) +{ + loadFromFile(u"docx/FDO75975.docx"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); } -void Chart2ExportTest::testPieChartRotation() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testPieChartRotation) { - load (u"/chart2/qa/extras/data/docx/", "pieChartRotation.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); + loadFromFile(u"docx/pieChartRotation.docx"); + 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", "val", "40"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY", "val", "30"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotX", "val", u"40"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:view3D/c:rotY", "val", u"30"); } -void Chart2ExportTest::testEmbeddingsOleObjectGrabBag() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testEmbeddingsOleObjectGrabBag) { // The problem was that .bin files were missing from docx file from embeddings folder // after saving file. // This test case tests whether embeddings files grabbagged properly in correct object. - load(u"/chart2/qa/extras/data/docx/", "testchartoleobjectembeddings.docx" ); + loadFromFile(u"docx/testchartoleobjectembeddings.docx" ); uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xTextDocumentPropertySet(xTextDocument, uno::UNO_QUERY); uno::Sequence<beans::PropertyValue> aGrabBag(0); - 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"}; - for(beans::PropertyValue const & prop : std::as_const(aGrabBag)) + for (beans::PropertyValue const& prop : aGrabBag) { if (prop.Name == "OOXEmbeddings") { @@ -1417,7 +1257,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; @@ -1427,7 +1267,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; @@ -1435,521 +1275,127 @@ void checkOverlap(Reference<beans::XPropertySet> const & xPropSet, sal_Int32 nVa CPPUNIT_ASSERT_EQUAL(nValue, aSequence[0]); } -void checkSheetForGapWidthAndOverlap(uno::Reference< chart2::XChartDocument > const & xChartDoc, +void checkSheetForGapWidthAndOverlap(uno::Reference< chart2::XChartType > const & xChartType, sal_Int32 nExpectedGapWidth, sal_Int32 nExpectedOverlap) { - CPPUNIT_ASSERT(xChartDoc.is()); - - Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, 0 ); - CPPUNIT_ASSERT(xChartType.is()); - Reference< beans::XPropertySet > xPropSet( xChartType, uno::UNO_QUERY_THROW ); checkGapWidth(xPropSet, nExpectedGapWidth); checkOverlap(xPropSet, nExpectedOverlap); +} } +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testGapWidthXLSX) +{ + loadFromFile(u"xlsx/gapWidth.xlsx"); + + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); + checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 120, -60); + + xChartDoc = getChartDocFromSheet( 1 ); + checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 50, 30); + + saveAndReload(u"Calc Office Open XML"_ustr); + + xChartDoc = getChartDocFromSheet( 0 ); + checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 120, -60); + + xChartDoc = getChartDocFromSheet( 1 ); + checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 50, 30); } -void Chart2ExportTest::testGapWidthXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataseriesOverlapStackedChartXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "gapWidth.xlsx"); + loadFromFile(u"xlsx/testDataseriesOverlapStackedChart.xlsx"); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); - checkSheetForGapWidthAndOverlap(xChartDoc, 120, -60); + // test the overlap value of a simple Stacked Column Chart + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0); + checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 100, 0); - xChartDoc = getChartDocFromSheet( 1, mxComponent ); - checkSheetForGapWidthAndOverlap(xChartDoc, 50, 30); + // test the overlap value of a Percent Stacked Bar Chart + xChartDoc = getChartDocFromSheet( 1); + checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 100, 35); - reload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); - xChartDoc = getChartDocFromSheet( 0, mxComponent ); - checkSheetForGapWidthAndOverlap(xChartDoc, 120, -60); + xChartDoc = getChartDocFromSheet( 0); + checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 100, 100); - xChartDoc = getChartDocFromSheet( 1, mxComponent ); - checkSheetForGapWidthAndOverlap(xChartDoc, 50, 30); + xChartDoc = getChartDocFromSheet( 1); + checkSheetForGapWidthAndOverlap(getChartTypeFromDoc( xChartDoc, 0 ), 100, 100); } -void Chart2ExportTest::testSmoothedLines() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSmoothedLines) { - load(u"/chart2/qa/extras/data/ods/", "smoothedLines.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"ods/smoothedLines.ods"); + 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", "val", "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:smooth", "val", u"0"); } -void Chart2ExportTest::testLabelStringODS() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testLabelStringODS) { - load(u"/chart2/qa/extras/data/ods/", "labelString.ods"); + loadFromFile(u"ods/labelString.ods"); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); Reference< chart2::data::XDataSequence > xLabelSeq = getLabelDataSequenceFromDoc(xChartDoc); CPPUNIT_ASSERT(xLabelSeq.is()); OUString aLabelString = xLabelSeq->getSourceRangeRepresentation(); - CPPUNIT_ASSERT_EQUAL(OUString("\"LabelName\""), aLabelString); + CPPUNIT_ASSERT_EQUAL(u"\"LabelName\""_ustr, aLabelString); - reload("calc8"); + saveAndReload(u"calc8"_ustr); - xChartDoc = getChartDocFromSheet( 0, mxComponent ); + xChartDoc = getChartDocFromSheet( 0 ); xLabelSeq = getLabelDataSequenceFromDoc(xChartDoc); CPPUNIT_ASSERT(xLabelSeq.is()); aLabelString = xLabelSeq->getSourceRangeRepresentation(); - CPPUNIT_ASSERT_EQUAL(OUString("\"LabelName\""), aLabelString); -} - -void Chart2ExportTest::testFdo83058dlblPos() -{ - load (u"/chart2/qa/extras/data/docx/", "fdo83058_dlblPos.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart","Office Open XML Text"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[2]/c:dLblPos", "val", "outEnd"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[3]/c:dLblPos", "val", "outEnd"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[4]/c:dLblPos", "val", "outEnd"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[5]/c:dLblPos", "val", "outEnd"); -} - -void Chart2ExportTest::testAutoTitleDelXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "autotitledel_2007.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", "0"); + CPPUNIT_ASSERT_EQUAL(u"\"LabelName\""_ustr, aLabelString); } -void Chart2ExportTest::testDispBlanksAsXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2007.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", "gap"); -} -void Chart2ExportTest::testMarkerColorXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testInvertNegative) { - load(u"/chart2/qa/extras/data/xlsx/", "markerColor.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", "92d050"); -} - -void Chart2ExportTest::testRoundedCornersXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "markerColor.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:roundedCorners", "val", "0"); -} - -void Chart2ExportTest::testAxisNumberFormatXLSX() -{ - load(u"/chart2/qa/extras/data/ods/", "axis_number_format.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx", 2); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt", "formatCode", "0.00E+000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt", "sourceLinked", "0"); + // Bar chart + { + loadFromFile(u"xlsx/invertIfNeg_bar.xlsx"); + // make sure the import was successful + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); + CPPUNIT_ASSERT(xChartDoc.is()); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt", "formatCode", "[$$-409]#,##0;\\-[$$-409]#,##0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt", "sourceLinked", "1"); -} + Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 ); + CPPUNIT_ASSERT( xDataSeries.is() ); -void Chart2ExportTest::testDataPointLabelNumberFormatXLSX() -{ - load(u"/chart2/qa/extras/data/ods/", "tdf123774.ods"); - { - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt", "formatCode", "[$-40E]0.00%"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt", "sourceLinked", "0"); + Reference< beans::XPropertySet > xPropSet( xDataSeries, UNO_QUERY_THROW ); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt", "formatCode", "[$-40E]0.00%"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt", "sourceLinked", "0"); + bool bInvertNeg; + CPPUNIT_ASSERT( + xPropSet->getPropertyValue(u"InvertNegative"_ustr) >>= bInvertNeg); + CPPUNIT_ASSERT_EQUAL(true, bInvertNeg); } - load(u"/chart2/qa/extras/data/xlsx/", "tdf130986.xlsx"); + // Bubble chart { - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:idx", "val", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:numFmt", "formatCode", "0.00E+00"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:numFmt", "sourceLinked", "0"); - } -} - -void Chart2ExportTest::testDataLabelDefaultValuesXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "data_label.xlsx"); - Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent); - Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0); - Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("Label"); - chart2::DataPointLabel aLabel; - CPPUNIT_ASSERT(aAny >>= aLabel); - CPPUNIT_ASSERT(aLabel.ShowNumber); - - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:showVal", "val", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLblPos", "val", "outEnd"); -} - -void Chart2ExportTest::testDataLabelFillColor() -{ - load(u"/chart2/qa/extras/data/xlsx/", "data_labels_fill_color.xlsx"); - Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0, mxComponent); - Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0); - Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW); - uno::Any aAny = xPropSet->getPropertyValue("LabelFillColor"); - sal_Int32 nLabelFillColor; - CPPUNIT_ASSERT(aAny >>= nLabelFillColor); - - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:spPr/a:solidFill/a:srgbClr", "val", "F79646"); -} - -void Chart2ExportTest::testTitleOverlayXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "chart_title.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:overlay", "val", "0"); -} - -void Chart2ExportTest::testInvertIfNegativeXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "bar_chart_simple.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:invertIfNegative", "val", "0"); -} - -void Chart2ExportTest::testBubble3DXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "bubble_chart_simple.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[1]/c:bubble3D", "val", "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[2]/c:bubble3D", "val", "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[3]/c:bubble3D", "val", "0"); -} - -void Chart2ExportTest::testNoMarkerXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "no_marker.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:marker/c:symbol", "val", "none"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:marker/c:symbol", "val", "none"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:marker", "val", "0"); -} - -void Chart2ExportTest::testTitleManualLayoutXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "title_manual_layout.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:layoutTarget", 0); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:xMode", "val", "edge"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:yMode", "val", "edge"); - - OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:x", "val"); - double nX = aXVal.toDouble(); - CPPUNIT_ASSERT(nX > 0); - CPPUNIT_ASSERT(nX < 1); - - OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:y", "val"); - double nY = aYVal.toDouble(); - CPPUNIT_ASSERT(nY > 0); - CPPUNIT_ASSERT(nY < 1); - CPPUNIT_ASSERT(nX != nY); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:bodyPr", "rot", "1200000"); -} - -void Chart2ExportTest::testPlotAreaManualLayoutXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "plot_area_manual_layout.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:layoutTarget", "val", "inner"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:xMode", "val", "edge"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:yMode", "val", "edge"); - - OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:x", "val"); - double nX = aXVal.toDouble(); - CPPUNIT_ASSERT(nX > 0); - CPPUNIT_ASSERT(nX < 1); - - OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:y", "val"); - double nY = aYVal.toDouble(); - CPPUNIT_ASSERT(nY > 0); - CPPUNIT_ASSERT(nY < 1); - CPPUNIT_ASSERT(nX != nY); - - OUString aWVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:w", "val"); - double nW = aWVal.toDouble(); - CPPUNIT_ASSERT(nW > 0); - CPPUNIT_ASSERT(nW < 1); - - OUString aHVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:h", "val"); - double nH = aHVal.toDouble(); - CPPUNIT_ASSERT(nH > 0); - CPPUNIT_ASSERT(nH < 1); - CPPUNIT_ASSERT(nH != nW); -} - -void Chart2ExportTest::testLegendManualLayoutXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "legend_manual_layout.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:layoutTarget", 0); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:xMode", "val", "edge"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:yMode", "val", "edge"); - - OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:x", "val"); - double nX = aXVal.toDouble(); - CPPUNIT_ASSERT(nX > 0); - CPPUNIT_ASSERT(nX < 1); - - OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:y", "val"); - double nY = aYVal.toDouble(); - CPPUNIT_ASSERT(nY > 0); - CPPUNIT_ASSERT(nY < 1); - CPPUNIT_ASSERT(nX != nY); - - OUString aWVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:w", "val"); - double nW = aWVal.toDouble(); - CPPUNIT_ASSERT(nW > 0); - CPPUNIT_ASSERT(nW < 1); - - OUString aHVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:h", "val"); - double nH = aHVal.toDouble(); - CPPUNIT_ASSERT(nH > 0); - CPPUNIT_ASSERT(nH < 1); - 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", "sz", "900"); -} - -void Chart2ExportTest::testChartSubTitle() -{ - load(u"/chart2/qa/extras/data/ods/", "testChartSubTitle.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - // test properties of subtitle - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "sz", "1100"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "b", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr", "val", "00a933"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr/a:latin", "typeface", "Times New Roman"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:t", "It is a Subtitle"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "b2b2b2"); -} - -void Chart2ExportTest::testChartMainWithSubTitle() -{ - load(u"/chart2/qa/extras/data/ods/", "testChartMainWithSubTitle.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - // test properties of title - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "sz", "1300"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "b", "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "i", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr", "val", "f10d0c"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr/a:latin", "typeface", "Arial"); - assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:t", "It is a Maintitle\nIt is a Subtitle"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "81d41a"); -} - -void Chart2ExportTest::testAutoTitleDeleted() -{ - load(u"/chart2/qa/extras/data/xlsx/", "testAutoTitleDeleted.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", "1"); -} - -void Chart2ExportTest::testChartTitlePropertiesColorFillXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesColorFill.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); -} - -void Chart2ExportTest::testChartTitlePropertiesGradientFillXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesGradientFill.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", "cccccc"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr", "val", "666666"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); -} - -void Chart2ExportTest::testChartTitlePropertiesBitmapFillXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "testChartTitlePropertiesBitmapFill.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", "rId1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); -} - -void Chart2ExportTest::testBarChartDataPointPropXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "testBarChartDataPointPropXLSX.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors", "val", "0"); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:idx", "val", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:solidFill/a:srgbClr", "val", "ff0000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", "000000"); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:idx", "val", "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", "val", "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", "val", "c7d5ed"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", "70ad47"); -} - -void Chart2ExportTest::testDataseriesOverlapStackedChartXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "testDataseriesOverlapStackedChart.xlsx"); - - // test the overlap value of a simple Stacked Column Chart - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); - checkSheetForGapWidthAndOverlap(xChartDoc, 100, 0); - - // test the overlap value of a Percent Stacked Bar Chart - xChartDoc = getChartDocFromSheet( 1, mxComponent ); - checkSheetForGapWidthAndOverlap(xChartDoc, 100, 35); - - reload("Calc Office Open XML"); - - xChartDoc = getChartDocFromSheet( 0, mxComponent ); - checkSheetForGapWidthAndOverlap(xChartDoc, 100, 100); - - xChartDoc = getChartDocFromSheet( 1, mxComponent ); - checkSheetForGapWidthAndOverlap(xChartDoc, 100, 100); -} - -void Chart2ExportTest::testAxisCharacterPropertiesXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "axis_character_properties.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "sz", "1000"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "b", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "i", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "u", "sng"); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr", "sz", "900"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr", "b", "1"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr", "strike", "sngStrike"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr", "val", "ff0000"); -} - -void Chart2ExportTest::testTitleCharacterPropertiesXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "title_character_properties.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "sz", "2400"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "b", "1"); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr", "sz", "2400"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr", "b", "1"); -} - -void Chart2ExportTest::testPlotVisOnlyXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "hidden_cells.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotVisOnly", "val", "0"); -} - -void Chart2ExportTest::testBarChartVaryColorsXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "tdf90876.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors", "val", "0"); -} - -void Chart2ExportTest::testTdf96161() -{ - load(u"/chart2/qa/extras/data/ods/", "tdf96161.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); - - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:varyColors", "val", "0"); -} - -void Chart2ExportTest::testMultipleAxisXLSX() -{ - load(u"/chart2/qa/extras/data/ods/", "multiple_axis.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); + loadFromFile(u"xlsx/invertIfNeg_bubble.xlsx"); + // make sure the import was successful + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0 ); + CPPUNIT_ASSERT(xChartDoc.is()); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart", 2); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart[1]/c:ser", 1); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart[2]/c:ser", 1); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx", 4); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:delete[@val='1']", 1); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:axPos[@val='l']", 1); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:axPos[@val='r']", 1); -} + Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 ); + CPPUNIT_ASSERT( xDataSeries.is() ); -void Chart2ExportTest::testSecondaryAxisXLSX() -{ - load(u"/chart2/qa/extras/data/ods/", "secondary_axis.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); + Reference< beans::XPropertySet > xPropSet( xDataSeries, UNO_QUERY_THROW ); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart", 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", 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", "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", "c"); - // 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", 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", "a"); + bool bInvertNeg; + CPPUNIT_ASSERT( + xPropSet->getPropertyValue(u"InvertNegative"_ustr) >>= bInvertNeg); + CPPUNIT_ASSERT_EQUAL(true, bInvertNeg); + } } -void Chart2ExportTest::testBarChartSecondaryAxisXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "testSecondaryAxis.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - 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]", "val"); - OUString YValueIdOf1Barchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart[1]/c:axId[2]", "val"); - // Collect barchart axID on secondary Axis - OUString XValueIdOf2Barchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart[2]/c:axId[1]", "val"); - OUString YValueIdOf2Barchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart[2]/c:axId[2]", "val"); - // Check which c:catAx and c:valAx contain the AxisId of barcharts - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[1]/c:axId", "val", XValueIdOf1Barchart); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:axId", "val", YValueIdOf1Barchart); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:axId", "val", XValueIdOf2Barchart); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:axId", "val", YValueIdOf2Barchart); -} - -CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/chart2export2.cxx b/chart2/qa/extras/chart2export2.cxx index 1fa862291459..f369661c5441 100644 --- a/chart2/qa/extras/chart2export2.cxx +++ b/chart2/qa/extras/chart2export2.cxx @@ -22,154 +22,17 @@ using beans::XPropertySet; class Chart2ExportTest2 : public ChartTest { -protected: - virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override; - public: Chart2ExportTest2() - : ChartTest() + : ChartTest(u"/chart2/qa/extras/data/"_ustr) { } - void testSetSeriesToSecondaryAxisXLSX(); - void testCombinedChartSecondaryAxisXLSX(); - void testCombinedChartSecondaryAxisODS(); - void testCrossBetweenXLSX(); - void testCrossBetweenWithDeletedAxis(); - void testCrossBetweenODS(); - void testAxisTitleRotationXLSX(); - void testAxisTitlePositionDOCX(); - void testAxisCrossBetweenDOCX(); - void testPieChartDataPointExplosionXLSX(); - void testCustomDataLabel(); - void testDataSeriesName(); - void testCustomPositionofDataLabel(); - void testCustomDataLabelMultipleSeries(); - void testLeaderLines(); - void testNumberFormatExportPPTX(); - void testLabelSeparatorExportDOCX(); - void testChartTitlePropertiesColorFillPPTX(); - void testChartTitlePropertiesGradientFillPPTX(); - void testChartTitlePropertiesBitmapFillPPTX(); - void testxAxisLabelsRotation(); - void testMultipleCategoryAxisLablesXLSX(); - void testMultipleCategoryAxisLablesDOCX(); - void testTdf116163(); - void testTdf111824(); - void test3DAreaChartZAxis(); - void testTdf119029(); - void testTdf108022(); - void testTdf121744(); - void testTdf121189(); - void testTdf122031(); - void testTdf115012(); - void testTdf134118(); - void testTdf123206_customLabelText(); - void testCustomLabelText(); - void testDeletedLegendEntries(); - void testTdf60316(); - void testTdf130225(); - void testTdf59857(); - void testTdf126076(); - void testTdf75330(); - void testTdf127792(); - void testTdf131979(); - void testTdf132076(); - void testTdf125812(); - void testTdf133190(); - void testTdf133191(); - void testTdf132594(); - void testTdf134255(); - void testTdf134977(); - void testTdf123647(); - void testTdf136267(); - void testDataLabelPlacementPieChart(); - void testTdf137917(); - void testTdf138204(); - void testTdf138181(); - void testCustomShapeText(); - void testuserShapesXLSX(); - void testuserShapesDOCX(); - void testGraphicBlipXLSX(); - void testNameRangeXLSX(); - void testTdf143942(); - void testDateCategoriesPPTX(); - - CPPUNIT_TEST_SUITE(Chart2ExportTest2); - CPPUNIT_TEST(testSetSeriesToSecondaryAxisXLSX); - CPPUNIT_TEST(testCombinedChartSecondaryAxisXLSX); - CPPUNIT_TEST(testCombinedChartSecondaryAxisODS); - CPPUNIT_TEST(testCrossBetweenXLSX); - CPPUNIT_TEST(testCrossBetweenWithDeletedAxis); - CPPUNIT_TEST(testCrossBetweenODS); - CPPUNIT_TEST(testAxisTitleRotationXLSX); - CPPUNIT_TEST(testAxisTitlePositionDOCX); - CPPUNIT_TEST(testAxisCrossBetweenDOCX); - CPPUNIT_TEST(testPieChartDataPointExplosionXLSX); - CPPUNIT_TEST(testCustomDataLabel); - CPPUNIT_TEST(testDataSeriesName); - CPPUNIT_TEST(testCustomPositionofDataLabel); - CPPUNIT_TEST(testCustomDataLabelMultipleSeries); - CPPUNIT_TEST(testLeaderLines); - CPPUNIT_TEST(testNumberFormatExportPPTX); - CPPUNIT_TEST(testLabelSeparatorExportDOCX); - CPPUNIT_TEST(testChartTitlePropertiesColorFillPPTX); - CPPUNIT_TEST(testChartTitlePropertiesGradientFillPPTX); - CPPUNIT_TEST(testChartTitlePropertiesBitmapFillPPTX); - CPPUNIT_TEST(testxAxisLabelsRotation); - CPPUNIT_TEST(testMultipleCategoryAxisLablesXLSX); - CPPUNIT_TEST(testMultipleCategoryAxisLablesDOCX); - CPPUNIT_TEST(testTdf116163); - CPPUNIT_TEST(testTdf111824); - CPPUNIT_TEST(test3DAreaChartZAxis); - CPPUNIT_TEST(testTdf119029); - CPPUNIT_TEST(testTdf108022); - CPPUNIT_TEST(testTdf121744); - CPPUNIT_TEST(testTdf121189); - CPPUNIT_TEST(testTdf122031); - CPPUNIT_TEST(testTdf115012); - CPPUNIT_TEST(testTdf134118); - CPPUNIT_TEST(testTdf123206_customLabelText); - CPPUNIT_TEST(testCustomLabelText); - CPPUNIT_TEST(testDeletedLegendEntries); - CPPUNIT_TEST(testTdf60316); - CPPUNIT_TEST(testTdf130225); - CPPUNIT_TEST(testTdf59857); - CPPUNIT_TEST(testTdf126076); - CPPUNIT_TEST(testTdf75330); - CPPUNIT_TEST(testTdf127792); - CPPUNIT_TEST(testTdf131979); - CPPUNIT_TEST(testTdf132076); - CPPUNIT_TEST(testTdf125812); - CPPUNIT_TEST(testTdf133190); - CPPUNIT_TEST(testTdf133191); - CPPUNIT_TEST(testTdf132594); - CPPUNIT_TEST(testTdf134255); - CPPUNIT_TEST(testTdf134977); - CPPUNIT_TEST(testTdf123647); - CPPUNIT_TEST(testTdf136267); - CPPUNIT_TEST(testDataLabelPlacementPieChart); - CPPUNIT_TEST(testTdf137917); - CPPUNIT_TEST(testTdf138204); - CPPUNIT_TEST(testTdf138181); - CPPUNIT_TEST(testCustomShapeText); - CPPUNIT_TEST(testuserShapesXLSX); - CPPUNIT_TEST(testuserShapesDOCX); - CPPUNIT_TEST(testGraphicBlipXLSX); - CPPUNIT_TEST(testNameRangeXLSX); - CPPUNIT_TEST(testTdf143942); - CPPUNIT_TEST(testDateCategoriesPPTX); - CPPUNIT_TEST_SUITE_END(); }; -void Chart2ExportTest2::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testSetSeriesToSecondaryAxisXLSX) { - XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx); -} - -void Chart2ExportTest2::testSetSeriesToSecondaryAxisXLSX() -{ - load(u"/chart2/qa/extras/data/xlsx/", "add_series_secondary_axis.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/add_series_secondary_axis.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); // Second series Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xChartDoc, 1); CPPUNIT_ASSERT(xSeries.is()); @@ -177,19 +40,21 @@ void 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)); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open 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", 2); } -void Chart2ExportTest2::testCombinedChartSecondaryAxisXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCombinedChartSecondaryAxisXLSX) { // Original file was created with MS Office - load(u"/chart2/qa/extras/data/xlsx/", "combined_chart_secondary_axis.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/combined_chart_secondary_axis.xlsx"); + 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 @@ -212,11 +77,12 @@ void Chart2ExportTest2::testCombinedChartSecondaryAxisXLSX() YValueIdOfBarchart); } -void Chart2ExportTest2::testCombinedChartSecondaryAxisODS() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCombinedChartSecondaryAxisODS) { // Original file was created with LibreOffice - load(u"/chart2/qa/extras/data/ods/", "combined_chart_secondary_axis.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"ods/combined_chart_secondary_axis.ods"); + 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 @@ -241,59 +107,85 @@ void Chart2ExportTest2::testCombinedChartSecondaryAxisODS() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:crosses", 0); } -void Chart2ExportTest2::testCrossBetweenXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenXLSX) { + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + // Original files were created with MS Office { - load(u"/chart2/qa/extras/data/xlsx/", "tdf127777.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf127777.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", - "between"); + u"between"); } { - load(u"/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf132076.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", - "between"); + u"between"); } } -void Chart2ExportTest2::testCrossBetweenWithDeletedAxis() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenWithDeletedAxis) { // Original file was created with MS Office (the category axis is deleted in the file) - load(u"/chart2/qa/extras/data/xlsx/", "tdf128633.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf128633.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", - "between"); + u"between"); } -void Chart2ExportTest2::testCrossBetweenODS() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCrossBetweenODS) { // Original file was created with LibreOffice - load(u"/chart2/qa/extras/data/ods/", "test_CrossBetween.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"ods/test_CrossBetween.ods"); + 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", "val", - "between"); + u"between"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartexTitleXLSX) +{ + loadFromFile(u"xlsx/funnel1.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chartEx1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/cx:chartSpace/cx:chart/cx:plotArea/cx:plotAreaRegion/cx:series", + "layoutId", u"funnel"); + assertXPath(pXmlDoc, + "/cx:chartSpace/cx:chart/cx:plotArea/cx:plotAreaRegion/cx:series/cx:spPr/" + "a:solidFill/a:srgbClr", + "val", u"c55a11"); + assertXPathContent(pXmlDoc, "/cx:chartSpace/cx:chart/cx:title/cx:tx/cx:txData/cx:v", + u"Funnel chart!"); } -void Chart2ExportTest2::testAxisTitleRotationXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisTitleRotationXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "axis_title_rotation.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/axis_title_rotation.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:title/c:tx/c:rich/a:bodyPr", - "rot", "0"); + "rot", u"0"); } -void Chart2ExportTest2::testAxisTitlePositionDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisTitlePositionDOCX) { - load(u"/chart2/qa/extras/data/docx/", "testAxisTitlePosition.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/testAxisTitlePosition.docx"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // test X Axis title position @@ -322,33 +214,32 @@ void Chart2ExportTest2::testAxisTitlePositionDOCX() CPPUNIT_ASSERT_DOUBLES_EQUAL(0.384070199122511, nY, 1e-2); } -void Chart2ExportTest2::testAxisCrossBetweenDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testAxisCrossBetweenDOCX) { - load(u"/chart2/qa/extras/data/odt/", "axis-position.odt"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); - assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", "midCat"); + loadFromFile(u"odt/axis-position.odt"); + + // FIXME: validation error in OOXML export: Errors: 3 + skipValidation(); + + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); + assertXPath(pXmlDoc, "(//c:crossBetween)[1]", "val", u"midCat"); } -void Chart2ExportTest2::testPieChartDataPointExplosionXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testPieChartDataPointExplosionXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "pie_chart_datapoint_explosion.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/pie_chart_datapoint_explosion.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dPt/c:explosion", - "val", "28"); + "val", u"28"); } -void Chart2ExportTest2::testCustomDataLabel() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabel) { - load(u"/chart2/qa/extras/data/pptx/", "tdf115107.pptx"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart1", "Impress MS PowerPoint 2007 XML"); - CPPUNIT_ASSERT(pXmlDoc); - // Check the data labels font color for the complete data series - 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", - "val", "404040"); + loadFromFile(u"pptx/tdf115107.pptx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -363,42 +254,42 @@ void 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); @@ -408,13 +299,13 @@ void 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); @@ -424,28 +315,28 @@ void 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( @@ -455,52 +346,65 @@ void 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(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", + "val", u"404040"); } /// Test for tdf#94235 -void Chart2ExportTest2::testDataSeriesName() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataSeriesName) { // ODF { - load(u"/chart2/qa/extras/data/ods/", "ser_labels.ods"); - reload("calc8"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"ods/ser_labels.ods"); + saveAndReload(u"calc8"_ustr); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); 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 { - load(u"/chart2/qa/extras/data/xlsx/", "ser_labels.xlsx"); - reload("Calc Office Open XML"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/ser_labels.xlsx"); + saveAndReload(u"Calc Office Open XML"_ustr); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); 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); } } -void Chart2ExportTest2::testCustomPositionofDataLabel() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomPositionofDataLabel) { - load(u"/chart2/qa/extras/data/xlsx/", "testCustomPosDataLabels.xlsx"); + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + loadFromFile(u"xlsx/testCustomPosDataLabels.xlsx"); { - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open 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", - "val", "2"); + "val", u"2"); OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/" "c:dLbl[1]/c:layout/c:manualLayout/c:x", @@ -516,15 +420,16 @@ void Chart2ExportTest2::testCustomPositionofDataLabel() CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.0742140311063737, nY, 1e-7); } - load(u"/chart2/qa/extras/data/docx/", "testTdf108110.docx"); + loadFromFile(u"docx/testTdf108110.docx"); { - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + 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", - "val", "2"); + "val", u"2"); OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/" "c:dLbl[2]/c:layout/c:manualLayout/c:x", @@ -540,11 +445,11 @@ void Chart2ExportTest2::testCustomPositionofDataLabel() CPPUNIT_ASSERT_DOUBLES_EQUAL(0.172648731408574, nY, 1e-7); } - load(u"/chart2/qa/extras/data/ods/", "tdf136024.ods"); + loadFromFile(u"ods/tdf136024.ods"); { - reload("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); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); @@ -553,19 +458,46 @@ void 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(aCustomLabelPosition.Primary, -0.0961935120945059, 1e-5); - CPPUNIT_ASSERT_DOUBLES_EQUAL(aCustomLabelPosition.Secondary, 0.209578842093566, 1e-5); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.0961935120945059, aCustomLabelPosition.Primary, 1e-5); + CPPUNIT_ASSERT_DOUBLES_EQUAL(0.209578842093566, aCustomLabelPosition.Secondary, 1e-5); } } -void Chart2ExportTest2::testCustomDataLabelMultipleSeries() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf161571PiechartCustomPosDataLabels) { - load(u"/chart2/qa/extras/data/pptx/", "tdf115107-2.pptx"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart2", "Impress MS PowerPoint 2007 XML"); + // FIXME: validation error in OOXML export + skipValidation(); + + loadFromFile(u"xlsx/tdf161607PieChartLeaderLinesColorWidth.xlsx"); + 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:doughnutChart/c:ser/c:dLbls/c:dLbl[2]/c:idx", + "val", u"1"); + OUString aXVal = getXPath(pXmlDoc, + "/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/" + "c:dLbl[2]/c:layout/c:manualLayout/c:x", + "val"); + double nX = aXVal.toDouble(); + CPPUNIT_ASSERT_DOUBLES_EQUAL(-0.13500189609404625, nX, 1e-7); + + OUString aYVal = getXPath(pXmlDoc, + "/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/" + "c:dLbl[2]/c:layout/c:manualLayout/c:y", + "val"); + double nY = aYVal.toDouble(); + CPPUNIT_ASSERT_DOUBLES_EQUAL(0.15994818221025045, nY, 1e-7); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomDataLabelMultipleSeries) +{ + loadFromFile(u"pptx/tdf115107-2.pptx"); + Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -578,234 +510,277 @@ void 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()); } -void Chart2ExportTest2::testLeaderLines() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLeaderLines) { - load(u"/chart2/qa/extras/data/xlsx/", "testTdf90749.xlsx"); + // FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + + loadFromFile(u"xlsx/testTdf90749.xlsx"); { - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open 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", - "val", "1"); + "val", u"1"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:dLbls/c:extLst/c:ext/" "c15:showLeaderLines", - "val", "0"); + "val", u"0"); } - load(u"/chart2/qa/extras/data/docx/", "MSO_Custom_Leader_Line.docx"); + loadFromFile(u"docx/MSO_Custom_Leader_Line.docx"); { - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1", "Office Open XML Text"); + 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", - "val", "0"); + "val", u"0"); } } -void Chart2ExportTest2::testNumberFormatExportPPTX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf161607PieChartLeaderLinesColorWidth) { - load(u"/chart2/qa/extras/data/pptx/", "tdf115859.pptx"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML"); + // FIXME: validation error in OOXML export + skipValidation(); + + loadFromFile(u"xlsx/tdf161607PieChartLeaderLinesColorWidth.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + // test LeaderLines width + OUString aWidth = getXPath( + pXmlDoc, + "/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:leaderLines/c:spPr/" + "a:ln", + "w"); + sal_Int32 nWidth = aWidth.toInt32(); + CPPUNIT_ASSERT_LESSEQUAL(static_cast<sal_Int32>(100), std::abs(nWidth - 88900)); + + // test LeaderLines Color + assertXPath( + pXmlDoc, + "/c:chartSpace/c:chart/c:plotArea/c:doughnutChart/c:ser/c:dLbls/c:leaderLines/c:spPr/" + "a:ln/a:solidFill/a:srgbClr", + "val", u"7030a0"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testNumberFormatExportPPTX) +{ + loadFromFile(u"pptx/tdf115859.pptx"); + 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", - "formatCode", "#,##0.00,\\K"); + "formatCode", u"#,##0.00,\\K"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:numFmt", - "sourceLinked", "0"); + "sourceLinked", u"0"); } -void Chart2ExportTest2::testLabelSeparatorExportDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testLabelSeparatorExportDOCX) { - load(u"/chart2/qa/extras/data/docx/", "testLabelSeparator.docx"); + loadFromFile(u"docx/testLabelSeparator.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + 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", "\n"); + pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls/c:separator", u"\n"); // The text separator should be a comma assertXPathContent( - pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:separator", ", "); + pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:separator", u", "); // The text separator should be a semicolon assertXPathContent( - pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:separator", "; "); + pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:dLbls/c:separator", u"; "); } -void Chart2ExportTest2::testChartTitlePropertiesColorFillPPTX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesColorFillPPTX) { - load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesColorFill.pptx"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML"); + loadFromFile(u"pptx/testChartTitlePropertiesColorFill.pptx"); + 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", "val", - "ff0000"); + u"ff0000"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); } -void Chart2ExportTest2::testChartTitlePropertiesGradientFillPPTX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesGradientFillPPTX) { - load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesGradientFill.pptx"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML"); + loadFromFile(u"pptx/testChartTitlePropertiesGradientFill.pptx"); + 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", "val", - "f6f8fc"); + u"f6f8fc"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr", "val", - "c7d5ed"); + u"c7d5ed"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); } -void Chart2ExportTest2::testChartTitlePropertiesBitmapFillPPTX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testChartTitlePropertiesBitmapFillPPTX) { - load(u"/chart2/qa/extras/data/pptx/", "testChartTitlePropertiesBitmapFill.pptx"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML"); + loadFromFile(u"pptx/testChartTitlePropertiesBitmapFill.pptx"); + 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", "embed", "rId1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", + u"rId1"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); } -void Chart2ExportTest2::testxAxisLabelsRotation() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testxAxisLabelsRotation) { - load(u"/chart2/qa/extras/data/xlsx/", "xAxisLabelsRotation.xlsx"); - xmlDocUniquePtr pXmlDoc1 = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/xAxisLabelsRotation.xlsx"); + 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", "rot", - "2700000"); + u"2700000"); } -void Chart2ExportTest2::testMultipleCategoryAxisLablesXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesXLSX) { - load(u"/chart2/qa/extras/data/ods/", "multilevelcat.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"ods/multilevelcat.ods"); + 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", - "val", "6"); + "val", u"6"); // check category axis labels text of first level assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[1]/c:v", - "Categoria 1"); + u"Categoria 1"); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[6]/c:v", - "Categoria 6"); + u"Categoria 6"); // check category axis labels text of second level assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[1]/c:v", - "2011"); + u"2011"); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[3]/c:v", - "2013"); + u"2013"); // check the 'noMultiLvlLbl' tag - ChartExport.cxx:2950 FIXME: seems not support, so check the default noMultiLvlLbl value. - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:noMultiLvlLbl", "val", "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:noMultiLvlLbl", "val", u"0"); } -void Chart2ExportTest2::testMultipleCategoryAxisLablesDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testMultipleCategoryAxisLablesDOCX) { - load(u"/chart2/qa/extras/data/odt/", "multilevelcat.odt"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"odt/multilevelcat.odt"); + 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", - "val", "4"); + "val", u"4"); // check category axis labels text of first level assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[1]/c:v", - "Categoria 1"); + u"Categoria 1"); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[1]/c:pt[4]/c:v", - "Categoria 4"); + u"Categoria 4"); // check category axis labels text of second level assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[1]/c:v", - "2011"); + u"2011"); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/" "c:multiLvlStrRef/c:multiLvlStrCache/c:lvl[2]/c:pt[2]/c:v", - "2012"); + u"2012"); // check the 'noMultiLvlLbl' tag - ChartExport.cxx:2950 FIXME: seems not support, so check the default noMultiLvlLbl value. - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:noMultiLvlLbl", "val", "0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:noMultiLvlLbl", "val", u"0"); } -void Chart2ExportTest2::testTdf116163() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf116163) { - load(u"/chart2/qa/extras/data/pptx/", "tdf116163.pptx"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML"); + loadFromFile(u"pptx/tdf116163.pptx"); + 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", "rot", - "-5400000"); + u"-5400000"); } -void Chart2ExportTest2::testTdf111824() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf111824) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf111824.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf111824.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Collect 3D barchart Z axID @@ -816,10 +791,11 @@ void Chart2ExportTest2::testTdf111824() zAxisIdOf3DBarchart); } -void Chart2ExportTest2::test3DAreaChartZAxis() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, test3DAreaChartZAxis) { - load(u"/chart2/qa/extras/data/xlsx/", "test3DAreaChartZAxis.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/test3DAreaChartZAxis.xlsx"); + 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 @@ -830,22 +806,23 @@ void Chart2ExportTest2::test3DAreaChartZAxis() zAxisIdOf3DAreachart); } -void Chart2ExportTest2::testTdf119029() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf119029) { - load(u"/chart2/qa/extras/data/odp/", "tdf119029.odp"); + loadFromFile(u"odp/tdf119029.odp"); // Only use "chart", without number, because the number depends on the previous tests - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML"); + 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", "rot", - "-5400000"); + u"-5400000"); } -void Chart2ExportTest2::testTdf108022() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf108022) { - load(u"/chart2/qa/extras/data/odt/", "tdf108022.odt"); - reload("Office Open XML Text"); + loadFromFile(u"odt/tdf108022.odt"); + saveAndReload(u"Office Open XML Text"_ustr); // assert we really have two charts Reference<chart2::XChartDocument> xChartDoc1(getChartDocFromWriter(0), uno::UNO_QUERY); @@ -854,10 +831,11 @@ void Chart2ExportTest2::testTdf108022() CPPUNIT_ASSERT(xChartDoc2.is()); } -void Chart2ExportTest2::testTdf121744() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121744) { - load(u"/chart2/qa/extras/data/docx/", "tdf121744.docx"); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + loadFromFile(u"docx/tdf121744.docx"); + save(u"Office Open XML Text"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"word/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); OUString XValueId @@ -869,152 +847,173 @@ void Chart2ExportTest2::testTdf121744() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:axId[2]", "val", YValueId); } -void Chart2ExportTest2::testTdf121189() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf121189) { - load(u"/chart2/qa/extras/data/odp/", "tdf121189.odp"); - reload("Impress Office Open XML"); + loadFromFile(u"odp/tdf121189.odp"); + 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()); } -void Chart2ExportTest2::testTdf122031() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf122031) { //Checks pie chart data label format. + loadFromFile(u"xlsx/tdf122031.xlsx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); - load(u"/chart2/qa/extras/data/xlsx/", "tdf122031.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open 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", - "formatCode", "0.000%"); + "formatCode", u"0.000%"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt", - "formatCode", "0.000%"); + "formatCode", u"0.000%"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[2]/c:numFmt", - "formatCode", "0.000%"); + "formatCode", u"0.000%"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[3]/c:numFmt", - "formatCode", "0.000%"); + "formatCode", u"0.000%"); } -void Chart2ExportTest2::testTdf115012() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf115012) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf115012.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf115012.xlsx"); + 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", "val", "zero"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", u"zero"); } -void Chart2ExportTest2::testTdf134118() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134118) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf134118.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf134118.xlsx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + 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", "val", "gap"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", u"gap"); } -void Chart2ExportTest2::testTdf123206_customLabelText() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123206_customLabelText) { - load(u"/chart2/qa/extras/data/docx/", "tdf123206.docx"); + loadFromFile(u"docx/tdf123206.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + // FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + + 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", - "kiscica"); + u"kiscica"); } -void Chart2ExportTest2::testCustomLabelText() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomLabelText) { - load(u"/chart2/qa/extras/data/docx/", "testCustomlabeltext.docx"); + loadFromFile(u"docx/testCustomlabeltext.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + // FIXME: validation error in OOXML export: Errors: 3 + skipValidation(); + + 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", "val", - "2"); + u"2"); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[1]/c:tx/" "c:rich/a:p/a:r[1]/a:t", - "3.5"); + u"3.5"); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[1]/c:tx/" "c:rich/a:p/a:r[3]/a:t", - "CustomLabel 1"); + u"CustomLabel 1"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[2]/c:idx", "val", - "3"); + u"3"); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[2]/c:tx/" "c:rich/a:p/a:r[1]/a:t", - "4.5"); + u"4.5"); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl[2]/c:tx/" "c:rich/a:p/a:r[3]/a:t", - "CustomLabel 2"); + u"CustomLabel 2"); } -void Chart2ExportTest2::testDeletedLegendEntries() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDeletedLegendEntries) { - load(u"/chart2/qa/extras/data/xlsx/", "deleted_legend_entry.xlsx"); + loadFromFile(u"xlsx/deleted_legend_entry.xlsx"); { - reload("Calc Office Open XML"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + saveAndReload(u"Calc Office Open XML"_ustr); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); 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); } - load(u"/chart2/qa/extras/data/xlsx/", "deleted_legend_entry2.xlsx"); + loadFromFile(u"xlsx/deleted_legend_entry2.xlsx"); { - reload("Calc Office Open XML"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + saveAndReload(u"Calc Office Open XML"_ustr); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); 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); + Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(1); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries2(getDataSeriesFromDoc(xChartDoc2, 0)); 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]); } } -void Chart2ExportTest2::testTdf60316() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf60316) { - load(u"/chart2/qa/extras/data/pptx/", "tdf60316.pptx"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML"); + loadFromFile(u"pptx/tdf60316.pptx"); + 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 @@ -1022,39 +1021,41 @@ void Chart2ExportTest2::testTdf60316() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:solidFill", 0); } -void Chart2ExportTest2::testTdf130225() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf130225) { - load(u"/chart2/qa/extras/data/docx/", "piechart_deleted_legend_entry.docx"); - reload("Office Open XML Text"); + loadFromFile(u"docx/piechart_deleted_legend_entry.docx"); + 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]); } -void Chart2ExportTest2::testTdf59857() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf59857) { - load(u"/chart2/qa/extras/data/ods/", "tdf59857.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"ods/tdf59857.ods"); + 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", 1); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:floor/c:spPr/a:solidFill/a:srgbClr", "val", - "cccccc"); + u"cccccc"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:backWall/c:spPr/a:ln/a:noFill", 0); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:backWall/c:spPr/a:ln/a:solidFill/a:srgbClr", - "val", "b3b3b3"); + "val", u"b3b3b3"); } -void Chart2ExportTest2::testTdf126076() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf126076) { - load(u"/chart2/qa/extras/data/xlsx/", "auto_marker_excel10.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/auto_marker_excel10.xlsx"); + 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 @@ -1065,54 +1066,52 @@ void Chart2ExportTest2::testTdf126076() assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker", 0); } -void Chart2ExportTest2::testTdf75330() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf75330) { - load(u"/chart2/qa/extras/data/ods/", "legend_overlay.ods"); - reload("calc8"); + loadFromFile(u"ods/legend_overlay.ods"); + saveAndReload(u"calc8"_ustr); { - uno::Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0, mxComponent); + uno::Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0); 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); } - reload("Calc Office Open XML"); + saveAndReload(u"Calc Office Open XML"_ustr); { - uno::Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0, mxComponent); + uno::Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0); 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); } } -void Chart2ExportTest2::testTdf127792() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf127792) { - load(u"/chart2/qa/extras/data/docx/", "MSO_axis_position.docx"); - { - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart1", "Office Open XML Text"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", - "between"); - } - { - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart2", "Office Open XML Text"); - CPPUNIT_ASSERT(pXmlDoc); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", - "midCat"); - } + loadFromFile(u"docx/MSO_axis_position.docx"); + 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", "val", + u"between"); + + pXmlDoc = parseExport(u"word/charts/chart2.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:crossBetween", "val", + u"midCat"); } -void Chart2ExportTest2::testTdf131979() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf131979) { - load(u"/chart2/qa/extras/data/ods/", "tdf131115.ods"); + loadFromFile(u"ods/tdf131115.ods"); { - reload("calc8"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + saveAndReload(u"calc8"_ustr); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); @@ -1125,10 +1124,10 @@ void Chart2ExportTest2::testTdf131979() !blinknumberformattosource); } - load(u"/chart2/qa/extras/data/ods/", "tdf131979.ods"); + loadFromFile(u"ods/tdf131979.ods"); { - reload("calc8"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + saveAndReload(u"calc8"_ustr); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); @@ -1142,87 +1141,104 @@ void Chart2ExportTest2::testTdf131979() } } -void Chart2ExportTest2::testTdf132076() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132076) { + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + { - load(u"/chart2/qa/extras/data/ods/", "tdf132076.ods"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"ods/tdf132076.ods"); + 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", "formatCode", - "dd"); + u"dd"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:numFmt", "sourceLinked", - "0"); + u"0"); } { - load(u"/chart2/qa/extras/data/xlsx/", "tdf132076.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf132076.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt", "formatCode", - "dd"); + u"dd"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:numFmt", "sourceLinked", - "0"); + u"0"); } } -void Chart2ExportTest2::testTdf125812() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf125812) { - load(u"/chart2/qa/extras/data/odp/", "ellipticalGradientFill.odp"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML"); + loadFromFile(u"odp/ellipticalGradientFill.odp"); + 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", "path", - "circle"); + u"circle"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect", - "l", "50000"); + "l", u"50000"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect", - "t", "49000"); + "t", u"49000"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect", - "r", "50000"); + "r", u"50000"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:path/a:fillToRect", - "b", "51000"); + "b", u"51000"); } -void Chart2ExportTest2::testTdf133190() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133190) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf133190_tdf133191.xlsx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + 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", - "wrap", "none"); + "wrap", u"none"); assertXPath( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[2]/c:txPr/a:bodyPr", - "wrap", "square"); + "wrap", u"square"); } -void Chart2ExportTest2::testTdf133191() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf133191) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf133190_tdf133191.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf133190_tdf133191.xlsx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + 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", - "rot", "-4500000"); + "rot", u"-4500000"); } -void Chart2ExportTest2::testTdf132594() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf132594) { - load(u"/chart2/qa/extras/data/xlsx/", "chart_pie2007.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/chart_pie2007.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:cat", 1); } -void Chart2ExportTest2::testTdf134255() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134255) { - load(u"/chart2/qa/extras/data/docx/", "tdf134255.docx"); + loadFromFile(u"docx/tdf134255.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1231,24 +1247,28 @@ void 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 - xmlDocUniquePtr pXmlDoc = parseExport("word/charts/chart", "Office Open XML Text"); + 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", "wrap", - "square"); + u"square"); } -void Chart2ExportTest2::testTdf134977() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134977) { - load(u"/chart2/qa/extras/data/xlsx/", "custom_data_label.xlsx"); + loadFromFile(u"xlsx/custom_data_label.xlsx"); //import test - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xDataSeries.is()); @@ -1256,89 +1276,91 @@ void 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 - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open 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", - "sz", "900"); + "sz", u"900"); } -void Chart2ExportTest2::testTdf123647() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf123647) { - load(u"/chart2/qa/extras/data/xlsx/", "empty_chart.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/empty_chart.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart", 1); } -void Chart2ExportTest2::testTdf136267() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf136267) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf136267.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf136267.xlsx"); + + // FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + + 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", - "John"); + u"John"); } -void Chart2ExportTest2::testDataLabelPlacementPieChart() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataLabelPlacementPieChart) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf134978.xlsx"); - reload("calc8"); - uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"xlsx/tdf134978.xlsx"); + saveAndReload(u"calc8"_ustr); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), 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); CPPUNIT_ASSERT_EQUAL(chart::DataLabelPlacement::OUTSIDE, nLabelPlacement); } -void Chart2ExportTest2::testTdf137917() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf137917) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf137917.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf137917.xlsx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + 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", "val", "days"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:majorUnit", "val", "1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:baseTimeUnit", "val", + u"days"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:majorUnit", "val", u"1"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:majorTimeUnit", "val", - "months"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:minorUnit", "val", "7"); + u"months"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:minorUnit", "val", u"7"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:dateAx/c:minorTimeUnit", "val", - "days"); + u"days"); } -void Chart2ExportTest2::testTdf138204() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf138204.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); + loadFromFile(u"xlsx/tdf138204.xlsx"); - // 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", - "type", "CELLRANGE"); - - assertXPath( - pXmlDoc, - "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:dLbl/c:tx/c:rich/a:p/a:fld", - "type", "CELLRANGE"); - - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); struct CustomLabelsTestData @@ -1357,8 +1379,8 @@ void 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 }, { @@ -1366,8 +1388,8 @@ void 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 }, }; @@ -1380,47 +1402,63 @@ void 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()); CPPUNIT_ASSERT_EQUAL(aTestEntry.aCellRange, aFields[0]->getCellRange()); CPPUNIT_ASSERT_EQUAL(aTestEntry.aString, aFields[0]->getString()); } + + // FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + + 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", + "type", u"CELLRANGE"); + + assertXPath( + pXmlDoc, + "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[2]/c:dLbls/c:dLbl/c:tx/c:rich/a:p/a:fld", + "type", u"CELLRANGE"); } -void Chart2ExportTest2::testTdf138181() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138181) { - load(u"/chart2/qa/extras/data/xlsx/", "piechart_deleted_legendentry.xlsx"); - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"xlsx/piechart_deleted_legendentry.xlsx"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); 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> 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()); } -void Chart2ExportTest2::testCustomShapeText() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testCustomShapeText) { - load(u"/chart2/qa/extras/data/ods/", "tdf72776.ods"); - reload("calc8"); - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"ods/tdf72776.ods"); + saveAndReload(u"calc8"_ustr); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); // test that the text of custom shape exists inside the chart Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); @@ -1431,12 +1469,12 @@ void Chart2ExportTest2::testCustomShapeText() CPPUNIT_ASSERT(!xRange->getString().isEmpty()); } -void Chart2ExportTest2::testuserShapesXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf128621.xlsx"); - reload("Calc Office Open XML"); + loadFromFile(u"xlsx/tdf128621.xlsx"); + saveAndReload(u"Calc Office Open XML"_ustr); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); // test that the custom shape exists @@ -1459,10 +1497,10 @@ void Chart2ExportTest2::testuserShapesXLSX() CPPUNIT_ASSERT(!xRange->getString().isEmpty()); } -void Chart2ExportTest2::testuserShapesDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testuserShapesDOCX) { - load(u"/chart2/qa/extras/data/docx/", "tdf143130.docx"); - reload("Office Open XML Text"); + loadFromFile(u"docx/tdf143130.docx"); + saveAndReload(u"Office Open XML Text"_ustr); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1487,12 +1525,12 @@ void Chart2ExportTest2::testuserShapesDOCX() CPPUNIT_ASSERT(!xRange->getString().isEmpty()); } -void Chart2ExportTest2::testGraphicBlipXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testGraphicBlipXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf143127.xlsx"); - reload("Calc Office Open XML"); + loadFromFile(u"xlsx/tdf143127.xlsx"); + saveAndReload(u"Calc Office Open XML"_ustr); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); // test that the Graphic shape exists @@ -1505,7 +1543,7 @@ void 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(); @@ -1515,42 +1553,68 @@ void Chart2ExportTest2::testGraphicBlipXLSX() CPPUNIT_ASSERT_GREATER(size_t(0), nDataSize); } -void Chart2ExportTest2::testNameRangeXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testNameRangeXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "chart_with_name_range.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/chart_with_name_range.xlsx"); + 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", - "Sheet1!local_name_range"); + u"Sheet1!local_name_range"); // test the syntax of a global range name. assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:val/c:numRef/c:f", - "[0]!series1"); + u"[0]!series1"); } -void Chart2ExportTest2::testTdf143942() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf143942.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); - CPPUNIT_ASSERT(pXmlDoc); + loadFromFile(u"xlsx/tdf143942.xlsx"); + + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); + CPPUNIT_ASSERT(xChartDoc.is()); + + uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); + 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; + uno::Sequence<uno::Reference<chart2::XDataPointCustomLabelField>> aFields; + for (size_t i = 0; i < nLabels; ++i) + { + xPropertySet.set(xDataSeries->getDataPointByIndex(i), uno::UNO_SET_THROW); + xPropertySet->getPropertyValue(u"CustomLabelFields"_ustr) >>= aFields; + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aFields.getLength()); + CPPUNIT_ASSERT_EQUAL( + chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CELLRANGE, + aFields[0]->getFieldType()); + CPPUNIT_ASSERT_EQUAL(aCellRange, aFields[0]->getCellRange()); + CPPUNIT_ASSERT_EQUAL(aLabels[i], aFields[0]->getString()); + } + + // FIXME: validation error in OOXML export: Errors: 4 + skipValidation(); + + 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", - "uri", "{02D57815-91ED-43cb-92C2-25804820EDAC}"); + "uri", u"{02D57815-91ED-43cb-92C2-25804820EDAC}"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/c:ext/" "c15:datalabelsRange/c15:dlblRangeCache/c:ptCount", - "val", "4"); + "val", u"4"); assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/c:ext/" "c15:datalabelsRange/c15:f", @@ -1560,11 +1624,11 @@ void 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", "CELLRANGE"); + "type", u"CELLRANGE"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dLbls/c:dLbl[" + OString::number(i + 1) + "]/c:extLst/c:ext/c15:showDataLabelsRange", - "val", "1"); + "val", u"1"); // Check if the actual label is stored under c15:datalabelsRange assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:extLst/" @@ -1572,31 +1636,17 @@ void Chart2ExportTest2::testTdf143942() + OString::number(i + 1) + "]/c:v", aLabels[i]); } - - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); - CPPUNIT_ASSERT(xChartDoc.is()); - uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); - CPPUNIT_ASSERT(xDataSeries.is()); - - uno::Reference<beans::XPropertySet> xPropertySet; - uno::Sequence<uno::Reference<chart2::XDataPointCustomLabelField>> aFields; - for (size_t i = 0; i < nLabels; ++i) - { - xPropertySet.set(xDataSeries->getDataPointByIndex(i), uno::UNO_SET_THROW); - xPropertySet->getPropertyValue("CustomLabelFields") >>= aFields; - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), aFields.getLength()); - CPPUNIT_ASSERT_EQUAL( - chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_CELLRANGE, - aFields[0]->getFieldType()); - CPPUNIT_ASSERT_EQUAL(aCellRange, aFields[0]->getCellRange()); - CPPUNIT_ASSERT_EQUAL(aLabels[i], aFields[0]->getString()); - } } -void Chart2ExportTest2::testDateCategoriesPPTX() +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDateCategoriesPPTX) { - load(u"/chart2/qa/extras/data/pptx/", "bnc889755.pptx"); - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress Office Open XML"); + loadFromFile(u"pptx/bnc889755.pptx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + 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 +1659,7 @@ void Chart2ExportTest2::testDateCategoriesPPTX() assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:numRef/" "c:numCache/c:formatCode", - "mmm\\-yy"); + u"mmm\\-yy"); assertXPath( pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:cat/c:numRef/c:numCache/c:ptCount", @@ -1630,7 +1680,76 @@ void Chart2ExportTest2::testDateCategoriesPPTX() } } -CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest2); +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataTableImportExport) +{ + loadFromFile(u"xlsx/ChartDataTable.xlsx"); + { + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); + CPPUNIT_ASSERT(xChartDoc.is()); + auto xDiagram = xChartDoc->getFirstDiagram(); + CPPUNIT_ASSERT(xDiagram.is()); + auto xDataTable = xDiagram->getDataTable(); + CPPUNIT_ASSERT(xDataTable.is()); + uno::Reference<beans::XPropertySet> xPropertySet(xDataTable, uno::UNO_QUERY); + CPPUNIT_ASSERT(xPropertySet.is()); + bool bHBorder; + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"HBorder"_ustr) >>= bHBorder); + CPPUNIT_ASSERT_EQUAL(true, bHBorder); + bool bVBorder; + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"VBorder"_ustr) >>= bVBorder); + CPPUNIT_ASSERT_EQUAL(true, bVBorder); + bool bOutline; + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Outline"_ustr) >>= bOutline); + CPPUNIT_ASSERT_EQUAL(false, bOutline); + bool bKeys; + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Keys"_ustr) >>= bKeys); + CPPUNIT_ASSERT_EQUAL(false, bKeys); + } + saveAndReload(u"calc8"_ustr); + { + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); + CPPUNIT_ASSERT(xChartDoc.is()); + auto xDiagram = xChartDoc->getFirstDiagram(); + CPPUNIT_ASSERT(xDiagram.is()); + auto xDataTable = xDiagram->getDataTable(); + CPPUNIT_ASSERT(xDataTable.is()); + uno::Reference<beans::XPropertySet> xPropertySet(xDataTable, uno::UNO_QUERY); + CPPUNIT_ASSERT(xPropertySet.is()); + bool bHBorder; + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"HBorder"_ustr) >>= bHBorder); + CPPUNIT_ASSERT_EQUAL(true, bHBorder); + bool bVBorder; + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"VBorder"_ustr) >>= bVBorder); + CPPUNIT_ASSERT_EQUAL(true, bVBorder); + bool bOutline; + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Outline"_ustr) >>= bOutline); + CPPUNIT_ASSERT_EQUAL(false, bOutline); + bool bKeys; + CPPUNIT_ASSERT(xPropertySet->getPropertyValue(u"Keys"_ustr) >>= bKeys); + CPPUNIT_ASSERT_EQUAL(false, bKeys); + } +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf166249) +{ + loadFromFile(u"xlsx/tdf166249.xlsx"); + // FIXME: validation error in OOXML export + skipValidation(); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + // test color and alpha value of data label borders + assertXPath(pXmlDoc, + "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:spPr/a:ln/" + "a:solidFill/a:srgbClr", + "val", u"156082"); + + assertXPath(pXmlDoc, + "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:spPr/a:ln/" + "a:solidFill/a:srgbClr/a:alpha", + "val", u"128"); +} CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/chart2export3.cxx b/chart2/qa/extras/chart2export3.cxx new file mode 100644 index 000000000000..dddce1ada490 --- /dev/null +++ b/chart2/qa/extras/chart2export3.cxx @@ -0,0 +1,890 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "charttest.hxx" + +#include <com/sun/star/chart2/DataPointLabel.hpp> +#include <com/sun/star/awt/FontWeight.hpp> +#include <com/sun/star/awt/FontSlant.hpp> +#include <com/sun/star/awt/FontUnderline.hpp> + +using uno::Reference; +using beans::XPropertySet; + +class Chart2ExportTest3 : public ChartTest +{ +public: + Chart2ExportTest3() : ChartTest(u"/chart2/qa/extras/data/"_ustr) {} +}; + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf108107) +{ + loadFromFile(u"xlsx/tdf108107.xlsx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + 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", "val", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr", "b", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:dLbls/c:dLbl[1]/c:txPr/a:p/a:pPr/a:defRPr", "sz", u"2000"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf114139) +{ + loadFromFile(u"xlsx/tdf114139.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pie3DChart", 1); + //no fill + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr", 0); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:solidFill", 0); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf64224) +{ + loadFromFile(u"ods/tdf64224.ods"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + //no fill + assertXPath(pXmlDoc, "/c:chartSpace/c:spPr/a:noFill", 1); + assertXPath(pXmlDoc, "/c:chartSpace/c:spPr/a:solidFill", 0); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesColorFillDOCX) +{ + loadFromFile(u"docx/testChartTitlePropertiesColorFill.docx"); + 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", "val", u"ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesGradientFillDOCX) +{ + loadFromFile(u"docx/testChartTitlePropertiesGradientFill.docx"); + 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", "val", u"cccccc"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr", "val", u"666666"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesBitmapFillDOCX) +{ + loadFromFile(u"docx/testChartTitlePropertiesBitmapFill.docx"); + 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", "embed", u"rId1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); +} + + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientWithTransparencyDOCX) +{ + // Test color gradient (two color) with gradient transparency + loadFromFile(u"docx/testColorGradientWithTransparency.docx"); + 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", "val", u"60000"); + // Test the transparency of the second color + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", u"90000"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientWithTransparencyODS) +{ + // Test color gradient (two color) with simple transparency + loadFromFile(u"ods/testColorGradientWithTransparency.ods"); + 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", "val", u"60000"); + // Test the transparency of the second color + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", u"60000"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testColorGradientStopXLSX) +{ + // Test color gradient (two color) stop of the first color + loadFromFile(u"xlsx/tdf128619.xlsx"); + 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]", "pos", u"45000"); + // Test the position of the second color + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:spPr/a:gradFill/a:gsLst/a:gs[2]", "pos", u"100000"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRadialColorGradientDOCX) +{ + loadFromFile(u"docx/tdf128794.docx"); + 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", "path", u"circle"); + // Test the linear gradient angle + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:gsLst/a:gs[1]", "pos", u"0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", u"ffffff"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:gsLst/a:gs[2]", "pos", u"100000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr", "val", u"5b9bd5"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartDataPointPropDOCX) +{ + loadFromFile(u"docx/testBarChartDataPointPropDOCX.docx"); + 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", "val", u"0"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:idx", "val", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", u"f6f8fc"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr", "val", u"c7d5ed"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", u"70ad47"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:idx", "val", u"2"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:solidFill/a:srgbClr", "val", u"ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", u"000000"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testFdo83058dlblPos) +{ + loadFromFile(u"docx/fdo83058_dlblPos.docx"); + + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + 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", "val", u"outEnd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[3]/c:dLblPos", "val", u"outEnd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[4]/c:dLblPos", "val", u"outEnd"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[1]/c:dLbls[1]/c:dLbl[5]/c:dLblPos", "val", u"outEnd"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAutoTitleDelXLSX) +{ + loadFromFile(u"xlsx/autotitledel_2007.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", u"0"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDispBlanksAsXLSX) +{ + loadFromFile(u"xlsx/dispBlanksAs_2007.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:dispBlanksAs", "val", u"gap"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMarkerColorXLSX) +{ + loadFromFile(u"xlsx/markerColor.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:marker/c:spPr/a:solidFill/a:srgbClr", "val", u"92d050"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testRoundedCornersXLSX) +{ + loadFromFile(u"xlsx/markerColor.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:roundedCorners", "val", u"0"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAxisNumberFormatXLSX) +{ + loadFromFile(u"ods/axis_number_format.ods"); + 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", 2); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt", "formatCode", u"0.00E+000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt", "sourceLinked", u"0"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt", "formatCode", u"[$$-409]#,##0;\\-[$$-409]#,##0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt", "sourceLinked", u"1"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataPointLabelNumberFormatXLSX) +{ + // FIXME: validation error in OOXML export: Errors: 1 + skipValidation(); + + loadFromFile(u"ods/tdf123774.ods"); + { + 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", "formatCode", u"[$-40E]0.00%"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:numFmt", "sourceLinked", u"0"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt", "formatCode", u"[$-40E]0.00%"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:pieChart/c:ser/c:dLbls/c:dLbl[1]/c:numFmt", "sourceLinked", u"0"); + } + + loadFromFile(u"xlsx/tdf130986.xlsx"); + { + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:idx", "val", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:numFmt", "formatCode", u"0.00E+00"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:numFmt", "sourceLinked", u"0"); + } +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelDefaultValuesXLSX) +{ + loadFromFile(u"xlsx/data_label.xlsx"); + Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0); + Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0); + Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW); + uno::Any aAny = xPropSet->getPropertyValue(u"Label"_ustr); + chart2::DataPointLabel aLabel; + CPPUNIT_ASSERT(aAny >>= aLabel); + CPPUNIT_ASSERT(aLabel.ShowNumber); + + 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", "val", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLblPos", "val", u"outEnd"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelFillColor) +{ + loadFromFile(u"xlsx/data_labels_fill_color.xlsx"); + Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0); + Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xDoc, 0); + Reference<beans::XPropertySet> xPropSet(xSeries, uno::UNO_QUERY_THROW); + uno::Any aAny = xPropSet->getPropertyValue(u"LabelFillColor"_ustr); + sal_Int32 nLabelFillColor; + CPPUNIT_ASSERT(aAny >>= nLabelFillColor); + + 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", "val", u"f79646"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleOverlayXLSX) +{ + loadFromFile(u"xlsx/chart_title.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:overlay", "val", u"0"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testInvertIfNegativeXLSX) +{ + loadFromFile(u"xlsx/bar_chart_simple.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:invertIfNegative", "val", u"0"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBubble3DXLSX) +{ + loadFromFile(u"xlsx/bubble_chart_simple.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[1]/c:bubble3D", "val", u"0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[2]/c:bubble3D", "val", u"0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:bubbleChart/c:ser[3]/c:bubble3D", "val", u"0"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testNoMarkerXLSX) +{ + loadFromFile(u"xlsx/no_marker.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[1]/c:marker/c:symbol", "val", u"none"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser[2]/c:marker/c:symbol", "val", u"none"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:marker", "val", u"0"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleManualLayoutXLSX) +{ + loadFromFile(u"xlsx/title_manual_layout.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:layoutTarget", 0); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:xMode", "val", u"edge"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:yMode", "val", u"edge"); + + OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:x", "val"); + double nX = aXVal.toDouble(); + CPPUNIT_ASSERT(nX > 0); + CPPUNIT_ASSERT(nX < 1); + + OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:layout/c:manualLayout/c:y", "val"); + double nY = aYVal.toDouble(); + CPPUNIT_ASSERT(nY > 0); + CPPUNIT_ASSERT(nY < 1); + CPPUNIT_ASSERT(nX != nY); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:bodyPr", "rot", u"1200000"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotAreaManualLayoutXLSX) +{ + loadFromFile(u"xlsx/plot_area_manual_layout.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:layoutTarget", "val", u"inner"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:xMode", "val", u"edge"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:yMode", "val", u"edge"); + + OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:x", "val"); + double nX = aXVal.toDouble(); + CPPUNIT_ASSERT(nX > 0); + CPPUNIT_ASSERT(nX < 1); + + OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:y", "val"); + double nY = aYVal.toDouble(); + CPPUNIT_ASSERT(nY > 0); + CPPUNIT_ASSERT(nY < 1); + CPPUNIT_ASSERT(nX != nY); + + OUString aWVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:w", "val"); + double nW = aWVal.toDouble(); + CPPUNIT_ASSERT(nW > 0); + CPPUNIT_ASSERT(nW < 1); + + OUString aHVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:h", "val"); + double nH = aHVal.toDouble(); + CPPUNIT_ASSERT(nH > 0); + CPPUNIT_ASSERT(nH < 1); + CPPUNIT_ASSERT(nH != nW); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testLegendManualLayoutXLSX) +{ + loadFromFile(u"xlsx/legend_manual_layout.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:layout/c:manualLayout/c:layoutTarget", 0); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:xMode", "val", u"edge"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:yMode", "val", u"edge"); + + OUString aXVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:x", "val"); + double nX = aXVal.toDouble(); + CPPUNIT_ASSERT(nX > 0); + CPPUNIT_ASSERT(nX < 1); + + OUString aYVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:y", "val"); + double nY = aYVal.toDouble(); + CPPUNIT_ASSERT(nY > 0); + CPPUNIT_ASSERT(nY < 1); + CPPUNIT_ASSERT(nX != nY); + + OUString aWVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:w", "val"); + double nW = aWVal.toDouble(); + CPPUNIT_ASSERT(nW > 0); + CPPUNIT_ASSERT(nW < 1); + + OUString aHVal = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:legend/c:layout/c:manualLayout/c:h", "val"); + double nH = aHVal.toDouble(); + CPPUNIT_ASSERT(nH > 0); + CPPUNIT_ASSERT(nH < 1); + 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", "sz", u"900"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartSubTitle) +{ + loadFromFile(u"ods/testChartSubTitle.ods"); + 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", "sz", u"1100"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "b", u"1"); + // run props + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr", "sz", u"1100"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr", "b", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr/a:solidFill/a:srgbClr", "val", u"00a933"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr/a:latin", "typeface", u"Times New Roman"); + // text + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:t", u"It is a Subtitle"); + // shape props + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", u"b2b2b2"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartMainWithSubTitle) +{ + loadFromFile(u"ods/testChartMainWithSubTitle.ods"); + 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", "sz", u"1300"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:pPr/a:defRPr", "b", u"0"); + // run props + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr", "sz", u"1300"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr", "b", u"0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr", "i", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr/a:solidFill/a:srgbClr", "val", u"f10d0c"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:rPr/a:latin", "typeface", u"Arial"); + // text + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r/a:t", u"It is a Maintitle"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r/a:t", u"It is a Subtitle"); + // shape props + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", u"81d41a"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAutoTitleDeleted) +{ + loadFromFile(u"xlsx/testAutoTitleDeleted.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:autoTitleDeleted", "val", u"1"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesColorFillXLSX) +{ + loadFromFile(u"xlsx/testChartTitlePropertiesColorFill.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:solidFill/a:srgbClr", "val", u"ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesGradientFillXLSX) +{ + loadFromFile(u"xlsx/testChartTitlePropertiesGradientFill.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", u"cccccc"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr", "val", u"666666"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testChartTitlePropertiesBitmapFillXLSX) +{ + loadFromFile(u"xlsx/testChartTitlePropertiesBitmapFill.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:blipFill/a:blip", "embed", u"rId1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:spPr/a:ln/a:noFill", 1); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartDataPointPropXLSX) +{ + loadFromFile(u"xlsx/testBarChartDataPointPropXLSX.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors", "val", u"0"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:idx", "val", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:solidFill/a:srgbClr", "val", u"ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[1]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", u"000000"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:idx", "val", u"2"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:gradFill/a:gsLst/a:gs[1]/a:srgbClr", "val", u"f6f8fc"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:gradFill/a:gsLst/a:gs[2]/a:srgbClr", "val", u"c7d5ed"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", u"70ad47"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAxisCharacterPropertiesXLSX) +{ + loadFromFile(u"xlsx/axis_character_properties.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "sz", u"1000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "b", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "i", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx/c:txPr/a:p/a:pPr/a:defRPr", "u", u"sng"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr", "sz", u"900"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr", "b", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr", "strike", u"sngStrike"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:txPr/a:p/a:pPr/a:defRPr/a:solidFill/a:srgbClr", "val", u"ff0000"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTitleCharacterPropertiesXLSX) +{ + loadFromFile(u"xlsx/title_character_properties.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "sz", u"1300"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:pPr/a:defRPr", "b", u"0"); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr", "sz", u"2400"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p/a:r/a:rPr", "b", u"1"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testPlotVisOnlyXLSX) +{ + loadFromFile(u"xlsx/hidden_cells.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotVisOnly", "val", u"0"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartVaryColorsXLSX) +{ + loadFromFile(u"xlsx/tdf90876.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); + CPPUNIT_ASSERT(pXmlDoc); + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:varyColors", "val", u"0"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf96161) +{ + loadFromFile(u"ods/tdf96161.ods"); + 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", "val", u"0"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTableOnPage3) +{ + loadFromFile(u"docx/TableOnPage3.docx"); + + // FIXME: validation error in OOXML export: Errors: 2 + skipValidation(); + + 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(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(u"Impress MS PowerPoint 2007 XML"_ustr); + + Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); + + Reference< chart2::data::XDataSequence > xDataSeq; + xDataSeq.set(getDataSequenceFromDocByRole(xChartDoc, u"values-y", 0)); + const sal_Int32 nKey_bananas = xDataSeq->getNumberFormatKeyByIndex(-1); + // This should not be General format (0), but a defined format (129) + CPPUNIT_ASSERT(nKey_bananas); + + xDataSeq.set(getDataSequenceFromDocByRole(xChartDoc, u"values-y", 1)); + const sal_Int32 nKey_pineapples = xDataSeq->getNumberFormatKeyByIndex(-1); + // This should not be General format (0), but a defined format (130) + CPPUNIT_ASSERT(nKey_pineapples); + CPPUNIT_ASSERT(nKey_pineapples != nKey_bananas); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testMultipleAxisXLSX) +{ + loadFromFile(u"ods/multiple_axis.ods"); + 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", 2); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart[1]/c:ser", 1); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart[2]/c:ser", 1); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx", 4); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:delete[@val='1']", 1); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:axPos[@val='l']", 1); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx/c:axPos[@val='r']", 1); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testSecondaryAxisXLSX) +{ + loadFromFile(u"ods/secondary_axis.ods"); + 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", 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", 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", u"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", u"c"); + // 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", 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", u"a"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testBarChartSecondaryAxisXLSX) +{ + loadFromFile(u"xlsx/testSecondaryAxis.xlsx"); + 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]", "val"); + OUString YValueIdOf1Barchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart[1]/c:axId[2]", "val"); + // Collect barchart axID on secondary Axis + OUString XValueIdOf2Barchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart[2]/c:axId[1]", "val"); + OUString YValueIdOf2Barchart = getXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart[2]/c:axId[2]", "val"); + // Check which c:catAx and c:valAx contain the AxisId of barcharts + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[1]/c:axId", "val", XValueIdOf1Barchart); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:axId", "val", YValueIdOf1Barchart); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:catAx[2]/c:axId", "val", XValueIdOf2Barchart); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:axId", "val", YValueIdOf2Barchart); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf148142) +{ + // The document contains a line chart with "Between tick marks" X axis position. + loadFromFile(u"ods/tdf148142.ods"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); + CPPUNIT_ASSERT(xChartDoc.is()); + Reference<chart2::XAxis> xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); + CPPUNIT_ASSERT(xAxis.is()); + chart2::ScaleData aScaleData = xAxis->getScaleData(); + CPPUNIT_ASSERT(aScaleData.ShiftedCategoryPosition); + + // Set the X axis position to "On tick marks". + aScaleData.ShiftedCategoryPosition = false; + xAxis->setScaleData(aScaleData); + + // Check the X axis position after export. + saveAndReload(u"calc8"_ustr); + Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(0); + CPPUNIT_ASSERT(xChartDoc2.is()); + Reference<chart2::XAxis> xAxis2 = getAxisFromDoc(xChartDoc2, 0, 0, 0); + CPPUNIT_ASSERT(xAxis2.is()); + chart2::ScaleData aScaleData2 = xAxis2->getScaleData(); + CPPUNIT_ASSERT(!aScaleData2.ShiftedCategoryPosition); +} + +CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testFormattedChartTitles) +{ + loadFromFile(u"xlsx/tdf39052.xlsx"); + 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", "b", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:rPr", "sz", u"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", "val", u"ff0000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:rPr/a:latin", "typeface", u"Aptos Narrow"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[1]/a:t", u"This"); + // 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", "b", u"0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[2]/a:rPr", "sz", u"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", "val", u"595959"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[2]/a:t", u" is"); + // 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", "b", u"0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[3]/a:rPr", "sz", u"1400"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[3]/a:rPr", "baseline", u"30000"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[3]/a:t", u"3"); + // 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", "b", u"0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[4]/a:rPr", "sz", u"1400"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[4]/a:t", u" a "); + // 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", "b", u"0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr", "i", u"1"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr", "sz", u"2000"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr", "u", u"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", "val", u"4ea72e"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:rPr/a:uFillTx", 1); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[5]/a:t", u"custom"); + // 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", "b", u"0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[6]/a:rPr", "sz", u"1400"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[1]/a:r[6]/a:t", u" erte1"); + // 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", "b", u"0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:rPr", "sz", u"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", "val", u"595959"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:rPr/a:latin", "typeface", u"Aptos Narrow"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[1]/a:t", u"2dfgd ch"); + // 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", "b", u"1"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[2]/a:t", u"ar"); + // 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", "b", u"0");; + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[3]/a:t", u"t "); + // 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", "b", u"0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[4]/a:rPr", "strike", u"sngStrike"); + assertXPathContent(pXmlDoc, "/c:chartSpace/c:chart/c:title/c:tx/c:rich/a:p[2]/a:r[4]/a:t", u"title"); +} + +namespace { + +void checkCharacterProps(Reference<beans::XPropertySet> const & xTitleProp) +{ + Sequence< uno::Reference< chart2::XFormattedString > > xFormattedSubTitle; + CPPUNIT_ASSERT(xTitleProp->getPropertyValue(u"FormattedStrings"_ustr) >>= xFormattedSubTitle); + CPPUNIT_ASSERT_EQUAL(sal_Int32(10), xFormattedSubTitle.getLength()); + // check texts + 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(u"CharFontName"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(u"Aptos Narrow"_ustr), aAny); + // unique props + if (aText == aValues[0]) + { + aAny = xRunPropSet->getPropertyValue(u"CharWeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::BOLD), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(14.0f), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0xff0000)), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharEscapement"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(short(0)), aAny); + 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(u"CharWeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::NORMAL), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(14.0f), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0x595959)), aAny); + } + else if (aText == aValues[2]) + { + aAny = xRunPropSet->getPropertyValue(u"CharWeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::NORMAL), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(14.0f), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0x595959)), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharEscapement"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(short(30)), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharEscapementHeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(short(58)), aAny); + } + else if (aText == aValues[4]) + { + aAny = xRunPropSet->getPropertyValue(u"CharWeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::NORMAL), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(20.0f), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0x4ea72e)), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharPosture"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontSlant_ITALIC), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharUnderline"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontUnderline::SINGLE), aAny); + } + else if (aText == aValues[7]) + { + aAny = xRunPropSet->getPropertyValue(u"CharWeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::BOLD), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(14.0f), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0x595959)), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharPosture"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontSlant_NONE), aAny); + } + else // aText == aValues[9] + { + aAny = xRunPropSet->getPropertyValue(u"CharWeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontWeight::NORMAL), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharHeight"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(14.0f), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharColor"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(Color(0x595959)), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharPosture"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontSlant_ITALIC), aAny); + aAny = xRunPropSet->getPropertyValue(u"CharOverline"_ustr); + CPPUNIT_ASSERT_EQUAL(uno::Any(awt::FontUnderline::NONE), aAny); + } + } +} + +} + +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(u"calc8"_ustr); + + Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0); + CPPUNIT_ASSERT(xChart2Doc.is()); + Reference< chart::XChartDocument > xChartDoc(xChart2Doc, uno::UNO_QUERY); + CPPUNIT_ASSERT(xChartDoc.is()); + uno::Reference< beans::XPropertySet > xTitleProp(xChartDoc->getTitle(), uno::UNO_QUERY); + CPPUNIT_ASSERT(xTitleProp.is()); + + checkCharacterProps(xTitleProp); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/qa/extras/chart2geometry.cxx b/chart2/qa/extras/chart2geometry.cxx index f460ac467621..da871c776e6f 100644 --- a/chart2/qa/extras/chart2geometry.cxx +++ b/chart2/qa/extras/chart2geometry.cxx @@ -9,8 +9,6 @@ #include "charttest.hxx" -#include <test/xmltesttools.hxx> - #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/drawing/FillStyle.hpp> @@ -25,12 +23,9 @@ using beans::XPropertySet; class Chart2GeometryTest : public ChartTest { -protected: - virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override; - public: Chart2GeometryTest() - : ChartTest() + : ChartTest(u"/chart2/qa/extras/data/"_ustr) { } // Mostly tests for line and fill properties @@ -68,12 +63,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; -void Chart2GeometryTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) -{ - XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx); - XmlTestTools::registerODFNamespaces(pXmlXPathCtx); -} - static OString OU2O(std::u16string_view sOUSource) { return rtl::OUStringToOString(sOUSource, RTL_TEXTENCODING_UTF8); @@ -84,13 +73,15 @@ static OString OU2O(std::u16string_view sOUSource) void Chart2GeometryTest::testTdf135184RoundLineCap() { // It tests chart area, data series line and regression-curve line. - load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "calc8"); + loadFromFile(u"xlsx/tdf135184RoundLineCap.xlsx"); + save(u"calc8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - const OString sStyleStart("/office:document-content/office:automatic-styles"); - const OString sCap("/style:graphic-properties[@svg:stroke-linecap='round']"); - const OString sChartStart("/office:document-content/office:body/office:chart/chart:chart"); + static constexpr OString sStyleStart("/office:document-content/office:automatic-styles"_ostr); + static constexpr OString sCap("/style:graphic-properties[@svg:stroke-linecap='round']"_ostr); + static constexpr OString sChartStart( + "/office:document-content/office:body/office:chart/chart:chart"_ostr); OString sPredicate; // chart area const OUString sOUAreaStyleName = getXPathContent(pXmlDoc, sChartStart + "/@chart:style-name"); @@ -111,13 +102,15 @@ void Chart2GeometryTest::testTdf135184RoundLineCap() void Chart2GeometryTest::testTdf135184RoundLineCap2() { // It tests legend, data series sector and title. - load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap2.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "calc8"); + loadFromFile(u"xlsx/tdf135184RoundLineCap2.xlsx"); + save(u"calc8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - const OString sStyleStart("/office:document-content/office:automatic-styles"); - const OString sCap("/style:graphic-properties[@svg:stroke-linecap='round']"); - const OString sChartStart("/office:document-content/office:body/office:chart/chart:chart"); + static constexpr OString sStyleStart("/office:document-content/office:automatic-styles"_ostr); + static constexpr OString sCap("/style:graphic-properties[@svg:stroke-linecap='round']"_ostr); + static constexpr OString sChartStart( + "/office:document-content/office:body/office:chart/chart:chart"_ostr); OString sPredicate; // legend const OString sLegend(sChartStart + "/chart:legend"); @@ -140,49 +133,58 @@ void Chart2GeometryTest::testTdf135184RoundLineCap2() void Chart2GeometryTest::testTdf135184RoundLineCap3() { // It tests chart area, data series line and regression-curve line. - load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf135184RoundLineCap.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - const OString sDash("/c:spPr/a:ln/a:prstDash"); + static constexpr OString sDash("/c:spPr/a:ln/a:prstDash"_ostr); // chart area - assertXPath(pXmlDoc, "/c:chartSpace" + sDash, "val", "dashDot"); + assertXPath(pXmlDoc, "/c:chartSpace" + sDash, "val", u"dashDot"); // data series line - const OString sStart("/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser"); - assertXPath(pXmlDoc, sStart + sDash, "val", "dash"); + static constexpr OString sStart("/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser"_ostr); + assertXPath(pXmlDoc, sStart + sDash, "val", u"dash"); // regression-curve (trendline) - assertXPath(pXmlDoc, sStart + "/c:trendline" + sDash, "val", "sysDot"); + assertXPath(pXmlDoc, sStart + "/c:trendline" + sDash, "val", u"sysDot"); } void Chart2GeometryTest::testTdf135184RoundLineCap4() { // It tests legend, data series sector and title. - load(u"/chart2/qa/extras/data/xlsx/", "tdf135184RoundLineCap2.xlsx"); - xmlDocUniquePtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML"); + loadFromFile(u"xlsx/tdf135184RoundLineCap2.xlsx"); + save(u"Calc Office Open XML"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"xl/charts/chart1.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); - const OString sChartStart("/c:chartSpace/c:chart"); - const OString sDash("/c:spPr/a:ln/a:prstDash"); - assertXPath(pXmlDoc, sChartStart + "/c:legend" + sDash, "val", "sysDot"); + 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", u"sysDot"); const OString sSeries(sChartStart + "/c:plotArea/c:pieChart/c:ser/c:dPt[3]"); - assertXPath(pXmlDoc, sSeries + sDash, "val", "dash"); - assertXPath(pXmlDoc, sChartStart + "/c:title" + sDash, "val", "dashDot"); + assertXPath(pXmlDoc, sSeries + sDash, "val", u"dash"); + assertXPath(pXmlDoc, sChartStart + "/c:title" + sDash, "val", u"dashDot"); } void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_export() { // chart area with color gradient and solid transparency // Without the patch the transparency was lost in saved pptx file. - load(u"/chart2/qa/extras/data/odp/", "tdf128345_ChartArea_CG_TS.odp"); + loadFromFile(u"odp/tdf128345_ChartArea_CG_TS.odp"); + + // MCGR: Similar to testTdf128345Legend_CS_TG_axial_export: + // Checked that it works with the existing import file, + // but will change with ODF MCGR im/export again. + // Adapting for now, but need to re-check values after + // ODF im/export for MCGR is integrated // Make sure the chart area has a transparency in gradient stops in saved pptx file. - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML"); + 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"); + 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", "30000"); - assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", "30000"); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]/a:srgbClr/a:alpha", "val", u"30000"); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", u"30000"); } void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import() @@ -192,10 +194,17 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import() // Make sure chart area has transparency when pptx document is opened and resaved as odp. // As of Aug 2020, the import generates a transparency gradient. When import is changed to // generate solid transparency, the test needs to be adapted. - load(u"/chart2/qa/extras/data/pptx/", "tdf128345_ChartArea_CG_TS.pptx"); + + // MCGR: Similar to testTdf128345Legend_CS_TG_axial_export: + // Checked that it works with the existing import file, + // but will change with ODF MCGR im/export again. We will need to + // update the *.odp input file. Disable unclear values for now and + // adapt when ODF im/export for MCGR is integrated + loadFromFile(u"pptx/tdf128345_ChartArea_CG_TS.pptx"); // Find transparency gradient name - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8"); + save(u"impress8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); const OUString sOUChartStyleName = getXPathContent( pXmlDoc, @@ -209,7 +218,8 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import() = getXPathContent(pXmlDoc, sStylePath + "/style:graphic-properties/@draw:opacity-name"); // Verify the content of the opacity definition - xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml", "impress8"); + 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); @@ -218,23 +228,24 @@ void Chart2GeometryTest::testTdf128345ChartArea_CG_TS_import() assertXPath(pXmlDoc2, sStart + " and @draw:start='30%']"); assertXPath(pXmlDoc2, sStart + " and @draw:end='30%']"); assertXPath(pXmlDoc2, sStart + " and @draw:angle='30deg']"); - assertXPath(pXmlDoc2, sStart + " and @draw:border='20%']"); + assertXPath(pXmlDoc2, sStart + " and @draw:border='0%']"); // MCGR: no border anymore 20% -> 0% } void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_export() { // chart wall with solid color and transparency gradient // Without the patch the transparency was lost. - load(u"/chart2/qa/extras/data/odp/", "tdf128345_ChartWall_CS_TG.odp"); + loadFromFile(u"odp/tdf128345_ChartWall_CS_TG.odp"); // Make sure the chart has a gradient with transparency in gradient stops in saved pptx file. - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 XML"); + 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"); + 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", "0"); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]/a:srgbClr/a:alpha", "val", u"0"); // no element for 0% transparent assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", 0); } @@ -243,10 +254,11 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import() { // This works on the file, which was exported from file tdf128345_ChartWall_CS_TG.odp to pptx. // Make sure chart wall has transparency when pptx document is resaved as odp. - load(u"/chart2/qa/extras/data/pptx/", "tdf128345_ChartWall_CS_TG.pptx"); + loadFromFile(u"pptx/tdf128345_ChartWall_CS_TG.pptx"); // Find transparency gradient name - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8"); + 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/" @@ -260,7 +272,8 @@ void Chart2GeometryTest::testTdf128345ChartWall_CS_TG_import() = getXPathContent(pXmlDoc, sStylePath + "/style:graphic-properties/@draw:opacity-name"); // Verify content of the opacity definition - xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml", "impress8"); + 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); @@ -274,30 +287,40 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_export() { // legend with solid color and transparency gradient // Without the patch the transparency was lost. - load(u"/chart2/qa/extras/data/odp/", "tdf128345_Legend_CS_TG_axial.odp"); + 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. - xmlDocUniquePtr pXmlDoc = parseExport("ppt/charts/chart", "Impress MS PowerPoint 2007 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"); - assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs", 3); // axial - // no element for 0% transparent + OString sPathStart("//c:chartSpace/c:chart/c:legend/c:spPr/a:gradFill"_ostr); + + // MCGR: three entries due to axial being mirrored+expanded to linear + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs", 3); + + // MCGR: start entry, no transparence, pos zero assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]/a:srgbClr/a:alpha", 0); - // 100% transparent = opacity 0. It comes from "axial", therefore it is in the middle. - assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", "0"); - assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]", "pos", "50000"); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[1]", "pos", u"0"); + + // MCGR: middle entry, 100% transparence, pos 0.5 + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]/a:srgbClr/a:alpha", "val", u"0"); + assertXPath(pXmlDoc, sPathStart + "/a:gsLst/a:gs[2]", "pos", u"50000"); + + // 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", u"100000"); } void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import() { // This works on the file, which was exported from file tdf128345_Legend_CS_TG_axial.odp to pptx. // Error was, that in case of axial not the middle value was taken but start and end value. - load(u"/chart2/qa/extras/data/pptx/", "tdf128345_Legend_CS_TG_axial.pptx"); + loadFromFile(u"pptx/tdf128345_Legend_CS_TG_axial.pptx"); // Find transparency gradient name - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8"); + 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/" @@ -311,7 +334,8 @@ void Chart2GeometryTest::testTdf128345Legend_CS_TG_axial_import() = getXPathContent(pXmlDoc, sStylePath + "/style:graphic-properties/@draw:opacity-name"); // Verify content of the opacity definition - xmlDocUniquePtr pXmlDoc2 = parseExport("Object 1/styles.xml", "impress8"); + 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); @@ -325,37 +349,37 @@ void Chart2GeometryTest::testTdf135366LabelOnSeries() { // Error was, that the fill and line properties of a <chart:data-label> were not // imported at all. Here they should be at the series. - load(u"/chart2/qa/extras/data/ods/", "tdf135366_data_label_series.ods"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"ods/tdf135366_data_label_series.ods"); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xDataSeries.is()); 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); } @@ -363,7 +387,7 @@ void Chart2GeometryTest::testTdf135366LabelOnPoint() { // Error was, that the fill and line properties of a <chart:data-label> were not // imported at all. Here they should be at point 2. - load(u"/chart2/qa/extras/data/odt/", "tdf135366_data_label_point.odt"); + loadFromFile(u"odt/tdf135366_data_label_point.odt"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); @@ -372,35 +396,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); } @@ -410,8 +434,13 @@ void Chart2GeometryTest::testTdf135366LabelExport() // Error was, that line and fill properties were not exported as // graphic-properties of a <chart:data-label> element, but only // as loext chart-properties of the <chart:data-point> element. - load(u"/chart2/qa/extras/data/odt/", "tdf135366_data_label_export.odt"); - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "writer8"); + loadFromFile(u"odt/tdf135366_data_label_export.odt"); + + // FIXME: Error: unexpected attribute "loext:label-stroke-color" + skipValidation(); + + save(u"writer8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); CPPUNIT_ASSERT(pXmlDoc); // Find label style @@ -433,25 +462,25 @@ void Chart2GeometryTest::testTdf135366LabelExport() void Chart2GeometryTest::testTdf135366_CustomLabelText() { + Resetter resetter([]() { SetODFDefaultVersion(SvtSaveOptions::ODFVER_LATEST); }); + // Error was, that custom text in a data label was only exported in ODF extended, // although the used <chart:data-label> element exists since ODF 1.2. - const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion(GetODFDefaultVersion()); SetODFDefaultVersion(SvtSaveOptions::ODFVER_012); - load(u"/chart2/qa/extras/data/pptx/", "tdf135366_CustomLabelText.pptx"); - xmlDocUniquePtr pXmlDoc = parseExport("Object 1/content.xml", "impress8"); + loadFromFile(u"pptx/tdf135366_CustomLabelText.pptx"); + 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. - const OString sCustomTextPath( + static constexpr const char* sCustomTextPath( "//office:document-content/office:body/office:chart/chart:chart/chart:plot-area" "/chart:series/chart:data-point[2]/chart:data-label/text:p/text:span"); assertXPath(pXmlDoc, sCustomTextPath, 1); // Verify text content const OUString sOUTextContent = getXPathContent(pXmlDoc, sCustomTextPath); - CPPUNIT_ASSERT_EQUAL(OUString("Custom"), sOUTextContent); - - SetODFDefaultVersion(nCurrentODFVersion); + CPPUNIT_ASSERT_EQUAL(u"Custom"_ustr, sOUTextContent); } CPPUNIT_TEST_SUITE_REGISTRATION(Chart2GeometryTest); diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 0b4f6d89303e..054ca5a86fd1 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -29,211 +29,45 @@ #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <com/sun/star/text/XTextRange.hpp> +#include <com/sun/star/qa/XDumper.hpp> #include <iterator> #include <com/sun/star/util/Color.hpp> -#include <com/sun/star/awt/Gradient.hpp> +#include <com/sun/star/awt/Gradient2.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <docmodel/uno/UnoGradientTools.hxx> +namespace +{ class Chart2ImportTest : public ChartTest { public: - void Fdo60083(); - void testSteppedLines(); - void testErrorBarRange(); - void testErrorBarFormatting(); - void testODSChartSeries(); - void testXLSXChartSeries(); - void testXLSChartSeries(); - void testODTChartSeries(); - void testDOCChartSeries(); - void testDOCXChartSeries(); - void testDOCXChartEmptySeries(); - void testTdf81396(); - void testDOCXChartValuesSize(); - void testPPTXChartSeries(); - void testPPTXSparseChartSeries(); - /** - * Original data contains 3 series but 2 of them are hidden. For now, we - * detect and skip those hidden series on import (since we don't support - * hidden columns for internal data table yet). - */ - void testPPTXHiddenDataSeries(); - void testPPTXPercentageNumberFormats(); - void testPieChartLabelsNumFormat(); - void testPPTXStackedNonStackedYAxis(); - void testPPTChartSeries(); - void testODPChartSeries(); - void testBnc864396(); - void testBnc882383(); - void testTransparencyGradientValue(); - void testBnc889755(); - void testSimpleStrictXLSX(); - void testDelayedCellImport(); // chart range referencing content on later sheets - void testFlatODSStackedColumnChart(); - void testFdo78080(); - void testFdo54361(); - void testFdo54361_1(); - void testTdf127811(); - void testTdf86624(); // manually placed legends - void testTdf105517(); - void testTdf106217(); - void testTdf108021(); - void testTdf100084(); - void testTdf124817(); - void testTdf126033(); - void testAutoBackgroundXLSX(); - void testAutoChartAreaBorderPropXLSX(); - void testChartAreaStyleBackgroundXLSX(); - void testChartHatchFillXLSX(); - void testAxisTextRotationXLSX(); - // void testTextCanOverlapXLSX(); // TODO : temporarily disabled. - void testTextBreakXLSX(); - void testNumberFormatsXLSX(); - void testNumberFormatsDOCX(); - void testPercentageNumberFormatsDOCX(); - - void testTransparentBackground(OUString const & filename); + Chart2ImportTest() : ChartTest(u"/chart2/qa/extras/data/"_ustr) {} - // below are OOXML default value tests for cases - // where we fixed the handling of MSO 2007 vs OOXML - void testAutoTitleDelDefaultValue2007XLSX(); - void testAutoTitleDelDefaultValue2013XLSX(); - void testDispBlanksAsDefaultValue2007XLSX(); - void testDispBlanksAsDefaultValue2013XLSX(); - - void testSmoothDefaultValue2007XLSX(); - void testSmoothDefaultValue2013XLSX(); - void testTrendlineDefaultValue2007XLSX(); - void testTrendlineDefaultValue2013XLSX(); - void testVaryColorDefaultValues2007XLSX(); - void testVaryColorDefaultValues2013XLSX(); - void testPlotVisOnlyDefaultValue2013XLSX(); - void testRAngAxDefaultValue2013XLSX(); - void testMajorTickMarksDefaultValue2013XLSX(); - void testMinorTickMarksDefaultValue2013XLSX(); - - void testAxisTitleDefaultRotationXLSX(); - void testSecondaryAxisTitleDefaultRotationXLSX(); - void testAxisTitleRotationXLSX(); - void testAxisTitlePositionDOCX(); - void testCombinedChartAttachedAxisXLSX(); - void testTdf140489MultiSeriesChartAxisXLSX(); - - void testTdf90510(); // Pie chart label placement settings(XLS) - void testTdf109858(); // Pie chart label placement settings(XLSX) - void testTdf130105(); - - void testTdf111173(); - void testTdf122226(); - - void testInternalDataProvider(); - - void testTdf115107(); // import complex data point labels - void testTdf115107_2(); // import complex data point labels in cobo charts with multiple data series - - void testTdf116163(); - - void testTdf48041(); - - void testTdf121205(); - - CPPUNIT_TEST_SUITE(Chart2ImportTest); - CPPUNIT_TEST(Fdo60083); - CPPUNIT_TEST(testSteppedLines); - CPPUNIT_TEST(testErrorBarRange); - CPPUNIT_TEST(testErrorBarFormatting); - CPPUNIT_TEST(testODSChartSeries); - CPPUNIT_TEST(testXLSXChartSeries); - CPPUNIT_TEST(testXLSChartSeries); - CPPUNIT_TEST(testODTChartSeries); - CPPUNIT_TEST(testDOCChartSeries); - CPPUNIT_TEST(testDOCXChartSeries); - CPPUNIT_TEST(testDOCXChartEmptySeries); - CPPUNIT_TEST(testTdf81396); - CPPUNIT_TEST(testDOCXChartValuesSize); - CPPUNIT_TEST(testPPTChartSeries); - CPPUNIT_TEST(testPPTXChartSeries); - CPPUNIT_TEST(testPPTXSparseChartSeries); - CPPUNIT_TEST(testPPTXHiddenDataSeries); - CPPUNIT_TEST(testPPTXPercentageNumberFormats); - CPPUNIT_TEST(testPieChartLabelsNumFormat); - CPPUNIT_TEST(testPPTXStackedNonStackedYAxis); - CPPUNIT_TEST(testODPChartSeries); - CPPUNIT_TEST(testBnc864396); - CPPUNIT_TEST(testBnc882383); - CPPUNIT_TEST(testTransparencyGradientValue); - CPPUNIT_TEST(testBnc889755); - CPPUNIT_TEST(testSimpleStrictXLSX); - CPPUNIT_TEST(testDelayedCellImport); - CPPUNIT_TEST(testFlatODSStackedColumnChart); - CPPUNIT_TEST(testFdo78080); - CPPUNIT_TEST(testFdo54361); - CPPUNIT_TEST(testFdo54361_1); - CPPUNIT_TEST(testTdf127811); - CPPUNIT_TEST(testTdf86624); - CPPUNIT_TEST(testTdf105517); - CPPUNIT_TEST(testTdf106217); - CPPUNIT_TEST(testTdf108021); - CPPUNIT_TEST(testTdf100084); - CPPUNIT_TEST(testTdf124817); - CPPUNIT_TEST(testTdf126033); - CPPUNIT_TEST(testAutoBackgroundXLSX); - CPPUNIT_TEST(testAutoChartAreaBorderPropXLSX); - CPPUNIT_TEST(testChartAreaStyleBackgroundXLSX); - CPPUNIT_TEST(testChartHatchFillXLSX); - CPPUNIT_TEST(testAxisTextRotationXLSX); - // CPPUNIT_TEST(testTextCanOverlapXLSX); // TODO : temporarily disabled. - CPPUNIT_TEST(testTextBreakXLSX); - CPPUNIT_TEST(testNumberFormatsXLSX); - CPPUNIT_TEST(testNumberFormatsDOCX); - CPPUNIT_TEST(testPercentageNumberFormatsDOCX); - CPPUNIT_TEST(testAutoTitleDelDefaultValue2007XLSX); - CPPUNIT_TEST(testAutoTitleDelDefaultValue2013XLSX); - CPPUNIT_TEST(testDispBlanksAsDefaultValue2007XLSX); - CPPUNIT_TEST(testDispBlanksAsDefaultValue2013XLSX); - CPPUNIT_TEST(testSmoothDefaultValue2007XLSX); - CPPUNIT_TEST(testSmoothDefaultValue2013XLSX); - CPPUNIT_TEST(testTrendlineDefaultValue2007XLSX); - CPPUNIT_TEST(testTrendlineDefaultValue2013XLSX); - CPPUNIT_TEST(testVaryColorDefaultValues2007XLSX); - CPPUNIT_TEST(testVaryColorDefaultValues2013XLSX); - CPPUNIT_TEST(testPlotVisOnlyDefaultValue2013XLSX); - CPPUNIT_TEST(testRAngAxDefaultValue2013XLSX); - CPPUNIT_TEST(testMajorTickMarksDefaultValue2013XLSX); - CPPUNIT_TEST(testMinorTickMarksDefaultValue2013XLSX); - CPPUNIT_TEST(testAxisTitleDefaultRotationXLSX); - CPPUNIT_TEST(testSecondaryAxisTitleDefaultRotationXLSX); - CPPUNIT_TEST(testAxisTitleRotationXLSX); - CPPUNIT_TEST(testAxisTitlePositionDOCX); - CPPUNIT_TEST(testCombinedChartAttachedAxisXLSX); - CPPUNIT_TEST(testTdf140489MultiSeriesChartAxisXLSX); - CPPUNIT_TEST(testTdf90510); - CPPUNIT_TEST(testTdf109858); - CPPUNIT_TEST(testTdf130105); - CPPUNIT_TEST(testTdf111173); - CPPUNIT_TEST(testTdf122226); - - CPPUNIT_TEST(testInternalDataProvider); - - CPPUNIT_TEST(testTdf115107); - CPPUNIT_TEST(testTdf115107_2); - - CPPUNIT_TEST(testTdf116163); - - CPPUNIT_TEST(testTdf48041); - - CPPUNIT_TEST(testTdf121205); - - CPPUNIT_TEST_SUITE_END(); +protected: + void testTransparentBackground(std::u16string_view filename); }; +OUString getShapeDump(css::uno::Reference<css::chart::XChartDocument> const& doc) +{ + return css::uno::Reference<css::qa::XDumper>(doc, css::uno::UNO_QUERY_THROW)->dump(u"shapes"_ustr); +} + +sal_Int32 getNumberFormat( const Reference<chart2::XChartDocument>& xChartDoc, const OUString& sFormat ) +{ + Reference<util::XNumberFormatsSupplier> xNFS(xChartDoc, uno::UNO_QUERY_THROW); + Reference<util::XNumberFormats> xNumberFormats = xNFS->getNumberFormats(); + CPPUNIT_ASSERT(xNumberFormats.is()); + + return xNumberFormats->queryKey(sFormat, css::lang::Locale(), false); +} + // error bar import // split method up into smaller chunks for more detailed tests -void Chart2ImportTest::Fdo60083() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo60083) { - load(u"/chart2/qa/extras/data/ods/", "fdo60083.ods"); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); + loadFromFile(u"ods/fdo60083.ods"); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0); CPPUNIT_ASSERT(xChartDoc.is()); Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 ); @@ -248,7 +82,7 @@ void Chart2ImportTest::Fdo60083() { sal_Int32 nErrorBarStyle; CPPUNIT_ASSERT( - xErrorBarYProps->getPropertyValue("ErrorBarStyle") + xErrorBarYProps->getPropertyValue(u"ErrorBarStyle"_ustr) >>= nErrorBarStyle); CPPUNIT_ASSERT_EQUAL( chart::ErrorBarStyle::RELATIVE, @@ -256,20 +90,20 @@ void Chart2ImportTest::Fdo60083() 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); } @@ -279,10 +113,10 @@ void Chart2ImportTest::Fdo60083() CPPUNIT_ASSERT(!xErrorBarXProps.is()); } -void Chart2ImportTest::testErrorBarRange() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testErrorBarRange) { - load(u"/chart2/qa/extras/data/ods/", "error_bar_range.ods"); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); + loadFromFile(u"ods/error_bar_range.ods"); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0); CPPUNIT_ASSERT(xChartDoc.is()); Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 ); @@ -297,21 +131,21 @@ void 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); } -void Chart2ImportTest::testErrorBarFormatting() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testErrorBarFormatting) { - load(u"/chart2/qa/extras/data/ods/", "error_bar_properties.ods"); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); + loadFromFile(u"ods/error_bar_properties.ods"); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0); CPPUNIT_ASSERT(xChartDoc.is()); Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 ); @@ -325,13 +159,13 @@ void 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); } // stepped line interpolation -void Chart2ImportTest::testSteppedLines() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSteppedLines) { const sal_Int32 MAXSHEET = 14; chart2::CurveStyle const curveStyle[] = { @@ -351,10 +185,10 @@ void Chart2ImportTest::testSteppedLines() chart2::CurveStyle_STEP_CENTER_Y }; - load(u"/chart2/qa/extras/data/ods/", "stepped_lines.ods"); + loadFromFile(u"ods/stepped_lines.ods"); for(sal_Int32 nSheet = 0; nSheet < MAXSHEET; ++nSheet) { - uno::Reference< chart2::XChartDocument > xChart2Doc = getChartDocFromSheet( nSheet, mxComponent ); + uno::Reference< chart2::XChartDocument > xChart2Doc = getChartDocFromSheet( nSheet); CPPUNIT_ASSERT(xChart2Doc.is()); Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChart2Doc, 0 ); @@ -364,12 +198,12 @@ void 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]); } } -static uno::Sequence < OUString > getChartColumnDescriptions( uno::Reference< chart::XChartDocument > const & xChart1Doc) +uno::Sequence < OUString > getChartColumnDescriptions( uno::Reference< chart::XChartDocument > const & xChart1Doc) { CPPUNIT_ASSERT(xChart1Doc.is()); uno::Reference< chart::XChartDataArray > xChartData ( xChart1Doc->getData(), UNO_QUERY_THROW); @@ -377,61 +211,61 @@ static uno::Sequence < OUString > getChartColumnDescriptions( uno::Reference< ch return seriesList; } -void Chart2ImportTest::testODSChartSeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODSChartSeries) { - load(u"/chart2/qa/extras/data/ods/", "chart.ods"); - uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW); + loadFromFile(u"ods/chart.ods"); + uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, 0), 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]); } -void Chart2ImportTest::testXLSXChartSeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSXChartSeries) { - load(u"/chart2/qa/extras/data/xlsx/", "chart.xlsx"); - uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW); + loadFromFile(u"xlsx/chart.xlsx"); + uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, 0), 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]); } -void Chart2ImportTest::testXLSChartSeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSChartSeries) { - load(u"/chart2/qa/extras/data/xls/", "chart.xls"); - uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW); + loadFromFile(u"xls/chart.xls"); + uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, 0), 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]); } -void Chart2ImportTest::testODTChartSeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODTChartSeries) { - load(u"/chart2/qa/extras/data/odt/", "chart.odt"); - uno::Sequence< OUString > seriesList = getWriterChartColumnDescriptions(mxComponent); - CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[2]); + loadFromFile(u"odt/chart.odt"); + uno::Sequence< OUString > seriesList = getWriterChartColumnDescriptions(); + 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]); } -void Chart2ImportTest::testDOCChartSeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCChartSeries) { - load(u"/chart2/qa/extras/data/doc/", "chart.doc"); - uno::Sequence< OUString > seriesList = getWriterChartColumnDescriptions(mxComponent); - CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[2]); + loadFromFile(u"doc/chart.doc"); + uno::Sequence< OUString > seriesList = getWriterChartColumnDescriptions(); + 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]); } -void Chart2ImportTest::testDOCXChartSeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCXChartSeries) { - load(u"/chart2/qa/extras/data/docx/", "chart.docx"); + loadFromFile(u"docx/chart.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -440,14 +274,14 @@ void 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>()); } -void Chart2ImportTest::testDOCXChartEmptySeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCXChartEmptySeries) { - load(u"/chart2/qa/extras/data/docx/", "tdf125337.docx"); + loadFromFile(u"docx/tdf125337.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -456,9 +290,9 @@ void 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); @@ -471,10 +305,10 @@ void Chart2ImportTest::testDOCXChartEmptySeries() CPPUNIT_ASSERT(std::isnan(aValues[2][1])); } -void Chart2ImportTest::testTdf81396() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf81396) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf81396.xlsx"); - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), + loadFromFile(u"xlsx/tdf81396.xlsx"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); Reference<chart2::XChartDocument> xChartDoc2(xChartDoc, UNO_QUERY_THROW); @@ -488,9 +322,22 @@ void Chart2ImportTest::testTdf81396() CPPUNIT_ASSERT_EQUAL(105.210801910481, aDataSeriesYValues[0][0]); } -void Chart2ImportTest::testDOCXChartValuesSize() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXChartErrorBars) { - load( u"/chart2/qa/extras/data/docx/", "bubblechart.docx" ); + loadFromFile(u"pptx/tdf127720.pptx"); + Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xChartDoc.is()); + + uno::Reference< chart::XChartDataArray > xDataArray(xChartDoc->getDataProvider(), UNO_QUERY_THROW); + Sequence<OUString> aColumnDesc = xDataArray->getColumnDescriptions(); + // Number of columns = 4 (Y-values, X-values and positive/negative error bars). + // Without the fix there would only be 2 columns (no error range). + CPPUNIT_ASSERT_EQUAL_MESSAGE("There must be 4 columns and descriptions", static_cast<sal_Int32>(4), aColumnDesc.getLength()); +} + +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCXChartValuesSize) +{ + loadFromFile(u"docx/bubblechart.docx" ); Reference<chart2::XChartDocument> xChartDoc( getChartDocFromWriter(0), uno::UNO_QUERY ); CPPUNIT_ASSERT( xChartDoc.is() ); @@ -509,21 +356,24 @@ void Chart2ImportTest::testDOCXChartValuesSize() CPPUNIT_ASSERT_DOUBLES_EQUAL( aExpected[nRowIdx][nColIdx], aData[nRowIdx][nColIdx], 1e-1 ); } -void Chart2ImportTest::testPPTChartSeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTChartSeries) { //test chart series names for ppt - uno::Sequence < OUString > seriesList = getImpressChartColumnDescriptions(u"/chart2/qa/extras/data/ppt/", "chart.ppt"); + loadFromFile(u"ppt/chart.ppt"); + uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromDrawImpress( 0, 0 ); + uno::Reference< chart::XChartDataArray > xChartData ( xChartDoc->getData(), uno::UNO_QUERY_THROW); + uno::Sequence < OUString > seriesList = xChartData->getColumnDescriptions(); - 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]); } -void Chart2ImportTest::testPPTXChartSeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXChartSeries) { //test chart series names for pptx - load(u"/chart2/qa/extras/data/pptx/", "chart.pptx"); + loadFromFile(u"pptx/chart.pptx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -532,15 +382,15 @@ void 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>()); } -void Chart2ImportTest::testPPTXSparseChartSeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXSparseChartSeries) { //test chart series sparse data for pptx - load(u"/chart2/qa/extras/data/pptx/", "sparse-chart.pptx"); + loadFromFile(u"pptx/sparse-chart.pptx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -559,16 +409,21 @@ void Chart2ImportTest::testPPTXSparseChartSeries() CPPUNIT_ASSERT_EQUAL(-2.8, aValues[1][3]); } -void Chart2ImportTest::testPPTXHiddenDataSeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXHiddenDataSeries) { - load(u"/chart2/qa/extras/data/pptx/", "stacked-bar-chart-hidden-series.pptx"); + /** + * Original data contains 3 series but 2 of them are hidden. For now, we + * detect and skip those hidden series on import (since we don't support + * hidden columns for internal data table yet). + */ + loadFromFile(u"pptx/stacked-bar-chart-hidden-series.pptx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); // "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); @@ -578,7 +433,7 @@ void 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()); @@ -592,15 +447,15 @@ void 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]); } -void Chart2ImportTest::testPPTXPercentageNumberFormats() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXPercentageNumberFormats) { - load(u"/chart2/qa/extras/data/pptx/", "percentage-number-formats.pptx"); + loadFromFile(u"pptx/percentage-number-formats.pptx"); // 1st chart Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); @@ -611,35 +466,35 @@ void 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 @@ -657,28 +512,28 @@ void 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); CPPUNIT_ASSERT_MESSAGE("Y axis should be a percent format.", (nType & util::NumberFormat::PERCENT)); } -void Chart2ImportTest::testPieChartLabelsNumFormat() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPieChartLabelsNumFormat) { - load(u"/chart2/qa/extras/data/xlsx/", "tdfPieNumFormat.xlsx"); - uno::Reference< chart::XChartDocument > xChartDoc(getChartCompFromSheet(0, mxComponent), UNO_QUERY_THROW); + loadFromFile(u"xlsx/tdfPieNumFormat.xlsx"); + uno::Reference< chart::XChartDocument > xChartDoc(getChartCompFromSheet(0, 0), UNO_QUERY_THROW); CPPUNIT_ASSERT(xChartDoc.is()); // 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); } -void Chart2ImportTest::testPPTXStackedNonStackedYAxis() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTXStackedNonStackedYAxis) { - load(u"/chart2/qa/extras/data/pptx/", "stacked-non-stacked-mix-y-axis.pptx"); + loadFromFile(u"pptx/stacked-non-stacked-mix-y-axis.pptx"); // 1st chart is a normal stacked column. Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); @@ -686,7 +541,7 @@ void 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); @@ -703,7 +558,7 @@ void 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); @@ -722,7 +577,7 @@ void 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); @@ -735,19 +590,23 @@ void Chart2ImportTest::testPPTXStackedNonStackedYAxis() CPPUNIT_ASSERT_MESSAGE("Y axis should NOT be a percent format.", !(nType & util::NumberFormat::PERCENT)); } -void Chart2ImportTest::testODPChartSeries() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODPChartSeries) { //test chart series names for odp - uno::Sequence < OUString > seriesList = getImpressChartColumnDescriptions(u"/chart2/qa/extras/data/odp/", "chart.odp"); - CPPUNIT_ASSERT_EQUAL(OUString("Column 1"), seriesList[0]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 2"), seriesList[1]); - CPPUNIT_ASSERT_EQUAL(OUString("Column 3"), seriesList[2]); + loadFromFile(u"odp/chart.odp"); + uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromDrawImpress( 0, 0 ); + uno::Reference< chart::XChartDataArray > xChartData ( xChartDoc->getData(), uno::UNO_QUERY_THROW); + uno::Sequence < OUString > seriesList = xChartData->getColumnDescriptions(); + 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]); } -void Chart2ImportTest::testBnc864396() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc864396) { - uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromImpress(u"/chart2/qa/extras/data/pptx/", "bnc864396.pptx"), uno::UNO_QUERY_THROW); + loadFromFile(u"pptx/bnc864396.pptx"); + uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0,0), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider()); uno::Reference< chart2::XInternalDataProvider > xDataProvider( xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW ); @@ -760,78 +619,114 @@ void Chart2ImportTest::testBnc864396() } } -void Chart2ImportTest::testBnc889755() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc889755) { - load(u"/chart2/qa/extras/data/pptx/", "bnc889755.pptx"); + loadFromFile(u"pptx/bnc889755.pptx"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 5), uno::UNO_QUERY_THROW); CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider()); constexpr sal_Int32 nNumCategories = 16; - Sequence<OUString> aDateSeq = getFormattedDateCategories(xChartDoc); + + Reference<util::XNumberFormatsSupplier> xNFS(xChartDoc, uno::UNO_QUERY_THROW); + Reference< util::XNumberFormatter > xNumFormatter( + util::NumberFormatter::create(comphelper::getComponentContext(m_xSFactory)), uno::UNO_QUERY_THROW ); + xNumFormatter->attachNumberFormatsSupplier(xNFS); + + Reference<chart2::XAxis> xAxisX = getAxisFromDoc(xChartDoc, 0, 0, 0); + chart2::ScaleData aScaleData = xAxisX->getScaleData(); + CPPUNIT_ASSERT_EQUAL(chart2::AxisType::DATE, aScaleData.AxisType); + + sal_Int32 nNumFmt = getNumberFormatFromAxis(xAxisX); + + CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider()); + uno::Reference< chart2::XInternalDataProvider > xDataProvider( xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW ); + uno::Reference< chart::XDateCategories > xDateCategories( xDataProvider, uno::UNO_QUERY_THROW ); + CPPUNIT_ASSERT(xDateCategories.is()); + Sequence<double> aDateSeq = xDateCategories->getDateCategories(); + Sequence<OUString> aFormattedDates(nNumCategories); + auto aFormattedDatesRange = asNonConstRange(aFormattedDates); + + for (sal_Int32 nIdx = 0; nIdx < nNumCategories; ++nIdx) + aFormattedDatesRange[nIdx] = xNumFormatter->convertNumberToString(nNumFmt, aDateSeq[nIdx]); 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) - CPPUNIT_ASSERT_EQUAL(aExpectedDateCategories[nIdx], aDateSeq[nIdx]); + CPPUNIT_ASSERT_EQUAL(aExpectedDateCategories[nIdx], aFormattedDates[nIdx]); //tdf#139940 - the title's gradient was lost and was filled with solid blue, instead of a "blue underline". uno::Reference<drawing::XDrawPagesSupplier> xDoc(mxComponent, uno::UNO_QUERY_THROW); uno::Reference<drawing::XDrawPage> xPage(xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW); + // Shape "Title 3" + // 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::Gradient aTransparence; - xShapeProps->getPropertyValue("FillTransparenceGradient") >>= aTransparence; - CPPUNIT_ASSERT(aTransparence.StartColor != aTransparence.EndColor); - CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0xffffff), aTransparence.StartColor); + awt::Gradient2 aTransparence; + xShapeProps->getPropertyValue(u"FillTransparenceGradient"_ustr) >>= aTransparence; + const basegfx::BColorStops aColorStops = model::gradient::getColorStopsFromUno(aTransparence.ColorStops); + + CPPUNIT_ASSERT_EQUAL(size_t(3), aColorStops.size()); + CPPUNIT_ASSERT_EQUAL(0.0, aColorStops[0].getStopOffset()); + CPPUNIT_ASSERT_EQUAL(Color(0x404040), Color(aColorStops[0].getStopColor())); + CPPUNIT_ASSERT(basegfx::fTools::equal(aColorStops[1].getStopOffset(), 0.070000000000000007)); + CPPUNIT_ASSERT_EQUAL(Color(0x404040), Color(aColorStops[1].getStopColor())); + CPPUNIT_ASSERT(basegfx::fTools::equal(aColorStops[2].getStopOffset(), 0.080000000000000002)); + CPPUNIT_ASSERT_EQUAL(COL_WHITE, Color(aColorStops[2].getStopColor())); } -void Chart2ImportTest::testBnc882383() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc882383) { - load(u"/chart2/qa/extras/data/pptx/", "bnc882383.pptx"); + loadFromFile(u"pptx/bnc882383.pptx"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY_THROW); uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); 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()); } -void Chart2ImportTest::testTransparencyGradientValue() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTransparencyGradientValue) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf128732.xlsx"); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/tdf128732.xlsx"); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); 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::Gradient aTransparenceGradient; + 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); - CPPUNIT_ASSERT_EQUAL(sal_Int32(3355443), aTransparenceGradient.EndColor); - CPPUNIT_ASSERT_EQUAL(sal_Int32(5000268), aTransparenceGradient.StartColor); + const basegfx::BColorStops aColorStops = model::gradient::getColorStopsFromUno(aTransparenceGradient.ColorStops); + + // MCGR: Use the whole completely imported transparency gradient to check for correctness + CPPUNIT_ASSERT_EQUAL(size_t(2), aColorStops.size()); + CPPUNIT_ASSERT_EQUAL(0.0, aColorStops[0].getStopOffset()); + CPPUNIT_ASSERT_EQUAL(Color(0x4d4d4d), Color(aColorStops[0].getStopColor())); + CPPUNIT_ASSERT(basegfx::fTools::equal(aColorStops[1].getStopOffset(), 1.0)); + CPPUNIT_ASSERT_EQUAL(Color(0x333333), Color(aColorStops[1].getStopColor())); } -void Chart2ImportTest::testSimpleStrictXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSimpleStrictXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "strict_chart.xlsx"); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); + loadFromFile(u"xlsx/strict_chart.xlsx"); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0); CPPUNIT_ASSERT(xChartDoc.is()); Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, 0 ); @@ -839,21 +734,22 @@ void Chart2ImportTest::testSimpleStrictXLSX() } -void Chart2ImportTest::testDelayedCellImport() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDelayedCellImport) { - load(u"/chart2/qa/extras/data/xlsx/", "fdo70609.xlsx"); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0, mxComponent ); + // chart range referencing content on later sheets + loadFromFile(u"xlsx/fdo70609.xlsx"); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet( 0); Reference< chart2::data::XDataSequence > xDataSeq = 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); } -void Chart2ImportTest::testFlatODSStackedColumnChart() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFlatODSStackedColumnChart) { - load(u"/chart2/qa/extras/data/fods/", "stacked-column-chart.fods"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"fods/stacked-column-chart.fods"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XChartType> xChartType = getChartTypeFromDoc(xChartDoc, 0); @@ -867,10 +763,10 @@ void Chart2ImportTest::testFlatODSStackedColumnChart() CPPUNIT_ASSERT_EQUAL(sal_Int32(5), aSeriesSeq.getLength()); } -void Chart2ImportTest::testFdo78080() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo78080) { - load(u"/chart2/qa/extras/data/xlsx/", "fdo78080.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/fdo78080.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW); @@ -878,9 +774,9 @@ void Chart2ImportTest::testFdo78080() CPPUNIT_ASSERT(!xTitle.is()); } -void Chart2ImportTest::testTdf127811() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf127811) { - load(u"/chart2/qa/extras/data/pptx/", "tdf127811.pptx"); + loadFromFile(u"pptx/tdf127811.pptx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -893,14 +789,15 @@ void 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>()); } -void Chart2ImportTest::testTdf86624() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf86624) { - load(u"/chart2/qa/extras/data/ods/", "tdf86624.ods"); - uno::Reference< chart2::XChartDocument > xChart2Doc = getChartDocFromSheet(0, mxComponent); + // manually placed legends + loadFromFile(u"ods/tdf86624.ods"); + uno::Reference< chart2::XChartDocument > xChart2Doc = getChartDocFromSheet(0); uno::Reference< chart::XChartDocument > xChartDoc (xChart2Doc, uno::UNO_QUERY); uno::Reference<drawing::XShape> xLegend = xChartDoc->getLegend(); awt::Point aPos = xLegend->getPosition(); @@ -908,9 +805,9 @@ void Chart2ImportTest::testTdf86624() CPPUNIT_ASSERT(aPos.Y > 4000); // real value for ms is above 7000 } -void Chart2ImportTest::testTdf105517() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf105517) { - load(u"/chart2/qa/extras/data/pptx/", "tdf105517.pptx"); + loadFromFile(u"pptx/tdf105517.pptx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -924,21 +821,21 @@ void 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); } -void Chart2ImportTest::testTdf106217() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf106217) { - load(u"/chart2/qa/extras/data/pptx/", "tdf106217.pptx"); + loadFromFile(u"pptx/tdf106217.pptx"); uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromDrawImpress(0, 0); CPPUNIT_ASSERT(xChartDoc.is()); @@ -948,7 +845,7 @@ void 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); @@ -958,38 +855,38 @@ void Chart2ImportTest::testTdf106217() CPPUNIT_ASSERT_EQUAL(sal_Int32(2700), aSize.Height); } -void Chart2ImportTest::testTdf108021() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf108021) { // Tdf108021 : To check TextBreak value is true. - load(u"/chart2/qa/extras/data/ods/", "tdf108021.ods"); + loadFromFile(u"ods/tdf108021.ods"); uno::Reference< chart::XDiagram > mxDiagram; uno::Reference< beans::XPropertySet > xAxisProp; bool bTextBreak = false; - uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW); + uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet( 0, 0), UNO_QUERY_THROW); mxDiagram.set(xChartDoc->getDiagram()); CPPUNIT_ASSERT(mxDiagram.is()); 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); } -void Chart2ImportTest::testTdf100084() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf100084) { // The test file was created with IBM Cognos, make sure there is a diagram. - load(u"/chart2/qa/extras/data/xlsx/", "tdf100084.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/tdf100084.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); Reference<beans::XPropertySet> xDiagram(xChartDoc->getFirstDiagram(), UNO_QUERY); CPPUNIT_ASSERT_MESSAGE("There should be a Diagram.", xDiagram.is()); } -void Chart2ImportTest::testTdf124817() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf124817) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf124817.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/tdf124817.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); uno::Reference<chart2::XDataSeries> xDataSeries; @@ -999,28 +896,28 @@ void 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); } -void Chart2ImportTest::testTdf126033() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf126033) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf126033.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/tdf126033.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); // Check symbol style and size of data points @@ -1028,16 +925,16 @@ void 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); } -void Chart2ImportTest::testTransparentBackground(OUString const & filename) +void Chart2ImportTest::testTransparentBackground(std::u16string_view filename) { - load(u"/chart2/qa/extras/data/xlsx/", filename); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(filename); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); uno::Reference< chart::XChartDocument > xChart2Doc (xChartDoc, uno::UNO_QUERY); @@ -1047,49 +944,50 @@ void Chart2ImportTest::testTransparentBackground(OUString const & 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); } + // 2 test methods here so that tearDown() can dispose the document -void Chart2ImportTest::testFdo54361() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo54361) { - testTransparentBackground("fdo54361.xlsx"); + testTransparentBackground(u"xlsx/fdo54361.xlsx"); } -void Chart2ImportTest::testFdo54361_1() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo54361_1) { - testTransparentBackground("fdo54361-1.xlsx"); + testTransparentBackground(u"xlsx/fdo54361-1.xlsx"); } -void Chart2ImportTest::testAutoBackgroundXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoBackgroundXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "chart-auto-background.xlsx"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/chart-auto-background.xlsx"); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); // "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.", sal_Int32(0x00FFFFFF), sal_Int32(nColor & 0x00FFFFFF)); // highest 2 bytes are transparency which we ignore here. } -void Chart2ImportTest::testAutoChartAreaBorderPropXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoChartAreaBorderPropXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "chart-area-style-border.xlsx"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/chart-area-style-border.xlsx"); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); // 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.", @@ -1098,44 +996,58 @@ void Chart2ImportTest::testAutoChartAreaBorderPropXLSX() sal_Int32(26), nWidth); } -void Chart2ImportTest::testChartAreaStyleBackgroundXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoChartAreaBorderPropPPTX) { - load(u"/chart2/qa/extras/data/xlsx/", "chart-area-style-background.xlsx"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"pptx/tdf150176.pptx"); + Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); + CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); + + // Test "Automatic" chartarea border style/color/width. + Reference<beans::XPropertySet> xPropSet = xChartDoc->getPageBackground(); + CPPUNIT_ASSERT(xPropSet.is()); + 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); +} + +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testChartAreaStyleBackgroundXLSX) +{ + loadFromFile(u"xlsx/chart-area-style-background.xlsx"); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); // "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.", sal_Int32(0), nColor); } -void Chart2ImportTest::testChartHatchFillXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testChartHatchFillXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "chart-hatch-fill.xlsx"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/chart-hatch-fill.xlsx"); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); // 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 @@ -1144,23 +1056,23 @@ void 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); } -void Chart2ImportTest::testAxisTextRotationXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAxisTextRotationXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "axis-label-rotation.xlsx"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/axis-label-rotation.xlsx"); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); Reference<chart2::XAxis> xYAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); @@ -1168,55 +1080,52 @@ void 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); } -/* TODO : temporarily disabled. -void Chart2ImportTest::testTextCanOverlapXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTextCanOverlapXLSX) { // fdo#84647 : To check textoverlap value is imported correctly. - load("/chart2/qa/extras/data/xlsx/", "chart-text-can-overlap.xlsx"); + loadFromFile(u"xlsx/chart-text-can-overlap.xlsx"); uno::Reference< chart::XDiagram > mxDiagram; uno::Reference< beans::XPropertySet > xAxisProp; bool bTextCanOverlap = false; - uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW); + uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet( 0, 0), UNO_QUERY_THROW); mxDiagram.set(xChartDoc->getDiagram()); CPPUNIT_ASSERT(mxDiagram.is()); uno::Reference< chart::XAxisXSupplier > xAxisXSupp( mxDiagram, uno::UNO_QUERY ); CPPUNIT_ASSERT(xAxisXSupp.is()); xAxisProp = xAxisXSupp->getXAxis(); - xAxisProp->getPropertyValue("TextCanOverlap") >>= bTextCanOverlap; - // Expected value of 'TextCanOverlap' is true - CPPUNIT_ASSERT(bTextCanOverlap); + xAxisProp->getPropertyValue(u"TextCanOverlap"_ustr) >>= bTextCanOverlap; + CPPUNIT_ASSERT(!bTextCanOverlap); } -*/ -void Chart2ImportTest::testTextBreakXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTextBreakXLSX) { // tdf#122091: To check textbreak value is true in case of 0° degree of Axis label rotation. - load(u"/chart2/qa/extras/data/xlsx/", "chart_label_text_break.xlsx"); + loadFromFile(u"xlsx/chart_label_text_break.xlsx"); uno::Reference< chart::XDiagram > mxDiagram; uno::Reference< beans::XPropertySet > xAxisProp; bool textBreak = false; - uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW); + uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet( 0, 0), UNO_QUERY_THROW); CPPUNIT_ASSERT(xChartDoc.is()); mxDiagram.set(xChartDoc->getDiagram()); CPPUNIT_ASSERT(mxDiagram.is()); 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); } -void Chart2ImportTest::testNumberFormatsXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testNumberFormatsXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "number-formats.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/number-formats.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); @@ -1226,48 +1135,48 @@ void 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); CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bLinkNumberFormatToSource); } -void Chart2ImportTest::testNumberFormatsDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testNumberFormatsDOCX) { - load(u"/chart2/qa/extras/data/docx/", "tdf132174.docx"); + loadFromFile(u"docx/tdf132174.docx"); { uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1279,7 +1188,7 @@ void 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; @@ -1288,7 +1197,7 @@ void Chart2ImportTest::testNumberFormatsDOCX() CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to false.", !bLinkNumberFormatToSource); } - load(u"/chart2/qa/extras/data/docx/", "tdf136650.docx"); + loadFromFile(u"docx/tdf136650.docx"); { uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1300,7 +1209,7 @@ void 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; @@ -1310,9 +1219,9 @@ void Chart2ImportTest::testNumberFormatsDOCX() } } -void Chart2ImportTest::testPercentageNumberFormatsDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPercentageNumberFormatsDOCX) { - load(u"/chart2/qa/extras/data/docx/", "tdf133632.docx"); + loadFromFile(u"docx/tdf133632.docx"); uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1323,7 +1232,7 @@ void 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; @@ -1331,10 +1240,12 @@ void Chart2ImportTest::testPercentageNumberFormatsDOCX() CPPUNIT_ASSERT_MESSAGE("\"LinkNumberFormatToSource\" should be set to true.", bLinkNumberFormatToSource); } -void Chart2ImportTest::testAutoTitleDelDefaultValue2007XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoTitleDelDefaultValue2007XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "autotitledel_2007.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + // below are OOXML default value tests for cases + // where we fixed the handling of MSO 2007 vs OOXML + loadFromFile(u"xlsx/autotitledel_2007.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW); @@ -1343,10 +1254,10 @@ void Chart2ImportTest::testAutoTitleDelDefaultValue2007XLSX() !aTitle.isEmpty()); } -void Chart2ImportTest::testAutoTitleDelDefaultValue2013XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoTitleDelDefaultValue2013XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "autotitledel_2013.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/autotitledel_2013.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW); @@ -1355,38 +1266,38 @@ void Chart2ImportTest::testAutoTitleDelDefaultValue2013XLSX() !xTitle.is()); } -void Chart2ImportTest::testDispBlanksAsDefaultValue2007XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDispBlanksAsDefaultValue2007XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2007.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/dispBlanksAs_2007.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); 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); } -void Chart2ImportTest::testDispBlanksAsDefaultValue2013XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDispBlanksAsDefaultValue2013XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "dispBlanksAs_2013.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/dispBlanksAs_2013.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); 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); } -void Chart2ImportTest::testSmoothDefaultValue2007XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSmoothDefaultValue2007XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "smoothed_series2007.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/smoothed_series2007.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1397,14 +1308,14 @@ void 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); } -void Chart2ImportTest::testSmoothDefaultValue2013XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSmoothDefaultValue2013XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "smoothed_series.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/smoothed_series.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1415,14 +1326,14 @@ void 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); } -void Chart2ImportTest::testTrendlineDefaultValue2007XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTrendlineDefaultValue2007XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "trendline2007.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/trendline2007.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); @@ -1434,21 +1345,21 @@ void 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); } -void Chart2ImportTest::testTrendlineDefaultValue2013XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTrendlineDefaultValue2013XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "trendline.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/trendline.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); @@ -1460,105 +1371,105 @@ void 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); } -void Chart2ImportTest::testVaryColorDefaultValues2007XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testVaryColorDefaultValues2007XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "vary_color2007.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/vary_color2007.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); CPPUNIT_ASSERT(xChartDoc.is()); 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); } -void Chart2ImportTest::testVaryColorDefaultValues2013XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testVaryColorDefaultValues2013XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "vary_color.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/vary_color.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); CPPUNIT_ASSERT(xChartDoc.is()); 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); } -void Chart2ImportTest::testPlotVisOnlyDefaultValue2013XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPlotVisOnlyDefaultValue2013XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "plotVisOnly.xlsx"); - uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW); + loadFromFile(u"xlsx/plotVisOnly.xlsx"); + uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, 0), 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); CPPUNIT_ASSERT(!bShowHiddenValues); } -void Chart2ImportTest::testRAngAxDefaultValue2013XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testRAngAxDefaultValue2013XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "rAngAx.xlsx"); - uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW); + loadFromFile(u"xlsx/rAngAx.xlsx"); + uno::Reference< chart::XChartDocument > xChart1Doc ( getChartCompFromSheet( 0, 0), 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); CPPUNIT_ASSERT(bRightAngleAxes); } -void Chart2ImportTest::testMajorTickMarksDefaultValue2013XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testMajorTickMarksDefaultValue2013XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "majorTickMark.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/majorTickMark.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); 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); CPPUNIT_ASSERT_EQUAL(chart2::TickmarkStyle::INNER | chart2::TickmarkStyle::OUTER, nMajorTickmarks); } -void Chart2ImportTest::testMinorTickMarksDefaultValue2013XLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testMinorTickMarksDefaultValue2013XLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "minorTickMark.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/minorTickMark.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); 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); CPPUNIT_ASSERT_EQUAL(chart2::TickmarkStyle::INNER | chart2::TickmarkStyle::OUTER, nMajorTickmarks); } -void Chart2ImportTest::testAxisTitleDefaultRotationXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAxisTitleDefaultRotationXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "axis_title_default_rotation.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/axis_title_default_rotation.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); Reference<chart2::XAxis> xYAxis = getAxisFromDoc(xChartDoc, 0, 1, 0); CPPUNIT_ASSERT(xYAxis.is()); @@ -1566,16 +1477,16 @@ void 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); } -void Chart2ImportTest::testSecondaryAxisTitleDefaultRotationXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSecondaryAxisTitleDefaultRotationXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "secondary_axis_title_default_rotation.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/secondary_axis_title_default_rotation.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); Reference<chart2::XAxis> xYAxis = getAxisFromDoc(xChartDoc, 0, 1, 1); CPPUNIT_ASSERT(xYAxis.is()); @@ -1583,16 +1494,16 @@ void 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); } -void Chart2ImportTest::testAxisTitleRotationXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAxisTitleRotationXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "axis_title_rotated.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/axis_title_rotated.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); { Reference<chart2::XAxis> xYAxis = getAxisFromDoc(xChartDoc, 0, 1, 0); @@ -1601,7 +1512,7 @@ void 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); @@ -1613,7 +1524,7 @@ void 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); @@ -1621,9 +1532,9 @@ void Chart2ImportTest::testAxisTitleRotationXLSX() } -void Chart2ImportTest::testAxisTitlePositionDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAxisTitlePositionDOCX) { - load(u"/chart2/qa/extras/data/docx/", "testAxisTitlePosition.docx"); + loadFromFile(u"docx/testAxisTitlePosition.docx"); uno::Reference< chart::XDiagram > mxDiagram; uno::Reference< drawing::XShape > xAxisTitle; uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromWriter(0); @@ -1653,10 +1564,10 @@ void Chart2ImportTest::testAxisTitlePositionDOCX() CPPUNIT_ASSERT_DOUBLES_EQUAL(6378, aPos.Y, 300); } -void Chart2ImportTest::testCombinedChartAttachedAxisXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testCombinedChartAttachedAxisXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "testCombinedChartAxis.xlsx"); - Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/testCombinedChartAxis.xlsx"); + Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); // First series Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xSeries.is()); @@ -1664,7 +1575,7 @@ void 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); @@ -1674,22 +1585,22 @@ void 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); } -void Chart2ImportTest::testTdf140489MultiSeriesChartAxisXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf140489MultiSeriesChartAxisXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf140489.xlsx"); - Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/tdf140489.xlsx"); + Reference< chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); // First series Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xSeries.is()); 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); @@ -1698,7 +1609,7 @@ void 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); @@ -1707,17 +1618,19 @@ void 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); } -void Chart2ImportTest::testInternalDataProvider() { - uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromImpress(u"/chart2/qa/extras/data/odp/", "chart.odp"), uno::UNO_QUERY_THROW); - const uno::Reference< chart2::data::XDataProvider >& rxDataProvider = xChartDoc->getDataProvider(); +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testInternalDataProvider) +{ + loadFromFile(u"odp/chart.odp"); + uno::Reference< chart2::XChartDocument > xChartDoc(getChartDocFromDrawImpress(0,0), uno::UNO_QUERY_THROW); + const uno::Reference< chart2::data::XDataProvider > xDataProvider = xChartDoc->getDataProvider(); // Parse 42 array - Reference<chart2::data::XDataSequence> xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{42;42;42;42}", ""); + Reference<chart2::data::XDataSequence> xDataSeq = xDataProvider->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]); @@ -1725,7 +1638,7 @@ void 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 = xDataProvider->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]); @@ -1733,7 +1646,7 @@ void Chart2ImportTest::testInternalDataProvider() { CPPUNIT_ASSERT( std::isnan( *static_cast<const double*>(xSequence[3].getValue()))); // Parse empty middle - xDataSeq = rxDataProvider->createDataSequenceByValueArray("values-y", "{42;\"\";\"\";42}", ""); + xDataSeq = xDataProvider->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())) ); @@ -1741,7 +1654,7 @@ void 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 = xDataProvider->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]); @@ -1749,34 +1662,36 @@ void 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 = xDataProvider->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]); } -void Chart2ImportTest::testTdf90510() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf90510) { - load(u"/chart2/qa/extras/data/xls/", "piechart_outside.xls"); - uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW ); + // Pie chart label placement settings(XLS) + loadFromFile(u"xls/piechart_outside.xls"); + uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, 0), 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 ); CPPUNIT_ASSERT_EQUAL_MESSAGE( "Data labels should be placed outside", chart::DataLabelPlacement::OUTSIDE, nLabelPlacement ); } -void Chart2ImportTest::testTdf109858() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf109858) { - load(u"/chart2/qa/extras/data/xlsx/", "piechart_outside.xlsx"); - uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW ); + // Pie chart label placement settings(XLSX) + loadFromFile(u"xlsx/piechart_outside.xlsx"); + uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, 0), UNO_QUERY_THROW ); // 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 ); @@ -1784,36 +1699,36 @@ void 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 ); } -void Chart2ImportTest::testTdf130105() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf130105) { - load(u"/chart2/qa/extras/data/xlsx/", "barchart_outend.xlsx"); - uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/barchart_outend.xlsx"); + uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); 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); CPPUNIT_ASSERT_EQUAL_MESSAGE("Data label should be placed outend", chart::DataLabelPlacement::OUTSIDE, nLabelPlacement); } -void Chart2ImportTest::testTdf111173() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf111173) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf111173.xlsx"); - uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW ); + loadFromFile(u"xlsx/tdf111173.xlsx"); + uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, 0), UNO_QUERY_THROW ); } -void Chart2ImportTest::testTdf122226() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf122226) { - load( u"/chart2/qa/extras/data/docx/", "testTdf122226.docx" ); + loadFromFile(u"docx/testTdf122226.docx" ); uno::Reference< chart2::XChartDocument > xChartDoc ( getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT( xChartDoc.is() ); @@ -1822,16 +1737,17 @@ void 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 ); } -void Chart2ImportTest::testTdf115107() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf115107) { - load(u"/chart2/qa/extras/data/pptx/", "tdf115107.pptx"); + // import complex data point labels + loadFromFile(u"pptx/tdf115107.pptx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1846,83 +1762,84 @@ void 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()); } -void Chart2ImportTest::testTdf115107_2() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf115107_2) { - load(u"/chart2/qa/extras/data/pptx/", "tdf115107-2.pptx"); + // import complex data point labels in cobo charts with multiple data series + loadFromFile(u"pptx/tdf115107-2.pptx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -1936,48 +1853,48 @@ void 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()); } -void Chart2ImportTest::testTdf116163() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf116163) { - load(u"/chart2/qa/extras/data/pptx/", "tdf116163.pptx"); + loadFromFile(u"pptx/tdf116163.pptx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -2002,10 +1919,10 @@ void 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 @@ -2014,7 +1931,7 @@ void 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 { @@ -2030,19 +1947,19 @@ void 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()); } -void Chart2ImportTest::testTdf48041() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf48041) { - load(u"/chart2/qa/extras/data/pptx/", "tdf48041.pptx"); + loadFromFile(u"pptx/tdf48041.pptx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -2059,7 +1976,7 @@ void 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 { @@ -2077,22 +1994,22 @@ void 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()); } -void Chart2ImportTest::testTdf121205() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf121205) { - load(u"/chart2/qa/extras/data/pptx/", "tdf121205.pptx"); + loadFromFile(u"pptx/tdf121205.pptx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); uno::Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW); @@ -2100,11 +2017,295 @@ void 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) +{ + loadFromFile(u"pptx/tdf146487.pptx"); + Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); + CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); + + Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW); + uno::Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); + CPPUNIT_ASSERT_MESSAGE("chart doc should not have a title", !xTitle.is()); + + // tdf#146756 use manualLayout Width that was provided (so Green; $7,654,321 is not wrapped + if (!IsDefaultDPI()) + return; + uno::Reference<chart::XChartDocument> xDoc = getChartDocFromDrawImpress(0, 0); + OString aXmlDump = OUStringToOString(getShapeDump(xDoc), RTL_TEXTENCODING_UTF8); + xmlDocUniquePtr pXmlDoc(xmlParseDoc(reinterpret_cast<const xmlChar*>(aXmlDump.getStr()))); + OString aPath("//XShape[@text='Green; $7,654,321 ']"_ostr); + assertXPath(pXmlDoc, aPath, 1); + // Expected - 1 line tall(371), not 4 lines(1481). + assertXPath(pXmlDoc, aPath, "sizeY", u"371"); +} + +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf146756) +{ + // FIXME: the DPI check should be removed when either (1) the test is fixed to work with + // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. + if (!IsDefaultDPI()) + return; + + // given a chart on page 2 + loadFromFile(u"pptx/tdf146756_bestFit.pptx"); + Reference<chart::XChartDocument> xChartDoc = getChartDocFromDrawImpress(1, 0); + OString aXmlDump = OUStringToOString(getShapeDump(xChartDoc), RTL_TEXTENCODING_UTF8); + xmlDocUniquePtr pXmlDoc(xmlParseDoc(reinterpret_cast<const xmlChar*>(aXmlDump.getStr()))); + 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). + assertXPath(pXmlDoc, aPath, "sizeY", u"1697"); + // Expected some reasonable maximum text length for the label like 2350, not 881. + sal_Int32 nTextLength = getXPath(pXmlDoc, aPath, "textMaximumFrameWidth").toInt32(); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2350), nTextLength); + // MSO doesn't allow much more than 1/5 of the total chart width, so never go higher than that + CPPUNIT_ASSERT_LESS(sal_Int32(2370.6), nTextLength); +} + +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFixedSizeBarChartVeryLongLabel) +{ + // Bar chart area size is fixed (not automatic) so we can't resize + // the chart area to let the label break into multiple lines. In this + // case the best course of action is to just crop the label text. This + // test checks that the rendered text is actually cropped. + + loadFromFile(u"odp/BarChartVeryLongLabel.odp"); + + // Select shape 0 which has fixed size chart + Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference<chart2::XAxis> xHAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); + CPPUNIT_ASSERT(xHAxis.is()); + + chart2::ScaleData aScaleData = xHAxis->getScaleData(); + CPPUNIT_ASSERT(aScaleData.Categories.is()); + + Reference<chart2::data::XLabeledDataSequence> xLabeledDataSequence = aScaleData.Categories; + CPPUNIT_ASSERT(xLabeledDataSequence.is()); + + Reference<chart2::data::XDataSequence> xDataSequence = xLabeledDataSequence->getValues(); + CPPUNIT_ASSERT(xDataSequence.is()); + + Reference<chart2::data::XTextualDataSequence> xTextualDataSequence(xDataSequence, uno::UNO_QUERY); + CPPUNIT_ASSERT(xTextualDataSequence.is()); + + std::vector<OUString> aCategories; + const Sequence<OUString> aTextData(xTextualDataSequence->getTextualData()); + ::std::copy(aTextData.begin(), aTextData.end(), + ::std::back_inserter(aCategories)); + + // Check that we have a very very long label text + 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); + uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); + uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xShapes.is()); + + 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 + { + uno::Reference<drawing::XShapes> xAxisShapes(rXShape, uno::UNO_QUERY); + CPPUNIT_ASSERT(xAxisShapes.is()); + uno::Reference<drawing::XShape> xChildShape(xAxisShapes->getByIndex(0), uno::UNO_QUERY); + uno::Reference< drawing::XShapeDescriptor > xShapeDescriptor(xChildShape, uno::UNO_QUERY_THROW); + return (xShapeDescriptor->getShapeType() == "com.sun.star.drawing.TextShape"); + }); + CPPUNIT_ASSERT(xXAxis.is()); + + uno::Reference<container::XIndexAccess> xIndexAccess(xXAxis, UNO_QUERY_THROW); + + // Check text is actually cropped. Depending on DPI, + // it may be "Very very very very very very..." or "Very very very very very ver..." + uno::Reference<text::XTextRange> xLabel(xIndexAccess->getByIndex(0), uno::UNO_QUERY_THROW); + const OUString aLabelString = xLabel->getString(); + CPPUNIT_ASSERT_LESSEQUAL(sal_Int32(32), aLabelString.getLength()); + CPPUNIT_ASSERT(aLabelString.endsWith(u"...")); + + 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 + CPPUNIT_ASSERT_LESS(xChartWall->getSize().Width, xXAxis->getSize().Width); + + CPPUNIT_ASSERT_DOUBLES_EQUAL(7113, xChartWall->getSize().Height, 100); + CPPUNIT_ASSERT_DOUBLES_EQUAL(398, xXAxis->getSize().Height, 100); } -CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest); +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutomaticSizeBarChartVeryLongLabel) +{ + // Bar chart area size is automatic so we expect the label to be broken + // into multiple lines. + + loadFromFile(u"odp/BarChartVeryLongLabel.odp"); + + // Select shape 1, which has an automatic sized chart + Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 1), uno::UNO_QUERY); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference<chart2::XAxis> xHAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); + CPPUNIT_ASSERT(xHAxis.is()); + + chart2::ScaleData aScaleData = xHAxis->getScaleData(); + CPPUNIT_ASSERT(aScaleData.Categories.is()); + + Reference<chart2::data::XLabeledDataSequence> xLabeledDataSequence = aScaleData.Categories; + CPPUNIT_ASSERT(xLabeledDataSequence.is()); + + Reference<chart2::data::XDataSequence> xDataSequence = xLabeledDataSequence->getValues(); + CPPUNIT_ASSERT(xDataSequence.is()); + + Reference<chart2::data::XTextualDataSequence> xTextualDataSequence(xDataSequence, uno::UNO_QUERY); + CPPUNIT_ASSERT(xTextualDataSequence.is()); + + std::vector<OUString> aCategories; + const Sequence<OUString> aTextData(xTextualDataSequence->getTextualData()); + ::std::copy(aTextData.begin(), aTextData.end(), + ::std::back_inserter(aCategories)); + + // Check that we have a very very long label text + 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); + uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); + uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xShapes.is()); + + 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 + { + uno::Reference<drawing::XShapes> xAxisShapes(rXShape, uno::UNO_QUERY); + CPPUNIT_ASSERT(xAxisShapes.is()); + uno::Reference<drawing::XShape> xChildShape(xAxisShapes->getByIndex(0), uno::UNO_QUERY); + uno::Reference< drawing::XShapeDescriptor > xShapeDescriptor(xChildShape, uno::UNO_QUERY_THROW); + return (xShapeDescriptor->getShapeType() == "com.sun.star.drawing.TextShape"); + }); + CPPUNIT_ASSERT(xXAxis.is()); + + uno::Reference<container::XIndexAccess> xIndexAccess(xXAxis, UNO_QUERY_THROW); + + // Check text is unmodified + uno::Reference<text::XTextRange> xLabel(xIndexAccess->getByIndex(0), uno::UNO_QUERY); + 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, u"CID/DiagramWall="_ustr); + CPPUNIT_ASSERT(xChartWall.is()); + + // The text shape width should be smaller than the chart wall + CPPUNIT_ASSERT_LESS(xChartWall->getSize().Width, xXAxis->getSize().Width); + + CPPUNIT_ASSERT_DOUBLES_EQUAL(7200, xChartWall->getSize().Height, 100); + CPPUNIT_ASSERT_DOUBLES_EQUAL(1192, xXAxis->getSize().Height, 100); +} + +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTotalsRowIgnored) +{ + loadFromFile(u"xlsx/barchart_totalsrow.xlsx"); + { + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference<chart2::data::XDataSequence> xDataSeq = + getDataSequenceFromDocByRole(xChartDoc, u"values-y"); + CPPUNIT_ASSERT(xDataSeq.is()); + + // Table data range is D2:D9 (8 rows) but because last row is totals row it is ignored + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(7u), xDataSeq->getData().size()); + } + { + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(1); + CPPUNIT_ASSERT(xChartDoc.is()); + + Reference<chart2::data::XDataSequence> xDataSeq = + getDataSequenceFromDocByRole(xChartDoc, u"values-y"); + CPPUNIT_ASSERT(xDataSeq.is()); + + // Table data range is D2:D10 (9 rows) and totals row isn't the last row so it's not ignored + CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(9u), xDataSeq->getData().size()); + } +} + +CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPieChartPlotAreaMarginWithAutomaticLayout) +{ + auto verify = [this](std::u16string_view rName, const Size& rSize, const Point& rPoint) + { + uno::Reference<drawing::XDrawPagesSupplier> xPages(mxComponent, uno::UNO_QUERY); + CPPUNIT_ASSERT(xPages); + + uno::Reference<drawing::XDrawPage> xPage(xPages->getDrawPages()->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xPage); + + uno::Reference<chart::XChartDocument> xChart; + for (sal_Int32 i=0; i < xPage->getCount(); ++i) + { + uno::Reference<container::XNamed> xNamedShape(xPage->getByIndex(i), uno::UNO_QUERY); + if (!xNamedShape.is()) + continue; + + if (xNamedShape->getName() != rName) + continue; + + uno::Reference<beans::XPropertySet> xShapeProps(xNamedShape, uno::UNO_QUERY); + if (!xShapeProps.is()) + continue; + + uno::Reference<frame::XModel> xDocModel; + xShapeProps->getPropertyValue(u"Model"_ustr) >>= xDocModel; + if (!xDocModel.is()) + continue; + + xChart.set(xDocModel, uno::UNO_QUERY); + } + CPPUNIT_ASSERT(xChart); + + uno::Reference<chart2::XChartDocument>xChartDocument(xChart, uno::UNO_QUERY); + CPPUNIT_ASSERT(xChartDocument.is()); + + // Get the shape of the diagram / chart + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDocument, uno::UNO_QUERY); + CPPUNIT_ASSERT(xDrawPageSupplier.is()); + uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); + uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xShapes.is()); + + uno::Reference<drawing::XShape> xChartDiagramShape = getShapeByName(xShapes, u"CID/D=0:CS=0:CT=0:Series=0"_ustr); + CPPUNIT_ASSERT(xChartDiagramShape.is()); + + // Size + CPPUNIT_ASSERT_DOUBLES_EQUAL(rSize.Width(), xChartDiagramShape->getSize().Width, 5); // calculated chart area size - 2 * margin + CPPUNIT_ASSERT_DOUBLES_EQUAL(rSize.Height(), xChartDiagramShape->getSize().Height, 5); // calculated chart area size - 2 * margin + // Position + CPPUNIT_ASSERT_DOUBLES_EQUAL(rPoint.X(), xChartDiagramShape->getPosition().X, 5); // margin + CPPUNIT_ASSERT_DOUBLES_EQUAL(rPoint.Y(), xChartDiagramShape->getPosition().Y, 5); // margin + }; + + // tdf#91265 + // Checks the margin and calculation of the plot area for the pie chart inside the chart area. + + loadFromFile(u"pptx/PieChartWithAutomaticLayout_SizeAndPosition.pptx"); + + // Chart Wuse case Width == Height + // Load chart Chart_2_2 - 2cm x 2cm - + verify(u"Chart_2_2", Size(1300, 1300), Point(350, 350)); + + // Chart use case - Width < Height + // Load chart Chart_3_4 - 3cm x 4cm + verify(u"Chart_3_4", Size(2300, 2300), Point(350, 850)); + + // Chart use case - Width > Height + // Load chart Chart_3_2 - 3cm x 2cm + verify(u"Chart_3_2", Size(1300, 1300), Point(850, 350)); +} +} // end of anonymous namespace CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/qa/extras/chart2import2.cxx b/chart2/qa/extras/chart2import2.cxx index f84254c30c2a..c7d349758846 100644 --- a/chart2/qa/extras/chart2import2.cxx +++ b/chart2/qa/extras/chart2import2.cxx @@ -22,102 +22,36 @@ class Chart2ImportTest2 : public ChartTest { public: - void testTdf114179(); - void testTdf124243(); - void testTdf127393(); - void testTdf128733(); - void testTdf128432(); - void testTdf128627(); - void testTdf128634(); - void testTdf130657(); - void testDeletedDataLabel(); - void testDataPointInheritedColorDOCX(); - void testExternalStrRefsXLSX(); - void testSourceNumberFormatComplexCategoriesXLS(); - void testSimpleCategoryAxis(); - void testMultilevelCategoryAxis(); - void testXaxisValues(); - void testTdf123504(); - void testTdf122765(); - void testTdf123206CustomLabelField(); - void testTdf125444PercentageCustomLabel(); - void testDataPointLabelCustomPos(); - void testTdf130032(); - void testTdf134978(); - void testTdf119138MissingAutoTitleDeleted(); - void testStockChartShiftedCategoryPosition(); - void testTdf133376(); - void testTdf134225(); - void testTdf136105(); - void testTdf91250(); - void testTdf134111(); - void testTdf136752(); - void testTdf137505(); - void testTdf137734(); - void testTdf137874(); - void testTdfCustomShapePos(); - void testTdf121281(); - void testTdf139658(); - - CPPUNIT_TEST_SUITE(Chart2ImportTest2); - - CPPUNIT_TEST(testTdf114179); - CPPUNIT_TEST(testTdf124243); - CPPUNIT_TEST(testTdf127393); - CPPUNIT_TEST(testTdf128733); - CPPUNIT_TEST(testTdf128432); - CPPUNIT_TEST(testTdf128627); - CPPUNIT_TEST(testTdf128634); - CPPUNIT_TEST(testTdf130657); - CPPUNIT_TEST(testDeletedDataLabel); - CPPUNIT_TEST(testDataPointInheritedColorDOCX); - CPPUNIT_TEST(testExternalStrRefsXLSX); - CPPUNIT_TEST(testSourceNumberFormatComplexCategoriesXLS); - CPPUNIT_TEST(testSimpleCategoryAxis); - CPPUNIT_TEST(testMultilevelCategoryAxis); - CPPUNIT_TEST(testXaxisValues); - CPPUNIT_TEST(testTdf123504); - CPPUNIT_TEST(testTdf122765); - CPPUNIT_TEST(testTdf123206CustomLabelField); - CPPUNIT_TEST(testTdf125444PercentageCustomLabel); - CPPUNIT_TEST(testDataPointLabelCustomPos); - CPPUNIT_TEST(testTdf130032); - CPPUNIT_TEST(testTdf134978); - CPPUNIT_TEST(testTdf119138MissingAutoTitleDeleted); - CPPUNIT_TEST(testStockChartShiftedCategoryPosition); - CPPUNIT_TEST(testTdf133376); - CPPUNIT_TEST(testTdf134225); - CPPUNIT_TEST(testTdf136105); - CPPUNIT_TEST(testTdf91250); - CPPUNIT_TEST(testTdf134111); - CPPUNIT_TEST(testTdf136752); - CPPUNIT_TEST(testTdf137505); - CPPUNIT_TEST(testTdf137734); - CPPUNIT_TEST(testTdf137874); - CPPUNIT_TEST(testTdfCustomShapePos); - CPPUNIT_TEST(testTdf121281); - CPPUNIT_TEST(testTdf139658); - - CPPUNIT_TEST_SUITE_END(); + Chart2ImportTest2() + : ChartTest(u"/chart2/qa/extras/data/"_ustr) + { + } }; -void Chart2ImportTest2::testTdf114179() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf114179) { - load(u"/chart2/qa/extras/data/docx/", "testTdf114179.docx"); + loadFromFile(u"docx/testTdf114179.docx"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); css::uno::Reference<chart2::XDiagram> xDiagram; xDiagram.set(xChartDoc->getFirstDiagram()); CPPUNIT_ASSERT_MESSAGE("There is a Diagram.", xDiagram.is()); - awt::Size aPage = getPageSize(xChartDoc); - awt::Size aSize = getSize(xDiagram, aPage); - CPPUNIT_ASSERT(aSize.Width > 0); - CPPUNIT_ASSERT(aSize.Height > 0); -} - -void Chart2ImportTest2::testTdf124243() -{ - load(u"/chart2/qa/extras/data/docx/", "tdf124243.docx"); + awt::Size aPage(0, 0); + uno::Reference<css::embed::XVisualObject> xVisualObject(xChartDoc, uno::UNO_QUERY); + CPPUNIT_ASSERT(xVisualObject.is()); + aPage = xVisualObject->getVisualAreaSize(css::embed::Aspects::MSOLE_CONTENT); + Reference<beans::XPropertySet> xProp(xDiagram, uno::UNO_QUERY); + chart2::RelativeSize aRelativeSize; + xProp->getPropertyValue(u"RelativeSize"_ustr) >>= aRelativeSize; + double fX = aRelativeSize.Primary * aPage.Width; + double fY = aRelativeSize.Secondary * aPage.Height; + CPPUNIT_ASSERT(static_cast<sal_Int32>(::rtl::math::round(fX)) > 0); + CPPUNIT_ASSERT(static_cast<sal_Int32>(::rtl::math::round(fY)) > 0); +} + +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf124243) +{ + loadFromFile(u"docx/tdf124243.docx"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); @@ -127,14 +61,14 @@ void 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); } -void Chart2ImportTest2::testTdf127393() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf127393) { - load(u"/chart2/qa/extras/data/pptx/", "tdf127393.pptx"); + loadFromFile(u"pptx/tdf127393.pptx"); // 1st chart Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); @@ -159,9 +93,9 @@ void Chart2ImportTest2::testTdf127393() CPPUNIT_ASSERT(!aScaleData2.ShiftedCategoryPosition); } -void Chart2ImportTest2::testTdf128733() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf128733) { - load(u"/chart2/qa/extras/data/odt/", "tdf128733.odt"); + loadFromFile(u"odt/tdf128733.odt"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -174,11 +108,11 @@ void Chart2ImportTest2::testTdf128733() CPPUNIT_ASSERT(aScaleData.ShiftedCategoryPosition); } -void Chart2ImportTest2::testTdf128432() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf128432) { - load(u"/chart2/qa/extras/data/ods/", "tdf128432.ods"); + loadFromFile(u"ods/tdf128432.ods"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XAxis> xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); @@ -189,11 +123,11 @@ void Chart2ImportTest2::testTdf128432() CPPUNIT_ASSERT(aScaleData.ShiftedCategoryPosition); } -void Chart2ImportTest2::testTdf128627() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf128627) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf128627.xlsx"); + loadFromFile(u"xlsx/tdf128627.xlsx"); // Test ShiftedCategoryPosition for Radar Chart - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); Reference<chart2::XAxis> xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); @@ -204,11 +138,11 @@ void Chart2ImportTest2::testTdf128627() CPPUNIT_ASSERT(!aScaleData.ShiftedCategoryPosition); } -void Chart2ImportTest2::testTdf128634() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf128634) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf128634.xlsx"); + loadFromFile(u"xlsx/tdf128634.xlsx"); // Test ShiftedCategoryPosition for 3D Charts - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); Reference<chart2::XAxis> xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); @@ -219,11 +153,11 @@ void Chart2ImportTest2::testTdf128634() CPPUNIT_ASSERT(aScaleData.ShiftedCategoryPosition); } -void Chart2ImportTest2::testTdf130657() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf130657) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf130657.xlsx"); + loadFromFile(u"xlsx/tdf130657.xlsx"); // Test ShiftedCategoryPosition for charts which is not contain a "crossbetween" OOXML tag. - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); Reference<chart2::XAxis> xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); @@ -242,17 +176,16 @@ 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)); } } -void Chart2ImportTest2::testDeletedDataLabel() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testDeletedDataLabel) { - load(u"/chart2/qa/extras/data/xlsx/", "deleted_data_labels.xlsx"); - uno::Reference<chart2::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"xlsx/deleted_data_labels.xlsx"); + uno::Reference<chart2::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), UNO_QUERY_THROW); Reference<chart2::XDataSeries> xDataSeries0 = getDataSeriesFromDoc(xChartDoc, 0); CPPUNIT_ASSERT(xDataSeries0.is()); checkDataLabelProperties(xDataSeries0, 0, true); @@ -265,9 +198,9 @@ void Chart2ImportTest2::testDeletedDataLabel() checkDataLabelProperties(xDataSeries1, 2, false); } -void Chart2ImportTest2::testDataPointInheritedColorDOCX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testDataPointInheritedColorDOCX) { - load(u"/chart2/qa/extras/data/docx/", "data_point_inherited_color.docx"); + loadFromFile(u"docx/data_point_inherited_color.docx"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); css::uno::Reference<chart2::XDiagram> xDiagram(xChartDoc->getFirstDiagram(), UNO_SET_THROW); @@ -276,29 +209,27 @@ void 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); } -void Chart2ImportTest2::testExternalStrRefsXLSX() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testExternalStrRefsXLSX) { - load(u"/chart2/qa/extras/data/xlsx/", "external_str_ref.xlsx"); - uno::Reference<chart2::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"xlsx/external_str_ref.xlsx"); + uno::Reference<chart2::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), UNO_QUERY_THROW); CPPUNIT_ASSERT(xChartDoc.is()); 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>()); } -void Chart2ImportTest2::testSourceNumberFormatComplexCategoriesXLS() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testSourceNumberFormatComplexCategoriesXLS) { - load(u"/chart2/qa/extras/data/xls/", "source_number_format_axis.xls"); - uno::Reference<chart2::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"xls/source_number_format_axis.xls"); + uno::Reference<chart2::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), UNO_QUERY_THROW); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XAxis> xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); @@ -307,9 +238,9 @@ void Chart2ImportTest2::testSourceNumberFormatComplexCategoriesXLS() CPPUNIT_ASSERT(nNumberFormat != 0); } -void Chart2ImportTest2::testSimpleCategoryAxis() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testSimpleCategoryAxis) { - load(u"/chart2/qa/extras/data/docx/", "testSimpleCategoryAxis.docx"); + loadFromFile(u"docx/testSimpleCategoryAxis.docx"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -335,9 +266,9 @@ void Chart2ImportTest2::testSimpleCategoryAxis() CPPUNIT_ASSERT(aCategories[3][0].endsWith("ria 4")); } -void Chart2ImportTest2::testMultilevelCategoryAxis() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testMultilevelCategoryAxis) { - load(u"/chart2/qa/extras/data/docx/", "testMultilevelCategoryAxis.docx"); + loadFromFile(u"docx/testMultilevelCategoryAxis.docx"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -354,19 +285,19 @@ void 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]); } -void Chart2ImportTest2::testXaxisValues() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testXaxisValues) { - load(u"/chart2/qa/extras/data/docx/", "tdf124083.docx"); + loadFromFile(u"docx/tdf124083.docx"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -381,11 +312,10 @@ void Chart2ImportTest2::testXaxisValues() CPPUNIT_ASSERT(std::isnan(*static_cast<const double*>(xSequence[4].getValue()))); } -void Chart2ImportTest2::testTdf123504() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf123504) { - load(u"/chart2/qa/extras/data/ods/", "pie_chart_100_and_0.ods"); - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"ods/pie_chart_100_and_0.ods"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); Reference<chart2::XChartDocument> xChartDoc2(xChartDoc, UNO_QUERY_THROW); Reference<chart2::XChartType> xChartType(getChartTypeFromDoc(xChartDoc2, 0), UNO_SET_THROW); @@ -395,8 +325,8 @@ void 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()); @@ -408,20 +338,20 @@ void Chart2ImportTest2::testTdf123504() CPPUNIT_ASSERT_GREATER(sal_Int32(3000), aSlicePosition.X); CPPUNIT_ASSERT_GREATER(sal_Int32(150), aSlicePosition.Y); awt::Size aSliceSize = xSlice->getSize(); - CPPUNIT_ASSERT_GREATER(sal_Int32(8500), aSliceSize.Height); - CPPUNIT_ASSERT_GREATER(sal_Int32(8500), aSliceSize.Width); + CPPUNIT_ASSERT_DOUBLES_EQUAL(8300.0, aSliceSize.Height, 10); + CPPUNIT_ASSERT_DOUBLES_EQUAL(8300.0, aSliceSize.Width, 10); } -void Chart2ImportTest2::testTdf122765() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf122765) { // The horizontal position of the slices was wrong. - load(u"/chart2/qa/extras/data/pptx/", "tdf122765.pptx"); + loadFromFile(u"pptx/tdf122765.pptx"); Reference<chart::XChartDocument> xChartDoc = getChartDocFromDrawImpress(0, 0); Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); 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()); @@ -433,28 +363,28 @@ void Chart2ImportTest2::testTdf122765() CPPUNIT_ASSERT_GREATER(sal_Int32(7000), aSlicePosition.X); } -void Chart2ImportTest2::testTdf123206CustomLabelField() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf123206CustomLabelField) { // File contains the deprecated "custom-label-field" attribute of the // "data-point" element. It should be interpreted and stored as a data point // property. - uno::Reference<chart2::XChartDocument> xChartDoc( - getChartDocFromImpress(u"/chart2/qa/extras/data/odp/", "tdf123206.odp"), - uno::UNO_QUERY_THROW); + loadFromFile(u"odp/tdf123206.odp"); + uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), + uno::UNO_QUERY_THROW); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XDataSeries> xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); 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()); } -void Chart2ImportTest2::testTdf125444PercentageCustomLabel() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf125444PercentageCustomLabel) { - load(u"/chart2/qa/extras/data/pptx/", "tdf125444.pptx"); + loadFromFile(u"pptx/tdf125444.pptx"); // 1st chart Reference<chart2::XChartDocument> xChartDoc(getChartDocFromDrawImpress(0, 0), uno::UNO_QUERY); @@ -464,7 +394,7 @@ void 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()); @@ -472,11 +402,11 @@ void Chart2ImportTest2::testTdf125444PercentageCustomLabel() aLabelFields[2]->getFieldType()); } -void Chart2ImportTest2::testDataPointLabelCustomPos() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testDataPointLabelCustomPos) { // test CustomLabelPosition on Bar chart - load(u"/chart2/qa/extras/data/xlsx/", "testDataPointLabelCustomPos.xlsx"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/testDataPointLabelCustomPos.xlsx"); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); @@ -486,20 +416,20 @@ void Chart2ImportTest2::testDataPointLabelCustomPos() CPPUNIT_ASSERT(xPropertySet.is()); chart2::RelativePosition aCustomLabelPosition; - xPropertySet->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition; - CPPUNIT_ASSERT_DOUBLES_EQUAL(aCustomLabelPosition.Primary, -0.14621409921671025, 1e-7); - CPPUNIT_ASSERT_DOUBLES_EQUAL(aCustomLabelPosition.Secondary, -5.2887961029923464E-2, 1e-7); + 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); } -void Chart2ImportTest2::testTdf130032() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf130032) { // test CustomLabelPosition on Line chart - load(u"/chart2/qa/extras/data/xlsx/", "testTdf130032.xlsx"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/testTdf130032.xlsx"); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); @@ -509,20 +439,20 @@ void Chart2ImportTest2::testTdf130032() CPPUNIT_ASSERT(xPropertySet.is()); chart2::RelativePosition aCustomLabelPosition; - xPropertySet->getPropertyValue("CustomLabelPosition") >>= aCustomLabelPosition; - CPPUNIT_ASSERT_DOUBLES_EQUAL(aCustomLabelPosition.Primary, -0.0438333333333334, 1e-7); - CPPUNIT_ASSERT_DOUBLES_EQUAL(aCustomLabelPosition.Secondary, 0.086794050743657, 1e-7); + 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); } -void Chart2ImportTest2::testTdf134978() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf134978) { // test CustomLabelPosition on Pie chart - load(u"/chart2/qa/extras/data/xlsx/", "tdf134978.xlsx"); - uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/tdf134978.xlsx"); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT(xChartDoc.is()); uno::Reference<chart2::XDataSeries> xDataSeries(getDataSeriesFromDoc(xChartDoc, 0)); CPPUNIT_ASSERT(xDataSeries.is()); @@ -532,15 +462,15 @@ void 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); } -void Chart2ImportTest2::testTdf119138MissingAutoTitleDeleted() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf119138MissingAutoTitleDeleted) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf119138-missing-autotitledeleted.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/tdf119138-missing-autotitledeleted.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW); @@ -549,9 +479,9 @@ void Chart2ImportTest2::testTdf119138MissingAutoTitleDeleted() "Missing autoTitleDeleted is implied to be True if title text is present", xTitle.is()); } -void Chart2ImportTest2::testStockChartShiftedCategoryPosition() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testStockChartShiftedCategoryPosition) { - load(u"/chart2/qa/extras/data/odt/", "stock_chart_LO_6_2.odt"); + loadFromFile(u"odt/stock_chart_LO_6_2.odt"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); @@ -564,50 +494,48 @@ void Chart2ImportTest2::testStockChartShiftedCategoryPosition() CPPUNIT_ASSERT(aScaleData.ShiftedCategoryPosition); } -void Chart2ImportTest2::testTdf133376() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf133376) { // FIXME: the DPI check should be removed when either (1) the test is fixed to work with // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. if (!IsDefaultDPI()) return; - load(u"/chart2/qa/extras/data/xlsx/", "tdf133376.xlsx"); - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"xlsx/tdf133376.xlsx"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); 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> 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()); // Check the position of the 3rd data point label, which is out from the pie slice awt::Point aLabelPosition = xDataPointLabel->getPosition(); - CPPUNIT_ASSERT_DOUBLES_EQUAL(1082, aLabelPosition.X, 30); - CPPUNIT_ASSERT_DOUBLES_EQUAL(5462, aLabelPosition.Y, 30); + CPPUNIT_ASSERT_DOUBLES_EQUAL(1624, aLabelPosition.X, 30); + CPPUNIT_ASSERT_DOUBLES_EQUAL(5635, aLabelPosition.Y, 30); } -void Chart2ImportTest2::testTdf134225() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf134225) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf134225.xlsx"); - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"xlsx/tdf134225.xlsx"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); 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> 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()); @@ -617,30 +545,29 @@ void Chart2ImportTest2::testTdf134225() awt::Point aLabelPosition2 = xDataPointLabel2->getPosition(); // Check the distance between the position of the 1st data point label and the second one - CPPUNIT_ASSERT_DOUBLES_EQUAL(1669, sal_Int32(aLabelPosition2.X - aLabelPosition1.X), 30); - CPPUNIT_ASSERT_DOUBLES_EQUAL(2166, sal_Int32(aLabelPosition2.Y - aLabelPosition1.Y), 30); + CPPUNIT_ASSERT_DOUBLES_EQUAL(1493, sal_Int32(aLabelPosition2.X - aLabelPosition1.X), 30); + CPPUNIT_ASSERT_DOUBLES_EQUAL(2015, sal_Int32(aLabelPosition2.Y - aLabelPosition1.Y), 30); #endif } -void Chart2ImportTest2::testTdf136105() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf136105) { // FIXME: the DPI check should be removed when either (1) the test is fixed to work with // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. if (!IsDefaultDPI()) return; - load(u"/chart2/qa/extras/data/xlsx/", "tdf136105.xlsx"); + loadFromFile(u"xlsx/tdf136105.xlsx"); // 1st chart with fix inner position and size { - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), - UNO_QUERY_THROW); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); 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> 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()); @@ -651,28 +578,27 @@ void Chart2ImportTest2::testTdf136105() } // 2nd chart with auto inner position and size { - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(1, mxComponent), - UNO_QUERY_THROW); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(1), UNO_QUERY_THROW); 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> 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()); // Check the position of the 1st data point label, which is out from the pie slice awt::Point aLabelPosition = xDataPointLabel->getPosition(); CPPUNIT_ASSERT_DOUBLES_EQUAL(7978, aLabelPosition.X, 500); - CPPUNIT_ASSERT_DOUBLES_EQUAL(1048, aLabelPosition.Y, 500); + CPPUNIT_ASSERT_DOUBLES_EQUAL(1550, aLabelPosition.Y, 500); } } -void Chart2ImportTest2::testTdf91250() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf91250) { - load(u"/chart2/qa/extras/data/docx/", "tdf91250.docx"); + loadFromFile(u"docx/tdf91250.docx"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XInternalDataProvider> xInternalProvider(xChartDoc->getDataProvider(), @@ -685,16 +611,16 @@ void 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]); } -void Chart2ImportTest2::testTdf134111() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf134111) { // tdf134111 : To check TextBreak value is true - load(u"/chart2/qa/extras/data/docx/", "tdf134111.docx"); + loadFromFile(u"docx/tdf134111.docx"); uno::Reference<chart::XChartDocument> xChartDoc = getChartDocFromWriter(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); uno::Reference<chart::XDiagram> mxDiagram(xChartDoc->getDiagram()); @@ -703,23 +629,22 @@ void 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); } -void Chart2ImportTest2::testTdf136752() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf136752) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf136752.xlsx"); - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"xlsx/tdf136752.xlsx"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); 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> 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()); @@ -729,11 +654,10 @@ void Chart2ImportTest2::testTdf136752() CPPUNIT_ASSERT_DOUBLES_EQUAL(1458, aLabelPosition.Y, 500); } -void Chart2ImportTest2::testTdf137505() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf137505) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf137505.xlsx"); - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"xlsx/tdf137505.xlsx"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); @@ -745,20 +669,20 @@ void 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); } -void Chart2ImportTest2::testTdf137734() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf137734) { - load(u"/chart2/qa/extras/data/xlsx/", "tdf137734.xlsx"); - Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0, mxComponent); + loadFromFile(u"xlsx/tdf137734.xlsx"); + Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); CPPUNIT_ASSERT(xChartDoc.is()); 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); @@ -770,29 +694,55 @@ void 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); } -void Chart2ImportTest2::testTdf137874() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf137874) { - load(u"/chart2/qa/extras/data/xlsx/", "piechart_legend.xlsx"); - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"xlsx/piechart_legend.xlsx"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); 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> 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()); } -void Chart2ImportTest2::testTdfCustomShapePos() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf146463) { - load(u"/chart2/qa/extras/data/docx/", "testcustomshapepos.docx"); + loadFromFile(u"ods/tdf146463.ods"); + Reference<chart2::XChartDocument> xChartDoc(getChartDocFromSheet(0)); + 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<chart2::XChartType> xChartType = getChartTypeFromDoc(xChartDoc, 0); + std::vector<std::vector<double>> aDataSeriesYValues + = getDataSeriesYValuesFromChartType(xChartType); + size_t nLegendEntryCount = aDataSeriesYValues.size(); + CPPUNIT_ASSERT_EQUAL(size_t(14), nLegendEntryCount); + + for (size_t nSeriesIndex = 0; nSeriesIndex < nLegendEntryCount; ++nSeriesIndex) + { + uno::Reference<drawing::XShape> xLegendEntry + = getShapeByName(xShapes, "CID/MultiClick/D=0:CS=0:CT=0:Series=" + + OUString::number(nSeriesIndex) + ":LegendEntry=0"); + if (nSeriesIndex == 0) + CPPUNIT_ASSERT_MESSAGE("Legend 0 is not visible", xLegendEntry.is()); + else + CPPUNIT_ASSERT_MESSAGE( + OString("Legend " + OString::number(nSeriesIndex) + " is visible").getStr(), + !xLegendEntry.is()); + } +} + +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdfCustomShapePos) +{ + loadFromFile(u"docx/testcustomshapepos.docx"); Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), UNO_QUERY_THROW); Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); Reference<drawing::XDrawPage> xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); @@ -818,17 +768,16 @@ void Chart2ImportTest2::testTdfCustomShapePos() } } -void Chart2ImportTest2::testTdf121281() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf121281) { - load(u"/chart2/qa/extras/data/xlsx/", "incorrect_label_position.xlsx"); - Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0, mxComponent), - UNO_QUERY_THROW); + loadFromFile(u"xlsx/incorrect_label_position.xlsx"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); 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> 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()); @@ -837,9 +786,9 @@ void Chart2ImportTest2::testTdf121281() CPPUNIT_ASSERT_GREATEREQUAL(static_cast<sal_Int32>(0), aLabelPosition.Y); } -void Chart2ImportTest2::testTdf139658() +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf139658) { - load(u"/chart2/qa/extras/data/docx/", "tdf139658.docx"); + loadFromFile(u"docx/tdf139658.docx"); uno::Reference<chart2::XChartDocument> xChartDoc(getChartDocFromWriter(0), uno::UNO_QUERY); CPPUNIT_ASSERT(xChartDoc.is()); Reference<chart2::XInternalDataProvider> xInternalProvider(xChartDoc->getDataProvider(), @@ -852,12 +801,162 @@ void 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) +{ + loadFromFile(u"ods/tdf146066.ods"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(xChartDoc, uno::UNO_QUERY); + uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); + uno::Reference<drawing::XShapes> xShapes(xDrawPage->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT(xShapes.is()); + + 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 { + uno::Reference<drawing::XShapes> xAxisShapes(rXShape, uno::UNO_QUERY); + CPPUNIT_ASSERT(xAxisShapes.is()); + uno::Reference<drawing::XShape> xChildShape(xAxisShapes->getByIndex(0), uno::UNO_QUERY); + uno::Reference<drawing::XShapeDescriptor> xShapeDescriptor(xChildShape, + uno::UNO_QUERY_THROW); + return (xShapeDescriptor->getShapeType() == "com.sun.star.drawing.TextShape"); + }); + CPPUNIT_ASSERT(xYAxisShape.is()); + + // Check label count + uno::Reference<container::XIndexAccess> xIndexAccess(xYAxisShape, UNO_QUERY_THROW); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(8), xIndexAccess->getCount()); + + // Check text + uno::Reference<text::XTextRange> xLabel0(xIndexAccess->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(u"0"_ustr, xLabel0->getString()); + uno::Reference<text::XTextRange> xLabel1(xIndexAccess->getByIndex(1), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(u"5"_ustr, xLabel1->getString()); + uno::Reference<text::XTextRange> xLabel2(xIndexAccess->getByIndex(2), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(u"10"_ustr, xLabel2->getString()); + uno::Reference<text::XTextRange> xLabel3(xIndexAccess->getByIndex(3), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(u"15"_ustr, xLabel3->getString()); + uno::Reference<text::XTextRange> xLabel4(xIndexAccess->getByIndex(4), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(u"20"_ustr, xLabel4->getString()); + uno::Reference<text::XTextRange> xLabel5(xIndexAccess->getByIndex(5), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(u"25"_ustr, xLabel5->getString()); + uno::Reference<text::XTextRange> xLabel6(xIndexAccess->getByIndex(6), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(u"30"_ustr, xLabel6->getString()); + uno::Reference<text::XTextRange> xLabel7(xIndexAccess->getByIndex(7), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(u"35"_ustr, xLabel7->getString()); +} + +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf150434) +{ + loadFromFile(u"xlsx/tdf150434.xlsx"); + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); + 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, u"CID/D=0:Legend="_ustr); + CPPUNIT_ASSERT(xLegend.is()); + awt::Point aPosition = xLegend->getPosition(); + + // This failed, if the legend flowed out of the chart area. + CPPUNIT_ASSERT_GREATEREQUAL(static_cast<sal_Int32>(0), aPosition.Y); } -CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest2); +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testChartDataTableWithMultipleLegendEntriesForOneDataSeries) +{ + loadFromFile(u"xlsx/DataTable-MultipleLegendEntriesForOneDataSeries.xlsx"); + // Loading this file caused a crash in the data table code + + Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0), UNO_QUERY_THROW); + 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, u"CID/D=0:DataTable="_ustr); + CPPUNIT_ASSERT(xDataTableShape.is()); +} + +namespace +{ +void lcl_assertAngles(const Reference<chart2::XAxis>& rAxis, const double& rExpectedLabelAngle, + const double& rExpectedTitleAngle) +{ + Reference<beans::XPropertySet> xPS(rAxis, uno::UNO_QUERY_THROW); + double fAxisLabelAngle = 0.0; + xPS->getPropertyValue(u"TextRotation"_ustr) >>= fAxisLabelAngle; + CPPUNIT_ASSERT_DOUBLES_EQUAL(rExpectedLabelAngle, fAxisLabelAngle, 1e-10); + + Reference<chart2::XTitled> xAxisTitled(rAxis, uno::UNO_QUERY_THROW); + Reference<chart2::XTitle> xAxisTitle = xAxisTitled->getTitleObject(); + CPPUNIT_ASSERT(xAxisTitle.is()); + Reference<beans::XPropertySet> xPropSet(xAxisTitle, uno::UNO_QUERY_THROW); + double fAxisTitleAngle = 0.0; + xPropSet->getPropertyValue(u"TextRotation"_ustr) >>= fAxisTitleAngle; + CPPUNIT_ASSERT_DOUBLES_EQUAL(rExpectedTitleAngle, fAxisTitleAngle, 1e-10); +} +} // end namespace + +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testAngleUnits) +{ + loadFromFile(u"fods/tdf161483_AngleUnits.fods"); + double fExpXAxisLabelAngle = 344.61; // = 382.9grad = 6.01457913529766rad + double fExpXAxisTitleAngle = 342.63; // = 380.7grad = 5.98002161610817rad + double fExpYAxisLabelAngle = 15.12; // = 16.8grad = 0.263893782901543rad + double fExpYAxisTitleAngle = 14.94; // = 16.6grad = 0.260752190247953rad + double fExpZAxisLabelAngle = 344.16; // = 382.4grad = 6.00672515366369rad + double fExpZAxisTitleAngle = 60.39; // = 67.1grad = 1.05400433527938rad + + // sheet 0: no unit; sheet 1: unit deg; sheet 2: unit rad; sheet 3: unit grad + // Without fix, the values with unit grad and rad were read as if they are in degrees. + for (size_t i = 0; i < 4; i++) + { + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(i); + CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is()); + + // x-axis + Reference<chart2::XAxis> xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0); + CPPUNIT_ASSERT(xAxis.is()); + lcl_assertAngles(xAxis, fExpXAxisLabelAngle, fExpXAxisTitleAngle); + + // y-axis + xAxis = getAxisFromDoc(xChartDoc, 0, 1, 0); + CPPUNIT_ASSERT(xAxis.is()); + lcl_assertAngles(xAxis, fExpYAxisLabelAngle, fExpYAxisTitleAngle); + + //z-axis + xAxis = getAxisFromDoc(xChartDoc, 0, 2, 0); + CPPUNIT_ASSERT(xAxis.is()); + lcl_assertAngles(xAxis, fExpZAxisLabelAngle, fExpZAxisTitleAngle); + } +} + +CPPUNIT_TEST_FIXTURE(Chart2ImportTest2, testTdf166428) +{ + // The file was generated in ODF 1.3 by LO 24.8 + loadFromFile(u"ods/tdf166428_Low_High_StockChart_LO248.ods"); + + // The attribute table:cell-range-address does not exist in ODF 1.4. and therefore may not be + // be written. + saveAndReload(u"calc8"_ustr); + xmlDocUniquePtr pXmlDoc = parseExport(u"Object 1/content.xml"_ustr); + assertXPathNoAttribute(pXmlDoc, + "/office:document-content/office:body/office:chart/chart:chart/" + "chart:plot-area", + "table:cell-range-address"); + + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0); + CPPUNIT_ASSERT(xChartDoc.is()); + + // Without applied fix, the series were not merged to one stock chart series and therefore + // only role "values-y" existed. + Reference<chart2::data::XDataSequence> xDataSeq + = getDataSequenceFromDocByRole(xChartDoc, u"values-min"); + CPPUNIT_ASSERT(xDataSeq.is()); +} CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx index 02ad9675d930..696e3c7ab164 100644 --- a/chart2/qa/extras/charttest.hxx +++ b/chart2/qa/extras/charttest.hxx @@ -9,15 +9,10 @@ #pragma once -#include <test/bootstrapfixture.hxx> -#include <test/xmltesttools.hxx> -#include <unotest/macros_test.hxx> +#include <test/unoapixml_test.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/frame/Desktop.hpp> - #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNamed.hpp> @@ -28,10 +23,8 @@ #include <com/sun/star/document/XEmbeddedObjectSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/packages/zip/ZipFileAccess.hpp> #include <o3tl/string_view.hxx> -#include <unotools/tempfile.hxx> #include <rtl/math.hxx> #include <svx/charthelper.hxx> @@ -59,182 +52,70 @@ #include <unonames.hxx> -#include <iostream> -#include <memory> -#include <string_view> - #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XVisualObject.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> -#include <unotools/ucbstreamhelper.hxx> - using namespace css; using namespace css::uno; -namespace com::sun::star::chart2 { class XDataSeries; } -namespace com::sun::star::chart2 { class XDiagram; } -namespace com::sun::star::table { class XTableCharts; } -namespace com::sun::star::table { class XTablePivotCharts; } - -namespace { - -struct CheckForChartName +class ChartTest : public UnoApiXmlTest { -private: - OUString aDir; - public: - explicit CheckForChartName( const OUString& rDir ): - aDir(rDir) {} - - bool operator()(std::u16string_view rName) + ChartTest(const OUString& path) + : UnoApiXmlTest(path) { - if(!o3tl::starts_with(rName, aDir)) - return false; - - if(!o3tl::ends_with(rName, u".xml")) - return false; - - return true; } -}; -OUString findChartFile(const OUString& rDir, uno::Reference< container::XNameAccess > const & xNames ) -{ - const uno::Sequence<OUString> aNames = xNames->getElementNames(); - const OUString* pElement = std::find_if(aNames.begin(), aNames.end(), CheckForChartName(rDir)); - - CPPUNIT_ASSERT(pElement != aNames.end()); - return *pElement; -} -} - -class ChartTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools -{ -public: - ChartTest():mbSkipValidation(false) {} - void load( std::u16string_view rDir, const OUString& rFileName ); - std::shared_ptr<utl::TempFile> save( const OUString& rFileName ); - std::shared_ptr<utl::TempFile> reload( const OUString& rFileName ); - uno::Sequence < OUString > getImpressChartColumnDescriptions( std::u16string_view pDir, const char* pName ); - OUString getFileExtension( const OUString& rFileName ); - - uno::Reference< chart::XChartDocument > getChartDocFromImpress( std::u16string_view pDir, const char* pName ); - - uno::Reference<chart::XChartDocument> getChartDocFromDrawImpress( sal_Int32 nPage, sal_Int32 nShape ); - - uno::Reference<chart::XChartDocument> getChartDocFromWriter( sal_Int32 nShape ); - Sequence< OUString > getFormattedDateCategories( const Reference<chart2::XChartDocument>& xChartDoc ); - awt::Size getPageSize( const Reference< chart2::XChartDocument > & xChartDoc ); - awt::Size getSize(css::uno::Reference<chart2::XDiagram> xDiagram, const awt::Size& rPageSize); - - virtual void setUp() override; - virtual void tearDown() override; - -protected: - Reference< lang::XComponent > mxComponent; - OUString maServiceName; - bool mbSkipValidation; // if you set this flag for a new test I'm going to haunt you! - - /** - * Given that some problem doesn't affect the result in the importer, we - * test the resulting file directly, by opening the zip file, parsing an - * xml stream, and asserting an XPath expression. This method returns the - * xml stream, so that you can do the asserting. - */ - xmlDocUniquePtr parseExport(const OUString& rDir, const OUString& rFilterFormat); + Reference<lang::XComponent> getChartCompFromSheet(sal_Int32 nSheet, sal_Int32 nChart); + Reference<chart2::XChartDocument> getChartDocFromSheet(sal_Int32 nSheet); + uno::Reference<table::XTablePivotCharts> getTablePivotChartsFromSheet(sal_Int32 nSheet); + Reference<chart2::XChartDocument> getPivotChartDocFromSheet(sal_Int32 nSheet); + uno::Reference<chart2::XChartDocument> + getPivotChartDocFromSheet(uno::Reference<table::XTablePivotCharts> const& xTablePivotCharts, + sal_Int32 nIndex); + Reference<chart2::XChartType> + getChartTypeFromDoc(Reference<chart2::XChartDocument> const& xChartDoc, sal_Int32 nChartType, + sal_Int32 nCooSys = 0); + Reference<chart2::XAxis> getAxisFromDoc(const Reference<chart2::XChartDocument>& xChartDoc, + sal_Int32 nCooSys, sal_Int32 nAxisDim, + sal_Int32 nAxisIndex); + sal_Int32 getNumberOfDataSeries(uno::Reference<chart2::XChartDocument> const& xChartDoc, + sal_Int32 nChartType = 0, sal_Int32 nCooSys = 0); + Reference<chart2::XDataSeries> + getDataSeriesFromDoc(uno::Reference<chart2::XChartDocument> const& xChartDoc, + sal_Int32 nDataSeries, sal_Int32 nChartType = 0, sal_Int32 nCooSys = 0); + Reference<chart2::data::XDataSequence> + getLabelDataSequenceFromDoc(Reference<chart2::XChartDocument> const& xChartDoc, + sal_Int32 nDataSeries = 0, sal_Int32 nChartType = 0); + Reference<chart2::data::XDataSequence> + getDataSequenceFromDocByRole(Reference<chart2::XChartDocument> const& xChartDoc, + std::u16string_view rRole, sal_Int32 nDataSeries = 0, + sal_Int32 nChartType = 0); + uno::Sequence<OUString> getWriterChartColumnDescriptions(); + std::vector<std::vector<double>> + getDataSeriesYValuesFromChartType(const Reference<chart2::XChartType>& xCT); + std::vector<uno::Sequence<uno::Any>> + getDataSeriesLabelsFromChartType(const Reference<chart2::XChartType>& xCT); + uno::Reference<chart::XChartDocument> getChartDocFromDrawImpress(sal_Int32 nPage, + sal_Int32 nShape); + uno::Reference<chart::XChartDocument> getChartDocFromWriter(sal_Int32 nShape); + OUString getTitleString(const Reference<chart2::XTitled>& xTitled); + sal_Int32 getNumberFormatFromAxis(const Reference<chart2::XAxis>& xAxis); + sal_Int16 getNumberFormatType(const Reference<chart2::XChartDocument>& xChartDoc, + sal_Int32 nNumberFormat); + uno::Reference<drawing::XShape> + getShapeByName(const uno::Reference<drawing::XShapes>& rShapes, const OUString& rName, + const std::function<bool(const uno::Reference<drawing::XShape>&)>& pCondition + = nullptr); }; -OUString ChartTest::getFileExtension( const OUString& aFileName ) -{ - sal_Int32 nDotLocation = aFileName.lastIndexOf('.'); - CPPUNIT_ASSERT(nDotLocation != -1); - return aFileName.copy(nDotLocation+1); // Skip the dot. -} - -void ChartTest::load( std::u16string_view aDir, const OUString& aName ) -{ - OUString extension = getFileExtension(aName); - if (extension == "ods" || extension == "xlsx" || extension == "fods") - { - maServiceName = "com.sun.star.sheet.SpreadsheetDocument"; - } - else if (extension == "docx") - { - maServiceName = "com.sun.star.text.TextDocument"; - } - else if (extension == "odg") - { - maServiceName = "com.sun.star.drawing.DrawingDocument"; - } - if (mxComponent.is()) - mxComponent->dispose(); - mxComponent = loadFromDesktop(m_directories.getURLFromSrc(aDir) + aName, maServiceName); -} - -std::shared_ptr<utl::TempFile> ChartTest::save(const OUString& rFilterName) -{ - uno::Reference<frame::XStorable> xStorable(mxComponent, uno::UNO_QUERY); - auto aArgs(::comphelper::InitPropertySequence({ - { "FilterName", Any(rFilterName) } - })); - std::shared_ptr<utl::TempFile> pTempFile = std::make_shared<utl::TempFile>(); - pTempFile->EnableKillingFile(); - xStorable->storeToURL(pTempFile->GetURL(), aArgs); - - return pTempFile; -} - -std::shared_ptr<utl::TempFile> ChartTest::reload(const OUString& rFilterName) -{ - std::shared_ptr<utl::TempFile> pTempFile = save(rFilterName); - mxComponent->dispose(); - mxComponent = loadFromDesktop(pTempFile->GetURL(), maServiceName); - std::cout << pTempFile->GetURL(); - if(rFilterName == "Calc Office Open XML") - { - validate(pTempFile->GetFileName(), test::OOXML); - } - else if(rFilterName == "Office Open XML Text") - { - // validate(pTempFile->GetFileName(), test::OOXML); - } - else if(rFilterName == "calc8") - { - if(!mbSkipValidation) - validate(pTempFile->GetFileName(), test::ODF); - } - else if(rFilterName == "MS Excel 97") - { - if(!mbSkipValidation) - validate(pTempFile->GetFileName(), test::MSBINARY); - } - return pTempFile; -} - -void ChartTest::setUp() -{ - test::BootstrapFixture::setUp(); - - mxDesktop.set( css::frame::Desktop::create( comphelper::getComponentContext(getMultiServiceFactory()) ) ); -} - -void ChartTest::tearDown() -{ - if(mxComponent.is()) - mxComponent->dispose(); - - test::BootstrapFixture::tearDown(); - -} - -Reference< lang::XComponent > getChartCompFromSheet( sal_Int32 nSheet, uno::Reference< lang::XComponent > const & xComponent ) +Reference< lang::XComponent > ChartTest::getChartCompFromSheet( sal_Int32 nSheet, sal_Int32 nChart ) { // let us assume that we only have one chart per sheet - uno::Reference< sheet::XSpreadsheetDocument > xDoc(xComponent, UNO_QUERY_THROW); + uno::Reference< sheet::XSpreadsheetDocument > xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference< container::XIndexAccess > xIA(xDoc->getSheets(), UNO_QUERY_THROW); @@ -244,7 +125,7 @@ Reference< lang::XComponent > getChartCompFromSheet( sal_Int32 nSheet, uno::Refe CPPUNIT_ASSERT(xCharts.is()); uno::Reference< container::XIndexAccess > xIACharts(xCharts, UNO_QUERY_THROW); - uno::Reference< table::XTableChart > xChart( xIACharts->getByIndex(0), UNO_QUERY_THROW); + uno::Reference< table::XTableChart > xChart( xIACharts->getByIndex(nChart), UNO_QUERY_THROW); uno::Reference< document::XEmbeddedObjectSupplier > xEmbObjectSupplier(xChart, UNO_QUERY_THROW); @@ -254,9 +135,9 @@ Reference< lang::XComponent > getChartCompFromSheet( sal_Int32 nSheet, uno::Refe } -Reference< chart2::XChartDocument > getChartDocFromSheet( sal_Int32 nSheet, uno::Reference< lang::XComponent > const & xComponent ) +Reference< chart2::XChartDocument > ChartTest::getChartDocFromSheet( sal_Int32 nSheet ) { - uno::Reference< chart2::XChartDocument > xChartDoc ( getChartCompFromSheet(nSheet, xComponent), UNO_QUERY_THROW ); + uno::Reference< chart2::XChartDocument > xChartDoc ( getChartCompFromSheet(nSheet, 0), UNO_QUERY_THROW ); // Update the chart view, so that its draw page is updated and ready for the test css::uno::Reference<css::frame::XModel> xModel(xChartDoc, css::uno::UNO_QUERY_THROW); @@ -265,9 +146,9 @@ Reference< chart2::XChartDocument > getChartDocFromSheet( sal_Int32 nSheet, uno: return xChartDoc; } -uno::Reference<table::XTablePivotCharts> getTablePivotChartsFromSheet(sal_Int32 nSheet, uno::Reference<lang::XComponent> const & xComponent) +uno::Reference<table::XTablePivotCharts> ChartTest::getTablePivotChartsFromSheet(sal_Int32 nSheet) { - uno::Reference<sheet::XSpreadsheetDocument> xDoc(xComponent, UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW); uno::Reference<container::XIndexAccess> xIA(xDoc->getSheets(), UNO_QUERY_THROW); @@ -279,9 +160,9 @@ uno::Reference<table::XTablePivotCharts> getTablePivotChartsFromSheet(sal_Int32 return xTablePivotCharts; } -Reference<lang::XComponent> getPivotChartCompFromSheet(sal_Int32 nSheet, uno::Reference<lang::XComponent> const & xComponent) +Reference<chart2::XChartDocument> ChartTest::getPivotChartDocFromSheet(sal_Int32 nSheet) { - uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(nSheet, xComponent); + uno::Reference<table::XTablePivotCharts> xTablePivotCharts = getTablePivotChartsFromSheet(nSheet); uno::Reference<container::XIndexAccess> xIACharts(xTablePivotCharts, UNO_QUERY_THROW); uno::Reference<table::XTablePivotChart> xTablePivotChart(xIACharts->getByIndex(0), UNO_QUERY_THROW); @@ -289,17 +170,11 @@ Reference<lang::XComponent> getPivotChartCompFromSheet(sal_Int32 nSheet, uno::Re uno::Reference<document::XEmbeddedObjectSupplier> xEmbObjectSupplier(xTablePivotChart, UNO_QUERY_THROW); uno::Reference<lang::XComponent> xChartComp(xEmbObjectSupplier->getEmbeddedObject(), UNO_SET_THROW); - - return xChartComp; -} - -Reference<chart2::XChartDocument> getPivotChartDocFromSheet(sal_Int32 nSheet, uno::Reference<lang::XComponent> const & xComponent) -{ - uno::Reference<chart2::XChartDocument> xChartDoc(getPivotChartCompFromSheet(nSheet, xComponent), UNO_QUERY_THROW); + uno::Reference<chart2::XChartDocument> xChartDoc(xChartComp, UNO_QUERY_THROW); return xChartDoc; } -Reference<chart2::XChartDocument> getPivotChartDocFromSheet(uno::Reference<table::XTablePivotCharts> const & xTablePivotCharts, sal_Int32 nIndex) +Reference<chart2::XChartDocument> ChartTest::getPivotChartDocFromSheet(uno::Reference<table::XTablePivotCharts> const & xTablePivotCharts, sal_Int32 nIndex) { uno::Reference<container::XIndexAccess> xIACharts(xTablePivotCharts, UNO_QUERY_THROW); uno::Reference<table::XTablePivotChart> xTablePivotChart(xIACharts->getByIndex(nIndex), UNO_QUERY_THROW); @@ -312,8 +187,8 @@ Reference<chart2::XChartDocument> getPivotChartDocFromSheet(uno::Reference<table return xChartDoc; } -Reference< chart2::XChartType > getChartTypeFromDoc( Reference< chart2::XChartDocument > const & xChartDoc, - sal_Int32 nChartType, sal_Int32 nCooSys = 0 ) +Reference< chart2::XChartType > ChartTest::getChartTypeFromDoc( Reference< chart2::XChartDocument > const & xChartDoc, + sal_Int32 nChartType, sal_Int32 nCooSys ) { CPPUNIT_ASSERT( xChartDoc.is() ); @@ -333,7 +208,7 @@ Reference< chart2::XChartType > getChartTypeFromDoc( Reference< chart2::XChartDo return xChartTypeSequence[nChartType]; } -Reference<chart2::XAxis> getAxisFromDoc( +Reference<chart2::XAxis> ChartTest::getAxisFromDoc( const Reference<chart2::XChartDocument>& xChartDoc, sal_Int32 nCooSys, sal_Int32 nAxisDim, sal_Int32 nAxisIndex ) { Reference<chart2::XDiagram> xDiagram = xChartDoc->getFirstDiagram(); @@ -353,8 +228,8 @@ Reference<chart2::XAxis> getAxisFromDoc( return xAxis; } -sal_Int32 getNumberOfDataSeries(uno::Reference<chart2::XChartDocument> const & xChartDoc, - sal_Int32 nChartType = 0, sal_Int32 nCooSys = 0) +sal_Int32 ChartTest::getNumberOfDataSeries(uno::Reference<chart2::XChartDocument> const & xChartDoc, + sal_Int32 nChartType, sal_Int32 nCooSys) { Reference<chart2::XChartType> xChartType = getChartTypeFromDoc(xChartDoc, nChartType, nCooSys); Reference<chart2::XDataSeriesContainer> xDataSeriesContainer(xChartType, UNO_QUERY_THROW); @@ -363,9 +238,9 @@ sal_Int32 getNumberOfDataSeries(uno::Reference<chart2::XChartDocument> const & x return xSeriesSequence.getLength(); } -Reference< chart2::XDataSeries > getDataSeriesFromDoc(uno::Reference<chart2::XChartDocument> const & xChartDoc, - sal_Int32 nDataSeries, sal_Int32 nChartType = 0, - sal_Int32 nCooSys = 0) +Reference< chart2::XDataSeries > ChartTest::getDataSeriesFromDoc(uno::Reference<chart2::XChartDocument> const & xChartDoc, + sal_Int32 nDataSeries, sal_Int32 nChartType, + sal_Int32 nCooSys) { Reference< chart2::XChartType > xChartType = getChartTypeFromDoc( xChartDoc, nChartType, nCooSys ); Reference< chart2::XDataSeriesContainer > xDataSeriesContainer( xChartType, UNO_QUERY_THROW ); @@ -378,9 +253,9 @@ Reference< chart2::XDataSeries > getDataSeriesFromDoc(uno::Reference<chart2::XCh return xSeries; } -Reference< chart2::data::XDataSequence > getLabelDataSequenceFromDoc( +Reference< chart2::data::XDataSequence > ChartTest::getLabelDataSequenceFromDoc( Reference< chart2::XChartDocument > const & xChartDoc, - sal_Int32 nDataSeries = 0, sal_Int32 nChartType = 0 ) + sal_Int32 nDataSeries, sal_Int32 nChartType ) { Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, nDataSeries, nChartType ); @@ -400,9 +275,9 @@ Reference< chart2::data::XDataSequence > getLabelDataSequenceFromDoc( CPPUNIT_FAIL("no Label sequence found"); } -Reference< chart2::data::XDataSequence > getDataSequenceFromDocByRole( +Reference< chart2::data::XDataSequence > ChartTest::getDataSequenceFromDocByRole( Reference< chart2::XChartDocument > const & xChartDoc, std::u16string_view rRole, - sal_Int32 nDataSeries = 0, sal_Int32 nChartType = 0 ) + sal_Int32 nDataSeries, sal_Int32 nChartType ) { Reference< chart2::XDataSeries > xDataSeries = getDataSeriesFromDoc( xChartDoc, nDataSeries, nChartType ); @@ -417,7 +292,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; @@ -426,7 +301,7 @@ Reference< chart2::data::XDataSequence > getDataSequenceFromDocByRole( return Reference< chart2::data::XDataSequence > (); } -uno::Sequence < OUString > getWriterChartColumnDescriptions( Reference< lang::XComponent > const & mxComponent ) +uno::Sequence < OUString > ChartTest::getWriterChartColumnDescriptions() { uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<drawing::XDrawPage> xDrawPage = xDrawPageSupplier->getDrawPage(); @@ -434,7 +309,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 ); @@ -442,7 +317,7 @@ uno::Sequence < OUString > getWriterChartColumnDescriptions( Reference< lang::XC return seriesList; } -std::vector<std::vector<double> > getDataSeriesYValuesFromChartType( const Reference<chart2::XChartType>& xCT ) +std::vector<std::vector<double> > ChartTest::getDataSeriesYValuesFromChartType( const Reference<chart2::XChartType>& xCT ) { Reference<chart2::XDataSeriesContainer> xDSCont(xCT, uno::UNO_QUERY); CPPUNIT_ASSERT(xDSCont.is()); @@ -463,7 +338,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(); @@ -485,7 +360,7 @@ std::vector<std::vector<double> > getDataSeriesYValuesFromChartType( const Refer return aRet; } -std::vector<uno::Sequence<uno::Any> > getDataSeriesLabelsFromChartType( const Reference<chart2::XChartType>& xCT ) +std::vector<uno::Sequence<uno::Any> > ChartTest::getDataSeriesLabelsFromChartType( const Reference<chart2::XChartType>& xCT ) { OUString aLabelRole = xCT->getRoleOfSequenceForSeriesLabel(); @@ -508,7 +383,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; @@ -524,23 +399,6 @@ std::vector<uno::Sequence<uno::Any> > getDataSeriesLabelsFromChartType( const Re return aRet; } -uno::Reference< chart::XChartDocument > ChartTest::getChartDocFromImpress( std::u16string_view pDir, const char* pName ) -{ - mxComponent = loadFromDesktop(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), "com.sun.star.comp.Draw.PresentationDocument"); - uno::Reference< drawing::XDrawPagesSupplier > xDoc(mxComponent, uno::UNO_QUERY_THROW ); - uno::Reference< drawing::XDrawPage > xPage( - xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW ); - uno::Reference< beans::XPropertySet > xShapeProps( - xPage->getByIndex(0), uno::UNO_QUERY ); - CPPUNIT_ASSERT(xShapeProps.is()); - uno::Reference< frame::XModel > xDocModel; - xShapeProps->getPropertyValue("Model") >>= xDocModel; - CPPUNIT_ASSERT(xDocModel.is()); - uno::Reference< chart::XChartDocument > xChartDoc( xDocModel, uno::UNO_QUERY_THROW ); - - return xChartDoc; -} - uno::Reference<chart::XChartDocument> ChartTest::getChartDocFromDrawImpress( sal_Int32 nPage, sal_Int32 nShape ) { @@ -558,7 +416,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; @@ -566,6 +424,7 @@ uno::Reference<chart::XChartDocument> ChartTest::getChartDocFromDrawImpress( return xChartDoc; } + uno::Reference<chart::XChartDocument> ChartTest::getChartDocFromWriter( sal_Int32 nShape ) { // DO NOT use XDrawPageSupplier since SwVirtFlyDrawObj are not created @@ -579,22 +438,14 @@ 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); return xChartDoc; } -uno::Sequence < OUString > ChartTest::getImpressChartColumnDescriptions( std::u16string_view pDir, const char* pName ) -{ - uno::Reference< chart::XChartDocument > xChartDoc = getChartDocFromImpress( pDir, pName ); - uno::Reference< chart::XChartDataArray > xChartData ( xChartDoc->getData(), uno::UNO_QUERY_THROW); - uno::Sequence < OUString > seriesList = xChartData->getColumnDescriptions(); - return seriesList; -} - -OUString getTitleString( const Reference<chart2::XTitled>& xTitled ) +OUString ChartTest::getTitleString( const Reference<chart2::XTitled>& xTitled ) { uno::Reference<chart2::XTitle> xTitle = xTitled->getTitleObject(); CPPUNIT_ASSERT(xTitle.is()); @@ -606,16 +457,7 @@ OUString getTitleString( const Reference<chart2::XTitled>& xTitled ) return aText; } -sal_Int32 getNumberFormat( const Reference<chart2::XChartDocument>& xChartDoc, const OUString& sFormat ) -{ - Reference<util::XNumberFormatsSupplier> xNFS(xChartDoc, uno::UNO_QUERY_THROW); - Reference<util::XNumberFormats> xNumberFormats = xNFS->getNumberFormats(); - CPPUNIT_ASSERT(xNumberFormats.is()); - - return xNumberFormats->queryKey(sFormat, css::lang::Locale(), false); -} - -sal_Int32 getNumberFormatFromAxis( const Reference<chart2::XAxis>& xAxis ) +sal_Int32 ChartTest::getNumberFormatFromAxis( const Reference<chart2::XAxis>& xAxis ) { Reference<beans::XPropertySet> xPS(xAxis, uno::UNO_QUERY); CPPUNIT_ASSERT(xPS.is()); @@ -626,7 +468,7 @@ sal_Int32 getNumberFormatFromAxis( const Reference<chart2::XAxis>& xAxis ) return nNumberFormat; } -sal_Int16 getNumberFormatType( const Reference<chart2::XChartDocument>& xChartDoc, sal_Int32 nNumberFormat ) +sal_Int16 ChartTest::getNumberFormatType( const Reference<chart2::XChartDocument>& xChartDoc, sal_Int32 nNumberFormat ) { Reference<util::XNumberFormatsSupplier> xNFS(xChartDoc, uno::UNO_QUERY_THROW); Reference<util::XNumberFormats> xNumberFormats = xNFS->getNumberFormats(); @@ -636,70 +478,14 @@ 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; } -Sequence< double > getDateCategories(const Reference<chart2::XChartDocument>& xChartDoc) -{ - CPPUNIT_ASSERT(xChartDoc->hasInternalDataProvider()); - uno::Reference< chart2::XInternalDataProvider > xDataProvider( xChartDoc->getDataProvider(), uno::UNO_QUERY_THROW ); - uno::Reference< chart::XDateCategories > xDateCategories( xDataProvider, uno::UNO_QUERY_THROW ); - CPPUNIT_ASSERT(xDateCategories.is()); - return xDateCategories->getDateCategories(); -} - -Sequence< OUString > ChartTest::getFormattedDateCategories( const Reference<chart2::XChartDocument>& xChartDoc ) -{ - Reference<util::XNumberFormatsSupplier> xNFS(xChartDoc, uno::UNO_QUERY_THROW); - Reference< util::XNumberFormatter > xNumFormatter( - util::NumberFormatter::create(comphelper::getComponentContext(m_xSFactory)), uno::UNO_QUERY_THROW ); - xNumFormatter->attachNumberFormatsSupplier(xNFS); - - Reference<chart2::XAxis> xAxisX = getAxisFromDoc(xChartDoc, 0, 0, 0); - chart2::ScaleData aScaleData = xAxisX->getScaleData(); - CPPUNIT_ASSERT_EQUAL(chart2::AxisType::DATE, aScaleData.AxisType); - - sal_Int32 nNumFmt = getNumberFormatFromAxis(xAxisX); - - Sequence<double> aDateSeq = getDateCategories(xChartDoc); - const sal_Int32 nNumCategories = aDateSeq.getLength(); - Sequence<OUString> aFormattedDates(nNumCategories); - auto aFormattedDatesRange = asNonConstRange(aFormattedDates); - - for (sal_Int32 nIdx = 0; nIdx < nNumCategories; ++nIdx) - aFormattedDatesRange[nIdx] = xNumFormatter->convertNumberToString(nNumFmt, aDateSeq[nIdx]); - - return aFormattedDates; -} - -awt::Size ChartTest::getPageSize( const Reference< chart2::XChartDocument > & xChartDoc ) -{ - awt::Size aSize( 0, 0 ); - uno::Reference< com::sun::star::embed::XVisualObject > xVisualObject( xChartDoc, uno::UNO_QUERY ); - CPPUNIT_ASSERT( xVisualObject.is() ); - aSize = xVisualObject->getVisualAreaSize( com::sun::star::embed::Aspects::MSOLE_CONTENT ); - return aSize; -} - -awt::Size ChartTest::getSize(css::uno::Reference<chart2::XDiagram> xDiagram, const awt::Size& rPageSize) -{ - Reference< beans::XPropertySet > xProp(xDiagram, uno::UNO_QUERY); - chart2::RelativeSize aRelativeSize; - xProp->getPropertyValue( "RelativeSize" ) >>= aRelativeSize; - double fX = aRelativeSize.Primary * rPageSize.Width; - double fY = aRelativeSize.Secondary * rPageSize.Height; - awt::Size aSize; - aSize.Width = static_cast< sal_Int32 >( ::rtl::math::round( fX ) ); - aSize.Height = static_cast< sal_Int32 >( ::rtl::math::round( fY ) ); - return aSize; -} - uno::Reference<drawing::XShape> -getShapeByName(const uno::Reference<drawing::XShapes>& rShapes, const OUString& rName, - const std::function<bool(const uno::Reference<drawing::XShape>&)>& pCondition - = nullptr) +ChartTest::getShapeByName(const uno::Reference<drawing::XShapes>& rShapes, const OUString& rName, + const std::function<bool(const uno::Reference<drawing::XShape>&)>& pCondition) { for (sal_Int32 i = 0; i < rShapes->getCount(); ++i) { @@ -721,17 +507,4 @@ getShapeByName(const uno::Reference<drawing::XShapes>& rShapes, const OUString& return uno::Reference<drawing::XShape>(); } -xmlDocUniquePtr ChartTest::parseExport(const OUString& rDir, const OUString& rFilterFormat) -{ - std::shared_ptr<utl::TempFile> pTempFile = save(rFilterFormat); - - // Read the XML stream we're interested in. - uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), pTempFile->GetURL()); - uno::Reference<io::XInputStream> xInputStream(xNameAccess->getByName(findChartFile(rDir, xNameAccess)), uno::UNO_QUERY); - CPPUNIT_ASSERT(xInputStream.is()); - std::unique_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); - - return parseXmlStream(pStream.get()); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/qa/extras/data/docx/TableOnPage3.docx b/chart2/qa/extras/data/docx/TableOnPage3.docx Binary files differnew file mode 100644 index 000000000000..79763bd35290 --- /dev/null +++ b/chart2/qa/extras/data/docx/TableOnPage3.docx diff --git a/chart2/qa/extras/data/fods/tdf161483_AngleUnits.fods b/chart2/qa/extras/data/fods/tdf161483_AngleUnits.fods new file mode 100644 index 000000000000..a71fb533165a --- /dev/null +++ b/chart2/qa/extras/data/fods/tdf161483_AngleUnits.fods @@ -0,0 +1,1851 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> + <office:meta> + <meta:generator>LODev_daily_installed/25.2.0.0.alpha0$Windows_X86_64 LibreOffice_project/aaf2967d74a9a7ba2d28433e1872422ce38b6244 + </meta:generator> + <dc:title>Metric</dc:title> + <meta:initial-creator>Regina Henschel</meta:initial-creator> + <meta:creation-date>2024-07-04T20:11:31</meta:creation-date> + <dc:creator>Regina Henschel</dc:creator> + <dc:date>2024-07-06T19:10:11</dc:date> + <meta:document-statistic meta:table-count="4" meta:object-count="4" meta:cell-count="100"/> + </office:meta> + <office:settings> + <config:config-item-set config:name="ooo:view-settings"> + <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item> + <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> + <config:config-item config:name="VisibleAreaWidth" config:type="int">27494</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">13002</config:config-item> + <config:config-item-map-indexed config:name="Views"> + <config:config-item-map-entry> + <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> + <config:config-item-map-named config:name="Tables"> + <config:config-item-map-entry config:name="deg"> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">0</config:config-item> + <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> + <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> + <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> + <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> + <config:config-item config:name="ZoomValue" config:type="int">80</config:config-item> + <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> + <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item> + <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item> + <config:config-item config:name="LegacySingleLineFontwork" config:type="boolean">false</config:config-item> + <config:config-item config:name="ConnectorUseSnapRect" config:type="boolean">false</config:config-item> + <config:config-item config:name="IgnoreBreakAfterMultilineField" config:type="boolean">false</config:config-item> + </config:config-item-map-entry> + <config:config-item-map-entry config:name="grad"> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">0</config:config-item> + <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> + <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> + <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> + <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> + <config:config-item config:name="ZoomValue" config:type="int">80</config:config-item> + <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> + <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item> + <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item> + <config:config-item config:name="LegacySingleLineFontwork" config:type="boolean">false</config:config-item> + <config:config-item config:name="ConnectorUseSnapRect" config:type="boolean">false</config:config-item> + <config:config-item config:name="IgnoreBreakAfterMultilineField" config:type="boolean">false</config:config-item> + </config:config-item-map-entry> + <config:config-item-map-entry config:name="noUnit"> + <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">5</config:config-item> + <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> + <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> + <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> + <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> + <config:config-item config:name="ZoomValue" config:type="int">80</config:config-item> + <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> + <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item> + <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item> + <config:config-item config:name="LegacySingleLineFontwork" config:type="boolean">false</config:config-item> + <config:config-item config:name="ConnectorUseSnapRect" config:type="boolean">false</config:config-item> + <config:config-item config:name="IgnoreBreakAfterMultilineField" config:type="boolean">false</config:config-item> + </config:config-item-map-entry> + <config:config-item-map-entry config:name="rad"> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">0</config:config-item> + <config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item> + <config:config-item config:name="PositionLeft" config:type="int">0</config:config-item> + <config:config-item config:name="PositionRight" config:type="int">0</config:config-item> + <config:config-item config:name="PositionTop" config:type="int">0</config:config-item> + <config:config-item config:name="PositionBottom" config:type="int">0</config:config-item> + <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> + <config:config-item config:name="ZoomValue" config:type="int">80</config:config-item> + <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> + <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item> + <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item> + <config:config-item config:name="LegacySingleLineFontwork" config:type="boolean">false</config:config-item> + <config:config-item config:name="ConnectorUseSnapRect" config:type="boolean">false</config:config-item> + <config:config-item config:name="IgnoreBreakAfterMultilineField" config:type="boolean">false</config:config-item> + </config:config-item-map-entry> + </config:config-item-map-named> + <config:config-item config:name="ActiveTable" config:type="string">noUnit</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1065</config:config-item> + <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> + <config:config-item config:name="ZoomValue" config:type="int">80</config:config-item> + <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> + <config:config-item config:name="ShowPageBreakPreview" config:type="boolean">false</config:config-item> + <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item> + <config:config-item config:name="ShowNotes" config:type="boolean">true</config:config-item> + <config:config-item config:name="ShowNoteAuthor" config:type="boolean">true</config:config-item> + <config:config-item config:name="ShowFormulasMarks" config:type="boolean">false</config:config-item> + <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item> + <config:config-item config:name="GridColor" config:type="int">12632256</config:config-item> + <config:config-item config:name="FormulaBarHeight" config:type="short">1</config:config-item> + <config:config-item config:name="HasColumnRowHeaders" config:type="boolean">true</config:config-item> + <config:config-item config:name="HasSheetTabs" config:type="boolean">true</config:config-item> + <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item> + <config:config-item config:name="IsValueHighlightingEnabled" config:type="boolean">false</config:config-item> + <config:config-item config:name="IsSnapToRaster" config:type="boolean">false</config:config-item> + <config:config-item config:name="RasterIsVisible" config:type="boolean">false</config:config-item> + <config:config-item config:name="RasterResolutionX" config:type="int">500</config:config-item> + <config:config-item config:name="RasterResolutionY" config:type="int">500</config:config-item> + <config:config-item config:name="RasterSubdivisionX" config:type="int">4</config:config-item> + <config:config-item config:name="RasterSubdivisionY" config:type="int">4</config:config-item> + <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> + <config:config-item config:name="AnchoredTextOverflowLegacy" config:type="boolean">false</config:config-item> + <config:config-item config:name="LegacySingleLineFontwork" config:type="boolean">false</config:config-item> + <config:config-item config:name="ConnectorUseSnapRect" config:type="boolean">false</config:config-item> + <config:config-item config:name="IgnoreBreakAfterMultilineField" config:type="boolean">false</config:config-item> + </config:config-item-map-entry> + </config:config-item-map-indexed> + </config:config-item-set> + <config:config-item-set config:name="ooo:configuration-settings"> + <config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item> + <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item> + <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> + <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item> + <config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item> + <config:config-item config:name="EmbedComplexScriptFonts" config:type="boolean">true</config:config-item> + <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item> + <config:config-item config:name="EmbedLatinScriptFonts" config:type="boolean">true</config:config-item> + <config:config-item config:name="EmbedOnlyUsedFonts" config:type="boolean">false</config:config-item> + <config:config-item config:name="GridColor" config:type="int">12632256</config:config-item> + <config:config-item config:name="HasColumnRowHeaders" config:type="boolean">true</config:config-item> + <config:config-item config:name="HasSheetTabs" config:type="boolean">true</config:config-item> + <config:config-item config:name="ImagePreferredDPI" config:type="int">0</config:config-item> + <config:config-item config:name="IsDocumentShared" config:type="boolean">false</config:config-item> + <config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item> + <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item> + <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> + <config:config-item config:name="IsSnapToRaster" config:type="boolean">false</config:config-item> + <config:config-item config:name="LinkUpdateMode" config:type="short">3</config:config-item> + <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrinterPaperFromSetup" config:type="boolean">false</config:config-item> + <config:config-item config:name="RasterIsVisible" config:type="boolean">false</config:config-item> + <config:config-item config:name="RasterResolutionX" config:type="int">500</config:config-item> + <config:config-item config:name="RasterResolutionY" config:type="int">500</config:config-item> + <config:config-item config:name="RasterSubdivisionX" config:type="int">4</config:config-item> + <config:config-item config:name="RasterSubdivisionY" config:type="int">4</config:config-item> + <config:config-item config:name="SaveThumbnail" config:type="boolean">true</config:config-item> + <config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item> + <config:config-item config:name="ShowFormulasMarks" config:type="boolean">false</config:config-item> + <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item> + <config:config-item config:name="ShowNoteAuthor" config:type="boolean">true</config:config-item> + <config:config-item config:name="ShowNotes" config:type="boolean">true</config:config-item> + <config:config-item config:name="ShowPageBreaks" config:type="boolean">true</config:config-item> + <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item> + <config:config-item config:name="SyntaxStringRef" config:type="short">7</config:config-item> + <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item> + <config:config-item-map-named config:name="ScriptConfiguration"> + <config:config-item-map-entry config:name="noUnit"> + <config:config-item config:name="CodeName" config:type="string">Sheet1</config:config-item> + </config:config-item-map-entry> + <config:config-item-map-entry config:name="deg"> + <config:config-item config:name="CodeName" config:type="string">noUnit_2</config:config-item> + </config:config-item-map-entry> + <config:config-item-map-entry config:name="rad"> + <config:config-item config:name="CodeName" config:type="string">deg_2</config:config-item> + </config:config-item-map-entry> + <config:config-item-map-entry config:name="grad"> + <config:config-item config:name="CodeName" config:type="string">rad_2</config:config-item> + </config:config-item-map-entry> + </config:config-item-map-named> + </config:config-item-set> + </office:settings> + <office:scripts> + <office:script script:language="ooo:Basic"> + <ooo:libraries xmlns:ooo="http://openoffice.org/2004/office" xmlns:xlink="http://www.w3.org/1999/xlink"> + <ooo:library-embedded ooo:name="Standard"/> + </ooo:libraries> + </office:script> + </office:scripts> + <office:font-face-decls> + <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/> + <style:font-face style:name="Lucida Sans" svg:font-family="'Lucida Sans'" style:font-family-generic="system" style:font-pitch="variable"/> + <style:font-face style:name="Microsoft YaHei" svg:font-family="'Microsoft YaHei'" style:font-family-generic="system" style:font-pitch="variable"/> + </office:font-face-decls> + <office:styles> + <style:default-style style:family="table-cell"> + <style:paragraph-properties style:tab-stop-distance="12.5mm"/> + <style:text-properties style:font-name="Liberation Sans" fo:font-size="10pt" fo:language="en" fo:country="US" style:font-name-asian="Microsoft YaHei" style:font-size-asian="10pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lucida Sans" style:font-size-complex="10pt" style:language-complex="hi" style:country-complex="IN"/> + </style:default-style> + <style:default-style style:family="graphic"> + <style:graphic-properties svg:stroke-color="#3465a4" draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="3mm" draw:shadow-offset-y="3mm" style:writing-mode="page"/> + <style:paragraph-properties style:text-autospace="ideograph-alpha" style:punctuation-wrap="simple" style:line-break="strict" loext:tab-stop-distance="0mm" style:writing-mode="page" style:font-independent-line-spacing="false"> + <style:tab-stops/> + </style:paragraph-properties> + <style:text-properties style:use-window-font-color="true" loext:opacity="0%" fo:font-family="'Liberation Serif'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="12pt" fo:language="en" fo:country="US" style:letter-kerning="true" style:font-family-asian="'Segoe UI'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN" style:font-family-complex="Tahoma" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/> + </style:default-style> + <style:style style:name="Default" style:family="graphic"/> + <style:style style:name="Note" style:family="graphic" style:parent-style-name="Default"> + <style:graphic-properties draw:stroke="solid" draw:marker-start="Arrowheads_20_1" draw:marker-start-width="2mm" draw:marker-start-center="false" draw:fill="solid" draw:fill-color="#ffffc0" draw:auto-grow-height="true" draw:auto-grow-width="false" fo:padding-top="1mm" fo:padding-bottom="1mm" fo:padding-left="1mm" fo:padding-right="1mm" draw:shadow="visible" draw:shadow-offset-x="1mm" draw:shadow-offset-y="1mm"/> + <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="10pt" style:font-name-asian="Microsoft YaHei" style:font-family-asian="'Microsoft YaHei'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="10pt" style:font-name-complex="Lucida Sans" style:font-family-complex="'Lucida Sans'" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="10pt"/> + </style:style> + <number:number-style style:name="N0"> + <number:number number:min-integer-digits="1"/> + </number:number-style> + <number:currency-style style:name="N114P0" style:volatile="true"> + <number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> + <number:text> </number:text> + <number:currency-symbol number:language="de" number:country="DE">€</number:currency-symbol> + </number:currency-style> + <number:currency-style style:name="N114"> + <style:text-properties fo:color="#ff0000"/> + <number:text>-</number:text> + <number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> + <number:text> </number:text> + <number:currency-symbol number:language="de" number:country="DE">€</number:currency-symbol> + <style:map style:condition="value()>=0" style:apply-style-name="N114P0"/> + </number:currency-style> + <style:style style:name="Default" style:family="table-cell"/> + <style:style style:name="Heading" style:family="table-cell" style:parent-style-name="Default"> + <style:table-cell-properties fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:font-size="24pt" fo:font-style="normal" fo:font-weight="bold" style:font-size-asian="24pt" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-size-complex="24pt" style:font-style-complex="normal" style:font-weight-complex="bold"/> + </style:style> + <style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="table-cell" style:parent-style-name="Heading"> + <style:table-cell-properties fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/> + </style:style> + <style:style style:name="Heading_20_2" style:display-name="Heading 2" style:family="table-cell" style:parent-style-name="Heading"> + <style:table-cell-properties fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:font-size="12pt" style:font-size-asian="12pt" style:font-size-complex="12pt"/> + </style:style> + <style:style style:name="Text" style:family="table-cell" style:parent-style-name="Default"> + <style:table-cell-properties fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + </style:style> + <style:style style:name="Note" style:family="table-cell" style:parent-style-name="Text"> + <style:table-cell-properties fo:background-color="#ffffcc" style:diagonal-bl-tr="none" style:diagonal-tl-br="none" fo:wrap-option="no-wrap" fo:border="0.74pt solid #808080" style:shrink-to-fit="false"/> + <style:text-properties fo:color="#333333"/> + </style:style> + <style:style style:name="Footnote" style:family="table-cell" style:parent-style-name="Text"> + <style:table-cell-properties fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:color="#808080" fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic"/> + </style:style> + <style:style style:name="Hyperlink" style:family="table-cell" style:parent-style-name="Text"> + <style:table-cell-properties fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:color="#0000ee" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="#0000ee"/> + </style:style> + <style:style style:name="Status" style:family="table-cell" style:parent-style-name="Default"> + <style:table-cell-properties fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + </style:style> + <style:style style:name="Good" style:family="table-cell" style:parent-style-name="Status"> + <style:table-cell-properties fo:background-color="#ccffcc" fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:color="#006600"/> + </style:style> + <style:style style:name="Neutral" style:family="table-cell" style:parent-style-name="Status"> + <style:table-cell-properties fo:background-color="#ffffcc" fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:color="#996600"/> + </style:style> + <style:style style:name="Bad" style:family="table-cell" style:parent-style-name="Status"> + <style:table-cell-properties fo:background-color="#ffcccc" fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:color="#cc0000"/> + </style:style> + <style:style style:name="Warning" style:family="table-cell" style:parent-style-name="Status"> + <style:table-cell-properties fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:color="#cc0000"/> + </style:style> + <style:style style:name="Error" style:family="table-cell" style:parent-style-name="Status"> + <style:table-cell-properties fo:background-color="#cc0000" fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:color="#ffffff" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> + </style:style> + <style:style style:name="Accent" style:family="table-cell" style:parent-style-name="Default"> + <style:table-cell-properties fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> + </style:style> + <style:style style:name="Accent_20_1" style:display-name="Accent 1" style:family="table-cell" style:parent-style-name="Accent"> + <style:table-cell-properties fo:background-color="#000000" fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:color="#ffffff"/> + </style:style> + <style:style style:name="Accent_20_2" style:display-name="Accent 2" style:family="table-cell" style:parent-style-name="Accent"> + <style:table-cell-properties fo:background-color="#808080" fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:color="#ffffff"/> + </style:style> + <style:style style:name="Accent_20_3" style:display-name="Accent 3" style:family="table-cell" style:parent-style-name="Accent"> + <style:table-cell-properties fo:background-color="#dddddd" fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + </style:style> + <style:style style:name="Result" style:family="table-cell" style:parent-style-name="Default"> + <style:table-cell-properties fo:wrap-option="no-wrap" style:shrink-to-fit="false"/> + <style:text-properties fo:font-style="italic" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" style:font-style-asian="italic" style:font-weight-asian="bold" style:font-style-complex="italic" style:font-weight-complex="bold"/> + </style:style> + <draw:marker draw:name="Arrowheads_20_1" draw:display-name="Arrowheads 1" svg:viewBox="0 0 20 30" svg:d="M10 0l-10 30h20z"/> + <loext:theme loext:name="Office"> + <loext:theme-colors loext:name="LibreOffice"> + <loext:color loext:name="dark1" loext:color="#000000"/> + <loext:color loext:name="light1" loext:color="#ffffff"/> + <loext:color loext:name="dark2" loext:color="#000000"/> + <loext:color loext:name="light2" loext:color="#ffffff"/> + <loext:color loext:name="accent1" loext:color="#18a303"/> + <loext:color loext:name="accent2" loext:color="#0369a3"/> + <loext:color loext:name="accent3" loext:color="#a33e03"/> + <loext:color loext:name="accent4" loext:color="#8e03a3"/> + <loext:color loext:name="accent5" loext:color="#c99c00"/> + <loext:color loext:name="accent6" loext:color="#c9211e"/> + <loext:color loext:name="hyperlink" loext:color="#0000ee"/> + <loext:color loext:name="followed-hyperlink" loext:color="#551a8b"/> + </loext:theme-colors> + </loext:theme> + </office:styles> + <office:automatic-styles> + <style:style style:name="co1" style:family="table-column"> + <style:table-column-properties fo:break-before="auto" style:column-width="24.99mm"/> + </style:style> + <style:style style:name="ro1" style:family="table-row"> + <style:table-row-properties style:row-height="10mm" fo:break-before="auto" style:use-optimal-row-height="false"/> + </style:style> + <style:style style:name="ta1" style:family="table" style:master-page-name="Default"> + <style:table-properties table:display="true" style:writing-mode="lr-tb"/> + </style:style> + <number:number-style style:name="N2"> + <number:number number:decimal-places="2" number:min-decimal-places="2" number:min-integer-digits="1"/> + </number:number-style> + <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default"> + <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" style:vertical-align="middle"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + </style:style> + <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default"> + <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" style:vertical-align="middle"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/> + </style:style> + <style:style style:name="gr1" style:family="graphic" style:parent-style-name="Default"> + <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" draw:ole-draw-aspect="1" loext:decorative="false"/> + <style:paragraph-properties fo:text-align="center"/> + </style:style> + <style:page-layout style:name="pm1"> + <style:page-layout-properties style:writing-mode="lr-tb"/> + <style:header-style> + <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-bottom="2.5mm"/> + </style:header-style> + <style:footer-style> + <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-top="2.5mm"/> + </style:footer-style> + </style:page-layout> + <style:page-layout style:name="pm2"> + <style:page-layout-properties style:writing-mode="lr-tb"/> + <style:header-style> + <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-bottom="2.5mm" fo:border="1.5pt solid #000000" fo:padding="0.18mm" fo:background-color="#c0c0c0"> + <style:background-image/> + </style:header-footer-properties> + </style:header-style> + <style:footer-style> + <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-top="2.5mm" fo:border="1.5pt solid #000000" fo:padding="0.18mm" fo:background-color="#c0c0c0"> + <style:background-image/> + </style:header-footer-properties> + </style:footer-style> + </style:page-layout> + <style:style style:name="P1" style:family="paragraph"> + <loext:graphic-properties draw:fill="none"/> + <style:paragraph-properties fo:text-align="center"/> + </style:style> + <style:style style:name="T1" style:family="text"> + <style:text-properties style:text-position="super 58%"/> + </style:style> + </office:automatic-styles> + <office:master-styles> + <style:master-page style:name="Default" style:page-layout-name="pm1"> + <style:header> + <text:p><text:sheet-name>???</text:sheet-name></text:p> + </style:header> + <style:header-left style:display="false"/> + <style:header-first style:display="false"/> + <style:footer> + <text:p>Page <text:page-number>1</text:page-number></text:p> + </style:footer> + <style:footer-left style:display="false"/> + <style:footer-first style:display="false"/> + </style:master-page> + <style:master-page style:name="Report" style:page-layout-name="pm2"> + <style:header> + <style:region-left> + <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> + </style:region-left> + <style:region-right> + <text:p><text:date style:data-style-name="N2" text:date-value="2024-07-06">00.00.0000</text:date>, <text:time style:data-style-name="N2" text:time-value="19:05:19.058000000">00:00:00</text:time></text:p> + </style:region-right> + </style:header> + <style:header-left style:display="false"/> + <style:header-first style:display="false"/> + <style:footer> + <text:p>Page <text:page-number>1</text:page-number><text:s/>/ <text:page-count>99</text:page-count></text:p> + </style:footer> + <style:footer-left style:display="false"/> + <style:footer-first style:display="false"/> + </style:master-page> + </office:master-styles> + <office:body> + <office:spreadsheet> + <table:calculation-settings table:automatic-find-labels="false" table:use-regular-expressions="false" table:use-wildcards="true"/> + <table:table table:name="noUnit" table:style-name="ta1"> + <table:shapes> + <draw:frame draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="131.81mm" svg:height="114.48mm" svg:x="138.64mm" svg:y="8.51mm"> + <draw:object draw:notify-on-update-of-ranges="noUnit.B1:noUnit.E1 noUnit.A2:noUnit.A2 noUnit.B2:noUnit.E2 noUnit.A3:noUnit.A3 noUnit.B3:noUnit.E3 noUnit.A4:noUnit.A4 noUnit.B4:noUnit.E4 noUnit.A5:noUnit.A5 noUnit.B5:noUnit.E5"> + <loext:p/> + <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:chartooo="http://openoffice.org/2010/chart" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.chart"> + <office:meta> + <meta:generator>LODev_daily_installed/25.2.0.0.alpha0$Windows_X86_64 LibreOffice_project/aaf2967d74a9a7ba2d28433e1872422ce38b6244 + </meta:generator> + </office:meta> + <office:styles/> + <office:automatic-styles> + <number:number-style style:name="N0"> + <number:number number:min-integer-digits="1"/> + </number:number-style> + <number:number-style style:name="N10000" number:language="en" number:country="US"> + <number:number number:min-integer-digits="1"/> + </number:number-style> + <number:text-style style:name="N10100" number:language="en" number:country="US"> + <number:text-content/> + </number:text-style> + <style:style style:name="ch1" style:family="chart"> + <style:graphic-properties draw:stroke="none"/> + </style:style> + <style:style style:name="ch2" style:family="chart"> + <style:chart-properties chart:auto-position="true" style:rotation-angle="0"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch3" style:family="chart"> + <style:chart-properties chart:three-dimensional="true" chart:deep="true" chart:include-hidden-cells="false" chart:treat-empty-cells="leave-gap" chart:series-source="rows"/> + </style:style> + <style:style style:name="ch4" style:family="chart" style:data-style-name="N10100"> + <style:chart-properties chart:display-label="true" chart:tick-marks-major-inner="true" chart:tick-marks-major-outer="true" chart:logarithmic="false" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="false" loext:major-origin="0.5" chart:axis-position="0" style:rotation-angle="344.61"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch5" style:family="chart"> + <style:chart-properties style:rotation-angle="342.63"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch6" style:family="chart"> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + </style:style> + <style:style style:name="ch7" style:family="chart" style:data-style-name="N10000"> + <style:chart-properties chart:display-label="true" chart:logarithmic="false" chart:origin="0" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="false" chart:axis-position="start" style:rotation-angle="15.12"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch8" style:family="chart"> + <style:chart-properties style:rotation-angle="14.94"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch9" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:display-label="true" chart:logarithmic="false" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="true" chart:axis-position="0" style:rotation-angle="344.16"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch10" style:family="chart"> + <style:chart-properties style:rotation-angle="60.39"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch11" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#004586" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch12" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#ff420e" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch13" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#ffd320" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch14" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#579d1c" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch15" style:family="chart"> + <style:graphic-properties draw:stroke="solid" svg:stroke-color="#b3b3b3" draw:fill="none" draw:fill-color="#e6e6e6"/> + </style:style> + <style:style style:name="ch16" style:family="chart"> + <style:graphic-properties svg:stroke-color="#b3b3b3" draw:fill-color="#cccccc"/> + </style:style> + <style:style style:name="T1" style:family="text"> + <style:text-properties style:text-position="0% 100%" fo:font-size="14pt" style:letter-kerning="false" style:font-size-asian="9pt" style:font-size-complex="9pt"/> + </style:style> + <style:style style:name="T2" style:family="text"> + <style:text-properties style:text-position="0% 100%" fo:font-size="12pt" style:letter-kerning="false" style:font-size-asian="9pt" style:font-size-complex="9pt"/> + </style:style> + </office:automatic-styles> + <office:body> + <office:chart> + <chart:chart svg:width="13.182cm" svg:height="11.449cm" xlink:href=".." xlink:type="simple" chart:class="chart:bar" chart:style-name="ch1"> + <chart:title svg:x="5.343cm" svg:y="0.364cm" chart:style-name="ch2"> + <text:p>Sales 2023</text:p> + </chart:title> + <chart:plot-area chart:style-name="ch3" table:cell-range-address="noUnit.A1:noUnit.E5" chart:data-source-has-labels="both" svg:x="1.538cm" svg:y="2.274cm" svg:width="9.651cm" svg:height="8.235cm" dr3d:transform="matrix (0.99826182973735 -0.0588167250409028 -0.00372989877902358 0.058817028267118 0.990268191440696 0.126132732494774 -0.0037251141276423 -0.126132873891924 0.992006361697595 0cm 0cm 0cm)" dr3d:vrp="(17634.6218373783 10271.4823817647 24594.8639082739)" dr3d:vpn="(0.416199821709347 0.173649045905254 0.892537795986984)" dr3d:vup="(-0.0733876362771618 0.984807599917971 -0.157379306090273)" dr3d:projection="perspective" dr3d:distance="4.2cm" dr3d:focal-length="8cm" dr3d:shadow-slant="0" dr3d:shade-mode="gouraud" dr3d:ambient-color="#999999" dr3d:lighting-mode="true"> + <chart:coordinate-region svg:x="2.275cm" svg:y="2.274cm" svg:width="8.328cm" svg:height="7.646cm"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="true"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(-0.422618261740699 -0.280064508328675 0.861949926630247)" dr3d:enabled="true" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <chart:axis chart:dimension="x" chart:name="primary-x" chart:style-name="ch4" chartooo:axis-type="text"> + <chart:title svg:x="3.149cm" svg:y="9.217cm" chart:style-name="ch5"> + <text:p> + <text:span text:style-name="T1">Quarter</text:span></text:p> + </chart:title> + <chart:categories table:cell-range-address="noUnit.B1:noUnit.E1"/> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:axis chart:dimension="y" chart:name="primary-y" chart:style-name="ch7"> + <chart:title svg:x="2.032cm" svg:y="2.302cm" chart:style-name="ch8"> + <text:p> + <text:span text:style-name="T2">in 1000 EUR</text:span></text:p> + </chart:title> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:axis chart:dimension="z" chart:name="primary-z" chart:style-name="ch9"> + <chart:title svg:x="10.235cm" svg:y="9.648cm" chart:style-name="ch10"> + <text:p> + <text:span text:style-name="T1">Seller</text:span></text:p> + </chart:title> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:series chart:style-name="ch11" chart:values-cell-range-address="noUnit.B2:noUnit.E2" chart:label-cell-address="noUnit.A2:noUnit.A2" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch12" chart:values-cell-range-address="noUnit.B3:noUnit.E3" chart:label-cell-address="noUnit.A3:noUnit.A3" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch13" chart:values-cell-range-address="noUnit.B4:noUnit.E4" chart:label-cell-address="noUnit.A4:noUnit.A4" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch14" chart:values-cell-range-address="noUnit.B5:noUnit.E5" chart:label-cell-address="noUnit.A5:noUnit.A5" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:wall chart:style-name="ch15"/> + <chart:floor chart:style-name="ch16"/> + </chart:plot-area> + <table:table table:name="local-table"> + <table:table-header-columns> + <table:table-column/> + </table:table-header-columns> + <table:table-columns> + <table:table-column table:number-columns-repeated="4"/> + </table:table-columns> + <table:table-header-rows> + <table:table-row> + <table:table-cell> + <text:p/> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>1st</text:p> + <draw:g> + <svg:desc>noUnit.B1:noUnit.E1</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>2nd</text:p> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>3rd</text:p> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>4th</text:p> + </table:table-cell> + </table:table-row> + </table:table-header-rows> + <table:table-rows> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>John</text:p> + <draw:g> + <svg:desc>noUnit.A2:noUnit.A2</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="72"> + <text:p>72</text:p> + <draw:g> + <svg:desc>noUnit.B2:noUnit.E2</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="42"> + <text:p>42</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="45"> + <text:p>45</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="12"> + <text:p>12</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Mary</text:p> + <draw:g> + <svg:desc>noUnit.A3:noUnit.A3</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56"> + <text:p>56</text:p> + <draw:g> + <svg:desc>noUnit.B3:noUnit.E3</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="13"> + <text:p>13</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="84"> + <text:p>84</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Tim</text:p> + <draw:g> + <svg:desc>noUnit.A4:noUnit.A4</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="44"> + <text:p>44</text:p> + <draw:g> + <svg:desc>noUnit.B4:noUnit.E4</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="30"> + <text:p>30</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="23"> + <text:p>23</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="27"> + <text:p>27</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Doris</text:p> + <draw:g> + <svg:desc>noUnit.A5:noUnit.A5</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="89"> + <text:p>89</text:p> + <draw:g> + <svg:desc>noUnit.B5:noUnit.E5</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="48"> + <text:p>48</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="54"> + <text:p>54</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="37"> + <text:p>37</text:p> + </table:table-cell> + </table:table-row> + </table:table-rows> + </table:table> + </chart:chart> + </office:chart> + </office:body> + </office:document> + </draw:object> + </draw:frame></table:shapes> + <table:table-column table:style-name="co1" table:number-columns-repeated="16384" table:default-cell-style-name="Default"/> + <table:table-row table:style-name="ro1"> + <table:table-cell table:style-name="ce1" office:value-type="float" office:value="2023" calcext:value-type="float"> + <text:p>2023</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>1<text:span text:style-name="T1">st</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>2<text:span text:style-name="T1">nd</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>3<text:span text:style-name="T1">rd</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>4<text:span text:style-name="T1">th</text:span></text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>John</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="72" calcext:value-type="float"> + <text:p>72</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="42" calcext:value-type="float"> + <text:p>42</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="45" calcext:value-type="float"> + <text:p>45</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="12" calcext:value-type="float"> + <text:p>12</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Mary</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56" calcext:value-type="float"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="13" calcext:value-type="float"> + <text:p>13</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56" calcext:value-type="float"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="84" calcext:value-type="float"> + <text:p>84</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Tim</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="44" calcext:value-type="float"> + <text:p>44</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="30" calcext:value-type="float"> + <text:p>30</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="23" calcext:value-type="float"> + <text:p>23</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="27" calcext:value-type="float"> + <text:p>27</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Doris</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="89" calcext:value-type="float"> + <text:p>89</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="48" calcext:value-type="float"> + <text:p>48</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="54" calcext:value-type="float"> + <text:p>54</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="37" calcext:value-type="float"> + <text:p>37</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048570"> + <table:table-cell table:number-columns-repeated="16384"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell table:number-columns-repeated="16384"/> + </table:table-row> + </table:table> + <table:table table:name="deg" table:style-name="ta1"> + <table:shapes> + <draw:frame draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="131.81mm" svg:height="114.48mm" svg:x="138.64mm" svg:y="8.51mm"> + <draw:object draw:notify-on-update-of-ranges="deg.B1:deg.E1 deg.A2:deg.A2 deg.B2:deg.E2 deg.A3:deg.A3 deg.B3:deg.E3 deg.A4:deg.A4 deg.B4:deg.E4 deg.A5:deg.A5 deg.B5:deg.E5"> + <loext:p/> + <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:chartooo="http://openoffice.org/2010/chart" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.chart"> + <office:meta> + <meta:generator>LODev_daily_installed/25.2.0.0.alpha0$Windows_X86_64 LibreOffice_project/aaf2967d74a9a7ba2d28433e1872422ce38b6244 + </meta:generator> + </office:meta> + <office:styles/> + <office:automatic-styles> + <number:number-style style:name="N0"> + <number:number number:min-integer-digits="1"/> + </number:number-style> + <number:number-style style:name="N10000" number:language="en" number:country="US"> + <number:number number:min-integer-digits="1"/> + </number:number-style> + <number:text-style style:name="N10100" number:language="en" number:country="US"> + <number:text-content/> + </number:text-style> + <style:style style:name="ch1" style:family="chart"> + <style:graphic-properties draw:stroke="none"/> + </style:style> + <style:style style:name="ch2" style:family="chart"> + <style:chart-properties chart:auto-position="true" style:rotation-angle="0"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch3" style:family="chart"> + <style:chart-properties chart:three-dimensional="true" chart:deep="true" chart:include-hidden-cells="false" chart:treat-empty-cells="leave-gap" chart:series-source="rows"/> + </style:style> + <style:style style:name="ch4" style:family="chart" style:data-style-name="N10100"> + <style:chart-properties chart:display-label="true" chart:tick-marks-major-inner="true" chart:tick-marks-major-outer="true" chart:logarithmic="false" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="false" loext:major-origin="0.5" chart:axis-position="0" style:rotation-angle="344.61deg"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch5" style:family="chart"> + <style:chart-properties style:rotation-angle="342.63deg"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch6" style:family="chart"> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + </style:style> + <style:style style:name="ch7" style:family="chart" style:data-style-name="N10000"> + <style:chart-properties chart:display-label="true" chart:logarithmic="false" chart:origin="0" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="false" chart:axis-position="start" style:rotation-angle="15.12deg"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch8" style:family="chart"> + <style:chart-properties style:rotation-angle="14.94deg"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch9" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:display-label="true" chart:logarithmic="false" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="true" chart:axis-position="0" style:rotation-angle="344.16deg"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch10" style:family="chart"> + <style:chart-properties style:rotation-angle="60.39deg"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch11" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#004586" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch12" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#ff420e" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch13" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#ffd320" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch14" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#579d1c" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch15" style:family="chart"> + <style:graphic-properties draw:stroke="solid" svg:stroke-color="#b3b3b3" draw:fill="none" draw:fill-color="#e6e6e6"/> + </style:style> + <style:style style:name="ch16" style:family="chart"> + <style:graphic-properties svg:stroke-color="#b3b3b3" draw:fill-color="#cccccc"/> + </style:style> + <style:style style:name="T1" style:family="text"> + <style:text-properties style:text-position="0% 100%" fo:font-size="14pt" style:letter-kerning="false" style:font-size-asian="9pt" style:font-size-complex="9pt"/> + </style:style> + <style:style style:name="T2" style:family="text"> + <style:text-properties style:text-position="0% 100%" fo:font-size="12pt" style:letter-kerning="false" style:font-size-asian="9pt" style:font-size-complex="9pt"/> + </style:style> + </office:automatic-styles> + <office:body> + <office:chart> + <chart:chart svg:width="13.182cm" svg:height="11.449cm" xlink:href=".." xlink:type="simple" chart:class="chart:bar" chart:style-name="ch1"> + <chart:title svg:x="5.343cm" svg:y="0.364cm" chart:style-name="ch2"> + <text:p>Sales 2023</text:p> + </chart:title> + <chart:plot-area chart:style-name="ch3" table:cell-range-address="deg.A1:deg.E5" chart:data-source-has-labels="both" svg:x="1.538cm" svg:y="2.274cm" svg:width="9.651cm" svg:height="8.235cm" dr3d:transform="matrix (0.99826182973735 -0.0588167250409028 -0.00372989877902358 0.058817028267118 0.990268191440696 0.126132732494774 -0.0037251141276423 -0.126132873891924 0.992006361697595 0cm 0cm 0cm)" dr3d:vrp="(17634.6218373783 10271.4823817647 24594.8639082739)" dr3d:vpn="(0.416199821709347 0.173649045905254 0.892537795986984)" dr3d:vup="(-0.0733876362771618 0.984807599917971 -0.157379306090273)" dr3d:projection="perspective" dr3d:distance="4.2cm" dr3d:focal-length="8cm" dr3d:shadow-slant="0" dr3d:shade-mode="gouraud" dr3d:ambient-color="#999999" dr3d:lighting-mode="true"> + <chart:coordinate-region svg:x="2.275cm" svg:y="2.274cm" svg:width="8.328cm" svg:height="7.646cm"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="true"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(-0.422618261740699 -0.280064508328675 0.861949926630247)" dr3d:enabled="true" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <chart:axis chart:dimension="x" chart:name="primary-x" chart:style-name="ch4" chartooo:axis-type="text"> + <chart:title svg:x="3.15cm" svg:y="9.218cm" chart:style-name="ch5"> + <text:p> + <text:span text:style-name="T1">Quarter</text:span></text:p> + </chart:title> + <chart:categories table:cell-range-address="deg.B1:deg.E1"/> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:axis chart:dimension="y" chart:name="primary-y" chart:style-name="ch7"> + <chart:title svg:x="2.032cm" svg:y="2.302cm" chart:style-name="ch8"> + <text:p> + <text:span text:style-name="T2">in 1000 EUR</text:span></text:p> + </chart:title> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:axis chart:dimension="z" chart:name="primary-z" chart:style-name="ch9"> + <chart:title svg:x="10.236cm" svg:y="9.648cm" chart:style-name="ch10"> + <text:p> + <text:span text:style-name="T1">Seller</text:span></text:p> + </chart:title> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:series chart:style-name="ch11" chart:values-cell-range-address="deg.B2:deg.E2" chart:label-cell-address="deg.A2:deg.A2" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch12" chart:values-cell-range-address="deg.B3:deg.E3" chart:label-cell-address="deg.A3:deg.A3" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch13" chart:values-cell-range-address="deg.B4:deg.E4" chart:label-cell-address="deg.A4:deg.A4" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch14" chart:values-cell-range-address="deg.B5:deg.E5" chart:label-cell-address="deg.A5:deg.A5" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:wall chart:style-name="ch15"/> + <chart:floor chart:style-name="ch16"/> + </chart:plot-area> + <table:table table:name="local-table"> + <table:table-header-columns> + <table:table-column/> + </table:table-header-columns> + <table:table-columns> + <table:table-column table:number-columns-repeated="4"/> + </table:table-columns> + <table:table-header-rows> + <table:table-row> + <table:table-cell> + <text:p/> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>1st</text:p> + <draw:g> + <svg:desc>deg.B1:deg.E1</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>2nd</text:p> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>3rd</text:p> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>4th</text:p> + </table:table-cell> + </table:table-row> + </table:table-header-rows> + <table:table-rows> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>John</text:p> + <draw:g> + <svg:desc>deg.A2:deg.A2</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="72"> + <text:p>72</text:p> + <draw:g> + <svg:desc>deg.B2:deg.E2</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="42"> + <text:p>42</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="45"> + <text:p>45</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="12"> + <text:p>12</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Mary</text:p> + <draw:g> + <svg:desc>deg.A3:deg.A3</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56"> + <text:p>56</text:p> + <draw:g> + <svg:desc>deg.B3:deg.E3</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="13"> + <text:p>13</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="84"> + <text:p>84</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Tim</text:p> + <draw:g> + <svg:desc>deg.A4:deg.A4</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="44"> + <text:p>44</text:p> + <draw:g> + <svg:desc>deg.B4:deg.E4</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="30"> + <text:p>30</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="23"> + <text:p>23</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="27"> + <text:p>27</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Doris</text:p> + <draw:g> + <svg:desc>deg.A5:deg.A5</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="89"> + <text:p>89</text:p> + <draw:g> + <svg:desc>deg.B5:deg.E5</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="48"> + <text:p>48</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="54"> + <text:p>54</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="37"> + <text:p>37</text:p> + </table:table-cell> + </table:table-row> + </table:table-rows> + </table:table> + </chart:chart> + </office:chart> + </office:body> + </office:document> + </draw:object> + </draw:frame></table:shapes> + <table:table-column table:style-name="co1" table:number-columns-repeated="16384" table:default-cell-style-name="Default"/> + <table:table-row table:style-name="ro1"> + <table:table-cell table:style-name="ce1" office:value-type="float" office:value="2023" calcext:value-type="float"> + <text:p>2023</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>1<text:span text:style-name="T1">st</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>2<text:span text:style-name="T1">nd</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>3<text:span text:style-name="T1">rd</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>4<text:span text:style-name="T1">th</text:span></text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>John</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="72" calcext:value-type="float"> + <text:p>72</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="42" calcext:value-type="float"> + <text:p>42</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="45" calcext:value-type="float"> + <text:p>45</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="12" calcext:value-type="float"> + <text:p>12</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Mary</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56" calcext:value-type="float"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="13" calcext:value-type="float"> + <text:p>13</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56" calcext:value-type="float"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="84" calcext:value-type="float"> + <text:p>84</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Tim</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="44" calcext:value-type="float"> + <text:p>44</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="30" calcext:value-type="float"> + <text:p>30</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="23" calcext:value-type="float"> + <text:p>23</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="27" calcext:value-type="float"> + <text:p>27</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Doris</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="89" calcext:value-type="float"> + <text:p>89</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="48" calcext:value-type="float"> + <text:p>48</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="54" calcext:value-type="float"> + <text:p>54</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="37" calcext:value-type="float"> + <text:p>37</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048570"> + <table:table-cell table:number-columns-repeated="16384"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell table:number-columns-repeated="16384"/> + </table:table-row> + </table:table> + <table:table table:name="rad" table:style-name="ta1"> + <table:shapes> + <draw:frame draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="131.81mm" svg:height="114.48mm" svg:x="138.64mm" svg:y="8.51mm"> + <draw:object draw:notify-on-update-of-ranges="rad.B1:rad.E1 rad.A2:rad.A2 rad.B2:rad.E2 rad.A3:rad.A3 rad.B3:rad.E3 rad.A4:rad.A4 rad.B4:rad.E4 rad.A5:rad.A5 rad.B5:rad.E5"> + <loext:p/> + <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:chartooo="http://openoffice.org/2010/chart" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.chart"> + <office:meta> + <meta:generator>LODev_daily_installed/25.2.0.0.alpha0$Windows_X86_64 LibreOffice_project/aaf2967d74a9a7ba2d28433e1872422ce38b6244 + </meta:generator> + </office:meta> + <office:styles/> + <office:automatic-styles> + <number:number-style style:name="N0"> + <number:number number:min-integer-digits="1"/> + </number:number-style> + <number:number-style style:name="N10000" number:language="en" number:country="US"> + <number:number number:min-integer-digits="1"/> + </number:number-style> + <number:text-style style:name="N10100" number:language="en" number:country="US"> + <number:text-content/> + </number:text-style> + <style:style style:name="ch1" style:family="chart"> + <style:graphic-properties draw:stroke="none"/> + </style:style> + <style:style style:name="ch2" style:family="chart"> + <style:chart-properties chart:auto-position="true" style:rotation-angle="0"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch3" style:family="chart"> + <style:chart-properties chart:three-dimensional="true" chart:deep="true" chart:include-hidden-cells="false" chart:treat-empty-cells="leave-gap" chart:series-source="rows"/> + </style:style> + <style:style style:name="ch4" style:family="chart" style:data-style-name="N10100"> + <style:chart-properties chart:display-label="true" chart:tick-marks-major-inner="true" chart:tick-marks-major-outer="true" chart:logarithmic="false" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="false" loext:major-origin="0.5" chart:axis-position="0" style:rotation-angle="6.01457913529766rad"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch5" style:family="chart"> + <style:chart-properties style:rotation-angle="5.98002161610817rad"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch6" style:family="chart"> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + </style:style> + <style:style style:name="ch7" style:family="chart" style:data-style-name="N10000"> + <style:chart-properties chart:display-label="true" chart:logarithmic="false" chart:origin="0" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="false" chart:axis-position="start" style:rotation-angle="0.263893782901543rad"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch8" style:family="chart"> + <style:chart-properties style:rotation-angle="0.260752190247953rad"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch9" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:display-label="true" chart:logarithmic="false" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="true" chart:axis-position="0" style:rotation-angle="6.00672515366369rad"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch10" style:family="chart"> + <style:chart-properties style:rotation-angle="1.05400433527938rad"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch11" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#004586" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch12" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#ff420e" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch13" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#ffd320" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch14" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#579d1c" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch15" style:family="chart"> + <style:graphic-properties draw:stroke="solid" svg:stroke-color="#b3b3b3" draw:fill="none" draw:fill-color="#e6e6e6"/> + </style:style> + <style:style style:name="ch16" style:family="chart"> + <style:graphic-properties svg:stroke-color="#b3b3b3" draw:fill-color="#cccccc"/> + </style:style> + <style:style style:name="T1" style:family="text"> + <style:text-properties style:text-position="0% 100%" fo:font-size="14pt" style:letter-kerning="false" style:font-size-asian="9pt" style:font-size-complex="9pt"/> + </style:style> + <style:style style:name="T2" style:family="text"> + <style:text-properties style:text-position="0% 100%" fo:font-size="12pt" style:letter-kerning="false" style:font-size-asian="9pt" style:font-size-complex="9pt"/> + </style:style> + </office:automatic-styles> + <office:body> + <office:chart> + <chart:chart svg:width="13.182cm" svg:height="11.449cm" xlink:href=".." xlink:type="simple" chart:class="chart:bar" chart:style-name="ch1"> + <chart:title svg:x="5.343cm" svg:y="0.364cm" chart:style-name="ch2"> + <text:p>Sales 2023</text:p> + </chart:title> + <chart:plot-area chart:style-name="ch3" table:cell-range-address="rad.A1:rad.E5" chart:data-source-has-labels="both" svg:x="1.538cm" svg:y="2.274cm" svg:width="9.651cm" svg:height="8.235cm" dr3d:transform="matrix (0.99826182973735 -0.0588167250409028 -0.00372989877902358 0.058817028267118 0.990268191440696 0.126132732494774 -0.0037251141276423 -0.126132873891924 0.992006361697595 0cm 0cm 0cm)" dr3d:vrp="(17634.6218373783 10271.4823817647 24594.8639082739)" dr3d:vpn="(0.416199821709347 0.173649045905254 0.892537795986984)" dr3d:vup="(-0.0733876362771618 0.984807599917971 -0.157379306090273)" dr3d:projection="perspective" dr3d:distance="4.2cm" dr3d:focal-length="8cm" dr3d:shadow-slant="0" dr3d:shade-mode="gouraud" dr3d:ambient-color="#999999" dr3d:lighting-mode="true"> + <chart:coordinate-region svg:x="2.275cm" svg:y="2.274cm" svg:width="8.328cm" svg:height="7.646cm"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="true"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(-0.422618261740699 -0.280064508328675 0.861949926630247)" dr3d:enabled="true" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <chart:axis chart:dimension="x" chart:name="primary-x" chart:style-name="ch4" chartooo:axis-type="text"> + <chart:title svg:x="3.15cm" svg:y="9.218cm" chart:style-name="ch5"> + <text:p> + <text:span text:style-name="T1">Quarter</text:span></text:p> + </chart:title> + <chart:categories table:cell-range-address="rad.B1:rad.E1"/> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:axis chart:dimension="y" chart:name="primary-y" chart:style-name="ch7"> + <chart:title svg:x="2.032cm" svg:y="2.301cm" chart:style-name="ch8"> + <text:p> + <text:span text:style-name="T2">in 1000 EUR</text:span></text:p> + </chart:title> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:axis chart:dimension="z" chart:name="primary-z" chart:style-name="ch9"> + <chart:title svg:x="10.236cm" svg:y="9.648cm" chart:style-name="ch10"> + <text:p> + <text:span text:style-name="T1">Seller</text:span></text:p> + </chart:title> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:series chart:style-name="ch11" chart:values-cell-range-address="rad.B2:rad.E2" chart:label-cell-address="rad.A2:rad.A2" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch12" chart:values-cell-range-address="rad.B3:rad.E3" chart:label-cell-address="rad.A3:rad.A3" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch13" chart:values-cell-range-address="rad.B4:rad.E4" chart:label-cell-address="rad.A4:rad.A4" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch14" chart:values-cell-range-address="rad.B5:rad.E5" chart:label-cell-address="rad.A5:rad.A5" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:wall chart:style-name="ch15"/> + <chart:floor chart:style-name="ch16"/> + </chart:plot-area> + <table:table table:name="local-table"> + <table:table-header-columns> + <table:table-column/> + </table:table-header-columns> + <table:table-columns> + <table:table-column table:number-columns-repeated="4"/> + </table:table-columns> + <table:table-header-rows> + <table:table-row> + <table:table-cell> + <text:p/> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>1st</text:p> + <draw:g> + <svg:desc>rad.B1:rad.E1</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>2nd</text:p> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>3rd</text:p> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>4th</text:p> + </table:table-cell> + </table:table-row> + </table:table-header-rows> + <table:table-rows> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>John</text:p> + <draw:g> + <svg:desc>rad.A2:rad.A2</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="72"> + <text:p>72</text:p> + <draw:g> + <svg:desc>rad.B2:rad.E2</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="42"> + <text:p>42</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="45"> + <text:p>45</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="12"> + <text:p>12</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Mary</text:p> + <draw:g> + <svg:desc>rad.A3:rad.A3</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56"> + <text:p>56</text:p> + <draw:g> + <svg:desc>rad.B3:rad.E3</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="13"> + <text:p>13</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="84"> + <text:p>84</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Tim</text:p> + <draw:g> + <svg:desc>rad.A4:rad.A4</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="44"> + <text:p>44</text:p> + <draw:g> + <svg:desc>rad.B4:rad.E4</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="30"> + <text:p>30</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="23"> + <text:p>23</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="27"> + <text:p>27</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Doris</text:p> + <draw:g> + <svg:desc>rad.A5:rad.A5</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="89"> + <text:p>89</text:p> + <draw:g> + <svg:desc>rad.B5:rad.E5</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="48"> + <text:p>48</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="54"> + <text:p>54</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="37"> + <text:p>37</text:p> + </table:table-cell> + </table:table-row> + </table:table-rows> + </table:table> + </chart:chart> + </office:chart> + </office:body> + </office:document> + </draw:object> + </draw:frame></table:shapes> + <table:table-column table:style-name="co1" table:number-columns-repeated="16384" table:default-cell-style-name="Default"/> + <table:table-row table:style-name="ro1"> + <table:table-cell table:style-name="ce1" office:value-type="float" office:value="2023" calcext:value-type="float"> + <text:p>2023</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>1<text:span text:style-name="T1">st</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>2<text:span text:style-name="T1">nd</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>3<text:span text:style-name="T1">rd</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>4<text:span text:style-name="T1">th</text:span></text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>John</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="72" calcext:value-type="float"> + <text:p>72</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="42" calcext:value-type="float"> + <text:p>42</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="45" calcext:value-type="float"> + <text:p>45</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="12" calcext:value-type="float"> + <text:p>12</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Mary</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56" calcext:value-type="float"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="13" calcext:value-type="float"> + <text:p>13</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56" calcext:value-type="float"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="84" calcext:value-type="float"> + <text:p>84</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Tim</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="44" calcext:value-type="float"> + <text:p>44</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="30" calcext:value-type="float"> + <text:p>30</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="23" calcext:value-type="float"> + <text:p>23</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="27" calcext:value-type="float"> + <text:p>27</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Doris</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="89" calcext:value-type="float"> + <text:p>89</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="48" calcext:value-type="float"> + <text:p>48</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="54" calcext:value-type="float"> + <text:p>54</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="37" calcext:value-type="float"> + <text:p>37</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048570"> + <table:table-cell table:number-columns-repeated="16384"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell table:number-columns-repeated="16384"/> + </table:table-row> + </table:table> + <table:table table:name="grad" table:style-name="ta1"> + <table:shapes> + <draw:frame draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="131.81mm" svg:height="114.48mm" svg:x="138.64mm" svg:y="8.51mm"> + <draw:object draw:notify-on-update-of-ranges="grad.B1:grad.E1 grad.A2:grad.A2 grad.B2:grad.E2 grad.A3:grad.A3 grad.B3:grad.E3 grad.A4:grad.A4 grad.B4:grad.E4 grad.A5:grad.A5 grad.B5:grad.E5"> + <loext:p/> + <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:chartooo="http://openoffice.org/2010/chart" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.chart"> + <office:meta> + <meta:generator>LODev_daily_installed/25.2.0.0.alpha0$Windows_X86_64 LibreOffice_project/aaf2967d74a9a7ba2d28433e1872422ce38b6244 + </meta:generator> + </office:meta> + <office:styles/> + <office:automatic-styles> + <number:number-style style:name="N0"> + <number:number number:min-integer-digits="1"/> + </number:number-style> + <number:number-style style:name="N10000" number:language="en" number:country="US"> + <number:number number:min-integer-digits="1"/> + </number:number-style> + <number:text-style style:name="N10100" number:language="en" number:country="US"> + <number:text-content/> + </number:text-style> + <style:style style:name="ch1" style:family="chart"> + <style:graphic-properties draw:stroke="none"/> + </style:style> + <style:style style:name="ch2" style:family="chart"> + <style:chart-properties chart:auto-position="true" style:rotation-angle="0"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch3" style:family="chart"> + <style:chart-properties chart:three-dimensional="true" chart:deep="true" chart:include-hidden-cells="false" chart:treat-empty-cells="leave-gap" chart:series-source="rows"/> + </style:style> + <style:style style:name="ch4" style:family="chart" style:data-style-name="N10100"> + <style:chart-properties chart:display-label="true" chart:tick-marks-major-inner="true" chart:tick-marks-major-outer="true" chart:logarithmic="false" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="false" loext:major-origin="0.5" chart:axis-position="0" style:rotation-angle="382.9grad"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch5" style:family="chart"> + <style:chart-properties style:rotation-angle="380.7grad"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch6" style:family="chart"> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + </style:style> + <style:style style:name="ch7" style:family="chart" style:data-style-name="N10000"> + <style:chart-properties chart:display-label="true" chart:logarithmic="false" chart:origin="0" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="false" chart:axis-position="start" style:rotation-angle="16.8grad"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch8" style:family="chart"> + <style:chart-properties style:rotation-angle="16.6grad"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch9" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:display-label="true" chart:logarithmic="false" chart:reverse-direction="false" text:line-break="false" loext:try-staggering-first="false" chart:link-data-style-to-source="true" chart:axis-position="0" style:rotation-angle="382.4grad"/> + <style:graphic-properties svg:stroke-color="#b3b3b3"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch10" style:family="chart"> + <style:chart-properties style:rotation-angle="67.1grad"/> + <style:text-properties fo:font-size="13pt" style:font-size-asian="13pt" style:font-size-complex="13pt"/> + </style:style> + <style:style style:name="ch11" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#004586" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch12" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#ff420e" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch13" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#ffd320" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch14" style:family="chart" style:data-style-name="N0"> + <style:chart-properties chart:link-data-style-to-source="true"/> + <style:graphic-properties draw:stroke="none" draw:fill-color="#579d1c" dr3d:edge-rounding="5%"/> + <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/> + </style:style> + <style:style style:name="ch15" style:family="chart"> + <style:graphic-properties draw:stroke="solid" svg:stroke-color="#b3b3b3" draw:fill="none" draw:fill-color="#e6e6e6"/> + </style:style> + <style:style style:name="ch16" style:family="chart"> + <style:graphic-properties svg:stroke-color="#b3b3b3" draw:fill-color="#cccccc"/> + </style:style> + <style:style style:name="T1" style:family="text"> + <style:text-properties style:text-position="0% 100%" fo:font-size="14pt" style:letter-kerning="false" style:font-size-asian="9pt" style:font-size-complex="9pt"/> + </style:style> + <style:style style:name="T2" style:family="text"> + <style:text-properties style:text-position="0% 100%" fo:font-size="12pt" style:letter-kerning="false" style:font-size-asian="9pt" style:font-size-complex="9pt"/> + </style:style> + </office:automatic-styles> + <office:body> + <office:chart> + <chart:chart svg:width="13.182cm" svg:height="11.449cm" xlink:href=".." xlink:type="simple" chart:class="chart:bar" chart:style-name="ch1"> + <chart:title svg:x="5.343cm" svg:y="0.364cm" chart:style-name="ch2"> + <text:p>Sales 2023</text:p> + </chart:title> + <chart:plot-area chart:style-name="ch3" table:cell-range-address="grad.A1:grad.E5" chart:data-source-has-labels="both" svg:x="1.538cm" svg:y="2.274cm" svg:width="9.651cm" svg:height="8.235cm" dr3d:transform="matrix (0.99826182973735 -0.0588167250409028 -0.00372989877902358 0.058817028267118 0.990268191440696 0.126132732494774 -0.0037251141276423 -0.126132873891924 0.992006361697595 0cm 0cm 0cm)" dr3d:vrp="(17634.6218373783 10271.4823817647 24594.8639082739)" dr3d:vpn="(0.416199821709347 0.173649045905254 0.892537795986984)" dr3d:vup="(-0.0733876362771618 0.984807599917971 -0.157379306090273)" dr3d:projection="perspective" dr3d:distance="4.2cm" dr3d:focal-length="8cm" dr3d:shadow-slant="0" dr3d:shade-mode="gouraud" dr3d:ambient-color="#999999" dr3d:lighting-mode="true"> + <chart:coordinate-region svg:x="2.275cm" svg:y="2.274cm" svg:width="8.328cm" svg:height="7.646cm"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="true"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(-0.422618261740699 -0.280064508328675 0.861949926630247)" dr3d:enabled="true" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <dr3d:light dr3d:diffuse-color="#808080" dr3d:direction="(0 0 1)" dr3d:enabled="false" dr3d:specular="false"/> + <chart:axis chart:dimension="x" chart:name="primary-x" chart:style-name="ch4" chartooo:axis-type="text"> + <chart:title svg:x="3.149cm" svg:y="9.219cm" chart:style-name="ch5"> + <text:p> + <text:span text:style-name="T1">Quarter</text:span></text:p> + </chart:title> + <chart:categories table:cell-range-address="grad.B1:grad.E1"/> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:axis chart:dimension="y" chart:name="primary-y" chart:style-name="ch7"> + <chart:title svg:x="2.032cm" svg:y="2.302cm" chart:style-name="ch8"> + <text:p> + <text:span text:style-name="T2">in 1000 EUR</text:span></text:p> + </chart:title> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:axis chart:dimension="z" chart:name="primary-z" chart:style-name="ch9"> + <chart:title svg:x="10.238cm" svg:y="9.648cm" chart:style-name="ch10"> + <text:p> + <text:span text:style-name="T1">Seller</text:span></text:p> + </chart:title> + <chart:grid chart:style-name="ch6" chart:class="major"/> + </chart:axis> + <chart:series chart:style-name="ch11" chart:values-cell-range-address="grad.B2:grad.E2" chart:label-cell-address="grad.A2:grad.A2" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch12" chart:values-cell-range-address="grad.B3:grad.E3" chart:label-cell-address="grad.A3:grad.A3" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch13" chart:values-cell-range-address="grad.B4:grad.E4" chart:label-cell-address="grad.A4:grad.A4" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:series chart:style-name="ch14" chart:values-cell-range-address="grad.B5:grad.E5" chart:label-cell-address="grad.A5:grad.A5" chart:class="chart:bar"> + <chart:data-point chart:repeated="4"/> + </chart:series> + <chart:wall chart:style-name="ch15"/> + <chart:floor chart:style-name="ch16"/> + </chart:plot-area> + <table:table table:name="local-table"> + <table:table-header-columns> + <table:table-column/> + </table:table-header-columns> + <table:table-columns> + <table:table-column table:number-columns-repeated="4"/> + </table:table-columns> + <table:table-header-rows> + <table:table-row> + <table:table-cell> + <text:p/> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>1st</text:p> + <draw:g> + <svg:desc>grad.B1:grad.E1</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>2nd</text:p> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>3rd</text:p> + </table:table-cell> + <table:table-cell office:value-type="string"> + <text:p>4th</text:p> + </table:table-cell> + </table:table-row> + </table:table-header-rows> + <table:table-rows> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>John</text:p> + <draw:g> + <svg:desc>grad.A2:grad.A2</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="72"> + <text:p>72</text:p> + <draw:g> + <svg:desc>grad.B2:grad.E2</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="42"> + <text:p>42</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="45"> + <text:p>45</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="12"> + <text:p>12</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Mary</text:p> + <draw:g> + <svg:desc>grad.A3:grad.A3</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56"> + <text:p>56</text:p> + <draw:g> + <svg:desc>grad.B3:grad.E3</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="13"> + <text:p>13</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="84"> + <text:p>84</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Tim</text:p> + <draw:g> + <svg:desc>grad.A4:grad.A4</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="44"> + <text:p>44</text:p> + <draw:g> + <svg:desc>grad.B4:grad.E4</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="30"> + <text:p>30</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="23"> + <text:p>23</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="27"> + <text:p>27</text:p> + </table:table-cell> + </table:table-row> + <table:table-row> + <table:table-cell office:value-type="string"> + <text:p>Doris</text:p> + <draw:g> + <svg:desc>grad.A5:grad.A5</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="89"> + <text:p>89</text:p> + <draw:g> + <svg:desc>grad.B5:grad.E5</svg:desc></draw:g> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="48"> + <text:p>48</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="54"> + <text:p>54</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="37"> + <text:p>37</text:p> + </table:table-cell> + </table:table-row> + </table:table-rows> + </table:table> + </chart:chart> + </office:chart> + </office:body> + </office:document> + </draw:object> + </draw:frame></table:shapes> + <table:table-column table:style-name="co1" table:number-columns-repeated="16384" table:default-cell-style-name="Default"/> + <table:table-row table:style-name="ro1"> + <table:table-cell table:style-name="ce1" office:value-type="float" office:value="2023" calcext:value-type="float"> + <text:p>2023</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>1<text:span text:style-name="T1">st</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>2<text:span text:style-name="T1">nd</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>3<text:span text:style-name="T1">rd</text:span></text:p> + </table:table-cell> + <table:table-cell table:style-name="ce2" office:value-type="string" calcext:value-type="string"><text:p>4<text:span text:style-name="T1">th</text:span></text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>John</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="72" calcext:value-type="float"> + <text:p>72</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="42" calcext:value-type="float"> + <text:p>42</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="45" calcext:value-type="float"> + <text:p>45</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="12" calcext:value-type="float"> + <text:p>12</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Mary</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56" calcext:value-type="float"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="13" calcext:value-type="float"> + <text:p>13</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="56" calcext:value-type="float"> + <text:p>56</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="84" calcext:value-type="float"> + <text:p>84</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Tim</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="44" calcext:value-type="float"> + <text:p>44</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="30" calcext:value-type="float"> + <text:p>30</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="23" calcext:value-type="float"> + <text:p>23</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="27" calcext:value-type="float"> + <text:p>27</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Doris</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="89" calcext:value-type="float"> + <text:p>89</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="48" calcext:value-type="float"> + <text:p>48</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="54" calcext:value-type="float"> + <text:p>54</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="37" calcext:value-type="float"> + <text:p>37</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="16379"/> + </table:table-row> + <table:table-row table:style-name="ro1" table:number-rows-repeated="1048570"> + <table:table-cell table:number-columns-repeated="16384"/> + </table:table-row> + <table:table-row table:style-name="ro1"> + <table:table-cell table:number-columns-repeated="16384"/> + </table:table-row> + </table:table> + <table:named-expressions/> + </office:spreadsheet> + </office:body> +</office:document>
\ No newline at end of file diff --git a/chart2/qa/extras/data/odp/BarChartVeryLongLabel.odp b/chart2/qa/extras/data/odp/BarChartVeryLongLabel.odp Binary files differnew file mode 100644 index 000000000000..c627af79e4d5 --- /dev/null +++ b/chart2/qa/extras/data/odp/BarChartVeryLongLabel.odp diff --git a/chart2/qa/extras/data/ods/chartWithDotInSheetName.ods b/chart2/qa/extras/data/ods/chartWithDotInSheetName.ods Binary files differnew file mode 100644 index 000000000000..873d45f4be8c --- /dev/null +++ b/chart2/qa/extras/data/ods/chartWithDotInSheetName.ods diff --git a/chart2/qa/extras/data/ods/tdf101894.ods b/chart2/qa/extras/data/ods/tdf101894.ods Binary files differnew file mode 100644 index 000000000000..70d8b3a0dd55 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf101894.ods diff --git a/chart2/qa/extras/data/ods/tdf107097.ods b/chart2/qa/extras/data/ods/tdf107097.ods Binary files differnew file mode 100644 index 000000000000..efa9f1c013f3 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf107097.ods diff --git a/chart2/qa/extras/data/ods/tdf120348.ods b/chart2/qa/extras/data/ods/tdf120348.ods Binary files differnew file mode 100644 index 000000000000..7a593c1bff7b --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf120348.ods diff --git a/chart2/qa/extras/data/ods/tdf136011.ods b/chart2/qa/extras/data/ods/tdf136011.ods Binary files differnew file mode 100644 index 000000000000..03a0a7dd6324 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf136011.ods diff --git a/chart2/qa/extras/data/ods/tdf146066.ods b/chart2/qa/extras/data/ods/tdf146066.ods Binary files differnew file mode 100644 index 000000000000..03abe9ae68ca --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf146066.ods diff --git a/chart2/qa/extras/data/ods/tdf146463.ods b/chart2/qa/extras/data/ods/tdf146463.ods Binary files differnew file mode 100644 index 000000000000..6214f4a50075 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf146463.ods diff --git a/chart2/qa/extras/data/ods/tdf148142.ods b/chart2/qa/extras/data/ods/tdf148142.ods Binary files differnew file mode 100644 index 000000000000..9b736a06d19a --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf148142.ods diff --git a/chart2/qa/extras/data/ods/tdf151091.ods b/chart2/qa/extras/data/ods/tdf151091.ods Binary files differnew file mode 100644 index 000000000000..b3a43b3ceac8 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf151091.ods diff --git a/chart2/qa/extras/data/ods/tdf153706_XY_scatter_chart.ods b/chart2/qa/extras/data/ods/tdf153706_XY_scatter_chart.ods Binary files differnew file mode 100644 index 000000000000..2c6153ed6ab2 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf153706_XY_scatter_chart.ods diff --git a/chart2/qa/extras/data/ods/tdf158223.ods b/chart2/qa/extras/data/ods/tdf158223.ods Binary files differnew file mode 100644 index 000000000000..33a71697444f --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf158223.ods diff --git a/chart2/qa/extras/data/ods/tdf161800_barOfPie_split_pos.ods b/chart2/qa/extras/data/ods/tdf161800_barOfPie_split_pos.ods Binary files differnew file mode 100644 index 000000000000..a87941bfa22d --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf161800_barOfPie_split_pos.ods diff --git a/chart2/qa/extras/data/ods/tdf161800_pieOfPie_split_pos.ods b/chart2/qa/extras/data/ods/tdf161800_pieOfPie_split_pos.ods Binary files differnew file mode 100644 index 000000000000..9a08628a91e7 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf161800_pieOfPie_split_pos.ods diff --git a/chart2/qa/extras/data/ods/tdf166428_Low_High_StockChart_LO248.ods b/chart2/qa/extras/data/ods/tdf166428_Low_High_StockChart_LO248.ods Binary files differnew file mode 100644 index 000000000000..12c5993d422f --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf166428_Low_High_StockChart_LO248.ods diff --git a/chart2/qa/extras/data/ods/tdf39052.ods b/chart2/qa/extras/data/ods/tdf39052.ods Binary files differnew file mode 100644 index 000000000000..68089195507e --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf39052.ods diff --git a/chart2/qa/extras/data/ods/tdf50934_barOfPie.ods b/chart2/qa/extras/data/ods/tdf50934_barOfPie.ods Binary files differnew file mode 100644 index 000000000000..d9b577a38a36 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf50934_barOfPie.ods diff --git a/chart2/qa/extras/data/ods/tdf50934_pieOfPie.ods b/chart2/qa/extras/data/ods/tdf50934_pieOfPie.ods Binary files differnew file mode 100644 index 000000000000..74a9f85f6981 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf50934_pieOfPie.ods diff --git a/chart2/qa/extras/data/ods/tdf62057.ods b/chart2/qa/extras/data/ods/tdf62057.ods Binary files differnew file mode 100644 index 000000000000..3945c41d0318 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf62057.ods diff --git a/chart2/qa/extras/data/ods/tdf99969.ods b/chart2/qa/extras/data/ods/tdf99969.ods Binary files differnew file mode 100644 index 000000000000..f30212ec73b4 --- /dev/null +++ b/chart2/qa/extras/data/ods/tdf99969.ods diff --git a/chart2/qa/extras/data/pptx/PieChartWithAutomaticLayout_SizeAndPosition.pptx b/chart2/qa/extras/data/pptx/PieChartWithAutomaticLayout_SizeAndPosition.pptx Binary files differnew file mode 100644 index 000000000000..3f95e932b1c5 --- /dev/null +++ b/chart2/qa/extras/data/pptx/PieChartWithAutomaticLayout_SizeAndPosition.pptx diff --git a/chart2/qa/extras/data/pptx/tdf127720.pptx b/chart2/qa/extras/data/pptx/tdf127720.pptx Binary files differnew file mode 100644 index 000000000000..b10a4c5ab4ed --- /dev/null +++ b/chart2/qa/extras/data/pptx/tdf127720.pptx diff --git a/chart2/qa/extras/data/pptx/tdf137691_dataTable.pptx b/chart2/qa/extras/data/pptx/tdf137691_dataTable.pptx Binary files differnew file mode 100644 index 000000000000..edb465d729af --- /dev/null +++ b/chart2/qa/extras/data/pptx/tdf137691_dataTable.pptx diff --git a/chart2/qa/extras/data/pptx/tdf146487.pptx b/chart2/qa/extras/data/pptx/tdf146487.pptx Binary files differnew file mode 100644 index 000000000000..2a78ae5d859b --- /dev/null +++ b/chart2/qa/extras/data/pptx/tdf146487.pptx diff --git a/chart2/qa/extras/data/pptx/tdf146756_bestFit.pptx b/chart2/qa/extras/data/pptx/tdf146756_bestFit.pptx Binary files differnew file mode 100644 index 000000000000..a643d95a53a8 --- /dev/null +++ b/chart2/qa/extras/data/pptx/tdf146756_bestFit.pptx diff --git a/chart2/qa/extras/data/pptx/tdf150176.pptx b/chart2/qa/extras/data/pptx/tdf150176.pptx Binary files differnew file mode 100644 index 000000000000..fa217f92c822 --- /dev/null +++ b/chart2/qa/extras/data/pptx/tdf150176.pptx diff --git a/chart2/qa/extras/data/xlsx/ChartDataTable.xlsx b/chart2/qa/extras/data/xlsx/ChartDataTable.xlsx Binary files differnew file mode 100644 index 000000000000..fff4f00aeafa --- /dev/null +++ b/chart2/qa/extras/data/xlsx/ChartDataTable.xlsx diff --git a/chart2/qa/extras/data/xlsx/DataTable-MultipleLegendEntriesForOneDataSeries.xlsx b/chart2/qa/extras/data/xlsx/DataTable-MultipleLegendEntriesForOneDataSeries.xlsx Binary files differnew file mode 100644 index 000000000000..b077fd2e0315 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/DataTable-MultipleLegendEntriesForOneDataSeries.xlsx diff --git a/chart2/qa/extras/data/xlsx/barOfPieChart.xlsx b/chart2/qa/extras/data/xlsx/barOfPieChart.xlsx Binary files differnew file mode 100644 index 000000000000..227ab832a4ac --- /dev/null +++ b/chart2/qa/extras/data/xlsx/barOfPieChart.xlsx diff --git a/chart2/qa/extras/data/xlsx/barOfPieChart2.xlsx b/chart2/qa/extras/data/xlsx/barOfPieChart2.xlsx Binary files differnew file mode 100644 index 000000000000..be24cd293915 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/barOfPieChart2.xlsx diff --git a/chart2/qa/extras/data/xlsx/barchart_totalsrow.xlsx b/chart2/qa/extras/data/xlsx/barchart_totalsrow.xlsx Binary files differnew file mode 100644 index 000000000000..c87b2b3186ac --- /dev/null +++ b/chart2/qa/extras/data/xlsx/barchart_totalsrow.xlsx diff --git a/chart2/qa/extras/data/xlsx/chart_pie2007.xlsx b/chart2/qa/extras/data/xlsx/chart_pie2007.xlsx Binary files differindex b122680257c0..583c6720a4da 100644 --- a/chart2/qa/extras/data/xlsx/chart_pie2007.xlsx +++ b/chart2/qa/extras/data/xlsx/chart_pie2007.xlsx diff --git a/chart2/qa/extras/data/xlsx/funnel1.xlsx b/chart2/qa/extras/data/xlsx/funnel1.xlsx Binary files differnew file mode 100644 index 000000000000..7ae3e6c32a59 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/funnel1.xlsx diff --git a/chart2/qa/extras/data/xlsx/invertIfNeg_bar.xlsx b/chart2/qa/extras/data/xlsx/invertIfNeg_bar.xlsx Binary files differnew file mode 100644 index 000000000000..97a83b43dc2f --- /dev/null +++ b/chart2/qa/extras/data/xlsx/invertIfNeg_bar.xlsx diff --git a/chart2/qa/extras/data/xlsx/invertIfNeg_bubble.xlsx b/chart2/qa/extras/data/xlsx/invertIfNeg_bubble.xlsx Binary files differnew file mode 100644 index 000000000000..27ae097e2eba --- /dev/null +++ b/chart2/qa/extras/data/xlsx/invertIfNeg_bubble.xlsx diff --git a/chart2/qa/extras/data/xlsx/pieOfPieChart.xlsx b/chart2/qa/extras/data/xlsx/pieOfPieChart.xlsx Binary files differnew file mode 100644 index 000000000000..b3a1c3588427 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/pieOfPieChart.xlsx diff --git a/chart2/qa/extras/data/xlsx/pieOfPieChart2.xlsx b/chart2/qa/extras/data/xlsx/pieOfPieChart2.xlsx Binary files differnew file mode 100644 index 000000000000..c80f0169cc89 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/pieOfPieChart2.xlsx diff --git a/chart2/qa/extras/data/xlsx/tdf150434.xlsx b/chart2/qa/extras/data/xlsx/tdf150434.xlsx Binary files differnew file mode 100644 index 000000000000..309a0c4c25f7 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/tdf150434.xlsx diff --git a/chart2/qa/extras/data/xlsx/tdf161607PieChartLeaderLinesColorWidth.xlsx b/chart2/qa/extras/data/xlsx/tdf161607PieChartLeaderLinesColorWidth.xlsx Binary files differnew file mode 100644 index 000000000000..c8c4e06a44c3 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/tdf161607PieChartLeaderLinesColorWidth.xlsx diff --git a/chart2/qa/extras/data/xlsx/tdf166249.xlsx b/chart2/qa/extras/data/xlsx/tdf166249.xlsx Binary files differnew file mode 100644 index 000000000000..8c7b5d2ad884 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/tdf166249.xlsx diff --git a/chart2/qa/extras/data/xlsx/tdf39052.xlsx b/chart2/qa/extras/data/xlsx/tdf39052.xlsx Binary files differnew file mode 100644 index 000000000000..5b0285bab292 --- /dev/null +++ b/chart2/qa/extras/data/xlsx/tdf39052.xlsx diff --git a/chart2/qa/extras/data/xlsx/tdf98690.xlsx b/chart2/qa/extras/data/xlsx/tdf98690.xlsx Binary files differnew file mode 100644 index 000000000000..4269afa9eadd --- /dev/null +++ b/chart2/qa/extras/data/xlsx/tdf98690.xlsx diff --git a/chart2/qa/extras/uichart.cxx b/chart2/qa/extras/uichart.cxx new file mode 100644 index 000000000000..e17d0e6daa20 --- /dev/null +++ b/chart2/qa/extras/uichart.cxx @@ -0,0 +1,567 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "charttest.hxx" + +#include <comphelper/propertyvalue.hxx> + +using namespace ::com::sun::star; + +class Chart2UiChartTest : public ChartTest +{ +public: + Chart2UiChartTest() + : ChartTest(u"/chart2/qa/extras/data/"_ustr) + { + } + + void testCopyPasteToNewSheet(const uno::Reference<chart::XChartDocument>& xChartDoc, + OUString aObjectName, sal_Int32 nColumns, sal_Int32 nRows); +}; + +void Chart2UiChartTest::testCopyPasteToNewSheet( + const uno::Reference<chart::XChartDocument>& xChartDoc, OUString aObjectName, + sal_Int32 nColumns, sal_Int32 nRows) +{ + CPPUNIT_ASSERT(xChartDoc.is()); + uno::Reference<chart::XChartDataArray> xChartData(xChartDoc->getData(), uno::UNO_QUERY_THROW); + + uno::Sequence<OUString> aExpectedColumnDescriptions = xChartData->getColumnDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of columns in origin file", nColumns, + aExpectedColumnDescriptions.getLength()); + + uno::Sequence<OUString> aExpectedRowDescriptions = xChartData->getRowDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of rows in origin file", nRows, + aExpectedRowDescriptions.getLength()); + + Sequence<Sequence<double>> aExpectedData = xChartData->getData(); + + uno::Sequence<beans::PropertyValue> aPropertyValues = { + comphelper::makePropertyValue(u"ToObject"_ustr, aObjectName), + }; + dispatchCommand(mxComponent, u".uno:GoToObject"_ustr, aPropertyValues); + + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); + + // create a new document + loadFromURL(u"private:factory/scalc"_ustr); + + dispatchCommand(mxComponent, u".uno:Paste"_ustr, {}); + + uno::Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(0); + CPPUNIT_ASSERT(xChartDoc2.is()); + + uno::Reference<chart::XChartDataArray> xDataArray(xChartDoc2->getDataProvider(), + UNO_QUERY_THROW); + + Sequence<OUString> aColumnDesc = xDataArray->getColumnDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of columns in destination file", nColumns, + aColumnDesc.getLength()); + for (sal_Int32 i = 0; i < nColumns; ++i) + { + OString sMessage("Incorrect description in column: " + OString::number(i)); + CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), aExpectedColumnDescriptions[i], + aColumnDesc[i]); + } + + Sequence<OUString> aRowDesc = xDataArray->getRowDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of rows in destination file", nRows, + aRowDesc.getLength()); + for (sal_Int32 i = 0; i < nRows; ++i) + { + OString sMessage("Incorrect description in row: " + OString::number(i)); + CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), aExpectedRowDescriptions[i], aRowDesc[i]); + } + + Sequence<Sequence<double>> aData = xDataArray->getData(); + + for (sal_Int32 nRowIdx = 0; nRowIdx < nRows; ++nRowIdx) + { + for (sal_Int32 nColIdx = 0; nColIdx < nColumns; ++nColIdx) + { + double nValue = aData[nRowIdx][nColIdx]; + double nExpected = aExpectedData[nRowIdx][nColIdx]; + OString sMessage("Incorrect value in Col: " + OString::number(nColIdx) + + " Row: " + OString::number(nRowIdx)); + + if (std::isnan(nValue)) + { + // On paste, 0 becomes NaN, check whether it's expected + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(sMessage.getStr(), 0.0, nExpected, 1e-1); + } + else + { + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(sMessage.getStr(), nExpected, nValue, 1e-1); + } + } + } +} + +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf99969) +{ + loadFromFile(u"ods/tdf99969.ods"); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), + uno::UNO_QUERY_THROW); + sal_Int32 nColumns = 2; + sal_Int32 nRows = 6; + CPPUNIT_ASSERT(xChartDoc.is()); + uno::Reference<chart::XChartDataArray> xChartData(xChartDoc->getData(), uno::UNO_QUERY_THROW); + + uno::Sequence<OUString> aExpectedColumnDescriptions = xChartData->getColumnDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of columns in origin file", nColumns, + aExpectedColumnDescriptions.getLength()); + + uno::Sequence<OUString> aExpectedRowDescriptions = xChartData->getRowDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of rows in origin file", nRows, + aExpectedRowDescriptions.getLength()); + + Sequence<Sequence<double>> aExpectedData = xChartData->getData(); + + dispatchCommand(mxComponent, u".uno:GoToCell"_ustr, + { comphelper::makePropertyValue(u"ToPoint"_ustr, uno::Any(u"C2:L25"_ustr)) }); + + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); + + // create a new document + loadFromURL(u"private:factory/scalc"_ustr); + + dispatchCommand(mxComponent, u".uno:Paste"_ustr, {}); + + uno::Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(0); + CPPUNIT_ASSERT(xChartDoc2.is()); + + uno::Reference<chart::XChartDataArray> xDataArray(xChartDoc2->getDataProvider(), + UNO_QUERY_THROW); + + Sequence<OUString> aColumnDesc = xDataArray->getColumnDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of columns in destination file", nColumns, + aColumnDesc.getLength()); + for (sal_Int32 i = 0; i < nColumns; ++i) + { + // Without the fix in place, this test would have failed with + // - Expected: ABC + // - Actual : + // - Incorrect description in column: 0 + OString sMessage("Incorrect description in column: " + OString::number(i)); + CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), aExpectedColumnDescriptions[i], + aColumnDesc[i]); + } + + Sequence<OUString> aRowDesc = xDataArray->getRowDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of rows in destination file", nRows, + aRowDesc.getLength()); + for (sal_Int32 i = 0; i < nRows; ++i) + { + OString sMessage("Incorrect description in row: " + OString::number(i)); + CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), aExpectedRowDescriptions[i], aRowDesc[i]); + } + + Sequence<Sequence<double>> aData = xDataArray->getData(); + + for (sal_Int32 nRowIdx = 0; nRowIdx < nRows; ++nRowIdx) + { + for (sal_Int32 nColIdx = 0; nColIdx < nColumns; ++nColIdx) + { + double nValue = aData[nRowIdx][nColIdx]; + double nExpected = aExpectedData[nRowIdx][nColIdx]; + OString sMessage("Incorrect value in Col: " + OString::number(nColIdx) + + " Row: " + OString::number(nRowIdx)); + + CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), nExpected, nValue); + } + } +} + +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf120348) +{ + loadFromFile(u"ods/tdf120348.ods"); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), + uno::UNO_QUERY_THROW); + + // Without the fix in place, this test would have failed with + // - Expected: 0 + // - Actual : 3.33625955201419 + // - Incorrect value in Col: 2 Row: 51 + testCopyPasteToNewSheet(xChartDoc, u"Object 2"_ustr, 4, 158); +} + +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf151091) +{ + std::vector<OUString> aExpected + = { u"ΩφÎλιμο"_ustr, u"Επικίνδυνο"_ustr, u"Απόσταση"_ustr, u"Μάσκα"_ustr, u"Εμβόλιο"_ustr }; + + loadFromFile(u"ods/tdf151091.ods"); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), + uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT(xChartDoc.is()); + uno::Reference<chart::XChartDataArray> xChartData(xChartDoc->getData(), uno::UNO_QUERY_THROW); + uno::Sequence<OUString> aSeriesList = xChartData->getColumnDescriptions(); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(5), aSeriesList.getLength()); + + for (size_t i = 0; i < 5; ++i) + CPPUNIT_ASSERT_EQUAL(aExpected[i], aSeriesList[i]); + + uno::Sequence<beans::PropertyValue> aPropertyValues = { + comphelper::makePropertyValue(u"ToObject"_ustr, u"Object 1"_ustr), + }; + dispatchCommand(mxComponent, u".uno:GoToObject"_ustr, aPropertyValues); + + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); + + // create a new writer document + loadFromURL(u"private:factory/swriter"_ustr); + + dispatchCommand(mxComponent, u".uno:Paste"_ustr, {}); + + aSeriesList = getWriterChartColumnDescriptions(); + + // Without the fix in place, this test would have failed with + // - Expected: 5 + // - Actual : 1 + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(5), aSeriesList.getLength()); + + for (size_t i = 0; i < 5; ++i) + CPPUNIT_ASSERT_EQUAL(aExpected[i], aSeriesList[i]); +} + +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf107097) +{ + loadFromFile(u"ods/tdf107097.ods"); + uno::Reference<chart::XChartDocument> xChartDoc(getPivotChartDocFromSheet(1), + uno::UNO_QUERY_THROW); + testCopyPasteToNewSheet(xChartDoc, u"Object 1"_ustr, 4, 12); +} + +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf136011) +{ + loadFromFile(u"ods/tdf136011.ods"); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), + uno::UNO_QUERY_THROW); + testCopyPasteToNewSheet(xChartDoc, u"Object 1"_ustr, 3, 9); + + loadFromFile(u"ods/tdf136011.ods"); + uno::Reference<chart::XChartDocument> xChartDoc2(getChartCompFromSheet(0, 1), + uno::UNO_QUERY_THROW); + + // Without the fix in place, this test would have failed with + // - Expected: Test 1 1 + // - Actual : Test 1 + // - Incorrect description in row: 0 + testCopyPasteToNewSheet(xChartDoc2, u"Object 2"_ustr, 3, 9); +} + +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf62057) +{ + loadFromFile(u"ods/tdf62057.ods"); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), + uno::UNO_QUERY_THROW); + + // Without the fix in place, this test would have failed with + // - Expected: 2 + // - Actual : 7 + // - Incorrect number of columns in destination file + testCopyPasteToNewSheet(xChartDoc, u"Object 1"_ustr, 2, 6); +} + +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf98690) +{ + loadFromFile(u"xlsx/tdf98690.xlsx"); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), + uno::UNO_QUERY_THROW); + + CPPUNIT_ASSERT(xChartDoc.is()); + uno::Reference<chart::XChartDataArray> xChartData(xChartDoc->getData(), uno::UNO_QUERY_THROW); + uno::Sequence<OUString> aSeriesList = xChartData->getColumnDescriptions(); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(6), aSeriesList.getLength()); + + uno::Sequence<beans::PropertyValue> aPropertyValues = { + comphelper::makePropertyValue(u"ToObject"_ustr, u"Chart 2"_ustr), + }; + dispatchCommand(mxComponent, u".uno:GoToObject"_ustr, aPropertyValues); + + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); + + // create a new document + loadFromURL(u"private:factory/scalc"_ustr); + + dispatchCommand(mxComponent, u".uno:Paste"_ustr, {}); + + uno::Reference<chart::XChartDocument> xChartDoc2(getChartCompFromSheet(0, 0), + uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT(xChartDoc2.is()); + uno::Reference<chart::XChartDataArray> xChartData2(xChartDoc2->getData(), uno::UNO_QUERY_THROW); + uno::Sequence<OUString> aSeriesList2 = xChartData2->getColumnDescriptions(); + + // Without the fix in place, this test would have failed with + // - Expected: 12 + // - Actual : 0 + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(12), aSeriesList2.getLength()); +} + +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf101894) +{ + loadFromFile(u"ods/tdf101894.ods"); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), + uno::UNO_QUERY_THROW); + + CPPUNIT_ASSERT(xChartDoc.is()); + uno::Reference<chart::XChartDataArray> xChartData(xChartDoc->getData(), uno::UNO_QUERY_THROW); + + uno::Sequence<OUString> aExpectedColumnDescriptions = xChartData->getColumnDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of columns in origin file", + static_cast<sal_Int32>(12), + aExpectedColumnDescriptions.getLength()); + + uno::Sequence<OUString> aExpectedRowDescriptions = xChartData->getRowDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of rows in origin file", + static_cast<sal_Int32>(8), aExpectedRowDescriptions.getLength()); + + Sequence<Sequence<double>> aExpectedData = xChartData->getData(); + + // Create a copy of the sheet and move to the end + uno::Sequence<beans::PropertyValue> aArgs( + comphelper::InitPropertySequence({ { "DocName", uno::Any(u"tdf101894"_ustr) }, + { "Index", uno::Any(sal_uInt16(32767)) }, + { "Copy", uno::Any(true) } })); + 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); + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), xIA->getCount()); + + for (sal_Int32 sheetIndex = 0; sheetIndex < 2; ++sheetIndex) + { + uno::Reference<chart::XChartDocument> xChartDoc2(getChartCompFromSheet(sheetIndex, 0), + uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT(xChartDoc2.is()); + uno::Reference<chart::XChartDataArray> xChartData2(xChartDoc2->getData(), + uno::UNO_QUERY_THROW); + + uno::Sequence<OUString> aColumnDescriptions = xChartData2->getColumnDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of columns in origin file", + static_cast<sal_Int32>(12), aColumnDescriptions.getLength()); + for (sal_Int32 i = 0; i < 12; ++i) + { + OString sMessage("Incorrect description in column: " + OString::number(i)); + CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), aExpectedColumnDescriptions[i], + aColumnDescriptions[i]); + } + + uno::Sequence<OUString> aRowDescriptions = xChartData2->getRowDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of rows in origin file", + static_cast<sal_Int32>(8), aRowDescriptions.getLength()); + for (sal_Int32 i = 0; i < 8; ++i) + { + OString sMessage("Incorrect description in row: " + OString::number(i)); + CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), aExpectedRowDescriptions[i], + aRowDescriptions[i]); + } + + Sequence<Sequence<double>> aData = xChartData2->getData(); + + for (sal_Int32 nRowIdx = 0; nRowIdx < 8; ++nRowIdx) + { + for (sal_Int32 nColIdx = 0; nColIdx < 12; ++nColIdx) + { + double nValue = aData[nRowIdx][nColIdx]; + double nExpected = aExpectedData[nRowIdx][nColIdx]; + OString sMessage("Incorrect value in Col: " + OString::number(nColIdx) + + " Row: " + OString::number(nRowIdx)); + + // Without the fix in place, this test would have failed with + // - Expected: 1 + // - Actual : 2.2250738585072e-308 + // - Incorrect value in Col: 0 Row: 0 + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(sMessage.getStr(), nExpected, nValue, 1e-1); + } + } + } +} + +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testCopyPasteChartWithDotInSheetName) +{ + loadFromFile(u"ods/chartWithDotInSheetName.ods"); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), + uno::UNO_QUERY_THROW); + + CPPUNIT_ASSERT(xChartDoc.is()); + uno::Reference<chart::XChartDataArray> xChartData(xChartDoc->getData(), uno::UNO_QUERY_THROW); + + uno::Sequence<OUString> aExpectedColumnDescriptions = xChartData->getColumnDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of columns in origin file", + static_cast<sal_Int32>(4), + aExpectedColumnDescriptions.getLength()); + + uno::Sequence<OUString> aExpectedRowDescriptions = xChartData->getRowDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of rows in origin file", + static_cast<sal_Int32>(7), aExpectedRowDescriptions.getLength()); + + Sequence<Sequence<double>> aExpectedData = xChartData->getData(); + + dispatchCommand(mxComponent, u".uno:SelectAll"_ustr, {}); + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); + + uno::Sequence<beans::PropertyValue> aArgs(comphelper::InitPropertySequence( + { { "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, u".uno:Paste"_ustr, {}); + + for (sal_Int32 sheetIndex = 0; sheetIndex < 2; ++sheetIndex) + { + uno::Reference<chart::XChartDocument> xChartDoc2(getChartCompFromSheet(sheetIndex, 0), + uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT(xChartDoc2.is()); + uno::Reference<chart::XChartDataArray> xChartData2(xChartDoc2->getData(), + uno::UNO_QUERY_THROW); + + uno::Sequence<OUString> aColumnDescriptions = xChartData2->getColumnDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of columns in origin file", + static_cast<sal_Int32>(4), aColumnDescriptions.getLength()); + for (sal_Int32 i = 0; i < 4; ++i) + { + OString sMessage("Incorrect description in column: " + OString::number(i)); + CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), aExpectedColumnDescriptions[i], + aColumnDescriptions[i]); + } + + uno::Sequence<OUString> aRowDescriptions = xChartData2->getRowDescriptions(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect number of rows in origin file", + static_cast<sal_Int32>(7), aRowDescriptions.getLength()); + for (sal_Int32 i = 0; i < 7; ++i) + { + OString sMessage("Incorrect description in row: " + OString::number(i)); + CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), aExpectedRowDescriptions[i], + aRowDescriptions[i]); + } + + Sequence<Sequence<double>> aData = xChartData2->getData(); + + for (sal_Int32 nRowIdx = 0; nRowIdx < 7; ++nRowIdx) + { + for (sal_Int32 nColIdx = 0; nColIdx < 4; ++nColIdx) + { + double nValue = aData[nRowIdx][nColIdx]; + double nExpected = aExpectedData[nRowIdx][nColIdx]; + OString sMessage("Incorrect value in Col: " + OString::number(nColIdx) + + " Row: " + OString::number(nRowIdx)); + + CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(sMessage.getStr(), nExpected, nValue, 1e-1); + } + } + } +} + +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf158223) +{ + loadFromFile(u"ods/tdf158223.ods"); + + 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>(3), xIA->getCount()); + + for (sal_Int32 sheetIndex = 0; sheetIndex < 2; ++sheetIndex) + { + OUString sExpectedValuesX("$Tabelle" + OUString::number(sheetIndex + 1) + ".$A$2:$A$11"); + OUString sExpectedValuesY("$Tabelle" + OUString::number(sheetIndex + 1) + ".$B$2:$B$11"); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(sheetIndex); + Reference<chart2::data::XDataSequence> xValuesX + = getDataSequenceFromDocByRole(xChartDoc, u"values-x"); + CPPUNIT_ASSERT_EQUAL(sExpectedValuesX, xValuesX->getSourceRangeRepresentation()); + Reference<chart2::data::XDataSequence> xValuesY + = getDataSequenceFromDocByRole(xChartDoc, u"values-y"); + CPPUNIT_ASSERT_EQUAL(sExpectedValuesY, xValuesY->getSourceRangeRepresentation()); + } + + // Remove last sheet + uno::Sequence<beans::PropertyValue> aArgs( + comphelper::InitPropertySequence({ { "Index", uno::Any(sal_uInt16(3)) } })); + dispatchCommand(mxComponent, u".uno:Remove"_ustr, aArgs); + + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2), xIA->getCount()); + + for (sal_Int32 sheetIndex = 0; sheetIndex < 2; ++sheetIndex) + { + OUString sExpectedValuesX("$Tabelle" + OUString::number(sheetIndex + 1) + ".$A$2:$A$11"); + OUString sExpectedValuesY("$Tabelle" + OUString::number(sheetIndex + 1) + ".$B$2:$B$11"); + uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(sheetIndex); + Reference<chart2::data::XDataSequence> xValuesX + = getDataSequenceFromDocByRole(xChartDoc, u"values-x"); + + // Without the fix in place, this test would have failed with + // - Expected: $Tabelle2.$A$2:$A$11 + // - Actual : $Tabelle2.$A$2:$Tabelle1.$A$11 + CPPUNIT_ASSERT_EQUAL(sExpectedValuesX, xValuesX->getSourceRangeRepresentation()); + Reference<chart2::data::XDataSequence> xValuesY + = getDataSequenceFromDocByRole(xChartDoc, u"values-y"); + CPPUNIT_ASSERT_EQUAL(sExpectedValuesY, xValuesY->getSourceRangeRepresentation()); + } +} + +CPPUNIT_TEST_FIXTURE(Chart2UiChartTest, testTdf153706) +{ + // Load a spreadsheet with a to-page XY scatter chart with the sheet as data source + loadFromFile(u"ods/tdf153706_XY_scatter_chart.ods"); + + // Select the cell range around the chart, and copy the range to clipboard, including the chart + dispatchCommand(mxComponent, u".uno:GoToCell"_ustr, + { comphelper::makePropertyValue(u"ToPoint"_ustr, u"D1:K23"_ustr) }); + dispatchCommand(mxComponent, u".uno:Copy"_ustr, {}); + + // create a new document + loadFromURL(u"private:factory/scalc"_ustr); + + // Paste; this must create a chart with own data source having a proper copy of the data + dispatchCommand(mxComponent, u".uno:Paste"_ustr, {}); + + css::uno::Reference xChartDoc(getChartDocFromSheet(0), css::uno::UNO_SET_THROW); + auto xDataArray(xChartDoc->getDataProvider().queryThrow<chart::XChartDataArray>()); + + css::uno::Sequence<Sequence<double>> aData = xDataArray->getData(); + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), aData.getLength()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aData[0].getLength()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aData[1].getLength()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), aData[2].getLength()); + CPPUNIT_ASSERT_EQUAL(2.0, aData[0][0]); + CPPUNIT_ASSERT_EQUAL(3.0, aData[0][1]); + CPPUNIT_ASSERT_EQUAL(3.0, aData[1][0]); + CPPUNIT_ASSERT_EQUAL(2.0, aData[1][1]); + CPPUNIT_ASSERT_EQUAL(4.0, aData[2][0]); + CPPUNIT_ASSERT_EQUAL(1.0, aData[2][1]); + + // Without the fix, this would fail with + // - Expected: 1 + // - Actual : 2 + // i.e., the X values were treated as another Y series + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getNumberOfDataSeries(xChartDoc)); + + auto xSeries(getDataSeriesFromDoc(xChartDoc, 0).queryThrow<chart2::data::XDataSource>()); + auto sequences = xSeries->getDataSequences(); + // Without the fix, this would fail with + // - Expected: 2 + // - Actual : 1 + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), sequences.getLength()); + + auto propX(sequences[0]->getValues().queryThrow<beans::XPropertySet>()); + // Without the fix, this would fail with + // - Expected: values-x + // - Actual : values-y + 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(u"Role"_ustr).get<OUString>()); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/qa/extras/xshape/chart2xshape.cxx b/chart2/qa/extras/xshape/chart2xshape.cxx index 18141a9ede88..ca945c8baa29 100644 --- a/chart2/qa/extras/xshape/chart2xshape.cxx +++ b/chart2/qa/extras/xshape/chart2xshape.cxx @@ -21,54 +21,71 @@ class Chart2XShapeTest : public ChartTest { public: + Chart2XShapeTest() + : ChartTest(u"/chart2/qa/extras/xshape/data/"_ustr) + { + } + + void testTdf150832(); + void testTdf149204(); + void testTdf151424(); void testFdo75075(); void testPropertyMappingBarChart(); void testPieChartLabels1(); void testPieChartLabels2(); void testPieChartLabels3(); void testPieChartLabels4(); + void testChart(); void testTdf76649TrendLineBug(); void testTdf88154LabelRotatedLayout(); CPPUNIT_TEST_SUITE(Chart2XShapeTest); + CPPUNIT_TEST(testTdf150832); + CPPUNIT_TEST(testTdf149204); + CPPUNIT_TEST(testTdf151424); CPPUNIT_TEST(testFdo75075); CPPUNIT_TEST(testPropertyMappingBarChart); CPPUNIT_TEST(testPieChartLabels1); CPPUNIT_TEST(testPieChartLabels2); CPPUNIT_TEST(testPieChartLabels3); CPPUNIT_TEST(testPieChartLabels4); + CPPUNIT_TEST(testChart); CPPUNIT_TEST(testTdf76649TrendLineBug); CPPUNIT_TEST(testTdf88154LabelRotatedLayout); CPPUNIT_TEST_SUITE_END(); private: - void compareAgainstReference(std::u16string_view rReferenceFile); + void compareAgainstReference(std::u16string_view rDump, std::u16string_view rReferenceFile); OUString getXShapeDumpString(); xmlDocUniquePtr getXShapeDumpXmlDoc(); }; namespace { -bool checkDumpAgainstFile(const OUString& rDump, std::u16string_view aFilePath, +OUString getShapeDump(css::uno::Reference<css::chart::XChartDocument> const& doc) +{ + 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, char const* toleranceFile) { OString aOFile = OUStringToOString(aFilePath, RTL_TEXTENCODING_UTF8); - CPPUNIT_ASSERT_MESSAGE("dump is empty", !rDump.isEmpty()); + CPPUNIT_ASSERT_MESSAGE("dump is empty", !rDump.empty()); OString aDump = OUStringToOString(rDump, RTL_TEXTENCODING_UTF8); - return doXMLDiff(aOFile.getStr(), aDump.getStr(), static_cast<int>(rDump.getLength()), + return doXMLDiff(aOFile.getStr(), aDump.getStr(), static_cast<int>(rDump.size()), toleranceFile); } } OUString Chart2XShapeTest::getXShapeDumpString() { - uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, mxComponent), - UNO_QUERY_THROW); - uno::Reference<qa::XDumper> xDumper(xChartDoc, UNO_QUERY_THROW); - return xDumper->dump(); + uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0, 0), UNO_QUERY_THROW); + return getShapeDump(xChartDoc); } xmlDocUniquePtr Chart2XShapeTest::getXShapeDumpXmlDoc() @@ -78,33 +95,86 @@ xmlDocUniquePtr Chart2XShapeTest::getXShapeDumpXmlDoc() return xmlDocUniquePtr(xmlParseDoc(reinterpret_cast<const xmlChar*>(aXmlDump.getStr()))); } -void Chart2XShapeTest::compareAgainstReference(std::u16string_view rReferenceFile) +void Chart2XShapeTest::compareAgainstReference(std::u16string_view rDump, + std::u16string_view rReferenceFile) { checkDumpAgainstFile( - getXShapeDumpString(), - OUStringConcatenation( - m_directories.getPathFromSrc(u"/chart2/qa/extras/xshape/data/reference/") - + rReferenceFile), + rDump, + Concat2View(m_directories.getPathFromSrc(u"/chart2/qa/extras/xshape/data/reference/") + + rReferenceFile), OUStringToOString( m_directories.getPathFromSrc(u"/chart2/qa/extras/xshape/data/reference/tolerance.xml"), RTL_TEXTENCODING_UTF8) .getStr()); } +void Chart2XShapeTest::testTdf150832() +{ + // FIXME: the DPI check should be removed when either (1) the test is fixed to work with + // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. + if (!IsDefaultDPI()) + return; + + // Without the fix in place, this test would have failed with + // - Expected: 319 + // - Actual : 0 + loadFromFile(u"xls/tdf150832.xls"); + compareAgainstReference(getXShapeDumpString(), u"tdf150832.xml"); +} + +void Chart2XShapeTest::testTdf149204() +{ + // FIXME: the DPI check should be removed when either (1) the test is fixed to work with + // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. + if (!IsDefaultDPI()) + return; + + // Without the fix in place, this test would have failed with + // - Expected: 12230 + // - Actual : 12940 + // - Node: /XShapes/XShape[2] + // - Attr: sizeX + loadFromFile(u"pptx/tdf149204.pptx"); + uno::Reference<chart::XChartDocument> xChartDoc = getChartDocFromDrawImpress(0, 0); + compareAgainstReference(getShapeDump(xChartDoc), u"tdf149204.xml"); +} + +void Chart2XShapeTest::testTdf151424() +{ + // FIXME: the DPI check should be removed when either (1) the test is fixed to work with + // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. + if (!IsDefaultDPI()) + return; + + // Without the fix in place, this test would have failed with + // - Expected: 3717 + // - Actual : 3530 + // - Node: /XShapes/XShape[2]/XShapes/XShape[1] + // - Attr: positionX + loadFromFile(u"ods/tdf151424.ods"); + compareAgainstReference(getXShapeDumpString(), u"tdf151424.xml"); +} + void Chart2XShapeTest::testFdo75075() { -#if 0 - load("chart2/qa/extras/xshape/data/ods/", "fdo75075.ods"); - compareAgainstReference("fdo75075.xml"); -#endif + // FIXME: the DPI check should be removed when either (1) the test is fixed to work with + // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. + if (!IsDefaultDPI()) + return; + + loadFromFile(u"ods/fdo75075.ods"); + compareAgainstReference(getXShapeDumpString(), u"fdo75075.xml"); } void Chart2XShapeTest::testPropertyMappingBarChart() { -#if 0 - load("chart2/qa/extras/xshape/data/ods/", "property-mapping-bar.ods"); - compareAgainstReference("property-mapping-bar.xml"); -#endif + // FIXME: the DPI check should be removed when either (1) the test is fixed to work with + // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. + if (!IsDefaultDPI()) + return; + + loadFromFile(u"ods/property-mapping-bar.ods"); + compareAgainstReference(getXShapeDumpString(), u"property-mapping-bar.xml"); } void Chart2XShapeTest::testPieChartLabels1() @@ -115,8 +185,8 @@ void Chart2XShapeTest::testPieChartLabels1() return; // inside placement for the best fit case - load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-1.xlsx"); - compareAgainstReference(u"tdf90839-1.xml"); + loadFromFile(u"xlsx/tdf90839-1.xlsx"); + compareAgainstReference(getXShapeDumpString(), u"tdf90839-1.xml"); } void Chart2XShapeTest::testPieChartLabels2() @@ -126,9 +196,9 @@ void Chart2XShapeTest::testPieChartLabels2() if (!IsDefaultDPI()) return; - // text wrap: wrap all text labels except one - load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-2.xlsx"); - compareAgainstReference(u"tdf90839-2.xml"); + // text wrap: wrap all text labels except Yellow one + loadFromFile(u"xlsx/tdf90839-2.xlsx"); + compareAgainstReference(getXShapeDumpString(), u"tdf90839-2.xml"); } void Chart2XShapeTest::testPieChartLabels3() @@ -138,9 +208,9 @@ void Chart2XShapeTest::testPieChartLabels3() if (!IsDefaultDPI()) return; - // text wrap: wrap no text label except one - load(u"chart2/qa/extras/xshape/data/xlsx/", "tdf90839-3.xlsx"); - compareAgainstReference(u"tdf90839-3.xml"); + // text wrap: wrap no text label except Yellow one + loadFromFile(u"xlsx/tdf90839-3.xlsx"); + compareAgainstReference(getXShapeDumpString(), u"tdf90839-3.xml"); } void Chart2XShapeTest::testPieChartLabels4() @@ -151,8 +221,19 @@ void Chart2XShapeTest::testPieChartLabels4() return; // data value and percent value are centered horizontally - load(u"chart2/qa/extras/xshape/data/ods/", "tdf90839-4.ods"); - compareAgainstReference(u"tdf90839-4.xml"); + loadFromFile(u"ods/tdf90839-4.ods"); + compareAgainstReference(getXShapeDumpString(), u"tdf90839-4.xml"); +} + +void Chart2XShapeTest::testChart() +{ + // FIXME: the DPI check should be removed when either (1) the test is fixed to work with + // non-default DPI; or (2) unit tests on Windows are made to use svp VCL plugin. + if (!IsDefaultDPI()) + return; + + loadFromFile(u"ods/testChart.ods"); + compareAgainstReference(getXShapeDumpString(), u"testChart.xml"); } void Chart2XShapeTest::testTdf76649TrendLineBug() @@ -160,7 +241,7 @@ void Chart2XShapeTest::testTdf76649TrendLineBug() // This bug prevents that the trendline (regression curve) is drawn // if the first cell is empty. See tdf#76649 for details. - load(u"chart2/qa/extras/xshape/data/ods/", "tdf76649_TrendLineBug.ods"); + loadFromFile(u"ods/tdf76649_TrendLineBug.ods"); xmlDocUniquePtr pXmlDoc = getXShapeDumpXmlDoc(); @@ -171,15 +252,14 @@ void Chart2XShapeTest::testTdf76649TrendLineBug() void Chart2XShapeTest::testTdf88154LabelRotatedLayout() { - load(u"chart2/qa/extras/xshape/data/pptx/", "tdf88154_LabelRotatedLayout.pptx"); + loadFromFile(u"pptx/tdf88154_LabelRotatedLayout.pptx"); uno::Reference<chart::XChartDocument> xChartDoc = getChartDocFromDrawImpress(0, 5); - uno::Reference<qa::XDumper> xDumper(xChartDoc, UNO_QUERY_THROW); - OUString rDump = xDumper->dump(); + OUString rDump = getShapeDump(xChartDoc); OString aXmlDump = OUStringToOString(rDump, RTL_TEXTENCODING_UTF8); xmlDocUniquePtr pXmlDoc(xmlParseDoc(reinterpret_cast<const xmlChar*>(aXmlDump.getStr()))); { - OString aPath("//XShape[@text='Oct-12']/Transformation"); + OString aPath("//XShape[@text='Oct-12']/Transformation"_ostr); assertXPath(pXmlDoc, aPath, 1); double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble(); double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble(); @@ -190,7 +270,7 @@ void Chart2XShapeTest::testTdf88154LabelRotatedLayout() CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8); } { - OString aPath("//XShape[@text='Nov-12']/Transformation"); + OString aPath("//XShape[@text='Nov-12']/Transformation"_ostr); assertXPath(pXmlDoc, aPath, 1); double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble(); double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble(); @@ -201,7 +281,7 @@ void Chart2XShapeTest::testTdf88154LabelRotatedLayout() CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8); } { - OString aPath("//XShape[@text='Dec-12']/Transformation"); + OString aPath("//XShape[@text='Dec-12']/Transformation"_ostr); assertXPath(pXmlDoc, aPath, 1); double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble(); double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble(); @@ -212,7 +292,7 @@ void Chart2XShapeTest::testTdf88154LabelRotatedLayout() CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8); } { - OString aPath("//XShape[@text='May-13']/Transformation"); + OString aPath("//XShape[@text='May-13']/Transformation"_ostr); assertXPath(pXmlDoc, aPath, 1); double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble(); double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble(); @@ -223,7 +303,7 @@ void Chart2XShapeTest::testTdf88154LabelRotatedLayout() CPPUNIT_ASSERT_DOUBLES_EQUAL(fT12, fT22, 1e-8); } { - OString aPath("//XShape[@text='Jan-14']/Transformation"); + OString aPath("//XShape[@text='Jan-14']/Transformation"_ostr); assertXPath(pXmlDoc, aPath, 1); double fT11 = getXPath(pXmlDoc, aPath + "/Line1", "column1").toDouble(); double fT12 = getXPath(pXmlDoc, aPath + "/Line1", "column2").toDouble(); diff --git a/chart2/qa/extras/xshape/data/ods/tdf151424.ods b/chart2/qa/extras/xshape/data/ods/tdf151424.ods Binary files differnew file mode 100644 index 000000000000..d1f6adcc24b1 --- /dev/null +++ b/chart2/qa/extras/xshape/data/ods/tdf151424.ods diff --git a/chart2/qa/extras/xshape/data/ods/tdf90839-4.ods b/chart2/qa/extras/xshape/data/ods/tdf90839-4.ods Binary files differindex fe9950f2797f..3126ac1759e3 100644 --- a/chart2/qa/extras/xshape/data/ods/tdf90839-4.ods +++ b/chart2/qa/extras/xshape/data/ods/tdf90839-4.ods diff --git a/chart2/qa/unit/data/ods/testChart.ods b/chart2/qa/extras/xshape/data/ods/testChart.ods Binary files differindex 956f57d525f0..956f57d525f0 100644 --- a/chart2/qa/unit/data/ods/testChart.ods +++ b/chart2/qa/extras/xshape/data/ods/testChart.ods diff --git a/chart2/qa/extras/xshape/data/pptx/tdf149204.pptx b/chart2/qa/extras/xshape/data/pptx/tdf149204.pptx Binary files differnew file mode 100644 index 000000000000..60d006547a2a --- /dev/null +++ b/chart2/qa/extras/xshape/data/pptx/tdf149204.pptx diff --git a/chart2/qa/extras/xshape/data/reference/fdo75075.xml b/chart2/qa/extras/xshape/data/reference/fdo75075.xml index 93becacffaa8..6f401aa41edd 100644 --- a/chart2/qa/extras/xshape/data/reference/fdo75075.xml +++ b/chart2/qa/extras/xshape/data/reference/fdo75075.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <XShapes> - <XShape positionX="0" positionY="0" sizeX="16000" sizeY="9000" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="0" positionY="0" sizeX="16000" sizeY="9000" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -14,10 +14,10 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="180" sizeX="12878" sizeY="8640" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> + <XShape positionX="320" positionY="180" sizeX="12850" sizeY="8640" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> <XShapes> - <XShape positionX="1497" positionY="354" sizeX="10417" sizeY="7872" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="1527" positionY="379" sizeX="10339" sizeY="7794" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -25,13 +25,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="10418.000000" column2="0.000000" column3="1497.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="354.000000"/> + <Line1 column1="10340.000000" column2="0.000000" column3="1527.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="379.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="180" sizeX="12878" sizeY="8640" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="180" sizeX="12850" sizeY="8640" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -39,19 +39,19 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="12879.000000" column2="0.000000" column3="320.000000"/> + <Line1 column1="12851.000000" column2="0.000000" column3="320.000000"/> <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="180" sizeX="12878" sizeY="8640" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="320" positionY="180" sizeX="12850" sizeY="8640" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1347" positionY="352" sizeX="10717" sizeY="8023" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="1377" positionY="378" sizeX="10639" sizeY="7944" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1497" positionY="354" sizeX="10417" sizeY="7872" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> + <XShape positionX="1527" positionY="379" sizeX="10339" sizeY="7794" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> <XShapes> - <XShape positionX="1497" positionY="354" sizeX="10417" sizeY="7872" type="com.sun.star.drawing.RectangleShape" name="CID/DiagramWall=" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="1527" positionY="379" sizeX="10339" sizeY="7794" type="com.sun.star.drawing.RectangleShape" name="CID/DiagramWall=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -59,216 +59,216 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="10418.000000" column2="0.000000" column3="1497.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="354.000000"/> + <Line1 column1="10340.000000" column2="0.000000" column3="1527.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="379.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="10418.000000" column2="0.000000" column3="1497.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="354.000000"/> + <Line1 column1="10340.000000" column2="0.000000" column3="1527.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="379.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1347" positionY="352" sizeX="10717" sizeY="8023" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> + <XShape positionX="1377" positionY="378" sizeX="10639" sizeY="7944" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> <XShapes> - <XShape positionX="1497" positionY="353" sizeX="10417" sizeY="7872" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="1527" positionY="378" sizeX="10339" sizeY="7794" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1497" positionY="353" sizeX="10417" sizeY="7872" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0:Grid=0"> + <XShape positionX="1527" positionY="378" sizeX="10339" sizeY="7794" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0:Grid=0"> <XShapes> - <XShape positionX="1497" positionY="353" sizeX="10417" sizeY="7872" type="com.sun.star.drawing.PolyLineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="1527" positionY="378" sizeX="10339" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="11914" positionY="8225"/> - <point positionX="1497" positionY="8225"/> + <point positionX="11866" positionY="8172"/> + <point positionX="1527" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="11914" positionY="7241"/> - <point positionX="1497" positionY="7241"/> + <point positionX="11866" positionY="7197"/> + <point positionX="1527" positionY="7197"/> </pointSequence> <pointSequence> - <point positionX="11914" positionY="6257"/> - <point positionX="1497" positionY="6257"/> + <point positionX="11866" positionY="6223"/> + <point positionX="1527" positionY="6223"/> </pointSequence> <pointSequence> - <point positionX="11914" positionY="5273"/> - <point positionX="1497" positionY="5273"/> + <point positionX="11866" positionY="5249"/> + <point positionX="1527" positionY="5249"/> </pointSequence> <pointSequence> - <point positionX="11914" positionY="4289"/> - <point positionX="1497" positionY="4289"/> + <point positionX="11866" positionY="4275"/> + <point positionX="1527" positionY="4275"/> </pointSequence> <pointSequence> - <point positionX="11914" positionY="3305"/> - <point positionX="1497" positionY="3305"/> + <point positionX="11866" positionY="3300"/> + <point positionX="1527" positionY="3300"/> </pointSequence> <pointSequence> - <point positionX="11914" positionY="2321"/> - <point positionX="1497" positionY="2321"/> + <point positionX="11866" positionY="2326"/> + <point positionX="1527" positionY="2326"/> </pointSequence> <pointSequence> - <point positionX="11914" positionY="1337"/> - <point positionX="1497" positionY="1337"/> + <point positionX="11866" positionY="1352"/> + <point positionX="1527" positionY="1352"/> </pointSequence> <pointSequence> - <point positionX="11914" positionY="353"/> - <point positionX="1497" positionY="353"/> + <point positionX="11866" positionY="378"/> + <point positionX="1527" positionY="378"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="10417" positionY="7872"/> - <point positionX="0" positionY="7872"/> + <point positionX="10339" positionY="7794"/> + <point positionX="0" positionY="7794"/> </pointSequence> <pointSequence> - <point positionX="10417" positionY="6888"/> - <point positionX="0" positionY="6888"/> + <point positionX="10339" positionY="6819"/> + <point positionX="0" positionY="6819"/> </pointSequence> <pointSequence> - <point positionX="10417" positionY="5904"/> - <point positionX="0" positionY="5904"/> + <point positionX="10339" positionY="5845"/> + <point positionX="0" positionY="5845"/> </pointSequence> <pointSequence> - <point positionX="10417" positionY="4920"/> - <point positionX="0" positionY="4920"/> + <point positionX="10339" positionY="4871"/> + <point positionX="0" positionY="4871"/> </pointSequence> <pointSequence> - <point positionX="10417" positionY="3936"/> - <point positionX="0" positionY="3936"/> + <point positionX="10339" positionY="3897"/> + <point positionX="0" positionY="3897"/> </pointSequence> <pointSequence> - <point positionX="10417" positionY="2952"/> - <point positionX="0" positionY="2952"/> + <point positionX="10339" positionY="2922"/> + <point positionX="0" positionY="2922"/> </pointSequence> <pointSequence> - <point positionX="10417" positionY="1968"/> - <point positionX="0" positionY="1968"/> + <point positionX="10339" positionY="1948"/> + <point positionX="0" positionY="1948"/> </pointSequence> <pointSequence> - <point positionX="10417" positionY="984"/> - <point positionX="0" positionY="984"/> + <point positionX="10339" positionY="974"/> + <point positionX="0" positionY="974"/> </pointSequence> <pointSequence> - <point positionX="10417" positionY="0"/> + <point positionX="10339" positionY="0"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="10417.000000" column2="0.000000" column3="1497.000000"/> - <Line2 column1="0.000000" column2="7872.000000" column3="353.000000"/> + <Line1 column1="10339.000000" column2="0.000000" column3="1527.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1497" positionY="353" sizeX="0" sizeY="7872" type="com.sun.star.drawing.PolyLineShape" name="HandlesOnly" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="NONE"> + <XShape positionX="1527" positionY="378" sizeX="0" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" name="HandlesOnly" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="NONE"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="1497" positionY="8225"/> - <point positionX="1497" positionY="7241"/> - <point positionX="1497" positionY="6257"/> - <point positionX="1497" positionY="5273"/> - <point positionX="1497" positionY="4289"/> - <point positionX="1497" positionY="3305"/> - <point positionX="1497" positionY="2321"/> - <point positionX="1497" positionY="1337"/> - <point positionX="1497" positionY="353"/> + <point positionX="1527" positionY="8172"/> + <point positionX="1527" positionY="7197"/> + <point positionX="1527" positionY="6223"/> + <point positionX="1527" positionY="5249"/> + <point positionX="1527" positionY="4275"/> + <point positionX="1527" positionY="3300"/> + <point positionX="1527" positionY="2326"/> + <point positionX="1527" positionY="1352"/> + <point positionX="1527" positionY="378"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="7872"/> - <point positionX="0" positionY="6888"/> - <point positionX="0" positionY="5904"/> - <point positionX="0" positionY="4920"/> - <point positionX="0" positionY="3936"/> - <point positionX="0" positionY="2952"/> - <point positionX="0" positionY="1968"/> - <point positionX="0" positionY="984"/> + <point positionX="0" positionY="7794"/> + <point positionX="0" positionY="6819"/> + <point positionX="0" positionY="5845"/> + <point positionX="0" positionY="4871"/> + <point positionX="0" positionY="3897"/> + <point positionX="0" positionY="2922"/> + <point positionX="0" positionY="1948"/> + <point positionX="0" positionY="974"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="1497.000000"/> - <Line2 column1="0.000000" column2="7872.000000" column3="353.000000"/> + <Line1 column1="0.000000" column2="0.000000" column3="1527.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="10418.000000" column2="0.000000" column3="1497.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="353.000000"/> + <Line1 column1="10340.000000" column2="0.000000" column3="1527.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="10418.000000" column2="0.000000" column3="1497.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="353.000000"/> + <Line1 column1="10340.000000" column2="0.000000" column3="1527.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1347" positionY="352" sizeX="10717" sizeY="8023" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="1377" positionY="378" sizeX="10639" sizeY="7944" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1497" positionY="8225" sizeX="10417" sizeY="150" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> + <XShape positionX="1527" positionY="8172" sizeX="10339" sizeY="150" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> <XShapes> - <XShape positionX="1497" positionY="8225" sizeX="10417" sizeY="150" type="com.sun.star.drawing.PolyLineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="1527" positionY="8172" sizeX="10339" sizeY="150" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="1497" positionY="8375"/> - <point positionX="1497" positionY="8225"/> + <point positionX="1527" positionY="8322"/> + <point positionX="1527" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="1497" positionY="8375"/> - <point positionX="1497" positionY="8225"/> + <point positionX="1527" positionY="8322"/> + <point positionX="1527" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="3580" positionY="8375"/> - <point positionX="3580" positionY="8225"/> + <point positionX="3594" positionY="8322"/> + <point positionX="3594" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="3580" positionY="8375"/> - <point positionX="3580" positionY="8225"/> + <point positionX="3594" positionY="8322"/> + <point positionX="3594" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="5663" positionY="8375"/> - <point positionX="5663" positionY="8225"/> + <point positionX="5662" positionY="8322"/> + <point positionX="5662" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="5663" positionY="8375"/> - <point positionX="5663" positionY="8225"/> + <point positionX="5662" positionY="8322"/> + <point positionX="5662" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="7747" positionY="8375"/> - <point positionX="7747" positionY="8225"/> + <point positionX="7730" positionY="8322"/> + <point positionX="7730" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="7747" positionY="8375"/> - <point positionX="7747" positionY="8225"/> + <point positionX="7730" positionY="8322"/> + <point positionX="7730" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="9830" positionY="8375"/> - <point positionX="9830" positionY="8225"/> + <point positionX="9798" positionY="8322"/> + <point positionX="9798" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="9830" positionY="8375"/> - <point positionX="9830" positionY="8225"/> + <point positionX="9798" positionY="8322"/> + <point positionX="9798" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="11914" positionY="8375"/> - <point positionX="11914" positionY="8225"/> + <point positionX="11866" positionY="8322"/> + <point positionX="11866" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="11914" positionY="8375"/> - <point positionX="11914" positionY="8225"/> + <point positionX="11866" positionY="8322"/> + <point positionX="11866" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> @@ -281,225 +281,225 @@ <point positionX="0" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="2083" positionY="150"/> - <point positionX="2083" positionY="0"/> + <point positionX="2067" positionY="150"/> + <point positionX="2067" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="2083" positionY="150"/> - <point positionX="2083" positionY="0"/> + <point positionX="2067" positionY="150"/> + <point positionX="2067" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="4166" positionY="150"/> - <point positionX="4166" positionY="0"/> + <point positionX="4135" positionY="150"/> + <point positionX="4135" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="4166" positionY="150"/> - <point positionX="4166" positionY="0"/> + <point positionX="4135" positionY="150"/> + <point positionX="4135" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="6250" positionY="150"/> - <point positionX="6250" positionY="0"/> + <point positionX="6203" positionY="150"/> + <point positionX="6203" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="6250" positionY="150"/> - <point positionX="6250" positionY="0"/> + <point positionX="6203" positionY="150"/> + <point positionX="6203" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="8333" positionY="150"/> - <point positionX="8333" positionY="0"/> + <point positionX="8271" positionY="150"/> + <point positionX="8271" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="8333" positionY="150"/> - <point positionX="8333" positionY="0"/> + <point positionX="8271" positionY="150"/> + <point positionX="8271" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="10417" positionY="150"/> - <point positionX="10417" positionY="0"/> + <point positionX="10339" positionY="150"/> + <point positionX="10339" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="10417" positionY="150"/> - <point positionX="10417" positionY="0"/> + <point positionX="10339" positionY="150"/> + <point positionX="10339" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="10417.000000" column2="0.000000" column3="1497.000000"/> - <Line2 column1="0.000000" column2="150.000000" column3="8225.000000"/> + <Line1 column1="10339.000000" column2="0.000000" column3="1527.000000"/> + <Line2 column1="0.000000" column2="150.000000" column3="8172.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1497" positionY="8225" sizeX="10417" sizeY="0" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="1527" positionY="8172" sizeX="10339" sizeY="0" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="1497" positionY="8225"/> - <point positionX="11914" positionY="8225"/> + <point positionX="1527" positionY="8172"/> + <point positionX="11866" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> <point positionX="0" positionY="0"/> - <point positionX="10417" positionY="0"/> + <point positionX="10339" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="10417.000000" column2="0.000000" column3="1497.000000"/> - <Line2 column1="0.000000" column2="0.000000" column3="8225.000000"/> + <Line1 column1="10339.000000" column2="0.000000" column3="1527.000000"/> + <Line2 column1="0.000000" column2="0.000000" column3="8172.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="10418.000000" column2="0.000000" column3="1497.000000"/> - <Line2 column1="0.000000" column2="151.000000" column3="8225.000000"/> + <Line1 column1="10340.000000" column2="0.000000" column3="1527.000000"/> + <Line2 column1="0.000000" column2="151.000000" column3="8172.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1347" positionY="353" sizeX="150" sizeY="7872" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShape positionX="1377" positionY="378" sizeX="150" sizeY="7794" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> <XShapes> - <XShape positionX="1347" positionY="353" sizeX="150" sizeY="7872" type="com.sun.star.drawing.PolyLineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="1377" positionY="378" sizeX="150" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="1347" positionY="8225"/> - <point positionX="1497" positionY="8225"/> + <point positionX="1377" positionY="8172"/> + <point positionX="1527" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="8225"/> - <point positionX="1497" positionY="8225"/> + <point positionX="1377" positionY="8172"/> + <point positionX="1527" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="7241"/> - <point positionX="1497" positionY="7241"/> + <point positionX="1377" positionY="7197"/> + <point positionX="1527" positionY="7197"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="7241"/> - <point positionX="1497" positionY="7241"/> + <point positionX="1377" positionY="7197"/> + <point positionX="1527" positionY="7197"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="6257"/> - <point positionX="1497" positionY="6257"/> + <point positionX="1377" positionY="6223"/> + <point positionX="1527" positionY="6223"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="6257"/> - <point positionX="1497" positionY="6257"/> + <point positionX="1377" positionY="6223"/> + <point positionX="1527" positionY="6223"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="5273"/> - <point positionX="1497" positionY="5273"/> + <point positionX="1377" positionY="5249"/> + <point positionX="1527" positionY="5249"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="5273"/> - <point positionX="1497" positionY="5273"/> + <point positionX="1377" positionY="5249"/> + <point positionX="1527" positionY="5249"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="4289"/> - <point positionX="1497" positionY="4289"/> + <point positionX="1377" positionY="4275"/> + <point positionX="1527" positionY="4275"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="4289"/> - <point positionX="1497" positionY="4289"/> + <point positionX="1377" positionY="4275"/> + <point positionX="1527" positionY="4275"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="3305"/> - <point positionX="1497" positionY="3305"/> + <point positionX="1377" positionY="3300"/> + <point positionX="1527" positionY="3300"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="3305"/> - <point positionX="1497" positionY="3305"/> + <point positionX="1377" positionY="3300"/> + <point positionX="1527" positionY="3300"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="2321"/> - <point positionX="1497" positionY="2321"/> + <point positionX="1377" positionY="2326"/> + <point positionX="1527" positionY="2326"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="2321"/> - <point positionX="1497" positionY="2321"/> + <point positionX="1377" positionY="2326"/> + <point positionX="1527" positionY="2326"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="1337"/> - <point positionX="1497" positionY="1337"/> + <point positionX="1377" positionY="1352"/> + <point positionX="1527" positionY="1352"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="1337"/> - <point positionX="1497" positionY="1337"/> + <point positionX="1377" positionY="1352"/> + <point positionX="1527" positionY="1352"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="353"/> - <point positionX="1497" positionY="353"/> + <point positionX="1377" positionY="378"/> + <point positionX="1527" positionY="378"/> </pointSequence> <pointSequence> - <point positionX="1347" positionY="353"/> - <point positionX="1497" positionY="353"/> + <point positionX="1377" positionY="378"/> + <point positionX="1527" positionY="378"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="7872"/> - <point positionX="150" positionY="7872"/> + <point positionX="0" positionY="7794"/> + <point positionX="150" positionY="7794"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="7872"/> - <point positionX="150" positionY="7872"/> + <point positionX="0" positionY="7794"/> + <point positionX="150" positionY="7794"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="6888"/> - <point positionX="150" positionY="6888"/> + <point positionX="0" positionY="6819"/> + <point positionX="150" positionY="6819"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="6888"/> - <point positionX="150" positionY="6888"/> + <point positionX="0" positionY="6819"/> + <point positionX="150" positionY="6819"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="5904"/> - <point positionX="150" positionY="5904"/> + <point positionX="0" positionY="5845"/> + <point positionX="150" positionY="5845"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="5904"/> - <point positionX="150" positionY="5904"/> + <point positionX="0" positionY="5845"/> + <point positionX="150" positionY="5845"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="4920"/> - <point positionX="150" positionY="4920"/> + <point positionX="0" positionY="4871"/> + <point positionX="150" positionY="4871"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="4920"/> - <point positionX="150" positionY="4920"/> + <point positionX="0" positionY="4871"/> + <point positionX="150" positionY="4871"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="3936"/> - <point positionX="150" positionY="3936"/> + <point positionX="0" positionY="3897"/> + <point positionX="150" positionY="3897"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="3936"/> - <point positionX="150" positionY="3936"/> + <point positionX="0" positionY="3897"/> + <point positionX="150" positionY="3897"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="2952"/> - <point positionX="150" positionY="2952"/> + <point positionX="0" positionY="2922"/> + <point positionX="150" positionY="2922"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="2952"/> - <point positionX="150" positionY="2952"/> + <point positionX="0" positionY="2922"/> + <point positionX="150" positionY="2922"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="1968"/> - <point positionX="150" positionY="1968"/> + <point positionX="0" positionY="1948"/> + <point positionX="150" positionY="1948"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="1968"/> - <point positionX="150" positionY="1968"/> + <point positionX="0" positionY="1948"/> + <point positionX="150" positionY="1948"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="984"/> - <point positionX="150" positionY="984"/> + <point positionX="0" positionY="974"/> + <point positionX="150" positionY="974"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="984"/> - <point positionX="150" positionY="984"/> + <point positionX="0" positionY="974"/> + <point positionX="150" positionY="974"/> </pointSequence> <pointSequence> <point positionX="0" positionY="0"/> @@ -511,168 +511,168 @@ </pointSequence> </Geometry> <Transformation> - <Line1 column1="150.000000" column2="0.000000" column3="1347.000000"/> - <Line2 column1="0.000000" column2="7872.000000" column3="353.000000"/> + <Line1 column1="150.000000" column2="0.000000" column3="1377.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1497" positionY="353" sizeX="0" sizeY="7872" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="1527" positionY="378" sizeX="0" sizeY="7794" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="1497" positionY="8225"/> - <point positionX="1497" positionY="353"/> + <point positionX="1527" positionY="8172"/> + <point positionX="1527" positionY="378"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="7872"/> + <point positionX="0" positionY="7794"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="1497.000000"/> - <Line2 column1="0.000000" column2="7872.000000" column3="353.000000"/> + <Line1 column1="0.000000" column2="0.000000" column3="1527.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="151.000000" column2="0.000000" column3="1347.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="353.000000"/> + <Line1 column1="151.000000" column2="0.000000" column3="1377.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="11914" positionY="352" sizeX="150" sizeY="7873" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,1"> + <XShape positionX="11866" positionY="378" sizeX="150" sizeY="7794" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,1"> <XShapes> - <XShape positionX="11914" positionY="352" sizeX="150" sizeY="7873" type="com.sun.star.drawing.PolyLineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="11866" positionY="378" sizeX="150" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="12064" positionY="8225"/> - <point positionX="11914" positionY="8225"/> + <point positionX="12016" positionY="8172"/> + <point positionX="11866" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="8225"/> - <point positionX="11914" positionY="8225"/> + <point positionX="12016" positionY="8172"/> + <point positionX="11866" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="7100"/> - <point positionX="11914" positionY="7100"/> + <point positionX="12016" positionY="7058"/> + <point positionX="11866" positionY="7058"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="7100"/> - <point positionX="11914" positionY="7100"/> + <point positionX="12016" positionY="7058"/> + <point positionX="11866" positionY="7058"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="5975"/> - <point positionX="11914" positionY="5975"/> + <point positionX="12016" positionY="5945"/> + <point positionX="11866" positionY="5945"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="5975"/> - <point positionX="11914" positionY="5975"/> + <point positionX="12016" positionY="5945"/> + <point positionX="11866" positionY="5945"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="4851"/> - <point positionX="11914" positionY="4851"/> + <point positionX="12016" positionY="4831"/> + <point positionX="11866" positionY="4831"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="4851"/> - <point positionX="11914" positionY="4851"/> + <point positionX="12016" positionY="4831"/> + <point positionX="11866" positionY="4831"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="3726"/> - <point positionX="11914" positionY="3726"/> + <point positionX="12016" positionY="3718"/> + <point positionX="11866" positionY="3718"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="3726"/> - <point positionX="11914" positionY="3726"/> + <point positionX="12016" positionY="3718"/> + <point positionX="11866" positionY="3718"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="2602"/> - <point positionX="11914" positionY="2602"/> + <point positionX="12016" positionY="2604"/> + <point positionX="11866" positionY="2604"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="2602"/> - <point positionX="11914" positionY="2602"/> + <point positionX="12016" positionY="2604"/> + <point positionX="11866" positionY="2604"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="1477"/> - <point positionX="11914" positionY="1477"/> + <point positionX="12016" positionY="1491"/> + <point positionX="11866" positionY="1491"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="1477"/> - <point positionX="11914" positionY="1477"/> + <point positionX="12016" positionY="1491"/> + <point positionX="11866" positionY="1491"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="352"/> - <point positionX="11914" positionY="352"/> + <point positionX="12016" positionY="378"/> + <point positionX="11866" positionY="378"/> </pointSequence> <pointSequence> - <point positionX="12064" positionY="352"/> - <point positionX="11914" positionY="352"/> + <point positionX="12016" positionY="378"/> + <point positionX="11866" positionY="378"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="150" positionY="7873"/> - <point positionX="0" positionY="7873"/> + <point positionX="150" positionY="7794"/> + <point positionX="0" positionY="7794"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="7873"/> - <point positionX="0" positionY="7873"/> + <point positionX="150" positionY="7794"/> + <point positionX="0" positionY="7794"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="6748"/> - <point positionX="0" positionY="6748"/> + <point positionX="150" positionY="6680"/> + <point positionX="0" positionY="6680"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="6748"/> - <point positionX="0" positionY="6748"/> + <point positionX="150" positionY="6680"/> + <point positionX="0" positionY="6680"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="5623"/> - <point positionX="0" positionY="5623"/> + <point positionX="150" positionY="5567"/> + <point positionX="0" positionY="5567"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="5623"/> - <point positionX="0" positionY="5623"/> + <point positionX="150" positionY="5567"/> + <point positionX="0" positionY="5567"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="4499"/> - <point positionX="0" positionY="4499"/> + <point positionX="150" positionY="4453"/> + <point positionX="0" positionY="4453"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="4499"/> - <point positionX="0" positionY="4499"/> + <point positionX="150" positionY="4453"/> + <point positionX="0" positionY="4453"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="3374"/> - <point positionX="0" positionY="3374"/> + <point positionX="150" positionY="3340"/> + <point positionX="0" positionY="3340"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="3374"/> - <point positionX="0" positionY="3374"/> + <point positionX="150" positionY="3340"/> + <point positionX="0" positionY="3340"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="2250"/> - <point positionX="0" positionY="2250"/> + <point positionX="150" positionY="2226"/> + <point positionX="0" positionY="2226"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="2250"/> - <point positionX="0" positionY="2250"/> + <point positionX="150" positionY="2226"/> + <point positionX="0" positionY="2226"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="1125"/> - <point positionX="0" positionY="1125"/> + <point positionX="150" positionY="1113"/> + <point positionX="0" positionY="1113"/> </pointSequence> <pointSequence> - <point positionX="150" positionY="1125"/> - <point positionX="0" positionY="1125"/> + <point positionX="150" positionY="1113"/> + <point positionX="0" positionY="1113"/> </pointSequence> <pointSequence> <point positionX="150" positionY="0"/> @@ -684,53 +684,53 @@ </pointSequence> </Geometry> <Transformation> - <Line1 column1="150.000000" column2="0.000000" column3="11914.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="352.000000"/> + <Line1 column1="150.000000" column2="0.000000" column3="11866.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="11914" positionY="353" sizeX="0" sizeY="7872" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="11866" positionY="378" sizeX="0" sizeY="7794" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="11914" positionY="8225"/> - <point positionX="11914" positionY="353"/> + <point positionX="11866" positionY="8172"/> + <point positionX="11866" positionY="378"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="7872"/> + <point positionX="0" positionY="7794"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="11914.000000"/> - <Line2 column1="0.000000" column2="7872.000000" column3="353.000000"/> + <Line1 column1="0.000000" column2="0.000000" column3="11866.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="151.000000" column2="0.000000" column3="11914.000000"/> - <Line2 column1="0.000000" column2="7874.000000" column3="352.000000"/> + <Line1 column1="151.000000" column2="0.000000" column3="11866.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="10718.000000" column2="0.000000" column3="1347.000000"/> - <Line2 column1="0.000000" column2="8024.000000" column3="352.000000"/> + <Line1 column1="10640.000000" column2="0.000000" column3="1377.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="2017" positionY="1234" sizeX="9376" sizeY="6991" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="2043" positionY="1250" sizeX="9306" sizeY="6922" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="2017" positionY="1234" sizeX="9376" sizeY="6991" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> + <XShape positionX="2043" positionY="1250" sizeX="9306" sizeY="6922" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> <XShapes> - <XShape positionX="10351" positionY="2600" sizeX="1042" sizeY="5625" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=4" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="2043" positionY="3765" sizeX="1034" sizeY="4407" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -739,30 +739,30 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="10351" positionY="8225"/> - <point positionX="11393" positionY="8225"/> - <point positionX="11393" positionY="2600"/> - <point positionX="10351" positionY="2600"/> - <point positionX="10351" positionY="8225"/> + <point positionX="2043" positionY="8172"/> + <point positionX="3077" positionY="8172"/> + <point positionX="3077" positionY="3765"/> + <point positionX="2043" positionY="3765"/> + <point positionX="2043" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="5625"/> - <point positionX="1042" positionY="5625"/> - <point positionX="1042" positionY="0"/> + <point positionX="0" positionY="4407"/> + <point positionX="1034" positionY="4407"/> + <point positionX="1034" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="5625"/> + <point positionX="0" positionY="4407"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1042.000000" column2="0.000000" column3="10351.000000"/> - <Line2 column1="0.000000" column2="5625.000000" column3="2600.000000"/> + <Line1 column1="1034.000000" column2="0.000000" column3="2043.000000"/> + <Line2 column1="0.000000" column2="4407.000000" column3="3765.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8268" positionY="1510" sizeX="1041" sizeY="6715" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="4111" positionY="1993" sizeX="1034" sizeY="6179" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -771,30 +771,30 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="8268" positionY="8225"/> - <point positionX="9309" positionY="8225"/> - <point positionX="9309" positionY="1510"/> - <point positionX="8268" positionY="1510"/> - <point positionX="8268" positionY="8225"/> + <point positionX="4111" positionY="8172"/> + <point positionX="5145" positionY="8172"/> + <point positionX="5145" positionY="1993"/> + <point positionX="4111" positionY="1993"/> + <point positionX="4111" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="6715"/> - <point positionX="1041" positionY="6715"/> - <point positionX="1041" positionY="0"/> + <point positionX="0" positionY="6179"/> + <point positionX="1034" positionY="6179"/> + <point positionX="1034" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="6715"/> + <point positionX="0" positionY="6179"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1041.000000" column2="0.000000" column3="8268.000000"/> - <Line2 column1="0.000000" column2="6715.000000" column3="1510.000000"/> + <Line1 column1="1034.000000" column2="0.000000" column3="4111.000000"/> + <Line2 column1="0.000000" column2="6179.000000" column3="1993.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="6184" positionY="1234" sizeX="1042" sizeY="6991" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="6179" positionY="1250" sizeX="1034" sizeY="6922" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -803,30 +803,30 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="6184" positionY="8225"/> - <point positionX="7226" positionY="8225"/> - <point positionX="7226" positionY="1234"/> - <point positionX="6184" positionY="1234"/> - <point positionX="6184" positionY="8225"/> + <point positionX="6179" positionY="8172"/> + <point positionX="7213" positionY="8172"/> + <point positionX="7213" positionY="1250"/> + <point positionX="6179" positionY="1250"/> + <point positionX="6179" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="6991"/> - <point positionX="1042" positionY="6991"/> - <point positionX="1042" positionY="0"/> + <point positionX="0" positionY="6922"/> + <point positionX="1034" positionY="6922"/> + <point positionX="1034" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="6991"/> + <point positionX="0" positionY="6922"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1042.000000" column2="0.000000" column3="6184.000000"/> - <Line2 column1="0.000000" column2="6991.000000" column3="1234.000000"/> + <Line1 column1="1034.000000" column2="0.000000" column3="6179.000000"/> + <Line2 column1="0.000000" column2="6922.000000" column3="1250.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="4101" positionY="1984" sizeX="1041" sizeY="6241" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="8247" positionY="1524" sizeX="1034" sizeY="6648" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -835,30 +835,30 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="4101" positionY="8225"/> - <point positionX="5142" positionY="8225"/> - <point positionX="5142" positionY="1984"/> - <point positionX="4101" positionY="1984"/> - <point positionX="4101" positionY="8225"/> + <point positionX="8247" positionY="8172"/> + <point positionX="9281" positionY="8172"/> + <point positionX="9281" positionY="1524"/> + <point positionX="8247" positionY="1524"/> + <point positionX="8247" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="6241"/> - <point positionX="1041" positionY="6241"/> - <point positionX="1041" positionY="0"/> + <point positionX="0" positionY="6648"/> + <point positionX="1034" positionY="6648"/> + <point positionX="1034" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="6241"/> + <point positionX="0" positionY="6648"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1041.000000" column2="0.000000" column3="4101.000000"/> - <Line2 column1="0.000000" column2="6241.000000" column3="1984.000000"/> + <Line1 column1="1034.000000" column2="0.000000" column3="8247.000000"/> + <Line2 column1="0.000000" column2="6648.000000" column3="1524.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="2017" positionY="3774" sizeX="1042" sizeY="4451" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="10315" positionY="2603" sizeX="1034" sizeY="5569" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=4" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -867,219 +867,219 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="2017" positionY="8225"/> - <point positionX="3059" positionY="8225"/> - <point positionX="3059" positionY="3774"/> - <point positionX="2017" positionY="3774"/> - <point positionX="2017" positionY="8225"/> + <point positionX="10315" positionY="8172"/> + <point positionX="11349" positionY="8172"/> + <point positionX="11349" positionY="2603"/> + <point positionX="10315" positionY="2603"/> + <point positionX="10315" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="4451"/> - <point positionX="1042" positionY="4451"/> - <point positionX="1042" positionY="0"/> + <point positionX="0" positionY="5569"/> + <point positionX="1034" positionY="5569"/> + <point positionX="1034" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="4451"/> + <point positionX="0" positionY="5569"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1042.000000" column2="0.000000" column3="2017.000000"/> - <Line2 column1="0.000000" column2="4451.000000" column3="3774.000000"/> + <Line1 column1="1034.000000" column2="0.000000" column3="10315.000000"/> + <Line2 column1="0.000000" column2="5569.000000" column3="2603.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9377.000000" column2="0.000000" column3="2017.000000"/> - <Line2 column1="0.000000" column2="6992.000000" column3="1234.000000"/> + <Line1 column1="9307.000000" column2="0.000000" column3="2043.000000"/> + <Line2 column1="0.000000" column2="6923.000000" column3="1250.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9377.000000" column2="0.000000" column3="2017.000000"/> - <Line2 column1="0.000000" column2="6992.000000" column3="1234.000000"/> + <Line1 column1="9307.000000" column2="0.000000" column3="2043.000000"/> + <Line2 column1="0.000000" column2="6923.000000" column3="1250.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="2538" positionY="860" sizeX="8334" sizeY="4193" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="2560" positionY="880" sizeX="8272" sizeY="4152" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="2538" positionY="860" sizeX="8334" sizeY="4193" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=1:Series=0"> + <XShape positionX="2560" positionY="880" sizeX="8272" sizeY="4152" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=1:Series=0"> <XShapes> - <XShape positionX="2538" positionY="4557" sizeX="0" sizeY="496" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:Point=0"> + <XShape positionX="2560" positionY="4541" sizeX="0" sizeY="491" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:Point=0"> <XShapes> - <XShape positionX="2538" positionY="4557" sizeX="0" sizeY="496" type="com.sun.star.drawing.LineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="2560" positionY="4541" sizeX="0" sizeY="491" type="com.sun.star.drawing.LineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="2538" positionY="5053"/> - <point positionX="2538" positionY="4557"/> + <point positionX="2560" positionY="5032"/> + <point positionX="2560" positionY="4541"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="496"/> + <point positionX="0" positionY="491"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="2538.000000"/> - <Line2 column1="0.000000" column2="496.000000" column3="4557.000000"/> + <Line1 column1="0.000000" column2="0.000000" column3="2560.000000"/> + <Line2 column1="0.000000" column2="491.000000" column3="4541.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="1.000000" column2="0.000000" column3="2538.000000"/> - <Line2 column1="0.000000" column2="497.000000" column3="4557.000000"/> + <Line1 column1="1.000000" column2="0.000000" column3="2560.000000"/> + <Line2 column1="0.000000" column2="492.000000" column3="4541.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="4622" positionY="3881" sizeX="0" sizeY="1071" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:Point=1"> + <XShape positionX="4628" positionY="3871" sizeX="0" sizeY="1060" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:Point=1"> <XShapes> - <XShape positionX="4622" positionY="3881" sizeX="0" sizeY="1071" type="com.sun.star.drawing.LineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="4628" positionY="3871" sizeX="0" sizeY="1060" type="com.sun.star.drawing.LineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="4622" positionY="4952"/> - <point positionX="4622" positionY="3881"/> + <point positionX="4628" positionY="4931"/> + <point positionX="4628" positionY="3871"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="1071"/> + <point positionX="0" positionY="1060"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="4622.000000"/> - <Line2 column1="0.000000" column2="1071.000000" column3="3881.000000"/> + <Line1 column1="0.000000" column2="0.000000" column3="4628.000000"/> + <Line2 column1="0.000000" column2="1060.000000" column3="3871.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="1.000000" column2="0.000000" column3="4622.000000"/> - <Line2 column1="0.000000" column2="1072.000000" column3="3881.000000"/> + <Line1 column1="1.000000" column2="0.000000" column3="4628.000000"/> + <Line2 column1="0.000000" column2="1061.000000" column3="3871.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="6705" positionY="2617" sizeX="0" sizeY="1958" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:Point=2"> + <XShape positionX="6696" positionY="2620" sizeX="0" sizeY="1938" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:Point=2"> <XShapes> - <XShape positionX="6705" positionY="2617" sizeX="0" sizeY="1958" type="com.sun.star.drawing.LineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="6696" positionY="2620" sizeX="0" sizeY="1938" type="com.sun.star.drawing.LineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="6705" positionY="4575"/> - <point positionX="6705" positionY="2617"/> + <point positionX="6696" positionY="4558"/> + <point positionX="6696" positionY="2620"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="1958"/> + <point positionX="0" positionY="1938"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="6705.000000"/> - <Line2 column1="0.000000" column2="1958.000000" column3="2617.000000"/> + <Line1 column1="0.000000" column2="0.000000" column3="6696.000000"/> + <Line2 column1="0.000000" column2="1938.000000" column3="2620.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="1.000000" column2="0.000000" column3="6705.000000"/> - <Line2 column1="0.000000" column2="1959.000000" column3="2617.000000"/> + <Line1 column1="1.000000" column2="0.000000" column3="6696.000000"/> + <Line2 column1="0.000000" column2="1939.000000" column3="2620.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8788" positionY="1789" sizeX="0" sizeY="907" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:Point=3"> + <XShape positionX="8764" positionY="1799" sizeX="0" sizeY="899" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:Point=3"> <XShapes> - <XShape positionX="8788" positionY="1789" sizeX="0" sizeY="907" type="com.sun.star.drawing.LineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="8764" positionY="1799" sizeX="0" sizeY="899" type="com.sun.star.drawing.LineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="8788" positionY="2696"/> - <point positionX="8788" positionY="1789"/> + <point positionX="8764" positionY="2698"/> + <point positionX="8764" positionY="1799"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="907"/> + <point positionX="0" positionY="899"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="8788.000000"/> - <Line2 column1="0.000000" column2="907.000000" column3="1789.000000"/> + <Line1 column1="0.000000" column2="0.000000" column3="8764.000000"/> + <Line2 column1="0.000000" column2="899.000000" column3="1799.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="1.000000" column2="0.000000" column3="8788.000000"/> - <Line2 column1="0.000000" column2="908.000000" column3="1789.000000"/> + <Line1 column1="1.000000" column2="0.000000" column3="8764.000000"/> + <Line2 column1="0.000000" column2="900.000000" column3="1799.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="10872" positionY="860" sizeX="0" sizeY="1254" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:Point=4"> + <XShape positionX="10832" positionY="880" sizeX="0" sizeY="1241" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:Point=4"> <XShapes> - <XShape positionX="10872" positionY="860" sizeX="0" sizeY="1254" type="com.sun.star.drawing.LineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="10832" positionY="880" sizeX="0" sizeY="1241" type="com.sun.star.drawing.LineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="10872" positionY="2114"/> - <point positionX="10872" positionY="860"/> + <point positionX="10832" positionY="2121"/> + <point positionX="10832" positionY="880"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="1254"/> + <point positionX="0" positionY="1241"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="10872.000000"/> - <Line2 column1="0.000000" column2="1254.000000" column3="860.000000"/> + <Line1 column1="0.000000" column2="0.000000" column3="10832.000000"/> + <Line2 column1="0.000000" column2="1241.000000" column3="880.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="1.000000" column2="0.000000" column3="10872.000000"/> - <Line2 column1="0.000000" column2="1255.000000" column3="860.000000"/> + <Line1 column1="1.000000" column2="0.000000" column3="10832.000000"/> + <Line2 column1="0.000000" column2="1242.000000" column3="880.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="8335.000000" column2="0.000000" column3="2538.000000"/> - <Line2 column1="0.000000" column2="4194.000000" column3="860.000000"/> + <Line1 column1="8273.000000" column2="0.000000" column3="2560.000000"/> + <Line2 column1="0.000000" column2="4153.000000" column3="880.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="8335.000000" column2="0.000000" column3="2538.000000"/> - <Line2 column1="0.000000" column2="4194.000000" column3="860.000000"/> + <Line1 column1="8273.000000" column2="0.000000" column3="2560.000000"/> + <Line2 column1="0.000000" column2="4153.000000" column3="880.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="2017" positionY="4747" sizeX="1041" sizeY="95" type="com.sun.star.drawing.GroupShape" name="CID/StockLoss="> + <XShape positionX="2043" positionY="4728" sizeX="1033" sizeY="94" type="com.sun.star.drawing.GroupShape" name="CID/StockLoss="> <XShapes> - <XShape positionX="2017" positionY="4747" sizeX="1041" sizeY="95" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="000000" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="2043" positionY="4728" sizeX="1033" sizeY="94" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="000000" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1087,22 +1087,22 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1042.000000" column2="0.000000" column3="2017.000000"/> - <Line2 column1="0.000000" column2="96.000000" column3="4747.000000"/> + <Line1 column1="1034.000000" column2="0.000000" column3="2043.000000"/> + <Line2 column1="0.000000" column2="95.000000" column3="4728.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="1042.000000" column2="0.000000" column3="2017.000000"/> - <Line2 column1="0.000000" column2="96.000000" column3="4747.000000"/> + <Line1 column1="1034.000000" column2="0.000000" column3="2043.000000"/> + <Line2 column1="0.000000" column2="95.000000" column3="4728.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="4101" positionY="954" sizeX="7291" sizeY="3888" type="com.sun.star.drawing.GroupShape" name="CID/StockGain="> + <XShape positionX="4111" positionY="972" sizeX="7237" sizeY="3850" type="com.sun.star.drawing.GroupShape" name="CID/StockGain="> <XShapes> - <XShape positionX="4101" positionY="4303" sizeX="1041" sizeY="539" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="4111" positionY="4288" sizeX="1033" sizeY="534" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1110,13 +1110,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1042.000000" column2="0.000000" column3="4101.000000"/> - <Line2 column1="0.000000" column2="540.000000" column3="4303.000000"/> + <Line1 column1="1034.000000" column2="0.000000" column3="4111.000000"/> + <Line2 column1="0.000000" column2="535.000000" column3="4288.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="6184" positionY="2668" sizeX="1041" sizeY="1634" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="6179" positionY="2671" sizeX="1033" sizeY="1617" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1124,13 +1124,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1042.000000" column2="0.000000" column3="6184.000000"/> - <Line2 column1="0.000000" column2="1635.000000" column3="2668.000000"/> + <Line1 column1="1034.000000" column2="0.000000" column3="6179.000000"/> + <Line2 column1="0.000000" column2="1618.000000" column3="2671.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8268" positionY="1969" sizeX="1041" sizeY="699" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="8247" positionY="1978" sizeX="1033" sizeY="692" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1138,13 +1138,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1042.000000" column2="0.000000" column3="8268.000000"/> - <Line2 column1="0.000000" column2="700.000000" column3="1969.000000"/> + <Line1 column1="1034.000000" column2="0.000000" column3="8247.000000"/> + <Line2 column1="0.000000" column2="693.000000" column3="1978.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="10351" positionY="954" sizeX="1041" sizeY="1015" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="10315" positionY="972" sizeX="1033" sizeY="1005" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1152,38 +1152,38 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1042.000000" column2="0.000000" column3="10351.000000"/> - <Line2 column1="0.000000" column2="1016.000000" column3="954.000000"/> + <Line1 column1="1034.000000" column2="0.000000" column3="10315.000000"/> + <Line2 column1="0.000000" column2="1006.000000" column3="972.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="7292.000000" column2="0.000000" column3="4101.000000"/> - <Line2 column1="0.000000" column2="3889.000000" column3="954.000000"/> + <Line1 column1="7238.000000" column2="0.000000" column3="4111.000000"/> + <Line2 column1="0.000000" column2="3851.000000" column3="972.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="10718.000000" column2="0.000000" column3="1347.000000"/> - <Line2 column1="0.000000" column2="8024.000000" column3="352.000000"/> + <Line1 column1="10640.000000" column2="0.000000" column3="1377.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="10718.000000" column2="0.000000" column3="1347.000000"/> - <Line2 column1="0.000000" column2="8024.000000" column3="352.000000"/> + <Line1 column1="10640.000000" column2="0.000000" column3="1377.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="180" sizeX="12878" sizeY="8640" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="320" positionY="180" sizeX="12850" sizeY="8640" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1691" positionY="8475" sizeX="10029" sizeY="345" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> + <XShape positionX="1699" positionY="8422" sizeX="9995" sizeY="398" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> <XShapes> - <XShape positionX="1691" positionY="8475" sizeX="1695" sizeY="345" type="com.sun.star.drawing.TextShape" text="2014.02.10" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="1699" positionY="8422" sizeX="1723" sizeY="398" type="com.sun.star.drawing.TextShape" text="2014.02.10" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1191,13 +1191,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1696.000000" column2="0.000000" column3="1691.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8475.000000"/> + <Line1 column1="1724.000000" column2="0.000000" column3="1699.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="3788" positionY="8475" sizeX="1669" sizeY="345" type="com.sun.star.drawing.TextShape" text="2014.02.11" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="3767" positionY="8422" sizeX="1723" sizeY="398" type="com.sun.star.drawing.TextShape" text="2014.02.11" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1205,13 +1205,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1670.000000" column2="0.000000" column3="3788.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8475.000000"/> + <Line1 column1="1724.000000" column2="0.000000" column3="3767.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="5858" positionY="8475" sizeX="1695" sizeY="345" type="com.sun.star.drawing.TextShape" text="2014.02.12" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="5835" positionY="8422" sizeX="1723" sizeY="398" type="com.sun.star.drawing.TextShape" text="2014.02.12" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1219,13 +1219,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1696.000000" column2="0.000000" column3="5858.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8475.000000"/> + <Line1 column1="1724.000000" column2="0.000000" column3="5835.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="7941" positionY="8475" sizeX="1695" sizeY="345" type="com.sun.star.drawing.TextShape" text="2014.02.13" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="7903" positionY="8422" sizeX="1723" sizeY="398" type="com.sun.star.drawing.TextShape" text="2014.02.13" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1233,13 +1233,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1696.000000" column2="0.000000" column3="7941.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8475.000000"/> + <Line1 column1="1724.000000" column2="0.000000" column3="7903.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="10025" positionY="8475" sizeX="1695" sizeY="345" type="com.sun.star.drawing.TextShape" text="2014.02.14" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="9971" positionY="8422" sizeX="1723" sizeY="398" type="com.sun.star.drawing.TextShape" text="2014.02.14" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1247,22 +1247,22 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1696.000000" column2="0.000000" column3="10025.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8475.000000"/> + <Line1 column1="1724.000000" column2="0.000000" column3="9971.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="10030.000000" column2="0.000000" column3="1691.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8475.000000"/> + <Line1 column1="9996.000000" column2="0.000000" column3="1699.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="181" sizeX="928" sizeY="8217" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShape positionX="320" positionY="180" sizeX="958" sizeY="8192" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> <XShapes> - <XShape positionX="1061" positionY="8053" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="0" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="1085" positionY="7974" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="0" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1270,13 +1270,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="1061.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8053.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="1085.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="7974.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="7069" sizeX="928" sizeY="345" type="com.sun.star.drawing.TextShape" text="10000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="6999" sizeX="958" sizeY="398" type="com.sun.star.drawing.TextShape" text="10000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1284,13 +1284,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="929.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="7069.000000"/> + <Line1 column1="959.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="6999.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="6085" sizeX="928" sizeY="345" type="com.sun.star.drawing.TextShape" text="20000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="6025" sizeX="958" sizeY="398" type="com.sun.star.drawing.TextShape" text="20000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1298,13 +1298,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="929.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="6085.000000"/> + <Line1 column1="959.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="6025.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="5101" sizeX="928" sizeY="345" type="com.sun.star.drawing.TextShape" text="30000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="5051" sizeX="958" sizeY="398" type="com.sun.star.drawing.TextShape" text="30000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1312,13 +1312,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="929.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="5101.000000"/> + <Line1 column1="959.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="5051.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="4117" sizeX="928" sizeY="345" type="com.sun.star.drawing.TextShape" text="40000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="4077" sizeX="958" sizeY="398" type="com.sun.star.drawing.TextShape" text="40000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1326,13 +1326,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="929.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="4117.000000"/> + <Line1 column1="959.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4077.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="3133" sizeX="928" sizeY="345" type="com.sun.star.drawing.TextShape" text="50000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="3102" sizeX="958" sizeY="398" type="com.sun.star.drawing.TextShape" text="50000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1340,13 +1340,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="929.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="3133.000000"/> + <Line1 column1="959.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="3102.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="2149" sizeX="928" sizeY="345" type="com.sun.star.drawing.TextShape" text="60000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="2128" sizeX="958" sizeY="398" type="com.sun.star.drawing.TextShape" text="60000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1354,13 +1354,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="929.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="2149.000000"/> + <Line1 column1="959.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="2128.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="1165" sizeX="928" sizeY="345" type="com.sun.star.drawing.TextShape" text="70000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="1154" sizeX="958" sizeY="398" type="com.sun.star.drawing.TextShape" text="70000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1368,13 +1368,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="929.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="1165.000000"/> + <Line1 column1="959.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="1154.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="181" sizeX="928" sizeY="345" type="com.sun.star.drawing.TextShape" text="80000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="180" sizeX="958" sizeY="398" type="com.sun.star.drawing.TextShape" text="80000" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1382,22 +1382,22 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="929.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="181.000000"/> + <Line1 column1="959.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="929.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="8218.000000" column3="181.000000"/> + <Line1 column1="959.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="8193.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12164" positionY="180" sizeX="1034" sizeY="8218" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,1"> + <XShape positionX="12116" positionY="180" sizeX="1054" sizeY="8192" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,1"> <XShapes> - <XShape positionX="12164" positionY="8053" sizeX="1034" sizeY="345" type="com.sun.star.drawing.TextShape" text="1.6100" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="12116" positionY="7974" sizeX="1054" sizeY="398" type="com.sun.star.drawing.TextShape" text="1.6100" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1405,13 +1405,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1035.000000" column2="0.000000" column3="12164.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8053.000000"/> + <Line1 column1="1055.000000" column2="0.000000" column3="12116.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="7974.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12164" positionY="6928" sizeX="1034" sizeY="345" type="com.sun.star.drawing.TextShape" text="1.6200" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="12116" positionY="6860" sizeX="1054" sizeY="398" type="com.sun.star.drawing.TextShape" text="1.6200" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1419,13 +1419,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1035.000000" column2="0.000000" column3="12164.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="6928.000000"/> + <Line1 column1="1055.000000" column2="0.000000" column3="12116.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="6860.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12164" positionY="5803" sizeX="1034" sizeY="345" type="com.sun.star.drawing.TextShape" text="1.6300" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="12116" positionY="5747" sizeX="1054" sizeY="398" type="com.sun.star.drawing.TextShape" text="1.6300" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1433,13 +1433,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1035.000000" column2="0.000000" column3="12164.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="5803.000000"/> + <Line1 column1="1055.000000" column2="0.000000" column3="12116.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="5747.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12164" positionY="4679" sizeX="1034" sizeY="345" type="com.sun.star.drawing.TextShape" text="1.6400" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="12116" positionY="4633" sizeX="1054" sizeY="398" type="com.sun.star.drawing.TextShape" text="1.6400" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1447,13 +1447,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1035.000000" column2="0.000000" column3="12164.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="4679.000000"/> + <Line1 column1="1055.000000" column2="0.000000" column3="12116.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4633.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12164" positionY="3554" sizeX="1034" sizeY="345" type="com.sun.star.drawing.TextShape" text="1.6500" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="12116" positionY="3520" sizeX="1054" sizeY="398" type="com.sun.star.drawing.TextShape" text="1.6500" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1461,13 +1461,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1035.000000" column2="0.000000" column3="12164.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="3554.000000"/> + <Line1 column1="1055.000000" column2="0.000000" column3="12116.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="3520.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12164" positionY="2430" sizeX="1034" sizeY="345" type="com.sun.star.drawing.TextShape" text="1.6600" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="12116" positionY="2406" sizeX="1054" sizeY="398" type="com.sun.star.drawing.TextShape" text="1.6600" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1475,13 +1475,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1035.000000" column2="0.000000" column3="12164.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="2430.000000"/> + <Line1 column1="1055.000000" column2="0.000000" column3="12116.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="2406.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12164" positionY="1305" sizeX="1034" sizeY="345" type="com.sun.star.drawing.TextShape" text="1.6700" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="12116" positionY="1293" sizeX="1054" sizeY="398" type="com.sun.star.drawing.TextShape" text="1.6700" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1489,13 +1489,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1035.000000" column2="0.000000" column3="12164.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="1305.000000"/> + <Line1 column1="1055.000000" column2="0.000000" column3="12116.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="1293.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12164" positionY="180" sizeX="1034" sizeY="345" type="com.sun.star.drawing.TextShape" text="1.6800" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="12116" positionY="180" sizeX="1054" sizeY="398" type="com.sun.star.drawing.TextShape" text="1.6800" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1503,43 +1503,43 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1035.000000" column2="0.000000" column3="12164.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="180.000000"/> + <Line1 column1="1055.000000" column2="0.000000" column3="12116.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="1035.000000" column2="0.000000" column3="12164.000000"/> - <Line2 column1="0.000000" column2="8219.000000" column3="180.000000"/> + <Line1 column1="1055.000000" column2="0.000000" column3="12116.000000"/> + <Line2 column1="0.000000" column2="8193.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="12879.000000" column2="0.000000" column3="320.000000"/> + <Line1 column1="12851.000000" column2="0.000000" column3="320.000000"/> <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="12879.000000" column2="0.000000" column3="320.000000"/> + <Line1 column1="12851.000000" column2="0.000000" column3="320.000000"/> <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="12879.000000" column2="0.000000" column3="320.000000"/> + <Line1 column1="12851.000000" column2="0.000000" column3="320.000000"/> <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="13518" positionY="4005" sizeX="2272" sizeY="990" type="com.sun.star.drawing.GroupShape" name="CID/D=0:Legend="> + <XShape positionX="13490" positionY="3952" sizeX="2300" sizeY="1096" type="com.sun.star.drawing.GroupShape" name="CID/D=0:Legend="> <XShapes> - <XShape positionX="13518" positionY="4005" sizeX="2272" sizeY="990" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="13490" positionY="3952" sizeX="2300" sizeY="1096" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1547,17 +1547,17 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="2273.000000" column2="0.000000" column3="13518.000000"/> - <Line2 column1="0.000000" column2="991.000000" column3="4005.000000"/> + <Line1 column1="2301.000000" column2="0.000000" column3="13490.000000"/> + <Line2 column1="0.000000" column2="1097.000000" column3="3952.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="13634" positionY="4172" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="13606" positionY="4145" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="13634" positionY="4172" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:LegendEntry=0"> + <XShape positionX="13606" positionY="4145" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:LegendEntry=0"> <XShapes> - <XShape positionX="13634" positionY="4172" sizeX="800" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="13606" positionY="4145" sizeX="800" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1565,13 +1565,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="801.000000" column2="0.000000" column3="13634.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4172.000000"/> + <Line1 column1="801.000000" column2="0.000000" column3="13606.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="13634" positionY="4172" sizeX="800" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="13606" positionY="4145" sizeX="800" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1579,31 +1579,31 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="801.000000" column2="0.000000" column3="13634.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4172.000000"/> + <Line1 column1="801.000000" column2="0.000000" column3="13606.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="801.000000" column2="0.000000" column3="13634.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4172.000000"/> + <Line1 column1="801.000000" column2="0.000000" column3="13606.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="801.000000" column2="0.000000" column3="13634.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4172.000000"/> + <Line1 column1="801.000000" column2="0.000000" column3="13606.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="13634" positionY="4617" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="13606" positionY="4643" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="13634" positionY="4617" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:LegendEntry=0"> + <XShape positionX="13606" positionY="4643" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=1:Series=0:LegendEntry=0"> <XShapes> - <XShape positionX="13634" positionY="4617" sizeX="800" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="13606" positionY="4643" sizeX="800" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1611,19 +1611,19 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="801.000000" column2="0.000000" column3="13634.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4617.000000"/> + <Line1 column1="801.000000" column2="0.000000" column3="13606.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="13634" positionY="4722" sizeX="800" sizeY="0" type="com.sun.star.drawing.LineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="13606" positionY="4748" sizeX="800" sizeY="0" type="com.sun.star.drawing.LineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="13634" positionY="4722"/> - <point positionX="14434" positionY="4722"/> + <point positionX="13606" positionY="4748"/> + <point positionX="14406" positionY="4748"/> </pointSequence> </PolyPolygon> <Geometry> @@ -1633,27 +1633,27 @@ </pointSequence> </Geometry> <Transformation> - <Line1 column1="800.000000" column2="0.000000" column3="13634.000000"/> - <Line2 column1="0.000000" column2="0.000000" column3="4722.000000"/> + <Line1 column1="800.000000" column2="0.000000" column3="13606.000000"/> + <Line2 column1="0.000000" column2="0.000000" column3="4748.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="801.000000" column2="0.000000" column3="13634.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4617.000000"/> + <Line1 column1="801.000000" column2="0.000000" column3="13606.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="801.000000" column2="0.000000" column3="13634.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4617.000000"/> + <Line1 column1="801.000000" column2="0.000000" column3="13606.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="14534" positionY="4105" sizeX="1140" sizeY="345" type="com.sun.star.drawing.TextShape" text="Volume" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="14506" positionY="4052" sizeX="1168" sizeY="398" type="com.sun.star.drawing.TextShape" text="Volume" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1661,13 +1661,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1141.000000" column2="0.000000" column3="14534.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="4105.000000"/> + <Line1 column1="1169.000000" column2="0.000000" column3="14506.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4052.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="14534" positionY="4550" sizeX="875" sizeY="345" type="com.sun.star.drawing.TextShape" text="Close" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="14506" positionY="4550" sizeX="881" sizeY="398" type="com.sun.star.drawing.TextShape" text="Close" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1675,15 +1675,15 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="876.000000" column2="0.000000" column3="14534.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="4550.000000"/> + <Line1 column1="882.000000" column2="0.000000" column3="14506.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4550.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="2273.000000" column2="0.000000" column3="13518.000000"/> - <Line2 column1="0.000000" column2="991.000000" column3="4005.000000"/> + <Line1 column1="2301.000000" column2="0.000000" column3="13490.000000"/> + <Line2 column1="0.000000" column2="1097.000000" column3="3952.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> diff --git a/chart2/qa/extras/xshape/data/reference/property-mapping-bar.xml b/chart2/qa/extras/xshape/data/reference/property-mapping-bar.xml index cc172969f01f..a64c984797bf 100644 --- a/chart2/qa/extras/xshape/data/reference/property-mapping-bar.xml +++ b/chart2/qa/extras/xshape/data/reference/property-mapping-bar.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <XShapes> - <XShape positionX="0" positionY="0" sizeX="16000" sizeY="9000" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="0" positionY="0" sizeX="16000" sizeY="9000" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -14,10 +14,10 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="180" sizeX="13970" sizeY="8640" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> + <XShape positionX="320" positionY="180" sizeX="13974" sizeY="8640" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> <XShapes> - <XShape positionX="756" positionY="354" sizeX="13534" sizeY="7872" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="762" positionY="380" sizeX="13532" sizeY="7793" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -25,13 +25,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="13535.000000" column2="0.000000" column3="756.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="354.000000"/> + <Line1 column1="13533.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="380.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="180" sizeX="13970" sizeY="8640" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="180" sizeX="13974" sizeY="8640" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -39,19 +39,19 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="13971.000000" column2="0.000000" column3="320.000000"/> + <Line1 column1="13975.000000" column2="0.000000" column3="320.000000"/> <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="180" sizeX="13970" sizeY="8640" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="320" positionY="180" sizeX="13974" sizeY="8640" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="606" positionY="352" sizeX="13684" sizeY="8023" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="612" positionY="378" sizeX="13682" sizeY="7944" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="756" positionY="354" sizeX="13534" sizeY="7872" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> + <XShape positionX="762" positionY="380" sizeX="13532" sizeY="7793" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> <XShapes> - <XShape positionX="756" positionY="354" sizeX="13534" sizeY="7872" type="com.sun.star.drawing.RectangleShape" name="CID/DiagramWall=" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="762" positionY="380" sizeX="13532" sizeY="7793" type="com.sun.star.drawing.RectangleShape" name="CID/DiagramWall=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -59,198 +59,198 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="13535.000000" column2="0.000000" column3="756.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="354.000000"/> + <Line1 column1="13533.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="380.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="13535.000000" column2="0.000000" column3="756.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="354.000000"/> + <Line1 column1="13533.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="380.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="606" positionY="352" sizeX="13684" sizeY="8023" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> + <XShape positionX="612" positionY="378" sizeX="13682" sizeY="7944" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> <XShapes> - <XShape positionX="756" positionY="352" sizeX="13534" sizeY="7873" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="762" positionY="378" sizeX="13532" sizeY="7794" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="756" positionY="352" sizeX="13534" sizeY="7873" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0:Grid=0"> + <XShape positionX="762" positionY="378" sizeX="13532" sizeY="7794" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0:Grid=0"> <XShapes> - <XShape positionX="756" positionY="352" sizeX="13534" sizeY="7873" type="com.sun.star.drawing.PolyLineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="762" positionY="378" sizeX="13532" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="14290" positionY="8225"/> - <point positionX="756" positionY="8225"/> + <point positionX="14294" positionY="8172"/> + <point positionX="762" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="14290" positionY="7100"/> - <point positionX="756" positionY="7100"/> + <point positionX="14294" positionY="7058"/> + <point positionX="762" positionY="7058"/> </pointSequence> <pointSequence> - <point positionX="14290" positionY="5975"/> - <point positionX="756" positionY="5975"/> + <point positionX="14294" positionY="5945"/> + <point positionX="762" positionY="5945"/> </pointSequence> <pointSequence> - <point positionX="14290" positionY="4851"/> - <point positionX="756" positionY="4851"/> + <point positionX="14294" positionY="4832"/> + <point positionX="762" positionY="4832"/> </pointSequence> <pointSequence> - <point positionX="14290" positionY="3726"/> - <point positionX="756" positionY="3726"/> + <point positionX="14294" positionY="3718"/> + <point positionX="762" positionY="3718"/> </pointSequence> <pointSequence> - <point positionX="14290" positionY="2602"/> - <point positionX="756" positionY="2602"/> + <point positionX="14294" positionY="2605"/> + <point positionX="762" positionY="2605"/> </pointSequence> <pointSequence> - <point positionX="14290" positionY="1477"/> - <point positionX="756" positionY="1477"/> + <point positionX="14294" positionY="1492"/> + <point positionX="762" positionY="1492"/> </pointSequence> <pointSequence> - <point positionX="14290" positionY="352"/> - <point positionX="756" positionY="352"/> + <point positionX="14294" positionY="378"/> + <point positionX="762" positionY="378"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="13534" positionY="7873"/> - <point positionX="0" positionY="7873"/> + <point positionX="13532" positionY="7794"/> + <point positionX="0" positionY="7794"/> </pointSequence> <pointSequence> - <point positionX="13534" positionY="6748"/> - <point positionX="0" positionY="6748"/> + <point positionX="13532" positionY="6680"/> + <point positionX="0" positionY="6680"/> </pointSequence> <pointSequence> - <point positionX="13534" positionY="5623"/> - <point positionX="0" positionY="5623"/> + <point positionX="13532" positionY="5567"/> + <point positionX="0" positionY="5567"/> </pointSequence> <pointSequence> - <point positionX="13534" positionY="4499"/> - <point positionX="0" positionY="4499"/> + <point positionX="13532" positionY="4454"/> + <point positionX="0" positionY="4454"/> </pointSequence> <pointSequence> - <point positionX="13534" positionY="3374"/> - <point positionX="0" positionY="3374"/> + <point positionX="13532" positionY="3340"/> + <point positionX="0" positionY="3340"/> </pointSequence> <pointSequence> - <point positionX="13534" positionY="2250"/> - <point positionX="0" positionY="2250"/> + <point positionX="13532" positionY="2227"/> + <point positionX="0" positionY="2227"/> </pointSequence> <pointSequence> - <point positionX="13534" positionY="1125"/> - <point positionX="0" positionY="1125"/> + <point positionX="13532" positionY="1114"/> + <point positionX="0" positionY="1114"/> </pointSequence> <pointSequence> - <point positionX="13534" positionY="0"/> + <point positionX="13532" positionY="0"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="13534.000000" column2="0.000000" column3="756.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="352.000000"/> + <Line1 column1="13532.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="756" positionY="352" sizeX="0" sizeY="7873" type="com.sun.star.drawing.PolyLineShape" name="HandlesOnly" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="NONE"> + <XShape positionX="762" positionY="378" sizeX="0" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" name="HandlesOnly" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="NONE"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="756" positionY="8225"/> - <point positionX="756" positionY="7100"/> - <point positionX="756" positionY="5975"/> - <point positionX="756" positionY="4851"/> - <point positionX="756" positionY="3726"/> - <point positionX="756" positionY="2602"/> - <point positionX="756" positionY="1477"/> - <point positionX="756" positionY="352"/> + <point positionX="762" positionY="8172"/> + <point positionX="762" positionY="7058"/> + <point positionX="762" positionY="5945"/> + <point positionX="762" positionY="4832"/> + <point positionX="762" positionY="3718"/> + <point positionX="762" positionY="2605"/> + <point positionX="762" positionY="1492"/> + <point positionX="762" positionY="378"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="7873"/> - <point positionX="0" positionY="6748"/> - <point positionX="0" positionY="5623"/> - <point positionX="0" positionY="4499"/> - <point positionX="0" positionY="3374"/> - <point positionX="0" positionY="2250"/> - <point positionX="0" positionY="1125"/> + <point positionX="0" positionY="7794"/> + <point positionX="0" positionY="6680"/> + <point positionX="0" positionY="5567"/> + <point positionX="0" positionY="4454"/> + <point positionX="0" positionY="3340"/> + <point positionX="0" positionY="2227"/> + <point positionX="0" positionY="1114"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="756.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="352.000000"/> + <Line1 column1="0.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="13535.000000" column2="0.000000" column3="756.000000"/> - <Line2 column1="0.000000" column2="7874.000000" column3="352.000000"/> + <Line1 column1="13533.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="13535.000000" column2="0.000000" column3="756.000000"/> - <Line2 column1="0.000000" column2="7874.000000" column3="352.000000"/> + <Line1 column1="13533.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="606" positionY="352" sizeX="13684" sizeY="8023" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="612" positionY="378" sizeX="13682" sizeY="7944" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="756" positionY="8225" sizeX="13534" sizeY="150" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> + <XShape positionX="762" positionY="8172" sizeX="13532" sizeY="150" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> <XShapes> - <XShape positionX="756" positionY="8225" sizeX="13534" sizeY="150" type="com.sun.star.drawing.PolyLineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="762" positionY="8172" sizeX="13532" sizeY="150" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="756" positionY="8375"/> - <point positionX="756" positionY="8225"/> + <point positionX="762" positionY="8322"/> + <point positionX="762" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="756" positionY="8375"/> - <point positionX="756" positionY="8225"/> + <point positionX="762" positionY="8322"/> + <point positionX="762" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="4139" positionY="8375"/> - <point positionX="4139" positionY="8225"/> + <point positionX="4145" positionY="8322"/> + <point positionX="4145" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="4139" positionY="8375"/> - <point positionX="4139" positionY="8225"/> + <point positionX="4145" positionY="8322"/> + <point positionX="4145" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="7523" positionY="8375"/> - <point positionX="7523" positionY="8225"/> + <point positionX="7528" positionY="8322"/> + <point positionX="7528" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="7523" positionY="8375"/> - <point positionX="7523" positionY="8225"/> + <point positionX="7528" positionY="8322"/> + <point positionX="7528" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="10906" positionY="8375"/> - <point positionX="10906" positionY="8225"/> + <point positionX="10911" positionY="8322"/> + <point positionX="10911" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="10906" positionY="8375"/> - <point positionX="10906" positionY="8225"/> + <point positionX="10911" positionY="8322"/> + <point positionX="10911" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="14290" positionY="8375"/> - <point positionX="14290" positionY="8225"/> + <point positionX="14294" positionY="8322"/> + <point positionX="14294" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="14290" positionY="8375"/> - <point positionX="14290" positionY="8225"/> + <point positionX="14294" positionY="8322"/> + <point positionX="14294" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> @@ -271,193 +271,193 @@ <point positionX="3383" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="6767" positionY="150"/> - <point positionX="6767" positionY="0"/> + <point positionX="6766" positionY="150"/> + <point positionX="6766" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="6767" positionY="150"/> - <point positionX="6767" positionY="0"/> + <point positionX="6766" positionY="150"/> + <point positionX="6766" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="10150" positionY="150"/> - <point positionX="10150" positionY="0"/> + <point positionX="10149" positionY="150"/> + <point positionX="10149" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="10150" positionY="150"/> - <point positionX="10150" positionY="0"/> + <point positionX="10149" positionY="150"/> + <point positionX="10149" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="13534" positionY="150"/> - <point positionX="13534" positionY="0"/> + <point positionX="13532" positionY="150"/> + <point positionX="13532" positionY="0"/> </pointSequence> <pointSequence> - <point positionX="13534" positionY="150"/> - <point positionX="13534" positionY="0"/> + <point positionX="13532" positionY="150"/> + <point positionX="13532" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="13534.000000" column2="0.000000" column3="756.000000"/> - <Line2 column1="0.000000" column2="150.000000" column3="8225.000000"/> + <Line1 column1="13532.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="150.000000" column3="8172.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="756" positionY="8225" sizeX="13534" sizeY="0" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="762" positionY="8172" sizeX="13532" sizeY="0" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="756" positionY="8225"/> - <point positionX="14290" positionY="8225"/> + <point positionX="762" positionY="8172"/> + <point positionX="14294" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> <point positionX="0" positionY="0"/> - <point positionX="13534" positionY="0"/> + <point positionX="13532" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="13534.000000" column2="0.000000" column3="756.000000"/> - <Line2 column1="0.000000" column2="0.000000" column3="8225.000000"/> + <Line1 column1="13532.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="0.000000" column3="8172.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="13535.000000" column2="0.000000" column3="756.000000"/> - <Line2 column1="0.000000" column2="151.000000" column3="8225.000000"/> + <Line1 column1="13533.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="151.000000" column3="8172.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="606" positionY="352" sizeX="150" sizeY="7873" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShape positionX="612" positionY="378" sizeX="150" sizeY="7794" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> <XShapes> - <XShape positionX="606" positionY="352" sizeX="150" sizeY="7873" type="com.sun.star.drawing.PolyLineShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="612" positionY="378" sizeX="150" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="606" positionY="8225"/> - <point positionX="756" positionY="8225"/> + <point positionX="612" positionY="8172"/> + <point positionX="762" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="8225"/> - <point positionX="756" positionY="8225"/> + <point positionX="612" positionY="8172"/> + <point positionX="762" positionY="8172"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="7100"/> - <point positionX="756" positionY="7100"/> + <point positionX="612" positionY="7058"/> + <point positionX="762" positionY="7058"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="7100"/> - <point positionX="756" positionY="7100"/> + <point positionX="612" positionY="7058"/> + <point positionX="762" positionY="7058"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="5975"/> - <point positionX="756" positionY="5975"/> + <point positionX="612" positionY="5945"/> + <point positionX="762" positionY="5945"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="5975"/> - <point positionX="756" positionY="5975"/> + <point positionX="612" positionY="5945"/> + <point positionX="762" positionY="5945"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="4851"/> - <point positionX="756" positionY="4851"/> + <point positionX="612" positionY="4832"/> + <point positionX="762" positionY="4832"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="4851"/> - <point positionX="756" positionY="4851"/> + <point positionX="612" positionY="4832"/> + <point positionX="762" positionY="4832"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="3726"/> - <point positionX="756" positionY="3726"/> + <point positionX="612" positionY="3718"/> + <point positionX="762" positionY="3718"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="3726"/> - <point positionX="756" positionY="3726"/> + <point positionX="612" positionY="3718"/> + <point positionX="762" positionY="3718"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="2602"/> - <point positionX="756" positionY="2602"/> + <point positionX="612" positionY="2605"/> + <point positionX="762" positionY="2605"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="2602"/> - <point positionX="756" positionY="2602"/> + <point positionX="612" positionY="2605"/> + <point positionX="762" positionY="2605"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="1477"/> - <point positionX="756" positionY="1477"/> + <point positionX="612" positionY="1492"/> + <point positionX="762" positionY="1492"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="1477"/> - <point positionX="756" positionY="1477"/> + <point positionX="612" positionY="1492"/> + <point positionX="762" positionY="1492"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="352"/> - <point positionX="756" positionY="352"/> + <point positionX="612" positionY="378"/> + <point positionX="762" positionY="378"/> </pointSequence> <pointSequence> - <point positionX="606" positionY="352"/> - <point positionX="756" positionY="352"/> + <point positionX="612" positionY="378"/> + <point positionX="762" positionY="378"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="7873"/> - <point positionX="150" positionY="7873"/> + <point positionX="0" positionY="7794"/> + <point positionX="150" positionY="7794"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="7873"/> - <point positionX="150" positionY="7873"/> + <point positionX="0" positionY="7794"/> + <point positionX="150" positionY="7794"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="6748"/> - <point positionX="150" positionY="6748"/> + <point positionX="0" positionY="6680"/> + <point positionX="150" positionY="6680"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="6748"/> - <point positionX="150" positionY="6748"/> + <point positionX="0" positionY="6680"/> + <point positionX="150" positionY="6680"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="5623"/> - <point positionX="150" positionY="5623"/> + <point positionX="0" positionY="5567"/> + <point positionX="150" positionY="5567"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="5623"/> - <point positionX="150" positionY="5623"/> + <point positionX="0" positionY="5567"/> + <point positionX="150" positionY="5567"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="4499"/> - <point positionX="150" positionY="4499"/> + <point positionX="0" positionY="4454"/> + <point positionX="150" positionY="4454"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="4499"/> - <point positionX="150" positionY="4499"/> + <point positionX="0" positionY="4454"/> + <point positionX="150" positionY="4454"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="3374"/> - <point positionX="150" positionY="3374"/> + <point positionX="0" positionY="3340"/> + <point positionX="150" positionY="3340"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="3374"/> - <point positionX="150" positionY="3374"/> + <point positionX="0" positionY="3340"/> + <point positionX="150" positionY="3340"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="2250"/> - <point positionX="150" positionY="2250"/> + <point positionX="0" positionY="2227"/> + <point positionX="150" positionY="2227"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="2250"/> - <point positionX="150" positionY="2250"/> + <point positionX="0" positionY="2227"/> + <point positionX="150" positionY="2227"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="1125"/> - <point positionX="150" positionY="1125"/> + <point positionX="0" positionY="1114"/> + <point positionX="150" positionY="1114"/> </pointSequence> <pointSequence> - <point positionX="0" positionY="1125"/> - <point positionX="150" positionY="1125"/> + <point positionX="0" positionY="1114"/> + <point positionX="150" positionY="1114"/> </pointSequence> <pointSequence> <point positionX="0" positionY="0"/> @@ -469,53 +469,53 @@ </pointSequence> </Geometry> <Transformation> - <Line1 column1="150.000000" column2="0.000000" column3="606.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="352.000000"/> + <Line1 column1="150.000000" column2="0.000000" column3="612.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="756" positionY="352" sizeX="0" sizeY="7873" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <XShape positionX="762" positionY="378" sizeX="0" sizeY="7794" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> <LineStart/> <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="756" positionY="8225"/> - <point positionX="756" positionY="352"/> + <point positionX="762" positionY="8172"/> + <point positionX="762" positionY="378"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="7873"/> + <point positionX="0" positionY="7794"/> <point positionX="0" positionY="0"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="756.000000"/> - <Line2 column1="0.000000" column2="7873.000000" column3="352.000000"/> + <Line1 column1="0.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="151.000000" column2="0.000000" column3="606.000000"/> - <Line2 column1="0.000000" column2="7874.000000" column3="352.000000"/> + <Line1 column1="151.000000" column2="0.000000" column3="612.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="13685.000000" column2="0.000000" column3="606.000000"/> - <Line2 column1="0.000000" column2="8024.000000" column3="352.000000"/> + <Line1 column1="13683.000000" column2="0.000000" column3="612.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1319" positionY="1477" sizeX="12407" sizeY="6748" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="1325" positionY="1492" sizeX="12405" sizeY="6680" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1319" positionY="3726" sizeX="11279" sizeY="4499" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> + <XShape positionX="1325" positionY="3718" sizeX="11277" sizeY="4454" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> <XShapes> - <XShape positionX="11470" positionY="3726" sizeX="1128" sizeY="4499" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="1325" positionY="7058" sizeX="1128" sizeY="1114" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff0000" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -524,30 +524,30 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="11470" positionY="8225"/> - <point positionX="12598" positionY="8225"/> - <point positionX="12598" positionY="3726"/> - <point positionX="11470" positionY="3726"/> - <point positionX="11470" positionY="8225"/> + <point positionX="1325" positionY="8172"/> + <point positionX="2453" positionY="8172"/> + <point positionX="2453" positionY="7058"/> + <point positionX="1325" positionY="7058"/> + <point positionX="1325" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="4499"/> - <point positionX="1128" positionY="4499"/> + <point positionX="0" positionY="1114"/> + <point positionX="1128" positionY="1114"/> <point positionX="1128" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="4499"/> + <point positionX="0" positionY="1114"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1128.000000" column2="0.000000" column3="11470.000000"/> - <Line2 column1="0.000000" column2="4499.000000" column3="3726.000000"/> + <Line1 column1="1128.000000" column2="0.000000" column3="1325.000000"/> + <Line2 column1="0.000000" column2="1114.000000" column3="7058.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8086" positionY="4851" sizeX="1128" sizeY="3374" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="0000ff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="4708" positionY="5945" sizeX="1128" sizeY="2227" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="00ff00" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -556,30 +556,30 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="8086" positionY="8225"/> - <point positionX="9214" positionY="8225"/> - <point positionX="9214" positionY="4851"/> - <point positionX="8086" positionY="4851"/> - <point positionX="8086" positionY="8225"/> + <point positionX="4708" positionY="8172"/> + <point positionX="5836" positionY="8172"/> + <point positionX="5836" positionY="5945"/> + <point positionX="4708" positionY="5945"/> + <point positionX="4708" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="3374"/> - <point positionX="1128" positionY="3374"/> + <point positionX="0" positionY="2227"/> + <point positionX="1128" positionY="2227"/> <point positionX="1128" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="3374"/> + <point positionX="0" positionY="2227"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1128.000000" column2="0.000000" column3="8086.000000"/> - <Line2 column1="0.000000" column2="3374.000000" column3="4851.000000"/> + <Line1 column1="1128.000000" column2="0.000000" column3="4708.000000"/> + <Line2 column1="0.000000" column2="2227.000000" column3="5945.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="4703" positionY="5975" sizeX="1128" sizeY="2250" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="00ff00" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="8091" positionY="4832" sizeX="1128" sizeY="3340" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="0000ff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -588,30 +588,30 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="4703" positionY="8225"/> - <point positionX="5831" positionY="8225"/> - <point positionX="5831" positionY="5975"/> - <point positionX="4703" positionY="5975"/> - <point positionX="4703" positionY="8225"/> + <point positionX="8091" positionY="8172"/> + <point positionX="9219" positionY="8172"/> + <point positionX="9219" positionY="4832"/> + <point positionX="8091" positionY="4832"/> + <point positionX="8091" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="2250"/> - <point positionX="1128" positionY="2250"/> + <point positionX="0" positionY="3340"/> + <point positionX="1128" positionY="3340"/> <point positionX="1128" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="2250"/> + <point positionX="0" positionY="3340"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1128.000000" column2="0.000000" column3="4703.000000"/> - <Line2 column1="0.000000" column2="2250.000000" column3="5975.000000"/> + <Line1 column1="1128.000000" column2="0.000000" column3="8091.000000"/> + <Line2 column1="0.000000" column2="3340.000000" column3="4832.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1319" positionY="7100" sizeX="1128" sizeY="1125" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff0000" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="11474" positionY="3718" sizeX="1128" sizeY="4454" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -620,39 +620,39 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="1319" positionY="8225"/> - <point positionX="2447" positionY="8225"/> - <point positionX="2447" positionY="7100"/> - <point positionX="1319" positionY="7100"/> - <point positionX="1319" positionY="8225"/> + <point positionX="11474" positionY="8172"/> + <point positionX="12602" positionY="8172"/> + <point positionX="12602" positionY="3718"/> + <point positionX="11474" positionY="3718"/> + <point positionX="11474" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="1125"/> - <point positionX="1128" positionY="1125"/> + <point positionX="0" positionY="4454"/> + <point positionX="1128" positionY="4454"/> <point positionX="1128" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="1125"/> + <point positionX="0" positionY="4454"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1128.000000" column2="0.000000" column3="1319.000000"/> - <Line2 column1="0.000000" column2="1125.000000" column3="7100.000000"/> + <Line1 column1="1128.000000" column2="0.000000" column3="11474.000000"/> + <Line2 column1="0.000000" column2="4454.000000" column3="3718.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="11280.000000" column2="0.000000" column3="1319.000000"/> - <Line2 column1="0.000000" column2="4500.000000" column3="3726.000000"/> + <Line1 column1="11278.000000" column2="0.000000" column3="1325.000000"/> + <Line2 column1="0.000000" column2="4455.000000" column3="3718.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="2447" positionY="1477" sizeX="11279" sizeY="6748" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=1"> + <XShape positionX="2453" positionY="1492" sizeX="11277" sizeY="6680" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=1"> <XShapes> - <XShape positionX="12598" positionY="1477" sizeX="1128" sizeY="6748" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=3" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="2453" positionY="4832" sizeX="1128" sizeY="3340" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -661,30 +661,30 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="12598" positionY="8225"/> - <point positionX="13726" positionY="8225"/> - <point positionX="13726" positionY="1477"/> - <point positionX="12598" positionY="1477"/> - <point positionX="12598" positionY="8225"/> + <point positionX="2453" positionY="8172"/> + <point positionX="3581" positionY="8172"/> + <point positionX="3581" positionY="4832"/> + <point positionX="2453" positionY="4832"/> + <point positionX="2453" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="6748"/> - <point positionX="1128" positionY="6748"/> + <point positionX="0" positionY="3340"/> + <point positionX="1128" positionY="3340"/> <point positionX="1128" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="6748"/> + <point positionX="0" positionY="3340"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1128.000000" column2="0.000000" column3="12598.000000"/> - <Line2 column1="0.000000" column2="6748.000000" column3="1477.000000"/> + <Line1 column1="1128.000000" column2="0.000000" column3="2453.000000"/> + <Line2 column1="0.000000" column2="3340.000000" column3="4832.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="9214" positionY="2602" sizeX="1128" sizeY="5623" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="5836" positionY="3718" sizeX="1128" sizeY="4454" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -693,30 +693,30 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="9214" positionY="8225"/> - <point positionX="10342" positionY="8225"/> - <point positionX="10342" positionY="2602"/> - <point positionX="9214" positionY="2602"/> - <point positionX="9214" positionY="8225"/> + <point positionX="5836" positionY="8172"/> + <point positionX="6964" positionY="8172"/> + <point positionX="6964" positionY="3718"/> + <point positionX="5836" positionY="3718"/> + <point positionX="5836" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="5623"/> - <point positionX="1128" positionY="5623"/> + <point positionX="0" positionY="4454"/> + <point positionX="1128" positionY="4454"/> <point positionX="1128" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="5623"/> + <point positionX="0" positionY="4454"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1128.000000" column2="0.000000" column3="9214.000000"/> - <Line2 column1="0.000000" column2="5623.000000" column3="2602.000000"/> + <Line1 column1="1128.000000" column2="0.000000" column3="5836.000000"/> + <Line2 column1="0.000000" column2="4454.000000" column3="3718.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="5831" positionY="3726" sizeX="1128" sizeY="4499" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="9219" positionY="2605" sizeX="1128" sizeY="5567" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -725,30 +725,30 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="5831" positionY="8225"/> - <point positionX="6959" positionY="8225"/> - <point positionX="6959" positionY="3726"/> - <point positionX="5831" positionY="3726"/> - <point positionX="5831" positionY="8225"/> + <point positionX="9219" positionY="8172"/> + <point positionX="10347" positionY="8172"/> + <point positionX="10347" positionY="2605"/> + <point positionX="9219" positionY="2605"/> + <point positionX="9219" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="4499"/> - <point positionX="1128" positionY="4499"/> + <point positionX="0" positionY="5567"/> + <point positionX="1128" positionY="5567"/> <point positionX="1128" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="4499"/> + <point positionX="0" positionY="5567"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1128.000000" column2="0.000000" column3="5831.000000"/> - <Line2 column1="0.000000" column2="4499.000000" column3="3726.000000"/> + <Line1 column1="1128.000000" column2="0.000000" column3="9219.000000"/> + <Line2 column1="0.000000" column2="5567.000000" column3="2605.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="2447" positionY="4851" sizeX="1128" sizeY="3374" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="12602" positionY="1492" sizeX="1128" sizeY="6680" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=3" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -757,62 +757,62 @@ <LineEnd/> <PolyPolygon> <pointSequence> - <point positionX="2447" positionY="8225"/> - <point positionX="3575" positionY="8225"/> - <point positionX="3575" positionY="4851"/> - <point positionX="2447" positionY="4851"/> - <point positionX="2447" positionY="8225"/> + <point positionX="12602" positionY="8172"/> + <point positionX="13730" positionY="8172"/> + <point positionX="13730" positionY="1492"/> + <point positionX="12602" positionY="1492"/> + <point positionX="12602" positionY="8172"/> </pointSequence> </PolyPolygon> <Geometry> <pointSequence> - <point positionX="0" positionY="3374"/> - <point positionX="1128" positionY="3374"/> + <point positionX="0" positionY="6680"/> + <point positionX="1128" positionY="6680"/> <point positionX="1128" positionY="0"/> <point positionX="0" positionY="0"/> - <point positionX="0" positionY="3374"/> + <point positionX="0" positionY="6680"/> </pointSequence> </Geometry> <Transformation> - <Line1 column1="1128.000000" column2="0.000000" column3="2447.000000"/> - <Line2 column1="0.000000" column2="3374.000000" column3="4851.000000"/> + <Line1 column1="1128.000000" column2="0.000000" column3="12602.000000"/> + <Line2 column1="0.000000" column2="6680.000000" column3="1492.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="11280.000000" column2="0.000000" column3="2447.000000"/> - <Line2 column1="0.000000" column2="6749.000000" column3="1477.000000"/> + <Line1 column1="11278.000000" column2="0.000000" column3="2453.000000"/> + <Line2 column1="0.000000" column2="6681.000000" column3="1492.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="12408.000000" column2="0.000000" column3="1319.000000"/> - <Line2 column1="0.000000" column2="6749.000000" column3="1477.000000"/> + <Line1 column1="12406.000000" column2="0.000000" column3="1325.000000"/> + <Line2 column1="0.000000" column2="6681.000000" column3="1492.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="13685.000000" column2="0.000000" column3="606.000000"/> - <Line2 column1="0.000000" column2="8024.000000" column3="352.000000"/> + <Line1 column1="13683.000000" column2="0.000000" column3="612.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="13685.000000" column2="0.000000" column3="606.000000"/> - <Line2 column1="0.000000" column2="8024.000000" column3="352.000000"/> + <Line1 column1="13683.000000" column2="0.000000" column3="612.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="378.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="180" sizeX="12372" sizeY="8640" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="320" positionY="180" sizeX="12379" sizeY="8640" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="2354" positionY="8475" sizeX="10338" sizeY="345" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> + <XShape positionX="2357" positionY="8422" sizeX="10342" sizeY="398" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> <XShapes> - <XShape positionX="2354" positionY="8475" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="1" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="2357" positionY="8422" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="1" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -820,13 +820,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="2354.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8475.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="2357.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="5738" positionY="8475" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="2" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="5740" positionY="8422" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="2" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -834,13 +834,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="5738.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8475.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="5740.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="9121" positionY="8475" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="3" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="9123" positionY="8422" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="3" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -848,13 +848,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="9121.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8475.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="9123.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12505" positionY="8475" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="4" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="12506" positionY="8422" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="4" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -862,22 +862,22 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="12505.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8475.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="12506.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="10339.000000" column2="0.000000" column3="2354.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8475.000000"/> + <Line1 column1="10343.000000" column2="0.000000" column3="2357.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="180" sizeX="187" sizeY="8218" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShape positionX="320" positionY="180" sizeX="193" sizeY="8192" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> <XShapes> - <XShape positionX="320" positionY="8053" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="0" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="7974" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="0" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -885,13 +885,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="8053.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="7974.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="6928" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="1" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="6860" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="1" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -899,13 +899,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="6928.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="6860.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="5803" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="2" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="5747" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="2" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -913,13 +913,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="5803.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="5747.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="4679" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="3" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="4634" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="3" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -927,13 +927,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="4679.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4634.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="3554" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="4" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="3520" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="4" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -941,13 +941,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="3554.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="3520.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="2430" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="5" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="2407" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="5" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -955,13 +955,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="2430.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="2407.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="1305" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="6" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="1294" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="6" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -969,13 +969,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="1305.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="1294.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="320" positionY="180" sizeX="187" sizeY="345" type="com.sun.star.drawing.TextShape" text="7" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="320" positionY="180" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="7" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -983,43 +983,43 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="180.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="320.000000"/> - <Line2 column1="0.000000" column2="8219.000000" column3="180.000000"/> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="8193.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="12373.000000" column2="0.000000" column3="320.000000"/> + <Line1 column1="12380.000000" column2="0.000000" column3="320.000000"/> <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="13971.000000" column2="0.000000" column3="320.000000"/> + <Line1 column1="13975.000000" column2="0.000000" column3="320.000000"/> <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="13971.000000" column2="0.000000" column3="320.000000"/> + <Line1 column1="13975.000000" column2="0.000000" column3="320.000000"/> <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="14610" positionY="4005" sizeX="1180" sizeY="990" type="com.sun.star.drawing.GroupShape" name="CID/D=0:Legend="> + <XShape positionX="14614" positionY="3952" sizeX="1176" sizeY="1096" type="com.sun.star.drawing.GroupShape" name="CID/D=0:Legend="> <XShapes> - <XShape positionX="14610" positionY="4005" sizeX="1180" sizeY="990" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="14614" positionY="3952" sizeX="1176" sizeY="1096" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1027,17 +1027,17 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1181.000000" column2="0.000000" column3="14610.000000"/> - <Line2 column1="0.000000" column2="991.000000" column3="4005.000000"/> + <Line1 column1="1177.000000" column2="0.000000" column3="14614.000000"/> + <Line2 column1="0.000000" column2="1097.000000" column3="3952.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="14726" positionY="4172" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="14730" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="14726" positionY="4172" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:LegendEntry=0"> + <XShape positionX="14730" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:LegendEntry=0"> <XShapes> - <XShape positionX="14726" positionY="4172" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="14730" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1045,13 +1045,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14726.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4172.000000"/> + <Line1 column1="212.000000" column2="0.000000" column3="14730.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="14726" positionY="4172" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="14730" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1059,31 +1059,31 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14726.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4172.000000"/> + <Line1 column1="212.000000" column2="0.000000" column3="14730.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14726.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4172.000000"/> + <Line1 column1="212.000000" column2="0.000000" column3="14730.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14726.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4172.000000"/> + <Line1 column1="212.000000" column2="0.000000" column3="14730.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="14726" positionY="4617" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="14730" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="14726" positionY="4617" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:LegendEntry=0"> + <XShape positionX="14730" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:LegendEntry=0"> <XShapes> - <XShape positionX="14726" positionY="4617" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="14730" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1091,13 +1091,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14726.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4617.000000"/> + <Line1 column1="212.000000" column2="0.000000" column3="14730.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="14726" positionY="4617" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="24.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="14730" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1105,27 +1105,27 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14726.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4617.000000"/> + <Line1 column1="212.000000" column2="0.000000" column3="14730.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14726.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4617.000000"/> + <Line1 column1="212.000000" column2="0.000000" column3="14730.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14726.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4617.000000"/> + <Line1 column1="212.000000" column2="0.000000" column3="14730.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="15037" positionY="4105" sizeX="637" sizeY="345" type="com.sun.star.drawing.TextShape" text="col1" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="15041" positionY="4052" sizeX="633" sizeY="398" type="com.sun.star.drawing.TextShape" text="col1" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1133,13 +1133,13 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="638.000000" column2="0.000000" column3="15037.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="4105.000000"/> + <Line1 column1="634.000000" column2="0.000000" column3="15041.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4052.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="15037" positionY="4550" sizeX="637" sizeY="345" type="com.sun.star.drawing.TextShape" text="col2" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <XShape positionX="15041" positionY="4550" sizeX="633" sizeY="398" type="com.sun.star.drawing.TextShape" text="col2" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> <FillBitmap/> @@ -1147,15 +1147,15 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="638.000000" column2="0.000000" column3="15037.000000"/> - <Line2 column1="0.000000" column2="346.000000" column3="4550.000000"/> + <Line1 column1="634.000000" column2="0.000000" column3="15041.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4550.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="1181.000000" column2="0.000000" column3="14610.000000"/> - <Line2 column1="0.000000" column2="991.000000" column3="4005.000000"/> + <Line1 column1="1177.000000" column2="0.000000" column3="14614.000000"/> + <Line2 column1="0.000000" column2="1097.000000" column3="3952.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> diff --git a/chart2/qa/extras/xshape/data/reference/tdf149204.xml b/chart2/qa/extras/xshape/data/reference/tdf149204.xml new file mode 100644 index 000000000000..b14a27418d0a --- /dev/null +++ b/chart2/qa/extras/xshape/data/reference/tdf149204.xml @@ -0,0 +1,397 @@ +<?xml version="1.0"?> +<XShapes> + <XShape positionX="0" positionY="0" sizeX="14277" sizeY="10471" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="14278.000000" column2="0.000000" column3="0.000000"/> + <Line2 column1="0.000000" column2="10472.000000" column3="0.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="1741" positionY="1996" sizeX="12230" sizeY="7836" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> + <XShapes> + <XShape positionX="1741" positionY="1996" sizeX="12230" sizeY="7836" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="12231.000000" column2="0.000000" column3="1741.000000"/> + <Line2 column1="0.000000" column2="7837.000000" column3="1996.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="1741" positionY="2023" sizeX="12230" sizeY="7782" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="12231.000000" column2="0.000000" column3="1741.000000"/> + <Line2 column1="0.000000" column2="7783.000000" column3="2023.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="1741" positionY="2023" sizeX="12230" sizeY="7782" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="1741" positionY="2023" sizeX="12230" sizeY="7782" type="com.sun.star.drawing.Shape3DSceneObject" name="PlotAreaExcludingAxes"/> + <XShape positionX="3838" positionY="3445" sizeX="9345" sizeY="5248" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="3838" positionY="3445" sizeX="9345" sizeY="5248" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="12788" positionY="8216" sizeX="395" sizeY="477" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels="> + <XShapes> + <XShape positionX="12788" positionY="8216" sizeX="395" sizeY="477" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"> + <XShapes> + <XShape positionX="12788" positionY="8216" sizeX="395" sizeY="477" type="com.sun.star.drawing.TextShape" text="13" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3490" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="396.000000" column2="0.000000" column3="12788.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="8216.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="396.000000" column2="0.000000" column3="12788.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="8216.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="396.000000" column2="0.000000" column3="12788.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="8216.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7092" positionY="5831" sizeX="199" sizeY="477" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=1:DataLabels="> + <XShapes> + <XShape positionX="7092" positionY="5831" sizeX="199" sizeY="477" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=1:DataLabels=:DataLabel=0"> + <XShapes> + <XShape positionX="7092" positionY="5831" sizeX="199" sizeY="477" type="com.sun.star.drawing.TextShape" text="6" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3490" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="200.000000" column2="0.000000" column3="7092.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="5831.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="200.000000" column2="0.000000" column3="7092.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="5831.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="200.000000" column2="0.000000" column3="7092.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="5831.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="3838" positionY="3445" sizeX="199" sizeY="477" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=2:DataLabels="> + <XShapes> + <XShape positionX="3838" positionY="3445" sizeX="199" sizeY="477" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=2:DataLabels=:DataLabel=0"> + <XShapes> + <XShape positionX="3838" positionY="3445" sizeX="199" sizeY="477" type="com.sun.star.drawing.TextShape" text="2" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3490" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="200.000000" column2="0.000000" column3="3838.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="3445.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="200.000000" column2="0.000000" column3="3838.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="3445.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="200.000000" column2="0.000000" column3="3838.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="3445.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="9346.000000" column2="0.000000" column3="3838.000000"/> + <Line2 column1="0.000000" column2="5249.000000" column3="3445.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="9346.000000" column2="0.000000" column3="3838.000000"/> + <Line2 column1="0.000000" column2="5249.000000" column3="3445.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="12231.000000" column2="0.000000" column3="1741.000000"/> + <Line2 column1="0.000000" column2="7783.000000" column3="2023.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="12231.000000" column2="0.000000" column3="1741.000000"/> + <Line2 column1="0.000000" column2="7837.000000" column3="1996.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4074" positionY="985" sizeX="9286" sizeY="1295" type="com.sun.star.drawing.TextShape" name="CID/Title=" text="Gráfico de Colunas ou Barras" fontHeight="18.600000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="118" textRightDistance="118" textUpperDistance="197" textLowerDistance="197" textMaximumFrameHeight="0" textMaximumFrameWidth="11421" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="d9d9d9" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="9287.000000" column2="0.000000" column3="4074.000000"/> + <Line2 column1="0.000000" column2="1296.000000" column3="985.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4928" positionY="9793" sizeX="4420" sizeY="677" type="com.sun.star.drawing.GroupShape" name="CID/D=0:Legend="> + <XShapes> + <XShape positionX="4928" positionY="9793" sizeX="4420" sizeY="677" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="d9d9d9" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="4421.000000" column2="0.000000" column3="4928.000000"/> + <Line2 column1="0.000000" column2="678.000000" column3="9793.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7919" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="7919" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:LegendEntry=0"> + <XShapes> + <XShape positionX="7919" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="7919.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7919" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="5b9bd5" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="7919.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="7919.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="7919.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="6424" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="6424" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:LegendEntry=0"> + <XShapes> + <XShape positionX="6424" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="6424.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="6424" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ed7d31" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="6424.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="6424.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="6424.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="5044" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="5044" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=2:LegendEntry=0"> + <XShapes> + <XShape positionX="5044" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="5044.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="5044" positionY="10026" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="a5a5a5" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="5044.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="5044.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="5044.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="10026.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="5355" positionY="9893" sizeX="837" sizeY="477" type="com.sun.star.drawing.TextShape" text="Cupe" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="13966" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="838.000000" column2="0.000000" column3="5355.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="9893.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="6735" positionY="9893" sizeX="952" sizeY="477" type="com.sun.star.drawing.TextShape" text="Hatch" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="13966" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="953.000000" column2="0.000000" column3="6735.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="9893.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="8230" positionY="9893" sizeX="1002" sizeY="477" type="com.sun.star.drawing.TextShape" text="Sedan" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="13966" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="1003.000000" column2="0.000000" column3="8230.000000"/> + <Line2 column1="0.000000" column2="478.000000" column3="9893.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="4421.000000" column2="0.000000" column3="4928.000000"/> + <Line2 column1="0.000000" column2="678.000000" column3="9793.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> +</XShapes> + + diff --git a/chart2/qa/extras/xshape/data/reference/tdf150832.xml b/chart2/qa/extras/xshape/data/reference/tdf150832.xml new file mode 100644 index 000000000000..83750aea2054 --- /dev/null +++ b/chart2/qa/extras/xshape/data/reference/tdf150832.xml @@ -0,0 +1,974 @@ +<?xml version="1.0"?> +<XShapes> + <XShape positionX="0" positionY="0" sizeX="15990" sizeY="8998" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="15991.000000" column2="0.000000" column3="0.000000"/> + <Line2 column1="0.000000" column2="8999.000000" column3="0.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="179" sizeX="13087" sizeY="8640" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> + <XShapes> + <XShape positionX="761" positionY="379" sizeX="12645" sizeY="7793" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="12646.000000" column2="0.000000" column3="761.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="379.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="179" sizeX="13087" sizeY="8640" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="13088.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="8641.000000" column3="179.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="179" sizeX="13087" sizeY="8640" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="611" positionY="377" sizeX="12795" sizeY="7944" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="761" positionY="379" sizeX="12645" sizeY="7793" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> + <XShapes> + <XShape positionX="761" positionY="379" sizeX="12645" sizeY="7793" type="com.sun.star.drawing.RectangleShape" name="CID/DiagramWall=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="000000" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="12646.000000" column2="0.000000" column3="761.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="379.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="12646.000000" column2="0.000000" column3="761.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="379.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="611" positionY="377" sizeX="12795" sizeY="7944" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> + <XShapes> + <XShape positionX="761" positionY="377" sizeX="12645" sizeY="7794" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="761" positionY="377" sizeX="12645" sizeY="7794" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0:Grid=0"> + <XShapes> + <XShape positionX="761" positionY="377" sizeX="12645" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="13406" positionY="8171"/> + <point positionX="761" positionY="8171"/> + </pointSequence> + <pointSequence> + <point positionX="13406" positionY="7057"/> + <point positionX="761" positionY="7057"/> + </pointSequence> + <pointSequence> + <point positionX="13406" positionY="5944"/> + <point positionX="761" positionY="5944"/> + </pointSequence> + <pointSequence> + <point positionX="13406" positionY="4831"/> + <point positionX="761" positionY="4831"/> + </pointSequence> + <pointSequence> + <point positionX="13406" positionY="3717"/> + <point positionX="761" positionY="3717"/> + </pointSequence> + <pointSequence> + <point positionX="13406" positionY="2604"/> + <point positionX="761" positionY="2604"/> + </pointSequence> + <pointSequence> + <point positionX="13406" positionY="1491"/> + <point positionX="761" positionY="1491"/> + </pointSequence> + <pointSequence> + <point positionX="13406" positionY="377"/> + <point positionX="761" positionY="377"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="12645" positionY="7794"/> + <point positionX="0" positionY="7794"/> + </pointSequence> + <pointSequence> + <point positionX="12645" positionY="6680"/> + <point positionX="0" positionY="6680"/> + </pointSequence> + <pointSequence> + <point positionX="12645" positionY="5567"/> + <point positionX="0" positionY="5567"/> + </pointSequence> + <pointSequence> + <point positionX="12645" positionY="4454"/> + <point positionX="0" positionY="4454"/> + </pointSequence> + <pointSequence> + <point positionX="12645" positionY="3340"/> + <point positionX="0" positionY="3340"/> + </pointSequence> + <pointSequence> + <point positionX="12645" positionY="2227"/> + <point positionX="0" positionY="2227"/> + </pointSequence> + <pointSequence> + <point positionX="12645" positionY="1114"/> + <point positionX="0" positionY="1114"/> + </pointSequence> + <pointSequence> + <point positionX="12645" positionY="0"/> + <point positionX="0" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="12645.000000" column2="0.000000" column3="761.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="377.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="761" positionY="377" sizeX="0" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" name="HandlesOnly" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="NONE"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="761" positionY="8171"/> + <point positionX="761" positionY="7057"/> + <point positionX="761" positionY="5944"/> + <point positionX="761" positionY="4831"/> + <point positionX="761" positionY="3717"/> + <point positionX="761" positionY="2604"/> + <point positionX="761" positionY="1491"/> + <point positionX="761" positionY="377"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="7794"/> + <point positionX="0" positionY="6680"/> + <point positionX="0" positionY="5567"/> + <point positionX="0" positionY="4454"/> + <point positionX="0" positionY="3340"/> + <point positionX="0" positionY="2227"/> + <point positionX="0" positionY="1114"/> + <point positionX="0" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="0.000000" column2="0.000000" column3="761.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="377.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="12646.000000" column2="0.000000" column3="761.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="377.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="12646.000000" column2="0.000000" column3="761.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="377.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="611" positionY="377" sizeX="12795" sizeY="7944" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="761" positionY="8171" sizeX="12645" sizeY="150" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> + <XShapes> + <XShape positionX="761" positionY="8171" sizeX="12645" sizeY="150" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="761" positionY="8321"/> + <point positionX="761" positionY="8171"/> + </pointSequence> + <pointSequence> + <point positionX="4976" positionY="8321"/> + <point positionX="4976" positionY="8171"/> + </pointSequence> + <pointSequence> + <point positionX="9191" positionY="8321"/> + <point positionX="9191" positionY="8171"/> + </pointSequence> + <pointSequence> + <point positionX="13406" positionY="8321"/> + <point positionX="13406" positionY="8171"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="150"/> + <point positionX="0" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="4215" positionY="150"/> + <point positionX="4215" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="8430" positionY="150"/> + <point positionX="8430" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="12645" positionY="150"/> + <point positionX="12645" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="12645.000000" column2="0.000000" column3="761.000000"/> + <Line2 column1="0.000000" column2="150.000000" column3="8171.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="761" positionY="8171" sizeX="12645" sizeY="0" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="761" positionY="8171"/> + <point positionX="13406" positionY="8171"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="0"/> + <point positionX="12645" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="12645.000000" column2="0.000000" column3="761.000000"/> + <Line2 column1="0.000000" column2="0.000000" column3="8171.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="12646.000000" column2="0.000000" column3="761.000000"/> + <Line2 column1="0.000000" column2="151.000000" column3="8171.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="611" positionY="377" sizeX="150" sizeY="7794" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="611" positionY="377" sizeX="150" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="611" positionY="8171"/> + <point positionX="761" positionY="8171"/> + </pointSequence> + <pointSequence> + <point positionX="611" positionY="7057"/> + <point positionX="761" positionY="7057"/> + </pointSequence> + <pointSequence> + <point positionX="611" positionY="5944"/> + <point positionX="761" positionY="5944"/> + </pointSequence> + <pointSequence> + <point positionX="611" positionY="4831"/> + <point positionX="761" positionY="4831"/> + </pointSequence> + <pointSequence> + <point positionX="611" positionY="3717"/> + <point positionX="761" positionY="3717"/> + </pointSequence> + <pointSequence> + <point positionX="611" positionY="2604"/> + <point positionX="761" positionY="2604"/> + </pointSequence> + <pointSequence> + <point positionX="611" positionY="1491"/> + <point positionX="761" positionY="1491"/> + </pointSequence> + <pointSequence> + <point positionX="611" positionY="377"/> + <point positionX="761" positionY="377"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="7794"/> + <point positionX="150" positionY="7794"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="6680"/> + <point positionX="150" positionY="6680"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="5567"/> + <point positionX="150" positionY="5567"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="4454"/> + <point positionX="150" positionY="4454"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="3340"/> + <point positionX="150" positionY="3340"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="2227"/> + <point positionX="150" positionY="2227"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="1114"/> + <point positionX="150" positionY="1114"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="0"/> + <point positionX="150" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="150.000000" column2="0.000000" column3="611.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="377.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="761" positionY="377" sizeX="0" sizeY="7794" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="761" positionY="8171"/> + <point positionX="761" positionY="377"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="7794"/> + <point positionX="0" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="0.000000" column2="0.000000" column3="761.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="377.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="151.000000" column2="0.000000" column3="611.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="377.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="12796.000000" column2="0.000000" column3="611.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="377.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="1463" positionY="1491" sizeX="11240" sizeY="6680" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="1463" positionY="2604" sizeX="9835" sizeY="5567" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> + <XShapes> + <XShape positionX="1463" positionY="7057" sizeX="1405" sizeY="1114" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="1463" positionY="8171"/> + <point positionX="2868" positionY="8171"/> + <point positionX="2868" positionY="7057"/> + <point positionX="1463" positionY="7057"/> + <point positionX="1463" positionY="8171"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="1114"/> + <point positionX="1405" positionY="1114"/> + <point positionX="1405" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="1114"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="1405.000000" column2="0.000000" column3="1463.000000"/> + <Line2 column1="0.000000" column2="1114.000000" column3="7057.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="5678" positionY="4831" sizeX="1405" sizeY="3340" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="5678" positionY="8171"/> + <point positionX="7083" positionY="8171"/> + <point positionX="7083" positionY="4831"/> + <point positionX="5678" positionY="4831"/> + <point positionX="5678" positionY="8171"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="3340"/> + <point positionX="1405" positionY="3340"/> + <point positionX="1405" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="3340"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="1405.000000" column2="0.000000" column3="5678.000000"/> + <Line2 column1="0.000000" column2="3340.000000" column3="4831.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="9893" positionY="2604" sizeX="1405" sizeY="5567" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="9893" positionY="8171"/> + <point positionX="11298" positionY="8171"/> + <point positionX="11298" positionY="2604"/> + <point positionX="9893" positionY="2604"/> + <point positionX="9893" positionY="8171"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="5567"/> + <point positionX="1405" positionY="5567"/> + <point positionX="1405" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="5567"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="1405.000000" column2="0.000000" column3="9893.000000"/> + <Line2 column1="0.000000" column2="5567.000000" column3="2604.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="9836.000000" column2="0.000000" column3="1463.000000"/> + <Line2 column1="0.000000" column2="5568.000000" column3="2604.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="2868" positionY="1491" sizeX="9835" sizeY="6680" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=1"> + <XShapes> + <XShape positionX="2868" positionY="5944" sizeX="1405" sizeY="2227" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="2868" positionY="8171"/> + <point positionX="4273" positionY="8171"/> + <point positionX="4273" positionY="5944"/> + <point positionX="2868" positionY="5944"/> + <point positionX="2868" positionY="8171"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="2227"/> + <point positionX="1405" positionY="2227"/> + <point positionX="1405" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="2227"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="1405.000000" column2="0.000000" column3="2868.000000"/> + <Line2 column1="0.000000" column2="2227.000000" column3="5944.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7083" positionY="3717" sizeX="1405" sizeY="4454" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7083" positionY="8171"/> + <point positionX="8488" positionY="8171"/> + <point positionX="8488" positionY="3717"/> + <point positionX="7083" positionY="3717"/> + <point positionX="7083" positionY="8171"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="4454"/> + <point positionX="1405" positionY="4454"/> + <point positionX="1405" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="4454"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="1405.000000" column2="0.000000" column3="7083.000000"/> + <Line2 column1="0.000000" column2="4454.000000" column3="3717.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="11298" positionY="1491" sizeX="1405" sizeY="6680" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="11298" positionY="8171"/> + <point positionX="12703" positionY="8171"/> + <point positionX="12703" positionY="1491"/> + <point positionX="11298" positionY="1491"/> + <point positionX="11298" positionY="8171"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="6680"/> + <point positionX="1405" positionY="6680"/> + <point positionX="1405" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="6680"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="1405.000000" column2="0.000000" column3="11298.000000"/> + <Line2 column1="0.000000" column2="6680.000000" column3="1491.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="9836.000000" column2="0.000000" column3="2868.000000"/> + <Line2 column1="0.000000" column2="6681.000000" column3="1491.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="11241.000000" column2="0.000000" column3="1463.000000"/> + <Line2 column1="0.000000" column2="6681.000000" column3="1491.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="12796.000000" column2="0.000000" column3="611.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="377.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="12796.000000" column2="0.000000" column3="611.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="377.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="179" sizeX="11076" sizeY="8640" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="2772" positionY="8421" sizeX="8623" sizeY="398" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> + <XShapes> + <XShape positionX="2772" positionY="8421" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="1" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="2772.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8421.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="6987" positionY="8421" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="2" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="6987.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8421.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="11202" positionY="8421" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="3" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="11202.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8421.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="8624.000000" column2="0.000000" column3="2772.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8421.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="179" sizeX="193" sizeY="8192" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="319" positionY="7973" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="0" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="7973.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="6859" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="1" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="6859.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="5746" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="2" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="5746.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="4633" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="3" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4633.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="3519" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="4" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="3519.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="2406" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="5" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="2406.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="1293" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="6" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="1293.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="319" positionY="179" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="7" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="179.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="8193.000000" column3="179.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="11077.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="8641.000000" column3="179.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13088.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="8641.000000" column3="179.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13088.000000" column2="0.000000" column3="319.000000"/> + <Line2 column1="0.000000" column2="8641.000000" column3="179.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="13725" positionY="3951" sizeX="2055" sizeY="1096" type="com.sun.star.drawing.GroupShape" name="CID/D=0:Legend="> + <XShapes> + <XShape positionX="13725" positionY="3951" sizeX="2055" sizeY="1096" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="000000" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="2056.000000" column2="0.000000" column3="13725.000000"/> + <Line2 column1="0.000000" column2="1097.000000" column3="3951.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="13841" positionY="4144" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="13841" positionY="4144" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:LegendEntry=0"> + <XShapes> + <XShape positionX="13841" positionY="4144" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="13841.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4144.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="13841" positionY="4144" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="13841.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4144.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="13841.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4144.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="13841.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4144.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="13841" positionY="4642" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="13841" positionY="4642" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:LegendEntry=0"> + <XShapes> + <XShape positionX="13841" positionY="4642" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="13841.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4642.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="13841" positionY="4642" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="13841.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4642.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="13841.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4642.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="13841.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4642.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14152" positionY="4051" sizeX="1512" sizeY="398" type="com.sun.star.drawing.TextShape" text="Column A" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4797" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="1513.000000" column2="0.000000" column3="14152.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4051.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14152" positionY="4549" sizeX="1512" sizeY="398" type="com.sun.star.drawing.TextShape" text="Column B" fontHeight="10.000000" fontColor="000000" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4797" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="1513.000000" column2="0.000000" column3="14152.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4549.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="2056.000000" column2="0.000000" column3="13725.000000"/> + <Line2 column1="0.000000" column2="1097.000000" column3="3951.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> +</XShapes> + + diff --git a/chart2/qa/extras/xshape/data/reference/tdf151424.xml b/chart2/qa/extras/xshape/data/reference/tdf151424.xml new file mode 100644 index 000000000000..eb37ef78c090 --- /dev/null +++ b/chart2/qa/extras/xshape/data/reference/tdf151424.xml @@ -0,0 +1,1160 @@ +<?xml version="1.0"?> +<XShapes> + <XShape positionX="0" positionY="0" sizeX="16011" sizeY="9010" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="16012.000000" column2="0.000000" column3="0.000000"/> + <Line2 column1="0.000000" column2="9011.000000" column3="0.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="180" sizeX="13511" sizeY="8650" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> + <XShapes> + <XShape positionX="3724" positionY="1154" sizeX="6703" sizeY="6703" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="6704.000000" column2="0.000000" column3="3724.000000"/> + <Line2 column1="0.000000" column2="6704.000000" column3="1154.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="180" sizeX="13511" sizeY="8650" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="13512.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="8651.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="2985" positionY="180" sizeX="8181" sizeY="8650" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="3724" positionY="1153" sizeX="6703" sizeY="6704" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="3724" positionY="1154" sizeX="6703" sizeY="6703" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> + <XShapes> + <XShape positionX="3724" positionY="1154" sizeX="6703" sizeY="6703" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="6704.000000" column2="0.000000" column3="3724.000000"/> + <Line2 column1="0.000000" column2="6704.000000" column3="1154.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="6704.000000" column2="0.000000" column3="3724.000000"/> + <Line2 column1="0.000000" column2="6704.000000" column3="1154.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4098" positionY="1153" sizeX="5954" sizeY="6703" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> + <XShapes> + <XShape positionX="4173" positionY="1153" sizeX="5804" sizeY="6703" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="4173" positionY="1153" sizeX="5804" sizeY="6703" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0:Grid=0"> + <XShapes> + <XShape positionX="4173" positionY="1153" sizeX="5804" sizeY="6703" type="com.sun.star.drawing.PolyLineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7075" positionY="4504"/> + <point positionX="7075" positionY="4504"/> + </pointSequence> + <pointSequence> + <point positionX="7075" positionY="1153"/> + <point positionX="4173" positionY="2828"/> + <point positionX="4173" positionY="6180"/> + <point positionX="7075" positionY="7856"/> + <point positionX="9977" positionY="6180"/> + <point positionX="9977" positionY="2828"/> + <point positionX="7075" positionY="1153"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="2902" positionY="3351"/> + <point positionX="2902" positionY="3351"/> + </pointSequence> + <pointSequence> + <point positionX="2902" positionY="0"/> + <point positionX="0" positionY="1675"/> + <point positionX="0" positionY="5027"/> + <point positionX="2902" positionY="6703"/> + <point positionX="5804" positionY="5027"/> + <point positionX="5804" positionY="1675"/> + <point positionX="2902" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5804.000000" column2="0.000000" column3="4173.000000"/> + <Line2 column1="0.000000" column2="6703.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="5805.000000" column2="0.000000" column3="4173.000000"/> + <Line2 column1="0.000000" column2="6704.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="5805.000000" column2="0.000000" column3="4173.000000"/> + <Line2 column1="0.000000" column2="6704.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4098" positionY="1153" sizeX="5954" sizeY="6703" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="4173" positionY="1153" sizeX="5804" sizeY="6703" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> + <XShapes> + <XShape positionX="4173" positionY="1153" sizeX="5804" sizeY="6703" type="com.sun.star.drawing.PolyLineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7075" positionY="1153"/> + <point positionX="4173" positionY="2828"/> + <point positionX="4173" positionY="6180"/> + <point positionX="7075" positionY="7856"/> + <point positionX="9977" positionY="6180"/> + <point positionX="9977" positionY="2828"/> + <point positionX="7075" positionY="1153"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="2902" positionY="0"/> + <point positionX="0" positionY="1675"/> + <point positionX="0" positionY="5027"/> + <point positionX="2902" positionY="6703"/> + <point positionX="5804" positionY="5027"/> + <point positionX="5804" positionY="1675"/> + <point positionX="2902" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5804.000000" column2="0.000000" column3="4173.000000"/> + <Line2 column1="0.000000" column2="6703.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="5805.000000" column2="0.000000" column3="4173.000000"/> + <Line2 column1="0.000000" column2="6704.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="6925" positionY="1153" sizeX="300" sizeY="3351" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="6925" positionY="1153" sizeX="300" sizeY="3351" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7225" positionY="4504"/> + <point positionX="6925" positionY="4504"/> + </pointSequence> + <pointSequence> + <point positionX="7225" positionY="4504"/> + <point positionX="6925" positionY="4504"/> + </pointSequence> + <pointSequence> + <point positionX="7225" positionY="1153"/> + <point positionX="6925" positionY="1153"/> + </pointSequence> + <pointSequence> + <point positionX="7225" positionY="1153"/> + <point positionX="6925" positionY="1153"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="300" positionY="3351"/> + <point positionX="0" positionY="3351"/> + </pointSequence> + <pointSequence> + <point positionX="300" positionY="3351"/> + <point positionX="0" positionY="3351"/> + </pointSequence> + <pointSequence> + <point positionX="300" positionY="0"/> + <point positionX="0" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="300" positionY="0"/> + <point positionX="0" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="300.000000" column2="0.000000" column3="6925.000000"/> + <Line2 column1="0.000000" column2="3351.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7075" positionY="1153" sizeX="0" sizeY="3351" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7075" positionY="4504"/> + <point positionX="7075" positionY="1153"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="3351"/> + <point positionX="0" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="0.000000" column2="0.000000" column3="7075.000000"/> + <Line2 column1="0.000000" column2="3351.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="301.000000" column2="0.000000" column3="6925.000000"/> + <Line2 column1="0.000000" column2="3352.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4098" positionY="2698" sizeX="3052" sizeY="1936" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="4098" positionY="2698" sizeX="3052" sizeY="1936" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7150" positionY="4374"/> + <point positionX="7000" positionY="4634"/> + </pointSequence> + <pointSequence> + <point positionX="7150" positionY="4374"/> + <point positionX="7000" positionY="4634"/> + </pointSequence> + <pointSequence> + <point positionX="4248" positionY="2698"/> + <point positionX="4098" positionY="2958"/> + </pointSequence> + <pointSequence> + <point positionX="4248" positionY="2698"/> + <point positionX="4098" positionY="2958"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="3052" positionY="1676"/> + <point positionX="2902" positionY="1936"/> + </pointSequence> + <pointSequence> + <point positionX="3052" positionY="1676"/> + <point positionX="2902" positionY="1936"/> + </pointSequence> + <pointSequence> + <point positionX="150" positionY="0"/> + <point positionX="0" positionY="260"/> + </pointSequence> + <pointSequence> + <point positionX="150" positionY="0"/> + <point positionX="0" positionY="260"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="3052.000000" column2="0.000000" column3="4098.000000"/> + <Line2 column1="0.000000" column2="1936.000000" column3="2698.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4173" positionY="2828" sizeX="2902" sizeY="1676" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7075" positionY="4504"/> + <point positionX="4173" positionY="2828"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="2902" positionY="1676"/> + <point positionX="0" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="2902.000000" column2="0.000000" column3="4173.000000"/> + <Line2 column1="0.000000" column2="1676.000000" column3="2828.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="3053.000000" column2="0.000000" column3="4098.000000"/> + <Line2 column1="0.000000" column2="1937.000000" column3="2698.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4098" positionY="4374" sizeX="3052" sizeY="1936" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="4098" positionY="4374" sizeX="3052" sizeY="1936" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7000" positionY="4374"/> + <point positionX="7150" positionY="4634"/> + </pointSequence> + <pointSequence> + <point positionX="7000" positionY="4374"/> + <point positionX="7150" positionY="4634"/> + </pointSequence> + <pointSequence> + <point positionX="4098" positionY="6050"/> + <point positionX="4248" positionY="6310"/> + </pointSequence> + <pointSequence> + <point positionX="4098" positionY="6050"/> + <point positionX="4248" positionY="6310"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="2902" positionY="0"/> + <point positionX="3052" positionY="260"/> + </pointSequence> + <pointSequence> + <point positionX="2902" positionY="0"/> + <point positionX="3052" positionY="260"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="1676"/> + <point positionX="150" positionY="1936"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="1676"/> + <point positionX="150" positionY="1936"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="3052.000000" column2="0.000000" column3="4098.000000"/> + <Line2 column1="0.000000" column2="1936.000000" column3="4374.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4173" positionY="4504" sizeX="2902" sizeY="1676" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7075" positionY="4504"/> + <point positionX="4173" positionY="6180"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="2902" positionY="0"/> + <point positionX="0" positionY="1676"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="2902.000000" column2="0.000000" column3="4173.000000"/> + <Line2 column1="0.000000" column2="1676.000000" column3="4504.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="3053.000000" column2="0.000000" column3="4098.000000"/> + <Line2 column1="0.000000" column2="1937.000000" column3="4374.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="6925" positionY="4504" sizeX="300" sizeY="3352" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="6925" positionY="4504" sizeX="300" sizeY="3352" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="6925" positionY="4504"/> + <point positionX="7225" positionY="4504"/> + </pointSequence> + <pointSequence> + <point positionX="6925" positionY="4504"/> + <point positionX="7225" positionY="4504"/> + </pointSequence> + <pointSequence> + <point positionX="6925" positionY="7856"/> + <point positionX="7225" positionY="7856"/> + </pointSequence> + <pointSequence> + <point positionX="6925" positionY="7856"/> + <point positionX="7225" positionY="7856"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="0"/> + <point positionX="300" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="0"/> + <point positionX="300" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="3352"/> + <point positionX="300" positionY="3352"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="3352"/> + <point positionX="300" positionY="3352"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="300.000000" column2="0.000000" column3="6925.000000"/> + <Line2 column1="0.000000" column2="3352.000000" column3="4504.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7075" positionY="4504" sizeX="0" sizeY="3352" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7075" positionY="4504"/> + <point positionX="7075" positionY="7856"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="3352"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="0.000000" column2="0.000000" column3="7075.000000"/> + <Line2 column1="0.000000" column2="3352.000000" column3="4504.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="301.000000" column2="0.000000" column3="6925.000000"/> + <Line2 column1="0.000000" column2="3353.000000" column3="4504.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7000" positionY="4374" sizeX="3052" sizeY="1936" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="7000" positionY="4374" sizeX="3052" sizeY="1936" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7000" positionY="4634"/> + <point positionX="7150" positionY="4374"/> + </pointSequence> + <pointSequence> + <point positionX="7000" positionY="4634"/> + <point positionX="7150" positionY="4374"/> + </pointSequence> + <pointSequence> + <point positionX="9902" positionY="6310"/> + <point positionX="10052" positionY="6050"/> + </pointSequence> + <pointSequence> + <point positionX="9902" positionY="6310"/> + <point positionX="10052" positionY="6050"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="260"/> + <point positionX="150" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="260"/> + <point positionX="150" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="2902" positionY="1936"/> + <point positionX="3052" positionY="1676"/> + </pointSequence> + <pointSequence> + <point positionX="2902" positionY="1936"/> + <point positionX="3052" positionY="1676"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="3052.000000" column2="0.000000" column3="7000.000000"/> + <Line2 column1="0.000000" column2="1936.000000" column3="4374.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7075" positionY="4504" sizeX="2902" sizeY="1676" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7075" positionY="4504"/> + <point positionX="9977" positionY="6180"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="0"/> + <point positionX="2902" positionY="1676"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="2902.000000" column2="0.000000" column3="7075.000000"/> + <Line2 column1="0.000000" column2="1676.000000" column3="4504.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="3053.000000" column2="0.000000" column3="7000.000000"/> + <Line2 column1="0.000000" column2="1937.000000" column3="4374.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7000" positionY="2698" sizeX="3052" sizeY="1936" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="7000" positionY="2698" sizeX="3052" sizeY="1936" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7150" positionY="4634"/> + <point positionX="7000" positionY="4374"/> + </pointSequence> + <pointSequence> + <point positionX="7150" positionY="4634"/> + <point positionX="7000" positionY="4374"/> + </pointSequence> + <pointSequence> + <point positionX="10052" positionY="2958"/> + <point positionX="9902" positionY="2698"/> + </pointSequence> + <pointSequence> + <point positionX="10052" positionY="2958"/> + <point positionX="9902" positionY="2698"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="150" positionY="1936"/> + <point positionX="0" positionY="1676"/> + </pointSequence> + <pointSequence> + <point positionX="150" positionY="1936"/> + <point positionX="0" positionY="1676"/> + </pointSequence> + <pointSequence> + <point positionX="3052" positionY="260"/> + <point positionX="2902" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="3052" positionY="260"/> + <point positionX="2902" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="3052.000000" column2="0.000000" column3="7000.000000"/> + <Line2 column1="0.000000" column2="1936.000000" column3="2698.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7075" positionY="2828" sizeX="2902" sizeY="1676" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7075" positionY="4504"/> + <point positionX="9977" positionY="2828"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="1676"/> + <point positionX="2902" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="2902.000000" column2="0.000000" column3="7075.000000"/> + <Line2 column1="0.000000" column2="1676.000000" column3="2828.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="3053.000000" column2="0.000000" column3="7000.000000"/> + <Line2 column1="0.000000" column2="1937.000000" column3="2698.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="6925" positionY="1153" sizeX="300" sizeY="3351" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="6925" positionY="1153" sizeX="300" sizeY="3351" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7225" positionY="4504"/> + <point positionX="6925" positionY="4504"/> + </pointSequence> + <pointSequence> + <point positionX="7225" positionY="4504"/> + <point positionX="6925" positionY="4504"/> + </pointSequence> + <pointSequence> + <point positionX="7225" positionY="1153"/> + <point positionX="6925" positionY="1153"/> + </pointSequence> + <pointSequence> + <point positionX="7225" positionY="1153"/> + <point positionX="6925" positionY="1153"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="300" positionY="3351"/> + <point positionX="0" positionY="3351"/> + </pointSequence> + <pointSequence> + <point positionX="300" positionY="3351"/> + <point positionX="0" positionY="3351"/> + </pointSequence> + <pointSequence> + <point positionX="300" positionY="0"/> + <point positionX="0" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="300" positionY="0"/> + <point positionX="0" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="300.000000" column2="0.000000" column3="6925.000000"/> + <Line2 column1="0.000000" column2="3351.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7075" positionY="1153" sizeX="0" sizeY="3351" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7075" positionY="4504"/> + <point positionX="7075" positionY="1153"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="3351"/> + <point positionX="0" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="0.000000" column2="0.000000" column3="7075.000000"/> + <Line2 column1="0.000000" column2="3351.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="301.000000" column2="0.000000" column3="6925.000000"/> + <Line2 column1="0.000000" column2="3352.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="5955.000000" column2="0.000000" column3="4098.000000"/> + <Line2 column1="0.000000" column2="6704.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4173" positionY="1153" sizeX="5804" sizeY="6703" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="5334" positionY="3163" sizeX="3482" sizeY="4022" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> + <XShapes> + <XShape positionX="5334" positionY="3163" sizeX="3482" sizeY="4022" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="5334" positionY="3163" sizeX="3482" sizeY="4022" type="com.sun.star.drawing.PolyLineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="40" textRightDistance="40" textUpperDistance="40" textLowerDistance="40" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7075" positionY="3163"/> + <point positionX="5334" positionY="3499"/> + <point positionX="6495" positionY="4839"/> + <point positionX="7075" positionY="7185"/> + <point positionX="8816" positionY="5509"/> + <point positionX="7655" positionY="4169"/> + <point positionX="7075" positionY="3163"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="1741" positionY="0"/> + <point positionX="0" positionY="336"/> + <point positionX="1161" positionY="1676"/> + <point positionX="1741" positionY="4022"/> + <point positionX="3482" positionY="2346"/> + <point positionX="2321" positionY="1006"/> + <point positionX="1741" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="3482.000000" column2="0.000000" column3="5334.000000"/> + <Line2 column1="0.000000" column2="4022.000000" column3="3163.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="3483.000000" column2="0.000000" column3="5334.000000"/> + <Line2 column1="0.000000" column2="4023.000000" column3="3163.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="3483.000000" column2="0.000000" column3="5334.000000"/> + <Line2 column1="0.000000" column2="4023.000000" column3="3163.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4173" positionY="1153" sizeX="5804" sizeY="6703" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=1"> + <XShapes> + <XShape positionX="4173" positionY="1153" sizeX="5804" sizeY="6703" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="4173" positionY="1153" sizeX="5804" sizeY="6703" type="com.sun.star.drawing.PolyLineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="40" textRightDistance="40" textUpperDistance="40" textLowerDistance="40" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7075" positionY="1153"/> + <point positionX="4173" positionY="2828"/> + <point positionX="4173" positionY="6180"/> + <point positionX="7075" positionY="7856"/> + <point positionX="9977" positionY="6180"/> + <point positionX="9977" positionY="2828"/> + <point positionX="7075" positionY="1153"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="2902" positionY="0"/> + <point positionX="0" positionY="1675"/> + <point positionX="0" positionY="5027"/> + <point positionX="2902" positionY="6703"/> + <point positionX="5804" positionY="5027"/> + <point positionX="5804" positionY="1675"/> + <point positionX="2902" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="5804.000000" column2="0.000000" column3="4173.000000"/> + <Line2 column1="0.000000" column2="6703.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="5805.000000" column2="0.000000" column3="4173.000000"/> + <Line2 column1="0.000000" column2="6704.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="5805.000000" column2="0.000000" column3="4173.000000"/> + <Line2 column1="0.000000" column2="6704.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="5805.000000" column2="0.000000" column3="4173.000000"/> + <Line2 column1="0.000000" column2="6704.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="5955.000000" column2="0.000000" column3="4098.000000"/> + <Line2 column1="0.000000" column2="6704.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="6704.000000" column2="0.000000" column3="3724.000000"/> + <Line2 column1="0.000000" column2="6705.000000" column3="1153.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="2985" positionY="180" sizeX="8181" sizeY="8650" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="2985" positionY="180" sizeX="8181" sizeY="8650" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> + <XShapes> + <XShape positionX="6731" positionY="180" sizeX="690" sizeY="398" type="com.sun.star.drawing.TextShape" text="Bla1" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="691.000000" column2="0.000000" column3="6731.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="2985" positionY="2143" sizeX="690" sizeY="398" type="com.sun.star.drawing.TextShape" text="Bla2" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="691.000000" column2="0.000000" column3="2985.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="2143.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="2985" positionY="6468" sizeX="690" sizeY="398" type="com.sun.star.drawing.TextShape" text="Bla3" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="691.000000" column2="0.000000" column3="2985.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="6468.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="6731" positionY="8432" sizeX="690" sizeY="398" type="com.sun.star.drawing.TextShape" text="Bla4" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="691.000000" column2="0.000000" column3="6731.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8432.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="10476" positionY="6468" sizeX="690" sizeY="398" type="com.sun.star.drawing.TextShape" text="Bla5" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="691.000000" column2="0.000000" column3="10476.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="6468.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="10476" positionY="2143" sizeX="690" sizeY="398" type="com.sun.star.drawing.TextShape" text="Bla6" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="691.000000" column2="0.000000" column3="10476.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="2143.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="8182.000000" column2="0.000000" column3="2985.000000"/> + <Line2 column1="0.000000" column2="8651.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7325" positionY="955" sizeX="193" sizeY="3749" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="7325" positionY="4306" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="0" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="7325.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4306.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7325" positionY="955" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="5" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="7325.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="955.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="7325.000000"/> + <Line2 column1="0.000000" column2="3750.000000" column3="955.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="8182.000000" column2="0.000000" column3="2985.000000"/> + <Line2 column1="0.000000" column2="8651.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="8182.000000" column2="0.000000" column3="2985.000000"/> + <Line2 column1="0.000000" column2="8651.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13512.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="8651.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14151" positionY="3957" sizeX="1650" sizeY="1096" type="com.sun.star.drawing.GroupShape" name="CID/D=0:Legend="> + <XShapes> + <XShape positionX="14151" positionY="3957" sizeX="1650" sizeY="1096" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="1651.000000" column2="0.000000" column3="14151.000000"/> + <Line2 column1="0.000000" column2="1097.000000" column3="3957.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14267" positionY="4150" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="14267" positionY="4150" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:LegendEntry=0"> + <XShapes> + <XShape positionX="14267" positionY="4150" sizeX="800" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="801.000000" column2="0.000000" column3="14267.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4150.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14267" positionY="4255" sizeX="800" sizeY="0" type="com.sun.star.drawing.LineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="40" textRightDistance="40" textUpperDistance="40" textLowerDistance="40" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="14267" positionY="4255"/> + <point positionX="15067" positionY="4255"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="0"/> + <point positionX="800" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="800.000000" column2="0.000000" column3="14267.000000"/> + <Line2 column1="0.000000" column2="0.000000" column3="4255.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="801.000000" column2="0.000000" column3="14267.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4150.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="801.000000" column2="0.000000" column3="14267.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4150.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14267" positionY="4648" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="14267" positionY="4648" sizeX="800" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:LegendEntry=0"> + <XShapes> + <XShape positionX="14267" positionY="4648" sizeX="800" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="801.000000" column2="0.000000" column3="14267.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4648.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14267" positionY="4753" sizeX="800" sizeY="0" type="com.sun.star.drawing.LineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="40" textRightDistance="40" textUpperDistance="40" textLowerDistance="40" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="14267" positionY="4753"/> + <point positionX="15067" positionY="4753"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="0"/> + <point positionX="800" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="800.000000" column2="0.000000" column3="14267.000000"/> + <Line2 column1="0.000000" column2="0.000000" column3="4753.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="801.000000" column2="0.000000" column3="14267.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4648.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="801.000000" column2="0.000000" column3="14267.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4648.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="15167" positionY="4057" sizeX="346" sizeY="398" type="com.sun.star.drawing.TextShape" text="ist" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4803" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="347.000000" column2="0.000000" column3="15167.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4057.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="15167" positionY="4555" sizeX="518" sizeY="398" type="com.sun.star.drawing.TextShape" text="soll" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4803" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="519.000000" column2="0.000000" column3="15167.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4555.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="1651.000000" column2="0.000000" column3="14151.000000"/> + <Line2 column1="0.000000" column2="1097.000000" column3="3957.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> +</XShapes> + + diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml index eb48c3f7293d..46d075a06020 100644 --- a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml +++ b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <XShapes> - <XShape positionX="0" positionY="0" sizeX="26494" sizeY="18368" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="0" positionY="0" sizeX="29642" sizeY="18368" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -9,14 +9,14 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="26495.000000" column2="0.000000" column3="0.000000"/> + <Line1 column1="29643.000000" column2="0.000000" column3="0.000000"/> <Line2 column1="0.000000" column2="18369.000000" column3="0.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9723" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> + <XShape positionX="8407" positionY="3819" sizeX="11075" sizeY="9723" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> <XShapes> - <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9761" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -25,12 +25,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9722.000000" column3="3821.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9723" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="8407" positionY="3819" sizeX="11075" sizeY="9723" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -39,18 +39,18 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="11076.000000" column2="0.000000" column3="8407.000000"/> <Line2 column1="0.000000" column2="9724.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9723" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="8407" positionY="3819" sizeX="11075" sizeY="9723" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9723" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="9761" positionY="3819" sizeX="9721" sizeY="9723" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> + <XShape positionX="9761" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> <XShapes> - <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="d9d9d9" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9761" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="d9d9d9" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -59,25 +59,25 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9722.000000" column3="3821.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9722.000000" column3="3821.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> + <XShape positionX="9761" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> <XShapes> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="9761" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> + <XShape positionX="9761" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> <XShapes> - <XShape positionX="13067" positionY="5243" sizeX="4861" sizeY="8132" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,17762,9938,22457,11196/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4f81bd" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="14621" positionY="5243" sizeX="4861" sizeY="8132" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,19316,9938,24011,11196/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4f81bd" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -86,12 +86,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="4861.000000" column2="0.000000" column3="13067.000000"/> + <Line1 column1="4861.000000" column2="0.000000" column3="14621.000000"/> <Line2 column1="0.000000" column2="8132.000000" column3="5243.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8225" positionY="8680" sizeX="6100" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,10279,12661,7491,16643/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="c0504d" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9779" positionY="8680" sizeX="6100" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,11833,12661,9045,16643/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="c0504d" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -100,12 +100,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6100.000000" column2="0.000000" column3="8225.000000"/> + <Line1 column1="6100.000000" column2="0.000000" column3="9779.000000"/> <Line2 column1="0.000000" column2="4861.000000" column3="8680.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8207" positionY="7422" sizeX="4860" sizeY="1682" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,8225,8256,3383,7833/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="9bbb59" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9761" positionY="7422" sizeX="4860" sizeY="1682" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,9779,8256,4937,7833/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="9bbb59" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -114,12 +114,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="4860.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="4860.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="1682.000000" column3="7422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8372" positionY="3838" sizeX="4695" sizeY="4842" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,9943,4957,6818,1233/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="8064a2" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9926" positionY="3838" sizeX="4695" sizeY="4842" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,11497,4957,8372,1233/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="8064a2" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -128,12 +128,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="4695.000000" column2="0.000000" column3="8372.000000"/> + <Line1 column1="4695.000000" column2="0.000000" column3="9926.000000"/> <Line2 column1="0.000000" column2="4842.000000" column3="3838.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12643" positionY="3819" sizeX="3861" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,14729,4113,16392,-454/D=0:CS=0:CT=0:Series=0:Point=4" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4bacc6" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="14197" positionY="3819" sizeX="3861" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,16283,4113,17946,-454/D=0:CS=0:CT=0:Series=0:Point=4" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4bacc6" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -142,48 +142,48 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="3861.000000" column2="0.000000" column3="12643.000000"/> + <Line1 column1="3861.000000" column2="0.000000" column3="14197.000000"/> <Line2 column1="0.000000" column2="4861.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9723.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9723.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9723.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9724.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8394" positionY="4386" sizeX="9180" sizeY="8065" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="8407" positionY="4376" sizeX="10666" sizeY="8129" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="8394" positionY="4386" sizeX="9180" sizeY="8065" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="8407" positionY="4376" sizeX="10666" sizeY="8129" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="8394" positionY="4386" sizeX="9180" sizeY="8065" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels="> + <XShape positionX="8407" positionY="4376" sizeX="10666" sizeY="8129" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels="> <XShapes> - <XShape positionX="16434" positionY="9300" sizeX="1140" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"> + <XShape positionX="17785" positionY="9140" sizeX="1288" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"> <XShapes> - <XShape positionX="16434" positionY="9300" sizeX="1140" sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow 33%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="17785" positionY="9140" sizeX="1288" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Yellow 33%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -192,21 +192,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1141.000000" column2="0.000000" column3="16434.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="9300.000000"/> + <Line1 column1="1289.000000" column2="0.000000" column3="17785.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="9140.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="1141.000000" column2="0.000000" column3="16434.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="9300.000000"/> + <Line1 column1="1289.000000" column2="0.000000" column3="17785.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="9140.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="10197" positionY="11602" sizeX="928" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1"> + <XShape positionX="11823" positionY="11340" sizeX="1053" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1"> <XShapes> - <XShape positionX="10197" positionY="11602" sizeX="928" sizeY="849" type="com.sun.star.drawing.TextShape" text="Black 28%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="11823" positionY="11340" sizeX="1053" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Black 28%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -215,21 +215,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="929.000000" column2="0.000000" column3="10197.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="11602.000000"/> + <Line1 column1="1054.000000" column2="0.000000" column3="11823.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="11340.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="929.000000" column2="0.000000" column3="10197.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="11602.000000"/> + <Line1 column1="1054.000000" column2="0.000000" column3="11823.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="11340.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8394" positionY="7893" sizeX="1060" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2"> + <XShape positionX="8407" positionY="7661" sizeX="1224" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2"> <XShapes> - <XShape positionX="8394" positionY="7893" sizeX="1060" sizeY="849" type="com.sun.star.drawing.TextShape" text="Green 6%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="8407" positionY="7661" sizeX="1224" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Green 6%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="5929" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -238,21 +238,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1061.000000" column2="0.000000" column3="8394.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="7893.000000"/> + <Line1 column1="1225.000000" column2="0.000000" column3="8407.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="7661.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="1061.000000" column2="0.000000" column3="8394.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="7893.000000"/> + <Line1 column1="1225.000000" column2="0.000000" column3="8407.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="7661.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="10043" positionY="5033" sizeX="716" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3"> + <XShape positionX="11686" positionY="4961" sizeX="838" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3"> <XShapes> - <XShape positionX="10043" positionY="5033" sizeX="716" sizeY="849" type="com.sun.star.drawing.TextShape" text="Red 19%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="11686" positionY="4961" sizeX="838" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Red 19%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -261,21 +261,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="717.000000" column2="0.000000" column3="10043.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="5033.000000"/> + <Line1 column1="839.000000" column2="0.000000" column3="11686.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="4961.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="717.000000" column2="0.000000" column3="10043.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="5033.000000"/> + <Line1 column1="839.000000" column2="0.000000" column3="11686.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="4961.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="14035" positionY="4386" sizeX="1034" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4"> + <XShape positionX="15443" positionY="4376" sizeX="1158" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4"> <XShapes> - <XShape positionX="14035" positionY="4386" sizeX="1034" sizeY="849" type="com.sun.star.drawing.TextShape" text="White 14%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="15443" positionY="4376" sizeX="1158" sizeY="1165" type="com.sun.star.drawing.TextShape" text="White 14%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -284,49 +284,49 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="1035.000000" column2="0.000000" column3="14035.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="4386.000000"/> + <Line1 column1="1159.000000" column2="0.000000" column3="15443.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="4376.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="1035.000000" column2="0.000000" column3="14035.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="4386.000000"/> + <Line1 column1="1159.000000" column2="0.000000" column3="15443.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="4376.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9181.000000" column2="0.000000" column3="8394.000000"/> - <Line2 column1="0.000000" column2="8066.000000" column3="4386.000000"/> + <Line1 column1="10667.000000" column2="0.000000" column3="8407.000000"/> + <Line2 column1="0.000000" column2="8130.000000" column3="4376.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9181.000000" column2="0.000000" column3="8394.000000"/> - <Line2 column1="0.000000" column2="8066.000000" column3="4386.000000"/> + <Line1 column1="10667.000000" column2="0.000000" column3="8407.000000"/> + <Line2 column1="0.000000" column2="8130.000000" column3="4376.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9181.000000" column2="0.000000" column3="8394.000000"/> - <Line2 column1="0.000000" column2="8066.000000" column3="4386.000000"/> + <Line1 column1="10667.000000" column2="0.000000" column3="8407.000000"/> + <Line2 column1="0.000000" column2="8130.000000" column3="4376.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="11076.000000" column2="0.000000" column3="8407.000000"/> <Line2 column1="0.000000" column2="9724.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="11076.000000" column2="0.000000" column3="8407.000000"/> <Line2 column1="0.000000" column2="9724.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml index 639c32d00491..91fcee4428c6 100644 --- a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml +++ b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <XShapes> - <XShape positionX="0" positionY="0" sizeX="26494" sizeY="18368" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="0" positionY="0" sizeX="29643" sizeY="18368" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -9,14 +9,14 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="26495.000000" column2="0.000000" column3="0.000000"/> + <Line1 column1="29644.000000" column2="0.000000" column3="0.000000"/> <Line2 column1="0.000000" column2="18369.000000" column3="0.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> + <XShape positionX="4506" positionY="2226" sizeX="22007" sizeY="12305" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> <XShapes> - <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9762" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -25,12 +25,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9762.000000"/> <Line2 column1="0.000000" column2="9722.000000" column3="3821.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="4506" positionY="2226" sizeX="22007" sizeY="12305" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -39,18 +39,18 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22008.000000" column2="0.000000" column3="4506.000000"/> + <Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="4506" positionY="2226" sizeX="22007" sizeY="12305" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9723" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="9762" positionY="3819" sizeX="9721" sizeY="9723" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> + <XShape positionX="9762" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> <XShapes> - <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="d9d9d9" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9762" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="d9d9d9" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -59,25 +59,25 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9762.000000"/> <Line2 column1="0.000000" column2="9722.000000" column3="3821.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9762.000000"/> <Line2 column1="0.000000" column2="9722.000000" column3="3821.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> + <XShape positionX="9762" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> <XShapes> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="9762" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> + <XShape positionX="9762" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> <XShapes> - <XShape positionX="13067" positionY="5243" sizeX="4861" sizeY="8132" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,17762,9938,22457,11196/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4f81bd" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="14622" positionY="5243" sizeX="4861" sizeY="8132" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,19317,9938,24012,11196/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4f81bd" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -86,12 +86,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="4861.000000" column2="0.000000" column3="13067.000000"/> + <Line1 column1="4861.000000" column2="0.000000" column3="14622.000000"/> <Line2 column1="0.000000" column2="8132.000000" column3="5243.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8225" positionY="8680" sizeX="6100" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,10279,12661,7491,16643/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="c0504d" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9780" positionY="8680" sizeX="6100" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,11834,12661,9046,16643/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="c0504d" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -100,12 +100,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6100.000000" column2="0.000000" column3="8225.000000"/> + <Line1 column1="6100.000000" column2="0.000000" column3="9780.000000"/> <Line2 column1="0.000000" column2="4861.000000" column3="8680.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8207" positionY="7422" sizeX="4860" sizeY="1682" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,8225,8256,3383,7833/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="9bbb59" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9762" positionY="7422" sizeX="4860" sizeY="1682" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,9780,8256,4938,7833/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="9bbb59" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -114,12 +114,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="4860.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="4860.000000" column2="0.000000" column3="9762.000000"/> <Line2 column1="0.000000" column2="1682.000000" column3="7422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8372" positionY="3838" sizeX="4695" sizeY="4842" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,9943,4957,6818,1233/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="8064a2" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9927" positionY="3838" sizeX="4695" sizeY="4842" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,11498,4957,8373,1233/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="8064a2" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -128,12 +128,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="4695.000000" column2="0.000000" column3="8372.000000"/> + <Line1 column1="4695.000000" column2="0.000000" column3="9927.000000"/> <Line2 column1="0.000000" column2="4842.000000" column3="3838.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12643" positionY="3819" sizeX="3861" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,14729,4113,16392,-454/D=0:CS=0:CT=0:Series=0:Point=4" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4bacc6" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="14198" positionY="3819" sizeX="3861" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,16284,4113,17947,-454/D=0:CS=0:CT=0:Series=0:Point=4" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4bacc6" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -142,48 +142,48 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="3861.000000" column2="0.000000" column3="12643.000000"/> + <Line1 column1="3861.000000" column2="0.000000" column3="14198.000000"/> <Line2 column1="0.000000" column2="4861.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9762.000000"/> <Line2 column1="0.000000" column2="9723.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9762.000000"/> <Line2 column1="0.000000" column2="9723.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9762.000000"/> <Line2 column1="0.000000" column2="9723.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9762.000000"/> <Line2 column1="0.000000" column2="9724.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="4506" positionY="2226" sizeX="22007" sizeY="12305" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="4506" positionY="2226" sizeX="22007" sizeY="12305" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels="> + <XShape positionX="4506" positionY="2226" sizeX="22007" sizeY="12305" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels="> <XShapes> - <XShape positionX="17907" positionY="9977" sizeX="6114" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"> + <XShape positionX="19462" positionY="9977" sizeX="7051" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"> <XShapes> - <XShape positionX="17907" positionY="9977" sizeX="6114" sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow - The color of sun and honey 33%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="19462" positionY="9977" sizeX="7051" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Yellow - The color of sun and honey 33%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -192,21 +192,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6115.000000" column2="0.000000" column3="17907.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="9977.000000"/> + <Line1 column1="7052.000000" column2="0.000000" column3="19462.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="9977.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6115.000000" column2="0.000000" column3="17907.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="9977.000000"/> + <Line1 column1="7052.000000" column2="0.000000" column3="19462.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="9977.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="3974" positionY="12784" sizeX="6220" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1"> + <XShape positionX="5958" positionY="12784" sizeX="5791" sizeY="1747" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1"> <XShapes> - <XShape positionX="3974" positionY="12784" sizeX="6220" sizeY="849" type="com.sun.star.drawing.TextShape" text="Black - The color of night and coffee 28%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="7129" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="5958" positionY="12784" sizeX="5791" sizeY="1747" type="com.sun.star.drawing.TextShape" text="Black - The color of night and coffee 28%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="5929" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -215,21 +215,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6221.000000" column2="0.000000" column3="3974.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="12784.000000"/> + <Line1 column1="5792.000000" column2="0.000000" column3="5958.000000"/> + <Line2 column1="0.000000" column2="1748.000000" column3="12784.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6221.000000" column2="0.000000" column3="3974.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="12784.000000"/> + <Line1 column1="5792.000000" column2="0.000000" column3="5958.000000"/> + <Line2 column1="0.000000" column2="1748.000000" column3="12784.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1910" positionY="7819" sizeX="6167" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2"> + <XShape positionX="4506" positionY="7370" sizeX="5126" sizeY="1747" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2"> <XShapes> - <XShape positionX="1910" positionY="7819" sizeX="6167" sizeY="849" type="com.sun.star.drawing.TextShape" text="Green - The color of grass and hope 6%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="7129" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="4506" positionY="7370" sizeX="5126" sizeY="1747" type="com.sun.star.drawing.TextShape" text="Green - The color of grass and hope 6%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="5929" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -238,21 +238,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6168.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="7819.000000"/> + <Line1 column1="5127.000000" column2="0.000000" column3="4506.000000"/> + <Line2 column1="0.000000" column2="1748.000000" column3="7370.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6168.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="7819.000000"/> + <Line1 column1="5127.000000" column2="0.000000" column3="4506.000000"/> + <Line2 column1="0.000000" column2="1748.000000" column3="7370.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="3813" positionY="3994" sizeX="6035" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3"> + <XShape positionX="6073" positionY="3096" sizeX="5330" sizeY="1747" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3"> <XShapes> - <XShape positionX="3813" positionY="3994" sizeX="6035" sizeY="849" type="com.sun.star.drawing.TextShape" text="Red - The color of rose and passion 19%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="7129" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="6073" positionY="3096" sizeX="5330" sizeY="1747" type="com.sun.star.drawing.TextShape" text="Red - The color of rose and passion 19%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="5929" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -261,21 +261,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6036.000000" column2="0.000000" column3="3813.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="3994.000000"/> + <Line1 column1="5331.000000" column2="0.000000" column3="6073.000000"/> + <Line2 column1="0.000000" column2="1748.000000" column3="3096.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6036.000000" column2="0.000000" column3="3813.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="3994.000000"/> + <Line1 column1="5331.000000" column2="0.000000" column3="6073.000000"/> + <Line2 column1="0.000000" column2="1748.000000" column3="3096.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="14780" positionY="3124" sizeX="6140" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4"> + <XShape positionX="16335" positionY="2226" sizeX="5691" sizeY="1747" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4"> <XShapes> - <XShape positionX="14780" positionY="3124" sizeX="6140" sizeY="849" type="com.sun.star.drawing.TextShape" text="White - The color of milk and purity 14%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="8832" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="16335" positionY="2226" sizeX="5691" sizeY="1747" type="com.sun.star.drawing.TextShape" text="White - The color of milk and purity 14%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="5929" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -284,51 +284,51 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6141.000000" column2="0.000000" column3="14780.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="3124.000000"/> + <Line1 column1="5692.000000" column2="0.000000" column3="16335.000000"/> + <Line2 column1="0.000000" column2="1748.000000" column3="2226.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6141.000000" column2="0.000000" column3="14780.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="3124.000000"/> + <Line1 column1="5692.000000" column2="0.000000" column3="16335.000000"/> + <Line2 column1="0.000000" column2="1748.000000" column3="2226.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22008.000000" column2="0.000000" column3="4506.000000"/> + <Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22008.000000" column2="0.000000" column3="4506.000000"/> + <Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22008.000000" column2="0.000000" column3="4506.000000"/> + <Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22008.000000" column2="0.000000" column3="4506.000000"/> + <Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22008.000000" column2="0.000000" column3="4506.000000"/> + <Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> -</XShapes>
\ No newline at end of file +</XShapes> diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml index 77be20e2147f..631bd3e18e8b 100644 --- a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml +++ b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <XShapes> - <XShape positionX="0" positionY="0" sizeX="26494" sizeY="18368" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="0" positionY="0" sizeX="29642" sizeY="18368" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -9,14 +9,14 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="26495.000000" column2="0.000000" column3="0.000000"/> + <Line1 column1="29643.000000" column2="0.000000" column3="0.000000"/> <Line2 column1="0.000000" column2="18369.000000" column3="0.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> + <XShape positionX="2509" positionY="2808" sizeX="22658" sizeY="11141" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> <XShapes> - <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9761" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -25,12 +25,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9722.000000" column3="3821.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="2509" positionY="2808" sizeX="22658" sizeY="11141" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -39,18 +39,18 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22659.000000" column2="0.000000" column3="2509.000000"/> + <Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="2509" positionY="2808" sizeX="22658" sizeY="11141" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9723" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="9761" positionY="3819" sizeX="9721" sizeY="9723" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> + <XShape positionX="9761" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> <XShapes> - <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="d9d9d9" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9761" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="d9d9d9" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -59,25 +59,25 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9722.000000" column3="3821.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9722.000000" column3="3821.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> + <XShape positionX="9761" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> <XShapes> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="9761" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> + <XShape positionX="9761" positionY="3819" sizeX="9721" sizeY="9722" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> <XShapes> - <XShape positionX="13067" positionY="5243" sizeX="4861" sizeY="8132" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,17762,9938,22457,11196/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4f81bd" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="14621" positionY="5243" sizeX="4861" sizeY="8132" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,19316,9938,24011,11196/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4f81bd" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -86,12 +86,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="4861.000000" column2="0.000000" column3="13067.000000"/> + <Line1 column1="4861.000000" column2="0.000000" column3="14621.000000"/> <Line2 column1="0.000000" column2="8132.000000" column3="5243.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8225" positionY="8680" sizeX="6100" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,10279,12661,7491,16643/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="c0504d" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9779" positionY="8680" sizeX="6100" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,11833,12661,9045,16643/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="c0504d" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -100,12 +100,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6100.000000" column2="0.000000" column3="8225.000000"/> + <Line1 column1="6100.000000" column2="0.000000" column3="9779.000000"/> <Line2 column1="0.000000" column2="4861.000000" column3="8680.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8207" positionY="7422" sizeX="4860" sizeY="1682" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,8225,8256,3383,7833/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="9bbb59" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9761" positionY="7422" sizeX="4860" sizeY="1682" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,9779,8256,4937,7833/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="9bbb59" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -114,12 +114,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="4860.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="4860.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="1682.000000" column3="7422.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="8372" positionY="3838" sizeX="4695" sizeY="4842" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,9943,4957,6818,1233/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="8064a2" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="9926" positionY="3838" sizeX="4695" sizeY="4842" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,11497,4957,8372,1233/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="8064a2" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -128,12 +128,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="4695.000000" column2="0.000000" column3="8372.000000"/> + <Line1 column1="4695.000000" column2="0.000000" column3="9926.000000"/> <Line2 column1="0.000000" column2="4842.000000" column3="3838.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="12643" positionY="3819" sizeX="3861" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,14729,4113,16392,-454/D=0:CS=0:CT=0:Series=0:Point=4" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4bacc6" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="14197" positionY="3819" sizeX="3861" sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,16283,4113,17946,-454/D=0:CS=0:CT=0:Series=0:Point=4" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" textRightDistance="26" textUpperDistance="26" textLowerDistance="26" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="4bacc6" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -142,48 +142,48 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="3861.000000" column2="0.000000" column3="12643.000000"/> + <Line1 column1="3861.000000" column2="0.000000" column3="14197.000000"/> <Line2 column1="0.000000" column2="4861.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9723.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9723.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9723.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/> + <Line1 column1="9722.000000" column2="0.000000" column3="9761.000000"/> <Line2 column1="0.000000" column2="9724.000000" column3="3819.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="2509" positionY="2808" sizeX="22658" sizeY="11141" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="2509" positionY="2808" sizeX="22658" sizeY="11141" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels="> + <XShape positionX="2509" positionY="2808" sizeX="22658" sizeY="11141" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels="> <XShapes> - <XShape positionX="17907" positionY="9977" sizeX="6114" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"> + <XShape positionX="19461" positionY="9977" sizeX="5706" sizeY="1747" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"> <XShapes> - <XShape positionX="17907" positionY="9977" sizeX="6114" sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow - The color of sun and honey 33%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="7129" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="19461" positionY="9977" sizeX="5706" sizeY="1747" type="com.sun.star.drawing.TextShape" text="Yellow - The color of sun and honey 33%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="5929" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -192,21 +192,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6115.000000" column2="0.000000" column3="17907.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="9977.000000"/> + <Line1 column1="5707.000000" column2="0.000000" column3="19461.000000"/> + <Line2 column1="0.000000" column2="1748.000000" column3="9977.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6115.000000" column2="0.000000" column3="17907.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="9977.000000"/> + <Line1 column1="5707.000000" column2="0.000000" column3="19461.000000"/> + <Line2 column1="0.000000" column2="1748.000000" column3="9977.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="3974" positionY="12784" sizeX="6220" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1"> + <XShape positionX="4618" positionY="12784" sizeX="7130" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1"> <XShapes> - <XShape positionX="3974" positionY="12784" sizeX="6220" sizeY="849" type="com.sun.star.drawing.TextShape" text="Black - The color of night and coffee 28%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="4618" positionY="12784" sizeX="7130" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Black - The color of night and coffee 28%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -215,21 +215,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6221.000000" column2="0.000000" column3="3974.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="12784.000000"/> + <Line1 column1="7131.000000" column2="0.000000" column3="4618.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="12784.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6221.000000" column2="0.000000" column3="3974.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="12784.000000"/> + <Line1 column1="7131.000000" column2="0.000000" column3="4618.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="12784.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1910" positionY="7819" sizeX="6167" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2"> + <XShape positionX="2509" positionY="7661" sizeX="7122" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2"> <XShapes> - <XShape positionX="1910" positionY="7819" sizeX="6167" sizeY="849" type="com.sun.star.drawing.TextShape" text="Green - The color of grass and hope 6%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="2509" positionY="7661" sizeX="7122" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Green - The color of grass and hope 6%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -238,21 +238,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6168.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="7819.000000"/> + <Line1 column1="7123.000000" column2="0.000000" column3="2509.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="7661.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6168.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="7819.000000"/> + <Line1 column1="7123.000000" column2="0.000000" column3="2509.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="7661.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="3813" positionY="3994" sizeX="6035" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3"> + <XShape positionX="4432" positionY="3678" sizeX="6970" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3"> <XShapes> - <XShape positionX="3813" positionY="3994" sizeX="6035" sizeY="849" type="com.sun.star.drawing.TextShape" text="Red - The color of rose and passion 19%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="4432" positionY="3678" sizeX="6970" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Red - The color of rose and passion 19%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -261,21 +261,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6036.000000" column2="0.000000" column3="3813.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="3994.000000"/> + <Line1 column1="6971.000000" column2="0.000000" column3="4432.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="3678.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6036.000000" column2="0.000000" column3="3813.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="3994.000000"/> + <Line1 column1="6971.000000" column2="0.000000" column3="4432.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="3678.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="14780" positionY="3124" sizeX="6140" sizeY="849" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4"> + <XShape positionX="16334" positionY="2808" sizeX="6976" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4"> <XShapes> - <XShape positionX="14780" positionY="3124" sizeX="6140" sizeY="849" type="com.sun.star.drawing.TextShape" text="White - The color of milk and purity 14%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="16334" positionY="2808" sizeX="6976" sizeY="1165" type="com.sun.star.drawing.TextShape" text="White - The color of milk and purity 14%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -284,51 +284,51 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6141.000000" column2="0.000000" column3="14780.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="3124.000000"/> + <Line1 column1="6977.000000" column2="0.000000" column3="16334.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="2808.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6141.000000" column2="0.000000" column3="14780.000000"/> - <Line2 column1="0.000000" column2="850.000000" column3="3124.000000"/> + <Line1 column1="6977.000000" column2="0.000000" column3="16334.000000"/> + <Line2 column1="0.000000" column2="1166.000000" column3="2808.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22659.000000" column2="0.000000" column3="2509.000000"/> + <Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22659.000000" column2="0.000000" column3="2509.000000"/> + <Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22659.000000" column2="0.000000" column3="2509.000000"/> + <Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22659.000000" column2="0.000000" column3="2509.000000"/> + <Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/> - <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/> + <Line1 column1="22659.000000" column2="0.000000" column3="2509.000000"/> + <Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> -</XShapes>
\ No newline at end of file +</XShapes> diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml b/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml index 6b182821f1c9..198cf985e29b 100644 --- a/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml +++ b/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml @@ -14,7 +14,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> + <XShape positionX="2778" positionY="1712" sizeX="19649" sizeY="13342" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> <XShapes> <XShape positionX="8034" positionY="3894" sizeX="9575" sizeY="9575" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> @@ -30,7 +30,7 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="2778" positionY="1712" sizeX="19649" sizeY="13342" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -39,12 +39,12 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="21968.000000" column2="0.000000" column3="1737.000000"/> - <Line2 column1="0.000000" column2="11231.000000" column3="2768.000000"/> + <Line1 column1="19650.000000" column2="0.000000" column3="2778.000000"/> + <Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="2778" positionY="1712" sizeX="19649" sizeY="13342" type="com.sun.star.drawing.GroupShape"> <XShapes> <XShape positionX="8034" positionY="3892" sizeX="9575" sizeY="9577" type="com.sun.star.drawing.GroupShape"> <XShapes> @@ -175,15 +175,15 @@ <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="2778" positionY="1712" sizeX="19649" sizeY="13342" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230" type="com.sun.star.drawing.GroupShape"> + <XShape positionX="2778" positionY="1712" sizeX="19649" sizeY="13342" type="com.sun.star.drawing.GroupShape"> <XShapes> - <XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels="> + <XShape positionX="2778" positionY="1712" sizeX="19649" sizeY="13342" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels="> <XShapes> - <XShape positionX="17590" positionY="9958" sizeX="6114" sizeY="1273" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"> + <XShape positionX="17590" positionY="9958" sizeX="4837" sizeY="2329" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"> <XShapes> - <XShape positionX="17590" positionY="9958" sizeX="6114" sizeY="1273" type="com.sun.star.drawing.TextShape" text="Yellow - The color of sun and honey 120 33%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="6977" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="17590" positionY="9958" sizeX="4837" sizeY="2329" type="com.sun.star.drawing.TextShape" text="Yellow - The color of sun and honey 120 33%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="5199" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -192,21 +192,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6115.000000" column2="0.000000" column3="17590.000000"/> - <Line2 column1="0.000000" column2="1274.000000" column3="9958.000000"/> + <Line1 column1="4838.000000" column2="0.000000" column3="17590.000000"/> + <Line2 column1="0.000000" column2="2330.000000" column3="9958.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6115.000000" column2="0.000000" column3="17590.000000"/> - <Line2 column1="0.000000" column2="1274.000000" column3="9958.000000"/> + <Line1 column1="4838.000000" column2="0.000000" column3="17590.000000"/> + <Line2 column1="0.000000" column2="2330.000000" column3="9958.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="3770" positionY="12725" sizeX="6220" sizeY="1273" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1"> + <XShape positionX="5068" positionY="12725" sizeX="4922" sizeY="2329" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1"> <XShapes> - <XShape positionX="3770" positionY="12725" sizeX="6220" sizeY="1273" type="com.sun.star.drawing.TextShape" text="Black - The color of night and coffee 100 28%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="6977" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="5068" positionY="12725" sizeX="4922" sizeY="2329" type="com.sun.star.drawing.TextShape" text="Black - The color of night and coffee 100 28%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="5199" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -215,21 +215,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6221.000000" column2="0.000000" column3="3770.000000"/> - <Line2 column1="0.000000" column2="1274.000000" column3="12725.000000"/> + <Line1 column1="4923.000000" column2="0.000000" column3="5068.000000"/> + <Line2 column1="0.000000" column2="2330.000000" column3="12725.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6221.000000" column2="0.000000" column3="3770.000000"/> - <Line2 column1="0.000000" column2="1274.000000" column3="12725.000000"/> + <Line1 column1="4923.000000" column2="0.000000" column3="5068.000000"/> + <Line2 column1="0.000000" column2="2330.000000" column3="12725.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="1737" positionY="7614" sizeX="6167" sizeY="1273" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2"> + <XShape positionX="2778" positionY="7086" sizeX="5126" sizeY="2329" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2"> <XShapes> - <XShape positionX="1737" positionY="7614" sizeX="6167" sizeY="1273" type="com.sun.star.drawing.TextShape" text="Green - The color of grass and hope 20 6%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="6977" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="2778" positionY="7086" sizeX="5126" sizeY="2329" type="com.sun.star.drawing.TextShape" text="Green - The color of grass and hope 20 6%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="5199" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -238,21 +238,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6168.000000" column2="0.000000" column3="1737.000000"/> - <Line2 column1="0.000000" column2="1274.000000" column3="7614.000000"/> + <Line1 column1="5127.000000" column2="0.000000" column3="2778.000000"/> + <Line2 column1="0.000000" column2="2330.000000" column3="7086.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6168.000000" column2="0.000000" column3="1737.000000"/> - <Line2 column1="0.000000" column2="1274.000000" column3="7614.000000"/> + <Line1 column1="5127.000000" column2="0.000000" column3="2778.000000"/> + <Line2 column1="0.000000" column2="2330.000000" column3="7086.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="3614" positionY="3626" sizeX="6035" sizeY="1273" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3"> + <XShape positionX="5189" positionY="2570" sizeX="4460" sizeY="2329" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3"> <XShapes> - <XShape positionX="3614" positionY="3626" sizeX="6035" sizeY="1273" type="com.sun.star.drawing.TextShape" text="Red - The color of rose and passion 70 19%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="6977" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="5189" positionY="2570" sizeX="4460" sizeY="2329" type="com.sun.star.drawing.TextShape" text="Red - The color of rose and passion 70 19%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="5199" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -261,21 +261,21 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6036.000000" column2="0.000000" column3="3614.000000"/> - <Line2 column1="0.000000" column2="1274.000000" column3="3626.000000"/> + <Line1 column1="4461.000000" column2="0.000000" column3="5189.000000"/> + <Line2 column1="0.000000" column2="2330.000000" column3="2570.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6036.000000" column2="0.000000" column3="3614.000000"/> - <Line2 column1="0.000000" column2="1274.000000" column3="3626.000000"/> + <Line1 column1="4461.000000" column2="0.000000" column3="5189.000000"/> + <Line2 column1="0.000000" column2="2330.000000" column3="2570.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> - <XShape positionX="14509" positionY="2768" sizeX="6140" sizeY="1273" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4"> + <XShape positionX="14509" positionY="1712" sizeX="4822" sizeY="2329" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4"> <XShapes> - <XShape positionX="14509" positionY="2768" sizeX="6140" sizeY="1273" type="com.sun.star.drawing.TextShape" text="White - The color of milk and purity 50 14%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="8664" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <XShape positionX="14509" positionY="1712" sizeX="4822" sizeY="2329" type="com.sun.star.drawing.TextShape" text="White - The color of milk and purity 50 14%" fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="5199" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> @@ -284,53 +284,51 @@ <LineStart/> <LineEnd/> <Transformation> - <Line1 column1="6141.000000" column2="0.000000" column3="14509.000000"/> - <Line2 column1="0.000000" column2="1274.000000" column3="2768.000000"/> + <Line1 column1="4823.000000" column2="0.000000" column3="14509.000000"/> + <Line2 column1="0.000000" column2="2330.000000" column3="1712.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="6141.000000" column2="0.000000" column3="14509.000000"/> - <Line2 column1="0.000000" column2="1274.000000" column3="2768.000000"/> + <Line1 column1="4823.000000" column2="0.000000" column3="14509.000000"/> + <Line2 column1="0.000000" column2="2330.000000" column3="1712.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="21968.000000" column2="0.000000" column3="1737.000000"/> - <Line2 column1="0.000000" column2="11231.000000" column3="2768.000000"/> + <Line1 column1="19650.000000" column2="0.000000" column3="2778.000000"/> + <Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="21968.000000" column2="0.000000" column3="1737.000000"/> - <Line2 column1="0.000000" column2="11231.000000" column3="2768.000000"/> + <Line1 column1="19650.000000" column2="0.000000" column3="2778.000000"/> + <Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="21968.000000" column2="0.000000" column3="1737.000000"/> - <Line2 column1="0.000000" column2="11231.000000" column3="2768.000000"/> + <Line1 column1="19650.000000" column2="0.000000" column3="2778.000000"/> + <Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="21968.000000" column2="0.000000" column3="1737.000000"/> - <Line2 column1="0.000000" column2="11231.000000" column3="2768.000000"/> + <Line1 column1="19650.000000" column2="0.000000" column3="2778.000000"/> + <Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> <Transformation> - <Line1 column1="21968.000000" column2="0.000000" column3="1737.000000"/> - <Line2 column1="0.000000" column2="11231.000000" column3="2768.000000"/> + <Line1 column1="19650.000000" column2="0.000000" column3="2778.000000"/> + <Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/> <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> </Transformation> </XShape> </XShapes> - - diff --git a/chart2/qa/extras/xshape/data/reference/testChart.xml b/chart2/qa/extras/xshape/data/reference/testChart.xml new file mode 100644 index 000000000000..f86dfe0b996b --- /dev/null +++ b/chart2/qa/extras/xshape/data/reference/testChart.xml @@ -0,0 +1,1218 @@ +<?xml version="1.0"?> +<XShapes> + <XShape positionX="0" positionY="0" sizeX="16000" sizeY="9000" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="16001.000000" column2="0.000000" column3="0.000000"/> + <Line2 column1="0.000000" column2="9001.000000" column3="0.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="180" sizeX="13859" sizeY="8640" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> + <XShapes> + <XShape positionX="762" positionY="379" sizeX="13417" sizeY="7794" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="13418.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="379.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="180" sizeX="13859" sizeY="8640" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="13860.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="180" sizeX="13859" sizeY="8640" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="612" positionY="378" sizeX="13567" sizeY="7944" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="762" positionY="379" sizeX="13417" sizeY="7794" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> + <XShapes> + <XShape positionX="762" positionY="379" sizeX="13417" sizeY="7794" type="com.sun.star.drawing.RectangleShape" name="CID/DiagramWall=" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="13418.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="379.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13418.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="379.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="612" positionY="378" sizeX="13566" sizeY="7944" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> + <XShapes> + <XShape positionX="762" positionY="378" sizeX="13416" sizeY="7794" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="762" positionY="378" sizeX="13416" sizeY="7794" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0:Grid=0"> + <XShapes> + <XShape positionX="762" positionY="378" sizeX="13416" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="14178" positionY="8172"/> + <point positionX="762" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="14178" positionY="6873"/> + <point positionX="762" positionY="6873"/> + </pointSequence> + <pointSequence> + <point positionX="14178" positionY="5574"/> + <point positionX="762" positionY="5574"/> + </pointSequence> + <pointSequence> + <point positionX="14178" positionY="4275"/> + <point positionX="762" positionY="4275"/> + </pointSequence> + <pointSequence> + <point positionX="14178" positionY="2976"/> + <point positionX="762" positionY="2976"/> + </pointSequence> + <pointSequence> + <point positionX="14178" positionY="1677"/> + <point positionX="762" positionY="1677"/> + </pointSequence> + <pointSequence> + <point positionX="14178" positionY="378"/> + <point positionX="762" positionY="378"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="13416" positionY="7794"/> + <point positionX="0" positionY="7794"/> + </pointSequence> + <pointSequence> + <point positionX="13416" positionY="6495"/> + <point positionX="0" positionY="6495"/> + </pointSequence> + <pointSequence> + <point positionX="13416" positionY="5196"/> + <point positionX="0" positionY="5196"/> + </pointSequence> + <pointSequence> + <point positionX="13416" positionY="3897"/> + <point positionX="0" positionY="3897"/> + </pointSequence> + <pointSequence> + <point positionX="13416" positionY="2598"/> + <point positionX="0" positionY="2598"/> + </pointSequence> + <pointSequence> + <point positionX="13416" positionY="1299"/> + <point positionX="0" positionY="1299"/> + </pointSequence> + <pointSequence> + <point positionX="13416" positionY="0"/> + <point positionX="0" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="13416.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="762" positionY="378" sizeX="0" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" name="HandlesOnly" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="NONE"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="762" positionY="8172"/> + <point positionX="762" positionY="6873"/> + <point positionX="762" positionY="5574"/> + <point positionX="762" positionY="4275"/> + <point positionX="762" positionY="2976"/> + <point positionX="762" positionY="1677"/> + <point positionX="762" positionY="378"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="7794"/> + <point positionX="0" positionY="6495"/> + <point positionX="0" positionY="5196"/> + <point positionX="0" positionY="3897"/> + <point positionX="0" positionY="2598"/> + <point positionX="0" positionY="1299"/> + <point positionX="0" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="0.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13417.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="378.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13417.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="378.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="612" positionY="378" sizeX="13566" sizeY="7944" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="762" positionY="8172" sizeX="13416" sizeY="150" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> + <XShapes> + <XShape positionX="762" positionY="8172" sizeX="13416" sizeY="150" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="762" positionY="8322"/> + <point positionX="762" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="762" positionY="8322"/> + <point positionX="762" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="3445" positionY="8322"/> + <point positionX="3445" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="3445" positionY="8322"/> + <point positionX="3445" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="6128" positionY="8322"/> + <point positionX="6128" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="6128" positionY="8322"/> + <point positionX="6128" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="8812" positionY="8322"/> + <point positionX="8812" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="8812" positionY="8322"/> + <point positionX="8812" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="11495" positionY="8322"/> + <point positionX="11495" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="11495" positionY="8322"/> + <point positionX="11495" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="14178" positionY="8322"/> + <point positionX="14178" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="14178" positionY="8322"/> + <point positionX="14178" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="150"/> + <point positionX="0" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="150"/> + <point positionX="0" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="2683" positionY="150"/> + <point positionX="2683" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="2683" positionY="150"/> + <point positionX="2683" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="5366" positionY="150"/> + <point positionX="5366" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="5366" positionY="150"/> + <point positionX="5366" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="8050" positionY="150"/> + <point positionX="8050" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="8050" positionY="150"/> + <point positionX="8050" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="10733" positionY="150"/> + <point positionX="10733" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="10733" positionY="150"/> + <point positionX="10733" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="13416" positionY="150"/> + <point positionX="13416" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="13416" positionY="150"/> + <point positionX="13416" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="13416.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="150.000000" column3="8172.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="762" positionY="8172" sizeX="13416" sizeY="0" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="762" positionY="8172"/> + <point positionX="14178" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="0"/> + <point positionX="13416" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="13416.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="0.000000" column3="8172.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13417.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="151.000000" column3="8172.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="612" positionY="378" sizeX="150" sizeY="7794" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="612" positionY="378" sizeX="150" sizeY="7794" type="com.sun.star.drawing.PolyLineShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="612" positionY="8172"/> + <point positionX="762" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="8172"/> + <point positionX="762" positionY="8172"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="6873"/> + <point positionX="762" positionY="6873"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="6873"/> + <point positionX="762" positionY="6873"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="5574"/> + <point positionX="762" positionY="5574"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="5574"/> + <point positionX="762" positionY="5574"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="4275"/> + <point positionX="762" positionY="4275"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="4275"/> + <point positionX="762" positionY="4275"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="2976"/> + <point positionX="762" positionY="2976"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="2976"/> + <point positionX="762" positionY="2976"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="1677"/> + <point positionX="762" positionY="1677"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="1677"/> + <point positionX="762" positionY="1677"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="378"/> + <point positionX="762" positionY="378"/> + </pointSequence> + <pointSequence> + <point positionX="612" positionY="378"/> + <point positionX="762" positionY="378"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="7794"/> + <point positionX="150" positionY="7794"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="7794"/> + <point positionX="150" positionY="7794"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="6495"/> + <point positionX="150" positionY="6495"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="6495"/> + <point positionX="150" positionY="6495"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="5196"/> + <point positionX="150" positionY="5196"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="5196"/> + <point positionX="150" positionY="5196"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="3897"/> + <point positionX="150" positionY="3897"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="3897"/> + <point positionX="150" positionY="3897"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="2598"/> + <point positionX="150" positionY="2598"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="2598"/> + <point positionX="150" positionY="2598"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="1299"/> + <point positionX="150" positionY="1299"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="1299"/> + <point positionX="150" positionY="1299"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="0"/> + <point positionX="150" positionY="0"/> + </pointSequence> + <pointSequence> + <point positionX="0" positionY="0"/> + <point positionX="150" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="150.000000" column2="0.000000" column3="612.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="762" positionY="378" sizeX="0" sizeY="7794" type="com.sun.star.drawing.LineShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="762" positionY="8172"/> + <point positionX="762" positionY="378"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="7794"/> + <point positionX="0" positionY="0"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="0.000000" column2="0.000000" column3="762.000000"/> + <Line2 column1="0.000000" column2="7794.000000" column3="378.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="151.000000" column2="0.000000" column3="612.000000"/> + <Line2 column1="0.000000" column2="7795.000000" column3="378.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13567.000000" column2="0.000000" column3="612.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="378.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="1209" positionY="1677" sizeX="12522" sizeY="6495" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="1209" positionY="1677" sizeX="11628" sizeY="6495" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> + <XShapes> + <XShape positionX="1209" positionY="6873" sizeX="894" sizeY="1299" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="1209" positionY="8172"/> + <point positionX="2103" positionY="8172"/> + <point positionX="2103" positionY="6873"/> + <point positionX="1209" positionY="6873"/> + <point positionX="1209" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="1299"/> + <point positionX="894" positionY="1299"/> + <point positionX="894" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="1299"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="894.000000" column2="0.000000" column3="1209.000000"/> + <Line2 column1="0.000000" column2="1299.000000" column3="6873.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="3892" positionY="5574" sizeX="895" sizeY="2598" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="3892" positionY="8172"/> + <point positionX="4787" positionY="8172"/> + <point positionX="4787" positionY="5574"/> + <point positionX="3892" positionY="5574"/> + <point positionX="3892" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="2598"/> + <point positionX="895" positionY="2598"/> + <point positionX="895" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="2598"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="895.000000" column2="0.000000" column3="3892.000000"/> + <Line2 column1="0.000000" column2="2598.000000" column3="5574.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="6576" positionY="4275" sizeX="894" sizeY="3897" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="6576" positionY="8172"/> + <point positionX="7470" positionY="8172"/> + <point positionX="7470" positionY="4275"/> + <point positionX="6576" positionY="4275"/> + <point positionX="6576" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="3897"/> + <point positionX="894" positionY="3897"/> + <point positionX="894" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="3897"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="894.000000" column2="0.000000" column3="6576.000000"/> + <Line2 column1="0.000000" column2="3897.000000" column3="4275.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="9259" positionY="2976" sizeX="894" sizeY="5196" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=3" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="9259" positionY="8172"/> + <point positionX="10153" positionY="8172"/> + <point positionX="10153" positionY="2976"/> + <point positionX="9259" positionY="2976"/> + <point positionX="9259" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="5196"/> + <point positionX="894" positionY="5196"/> + <point positionX="894" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="5196"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="894.000000" column2="0.000000" column3="9259.000000"/> + <Line2 column1="0.000000" column2="5196.000000" column3="2976.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="11942" positionY="1677" sizeX="895" sizeY="6495" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=4" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="11942" positionY="8172"/> + <point positionX="12837" positionY="8172"/> + <point positionX="12837" positionY="1677"/> + <point positionX="11942" positionY="1677"/> + <point positionX="11942" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="6495"/> + <point positionX="895" positionY="6495"/> + <point positionX="895" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="6495"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="895.000000" column2="0.000000" column3="11942.000000"/> + <Line2 column1="0.000000" column2="6495.000000" column3="1677.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="11629.000000" column2="0.000000" column3="1209.000000"/> + <Line2 column1="0.000000" column2="6496.000000" column3="1677.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="2103" positionY="2976" sizeX="11628" sizeY="5196" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=1"> + <XShapes> + <XShape positionX="2103" positionY="5574" sizeX="895" sizeY="2598" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="2103" positionY="8172"/> + <point positionX="2998" positionY="8172"/> + <point positionX="2998" positionY="5574"/> + <point positionX="2103" positionY="5574"/> + <point positionX="2103" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="2598"/> + <point positionX="895" positionY="2598"/> + <point positionX="895" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="2598"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="895.000000" column2="0.000000" column3="2103.000000"/> + <Line2 column1="0.000000" column2="2598.000000" column3="5574.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4787" positionY="6873" sizeX="894" sizeY="1299" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="4787" positionY="8172"/> + <point positionX="5681" positionY="8172"/> + <point positionX="5681" positionY="6873"/> + <point positionX="4787" positionY="6873"/> + <point positionX="4787" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="1299"/> + <point positionX="894" positionY="1299"/> + <point positionX="894" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="1299"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="894.000000" column2="0.000000" column3="4787.000000"/> + <Line2 column1="0.000000" column2="1299.000000" column3="6873.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7470" positionY="4275" sizeX="894" sizeY="3897" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="7470" positionY="8172"/> + <point positionX="8364" positionY="8172"/> + <point positionX="8364" positionY="4275"/> + <point positionX="7470" positionY="4275"/> + <point positionX="7470" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="3897"/> + <point positionX="894" positionY="3897"/> + <point positionX="894" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="3897"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="894.000000" column2="0.000000" column3="7470.000000"/> + <Line2 column1="0.000000" column2="3897.000000" column3="4275.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="10153" positionY="2976" sizeX="895" sizeY="5196" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=3" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="10153" positionY="8172"/> + <point positionX="11048" positionY="8172"/> + <point positionX="11048" positionY="2976"/> + <point positionX="10153" positionY="2976"/> + <point positionX="10153" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="5196"/> + <point positionX="895" positionY="5196"/> + <point positionX="895" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="5196"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="895.000000" column2="0.000000" column3="10153.000000"/> + <Line2 column1="0.000000" column2="5196.000000" column3="2976.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="12837" positionY="5574" sizeX="894" sizeY="2598" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=4" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <PolyPolygon> + <pointSequence> + <point positionX="12837" positionY="8172"/> + <point positionX="13731" positionY="8172"/> + <point positionX="13731" positionY="5574"/> + <point positionX="12837" positionY="5574"/> + <point positionX="12837" positionY="8172"/> + </pointSequence> + </PolyPolygon> + <Geometry> + <pointSequence> + <point positionX="0" positionY="2598"/> + <point positionX="894" positionY="2598"/> + <point positionX="894" positionY="0"/> + <point positionX="0" positionY="0"/> + <point positionX="0" positionY="2598"/> + </pointSequence> + </Geometry> + <Transformation> + <Line1 column1="894.000000" column2="0.000000" column3="12837.000000"/> + <Line2 column1="0.000000" column2="2598.000000" column3="5574.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="11629.000000" column2="0.000000" column3="2103.000000"/> + <Line2 column1="0.000000" column2="5197.000000" column3="2976.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="12523.000000" column2="0.000000" column3="1209.000000"/> + <Line2 column1="0.000000" column2="6496.000000" column3="1677.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13567.000000" column2="0.000000" column3="612.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="378.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13568.000000" column2="0.000000" column3="612.000000"/> + <Line2 column1="0.000000" column2="7945.000000" column3="378.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="180" sizeX="12614" sizeY="8640" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="2007" positionY="8422" sizeX="10927" sizeY="398" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> + <XShapes> + <XShape positionX="2007" positionY="8422" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="1" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="2007.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="4691" positionY="8422" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="2" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="4691.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="7374" positionY="8422" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="3" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="7374.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="10057" positionY="8422" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="4" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="10057.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="12741" positionY="8422" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="5" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="12741.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="10928.000000" column2="0.000000" column3="2007.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="8422.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="180" sizeX="193" sizeY="8192" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> + <XShapes> + <XShape positionX="320" positionY="7974" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="0" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="7974.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="6675" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="1" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="6675.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="5376" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="2" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="5376.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="4077" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="3" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4077.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="2778" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="4" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="2778.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="1479" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="5" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="1479.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="320" positionY="180" sizeX="193" sizeY="398" type="com.sun.star.drawing.TextShape" text="6" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="194.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="8193.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="12615.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13860.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="13860.000000" column2="0.000000" column3="320.000000"/> + <Line2 column1="0.000000" column2="8641.000000" column3="180.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14499" positionY="3952" sizeX="1291" sizeY="1096" type="com.sun.star.drawing.GroupShape" name="CID/D=0:Legend="> + <XShapes> + <XShape positionX="14499" positionY="3952" sizeX="1291" sizeY="1096" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="e6e6e6" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="1292.000000" column2="0.000000" column3="14499.000000"/> + <Line2 column1="0.000000" column2="1097.000000" column3="3952.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14615" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="14615" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:LegendEntry=0"> + <XShapes> + <XShape positionX="14615" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="14615.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14615" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="004586" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="14615.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="14615.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="14615.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14615" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> + <XShapes> + <XShape positionX="14615" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:LegendEntry=0"> + <XShapes> + <XShape positionX="14615" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="14615.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14615" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="ff420e" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="14615.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="14615.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="212.000000" column2="0.000000" column3="14615.000000"/> + <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14926" positionY="4052" sizeX="748" sizeY="398" type="com.sun.star.drawing.TextShape" text="test1" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="749.000000" column2="0.000000" column3="14926.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4052.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + <XShape positionX="14926" positionY="4550" sizeX="748" sizeY="398" type="com.sun.star.drawing.TextShape" text="test2" fontHeight="10.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="100" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName=""> + <FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> + <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/> + <FillBitmap/> + <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> + <LineStart/> + <LineEnd/> + <Transformation> + <Line1 column1="749.000000" column2="0.000000" column3="14926.000000"/> + <Line2 column1="0.000000" column2="399.000000" column3="4550.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> + </XShapes> + <Transformation> + <Line1 column1="1292.000000" column2="0.000000" column3="14499.000000"/> + <Line2 column1="0.000000" column2="1097.000000" column3="3952.000000"/> + <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> + </Transformation> + </XShape> +</XShapes> + + diff --git a/chart2/qa/extras/xshape/data/xls/tdf150832.xls b/chart2/qa/extras/xshape/data/xls/tdf150832.xls Binary files differnew file mode 100644 index 000000000000..1044345619c4 --- /dev/null +++ b/chart2/qa/extras/xshape/data/xls/tdf150832.xls diff --git a/chart2/qa/extras/xshape/data/xlsx/tdf90839-1.xlsx b/chart2/qa/extras/xshape/data/xlsx/tdf90839-1.xlsx Binary files differindex 9474de35fb77..05db435f6052 100644 --- a/chart2/qa/extras/xshape/data/xlsx/tdf90839-1.xlsx +++ b/chart2/qa/extras/xshape/data/xlsx/tdf90839-1.xlsx diff --git a/chart2/qa/extras/xshape/data/xlsx/tdf90839-2.xlsx b/chart2/qa/extras/xshape/data/xlsx/tdf90839-2.xlsx Binary files differindex 9a5b35228118..d3922f7f20ed 100644 --- a/chart2/qa/extras/xshape/data/xlsx/tdf90839-2.xlsx +++ b/chart2/qa/extras/xshape/data/xlsx/tdf90839-2.xlsx diff --git a/chart2/qa/extras/xshape/data/xlsx/tdf90839-3.xlsx b/chart2/qa/extras/xshape/data/xlsx/tdf90839-3.xlsx Binary files differindex e256c3a0b4f9..5a3ee4cf49eb 100644 --- a/chart2/qa/extras/xshape/data/xlsx/tdf90839-3.xlsx +++ b/chart2/qa/extras/xshape/data/xlsx/tdf90839-3.xlsx diff --git a/chart2/qa/unit/common_functor_test.cxx b/chart2/qa/unit/common_functor_test.cxx index b2e404e13508..05e62490848d 100644 --- a/chart2/qa/unit/common_functor_test.cxx +++ b/chart2/qa/unit/common_functor_test.cxx @@ -48,15 +48,15 @@ void CommonFunctorsTest::testAnyToString() std::vector<OUString> aOutput; std::transform(aInput.begin(), aInput.end(), - std::back_inserter(aOutput), chart::CommonFunctors::AnyToString()); - - 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]); + std::back_inserter(aOutput), chart::CommonFunctors::ToString()); + + 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() @@ -65,15 +65,15 @@ void CommonFunctorsTest::testDoubleToString() std::vector<OUString> aOutput; std::transform(aInput.begin(), aInput.end(), - std::back_inserter(aOutput), chart::CommonFunctors::DoubleToOUString()); - - 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]); + std::back_inserter(aOutput), chart::CommonFunctors::ToString()); + + 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/qa/unit/data/reference/testChart.xml b/chart2/qa/unit/data/reference/testChart.xml deleted file mode 100644 index 03ad3d95f85b..000000000000 --- a/chart2/qa/unit/data/reference/testChart.xml +++ /dev/null @@ -1,1216 +0,0 @@ -<?xml version="1.0"?> -<XShapes> - <XShape positionX="0" positionY="0" sizeX="16000" sizeY="9000" type="com.sun.star.drawing.RectangleShape" name="CID/Page=" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="16001.000000" column2="0.000000" column3="0.000000"/> - <Line2 column1="0.000000" column2="9001.000000" column3="0.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="770" positionY="854" sizeX="13068" sizeY="7546" type="com.sun.star.drawing.GroupShape" name="CID/D=0"> - <XShapes> - <XShape positionX="1206" positionY="1054" sizeX="12632" sizeY="6699" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="10079487" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/> - <Line2 column1="0.000000" column2="6700.000000" column3="1054.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="770" positionY="855" sizeX="13068" sizeY="7545" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="10079487" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="13069.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="7546.000000" column3="855.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="770" positionY="854" sizeX="13068" sizeY="7546" type="com.sun.star.drawing.GroupShape"> - <XShapes> - <XShape positionX="1056" positionY="1052" sizeX="12782" sizeY="6850" type="com.sun.star.drawing.GroupShape"> - <XShapes> - <XShape positionX="1206" positionY="1054" sizeX="12632" sizeY="6699" type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes"> - <XShapes> - <XShape positionX="1206" positionY="1054" sizeX="12632" sizeY="6699" type="com.sun.star.drawing.RectangleShape" name="CID/DiagramWall=" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="15132390" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/> - <Line2 column1="0.000000" column2="6700.000000" column3="1054.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/> - <Line2 column1="0.000000" column2="6700.000000" column3="1054.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="1056" positionY="1052" sizeX="12782" sizeY="6850" type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID"> - <XShapes> - <XShape positionX="1206" positionY="1052" sizeX="12632" sizeY="6700" type="com.sun.star.drawing.GroupShape"> - <XShapes> - <XShape positionX="1206" positionY="1052" sizeX="12632" sizeY="6700" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0:Grid=0"> - <XShapes> - <XShape positionX="1206" positionY="1052" sizeX="12632" sizeY="6700" type="com.sun.star.drawing.PolyLineShape" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="13838" positionY="7752"/> - <point positionX="1206" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="13838" positionY="6635"/> - <point positionX="1206" positionY="6635"/> - </pointSequence> - <pointSequence> - <point positionX="13838" positionY="5519"/> - <point positionX="1206" positionY="5519"/> - </pointSequence> - <pointSequence> - <point positionX="13838" positionY="4402"/> - <point positionX="1206" positionY="4402"/> - </pointSequence> - <pointSequence> - <point positionX="13838" positionY="3285"/> - <point positionX="1206" positionY="3285"/> - </pointSequence> - <pointSequence> - <point positionX="13838" positionY="2169"/> - <point positionX="1206" positionY="2169"/> - </pointSequence> - <pointSequence> - <point positionX="13838" positionY="1052"/> - <point positionX="1206" positionY="1052"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="12632" positionY="6700"/> - <point positionX="0" positionY="6700"/> - </pointSequence> - <pointSequence> - <point positionX="12632" positionY="5583"/> - <point positionX="0" positionY="5583"/> - </pointSequence> - <pointSequence> - <point positionX="12632" positionY="4467"/> - <point positionX="0" positionY="4467"/> - </pointSequence> - <pointSequence> - <point positionX="12632" positionY="3350"/> - <point positionX="0" positionY="3350"/> - </pointSequence> - <pointSequence> - <point positionX="12632" positionY="2233"/> - <point positionX="0" positionY="2233"/> - </pointSequence> - <pointSequence> - <point positionX="12632" positionY="1117"/> - <point positionX="0" positionY="1117"/> - </pointSequence> - <pointSequence> - <point positionX="12632" positionY="0"/> - <point positionX="0" positionY="0"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="12632.000000" column2="0.000000" column3="1206.000000"/> - <Line2 column1="0.000000" column2="6700.000000" column3="1052.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="1206" positionY="1052" sizeX="0" sizeY="6700" type="com.sun.star.drawing.PolyLineShape" name="HandlesOnly" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="NONE"> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="1206" positionY="7752"/> - <point positionX="1206" positionY="6635"/> - <point positionX="1206" positionY="5519"/> - <point positionX="1206" positionY="4402"/> - <point positionX="1206" positionY="3285"/> - <point positionX="1206" positionY="2169"/> - <point positionX="1206" positionY="1052"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="6700"/> - <point positionX="0" positionY="5583"/> - <point positionX="0" positionY="4467"/> - <point positionX="0" positionY="3350"/> - <point positionX="0" positionY="2233"/> - <point positionX="0" positionY="1117"/> - <point positionX="0" positionY="0"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="1206.000000"/> - <Line2 column1="0.000000" column2="6700.000000" column3="1052.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/> - <Line2 column1="0.000000" column2="6701.000000" column3="1052.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/> - <Line2 column1="0.000000" column2="6701.000000" column3="1052.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="1056" positionY="1052" sizeX="12782" sizeY="6850" type="com.sun.star.drawing.GroupShape"> - <XShapes> - <XShape positionX="1206" positionY="7752" sizeX="12632" sizeY="150" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> - <XShapes> - <XShape positionX="1206" positionY="7752" sizeX="12632" sizeY="150" type="com.sun.star.drawing.PolyLineShape" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="1206" positionY="7902"/> - <point positionX="1206" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="1206" positionY="7902"/> - <point positionX="1206" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="3732" positionY="7902"/> - <point positionX="3732" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="3732" positionY="7902"/> - <point positionX="3732" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="6258" positionY="7902"/> - <point positionX="6258" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="6258" positionY="7902"/> - <point positionX="6258" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="8785" positionY="7902"/> - <point positionX="8785" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="8785" positionY="7902"/> - <point positionX="8785" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="11311" positionY="7902"/> - <point positionX="11311" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="11311" positionY="7902"/> - <point positionX="11311" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="13838" positionY="7902"/> - <point positionX="13838" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="13838" positionY="7902"/> - <point positionX="13838" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="150"/> - <point positionX="0" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="150"/> - <point positionX="0" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="2526" positionY="150"/> - <point positionX="2526" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="2526" positionY="150"/> - <point positionX="2526" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="5052" positionY="150"/> - <point positionX="5052" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="5052" positionY="150"/> - <point positionX="5052" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="7579" positionY="150"/> - <point positionX="7579" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="7579" positionY="150"/> - <point positionX="7579" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="10105" positionY="150"/> - <point positionX="10105" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="10105" positionY="150"/> - <point positionX="10105" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="12632" positionY="150"/> - <point positionX="12632" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="12632" positionY="150"/> - <point positionX="12632" positionY="0"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="12632.000000" column2="0.000000" column3="1206.000000"/> - <Line2 column1="0.000000" column2="150.000000" column3="7752.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="1206" positionY="7752" sizeX="12632" sizeY="0" type="com.sun.star.drawing.LineShape" name="MarkHandles" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="1206" positionY="7752"/> - <point positionX="13838" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="0"/> - <point positionX="12632" positionY="0"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="12632.000000" column2="0.000000" column3="1206.000000"/> - <Line2 column1="0.000000" column2="0.000000" column3="7752.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="12633.000000" column2="0.000000" column3="1206.000000"/> - <Line2 column1="0.000000" column2="151.000000" column3="7752.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="1056" positionY="1052" sizeX="150" sizeY="6700" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> - <XShapes> - <XShape positionX="1056" positionY="1052" sizeX="150" sizeY="6700" type="com.sun.star.drawing.PolyLineShape" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="1056" positionY="7752"/> - <point positionX="1206" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="7752"/> - <point positionX="1206" positionY="7752"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="6635"/> - <point positionX="1206" positionY="6635"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="6635"/> - <point positionX="1206" positionY="6635"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="5519"/> - <point positionX="1206" positionY="5519"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="5519"/> - <point positionX="1206" positionY="5519"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="4402"/> - <point positionX="1206" positionY="4402"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="4402"/> - <point positionX="1206" positionY="4402"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="3285"/> - <point positionX="1206" positionY="3285"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="3285"/> - <point positionX="1206" positionY="3285"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="2169"/> - <point positionX="1206" positionY="2169"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="2169"/> - <point positionX="1206" positionY="2169"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="1052"/> - <point positionX="1206" positionY="1052"/> - </pointSequence> - <pointSequence> - <point positionX="1056" positionY="1052"/> - <point positionX="1206" positionY="1052"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="6700"/> - <point positionX="150" positionY="6700"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="6700"/> - <point positionX="150" positionY="6700"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="5583"/> - <point positionX="150" positionY="5583"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="5583"/> - <point positionX="150" positionY="5583"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="4467"/> - <point positionX="150" positionY="4467"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="4467"/> - <point positionX="150" positionY="4467"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="3350"/> - <point positionX="150" positionY="3350"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="3350"/> - <point positionX="150" positionY="3350"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="2233"/> - <point positionX="150" positionY="2233"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="2233"/> - <point positionX="150" positionY="2233"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="1117"/> - <point positionX="150" positionY="1117"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="1117"/> - <point positionX="150" positionY="1117"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="0"/> - <point positionX="150" positionY="0"/> - </pointSequence> - <pointSequence> - <point positionX="0" positionY="0"/> - <point positionX="150" positionY="0"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="150.000000" column2="0.000000" column3="1056.000000"/> - <Line2 column1="0.000000" column2="6700.000000" column3="1052.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="1206" positionY="1052" sizeX="0" sizeY="6700" type="com.sun.star.drawing.LineShape" name="MarkHandles" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" lineStyle="SOLID"> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="1206" positionY="7752"/> - <point positionX="1206" positionY="1052"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="6700"/> - <point positionX="0" positionY="0"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="0.000000" column2="0.000000" column3="1206.000000"/> - <Line2 column1="0.000000" column2="6700.000000" column3="1052.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="151.000000" column2="0.000000" column3="1056.000000"/> - <Line2 column1="0.000000" column2="6701.000000" column3="1052.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="12783.000000" column2="0.000000" column3="1056.000000"/> - <Line2 column1="0.000000" column2="6851.000000" column3="1052.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="1627" positionY="2169" sizeX="11789" sizeY="5583" type="com.sun.star.drawing.GroupShape"> - <XShapes> - <XShape positionX="1627" positionY="2169" sizeX="10947" sizeY="5583" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0"> - <XShapes> - <XShape positionX="11732" positionY="2169" sizeX="842" sizeY="5583" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=4" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="17798" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="11732" positionY="7752"/> - <point positionX="12574" positionY="7752"/> - <point positionX="12574" positionY="2169"/> - <point positionX="11732" positionY="2169"/> - <point positionX="11732" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="5583"/> - <point positionX="842" positionY="5583"/> - <point positionX="842" positionY="0"/> - <point positionX="0" positionY="0"/> - <point positionX="0" positionY="5583"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="842.000000" column2="0.000000" column3="11732.000000"/> - <Line2 column1="0.000000" column2="5583.000000" column3="2169.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="9206" positionY="3285" sizeX="842" sizeY="4467" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=3" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="17798" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="9206" positionY="7752"/> - <point positionX="10048" positionY="7752"/> - <point positionX="10048" positionY="3285"/> - <point positionX="9206" positionY="3285"/> - <point positionX="9206" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="4467"/> - <point positionX="842" positionY="4467"/> - <point positionX="842" positionY="0"/> - <point positionX="0" positionY="0"/> - <point positionX="0" positionY="4467"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="842.000000" column2="0.000000" column3="9206.000000"/> - <Line2 column1="0.000000" column2="4467.000000" column3="3285.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="6679" positionY="4402" sizeX="843" sizeY="3350" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=2" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="17798" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="6679" positionY="7752"/> - <point positionX="7522" positionY="7752"/> - <point positionX="7522" positionY="4402"/> - <point positionX="6679" positionY="4402"/> - <point positionX="6679" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="3350"/> - <point positionX="843" positionY="3350"/> - <point positionX="843" positionY="0"/> - <point positionX="0" positionY="0"/> - <point positionX="0" positionY="3350"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="843.000000" column2="0.000000" column3="6679.000000"/> - <Line2 column1="0.000000" column2="3350.000000" column3="4402.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="4153" positionY="5519" sizeX="842" sizeY="2233" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=1" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="17798" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="4153" positionY="7752"/> - <point positionX="4995" positionY="7752"/> - <point positionX="4995" positionY="5519"/> - <point positionX="4153" positionY="5519"/> - <point positionX="4153" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="2233"/> - <point positionX="842" positionY="2233"/> - <point positionX="842" positionY="0"/> - <point positionX="0" positionY="0"/> - <point positionX="0" positionY="2233"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="842.000000" column2="0.000000" column3="4153.000000"/> - <Line2 column1="0.000000" column2="2233.000000" column3="5519.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="1627" positionY="6635" sizeX="842" sizeY="1117" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:Point=0" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="17798" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="1627" positionY="7752"/> - <point positionX="2469" positionY="7752"/> - <point positionX="2469" positionY="6635"/> - <point positionX="1627" positionY="6635"/> - <point positionX="1627" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="1117"/> - <point positionX="842" positionY="1117"/> - <point positionX="842" positionY="0"/> - <point positionX="0" positionY="0"/> - <point positionX="0" positionY="1117"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="842.000000" column2="0.000000" column3="1627.000000"/> - <Line2 column1="0.000000" column2="1117.000000" column3="6635.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="10948.000000" column2="0.000000" column3="1627.000000"/> - <Line2 column1="0.000000" column2="5584.000000" column3="2169.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="2469" positionY="3285" sizeX="10947" sizeY="4467" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=1"> - <XShapes> - <XShape positionX="12574" positionY="5519" sizeX="842" sizeY="2233" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=4" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16728590" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="12574" positionY="7752"/> - <point positionX="13416" positionY="7752"/> - <point positionX="13416" positionY="5519"/> - <point positionX="12574" positionY="5519"/> - <point positionX="12574" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="2233"/> - <point positionX="842" positionY="2233"/> - <point positionX="842" positionY="0"/> - <point positionX="0" positionY="0"/> - <point positionX="0" positionY="2233"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="842.000000" column2="0.000000" column3="12574.000000"/> - <Line2 column1="0.000000" column2="2233.000000" column3="5519.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="10048" positionY="3285" sizeX="842" sizeY="4467" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=3" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16728590" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="10048" positionY="7752"/> - <point positionX="10890" positionY="7752"/> - <point positionX="10890" positionY="3285"/> - <point positionX="10048" positionY="3285"/> - <point positionX="10048" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="4467"/> - <point positionX="842" positionY="4467"/> - <point positionX="842" positionY="0"/> - <point positionX="0" positionY="0"/> - <point positionX="0" positionY="4467"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="842.000000" column2="0.000000" column3="10048.000000"/> - <Line2 column1="0.000000" column2="4467.000000" column3="3285.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="7522" positionY="4402" sizeX="842" sizeY="3350" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=2" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16728590" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="7522" positionY="7752"/> - <point positionX="8364" positionY="7752"/> - <point positionX="8364" positionY="4402"/> - <point positionX="7522" positionY="4402"/> - <point positionX="7522" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="3350"/> - <point positionX="842" positionY="3350"/> - <point positionX="842" positionY="0"/> - <point positionX="0" positionY="0"/> - <point positionX="0" positionY="3350"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="842.000000" column2="0.000000" column3="7522.000000"/> - <Line2 column1="0.000000" column2="3350.000000" column3="4402.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="4995" positionY="6635" sizeX="842" sizeY="1117" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=1" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16728590" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="4995" positionY="7752"/> - <point positionX="5837" positionY="7752"/> - <point positionX="5837" positionY="6635"/> - <point positionX="4995" positionY="6635"/> - <point positionX="4995" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="1117"/> - <point positionX="842" positionY="1117"/> - <point positionX="842" positionY="0"/> - <point positionX="0" positionY="0"/> - <point positionX="0" positionY="1117"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="842.000000" column2="0.000000" column3="4995.000000"/> - <Line2 column1="0.000000" column2="1117.000000" column3="6635.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="2469" positionY="5519" sizeX="842" sizeY="2233" type="com.sun.star.drawing.PolyPolygonShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:Point=0" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16728590" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <PolyPolygon> - <pointSequence> - <point positionX="2469" positionY="7752"/> - <point positionX="3311" positionY="7752"/> - <point positionX="3311" positionY="5519"/> - <point positionX="2469" positionY="5519"/> - <point positionX="2469" positionY="7752"/> - </pointSequence> - </PolyPolygon> - <Geometry> - <pointSequence> - <point positionX="0" positionY="2233"/> - <point positionX="842" positionY="2233"/> - <point positionX="842" positionY="0"/> - <point positionX="0" positionY="0"/> - <point positionX="0" positionY="2233"/> - </pointSequence> - </Geometry> - <Transformation> - <Line1 column1="842.000000" column2="0.000000" column3="2469.000000"/> - <Line2 column1="0.000000" column2="2233.000000" column3="5519.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="10948.000000" column2="0.000000" column3="2469.000000"/> - <Line2 column1="0.000000" column2="4468.000000" column3="3285.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="11790.000000" column2="0.000000" column3="1627.000000"/> - <Line2 column1="0.000000" column2="5584.000000" column3="2169.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="12783.000000" column2="0.000000" column3="1056.000000"/> - <Line2 column1="0.000000" column2="6851.000000" column3="1052.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="12783.000000" column2="0.000000" column3="1056.000000"/> - <Line2 column1="0.000000" column2="6851.000000" column3="1052.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="770" positionY="854" sizeX="11898" sizeY="7546" type="com.sun.star.drawing.GroupShape"> - <XShapes> - <XShape positionX="2376" positionY="8002" sizeX="10292" sizeY="398" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=0,0"> - <XShapes> - <XShape positionX="2376" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="1" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="2376.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="8002.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="4902" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="2" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="4902.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="8002.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="7429" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="3" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="7429.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="8002.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="9955" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="4" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="9955.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="8002.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="12481" positionY="8002" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="5" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="12481.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="8002.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="10293.000000" column2="0.000000" column3="2376.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="8002.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="770" positionY="854" sizeX="187" sizeY="7098" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:Axis=1,0"> - <XShapes> - <XShape positionX="770" positionY="7554" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="0" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="7554.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="770" positionY="6437" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="1" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="6437.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="770" positionY="5321" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="2" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="5321.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="770" positionY="4204" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="3" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="4204.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="770" positionY="3087" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="4" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="3087.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="770" positionY="1971" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="5" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="1971.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="770" positionY="854" sizeX="187" sizeY="398" type="com.sun.star.drawing.TextShape" text="6" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="854.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="188.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="7099.000000" column3="854.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="11899.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="7547.000000" column3="854.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="13069.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="7547.000000" column3="854.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="13069.000000" column2="0.000000" column3="770.000000"/> - <Line2 column1="0.000000" column2="7547.000000" column3="854.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="14478" positionY="3952" sizeX="1312" sizeY="1096" type="com.sun.star.drawing.GroupShape" name="CID/D=0:Legend="> - <XShapes> - <XShape positionX="14478" positionY="3952" sizeX="1312" sizeY="1096" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="15132390" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="1313.000000" column2="0.000000" column3="14478.000000"/> - <Line2 column1="0.000000" column2="1097.000000" column3="3952.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="14594" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> - <XShapes> - <XShape positionX="14594" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=0:LegendEntry=0"> - <XShapes> - <XShape positionX="14594" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="10079487" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14594.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="14594" positionY="4145" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="17798" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14594.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14594.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14594.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4145.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="14594" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape"> - <XShapes> - <XShape positionX="14594" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/D=0:CS=0:CT=0:Series=1:LegendEntry=0"> - <XShapes> - <XShape positionX="14594" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="10079487" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14594.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="14594" positionY="4643" sizeX="211" sizeY="211" type="com.sun.star.drawing.RectangleShape" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="SOLID" fillColor="16728590" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14594.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14594.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="212.000000" column2="0.000000" column3="14594.000000"/> - <Line2 column1="0.000000" column2="212.000000" column3="4643.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="14905" positionY="4052" sizeX="769" sizeY="398" type="com.sun.star.drawing.TextShape" text="test1" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="770.000000" column2="0.000000" column3="14905.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="4052.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - <XShape positionX="14905" positionY="4550" sizeX="769" sizeY="398" type="com.sun.star.drawing.TextShape" text="test2" textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="4800" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="16777215" fillTransparence="0" fillTransparenceGradientName=""> - <FillTransparenceGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillGradient style="LINEAR" startColor="0" endColor="16777215" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/> - <FillHatch style="SINGLE" color="0" distance="20" angle="0"/> - <FillBitmap/> - <LineDash style="RECT" dots="1" dotLen="20" dashes="1" dashLen="20" distance="20"/> - <LineStart/> - <LineEnd/> - <Transformation> - <Line1 column1="770.000000" column2="0.000000" column3="14905.000000"/> - <Line2 column1="0.000000" column2="399.000000" column3="4550.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> - </XShapes> - <Transformation> - <Line1 column1="1313.000000" column2="0.000000" column3="14478.000000"/> - <Line2 column1="0.000000" column2="1097.000000" column3="3952.000000"/> - <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/> - </Transformation> - </XShape> -</XShapes> |