chart2/qa/extras/PivotChartTest.cxx | 130 ++++++----
chart2/qa/extras/chart2_trendcalculators.cxx | 2
chart2/qa/extras/chart2dump/chart2dump.cxx | 14 -
chart2/qa/extras/chart2export.cxx | 324 ++++++++++++---------------
chart2/qa/extras/chart2export2.cxx | 45 +--
chart2/qa/extras/chart2export3.cxx | 69 -----
chart2/qa/extras/chart2geometry.cxx | 2
chart2/qa/extras/chart2import.cxx | 256 +++++++++++----------
chart2/qa/extras/chart2import2.cxx | 82 +++---
chart2/qa/extras/charttest.hxx | 237 +++++--------------
chart2/qa/extras/uichart.cxx | 44 +--
chart2/qa/extras/xshape/chart2xshape.cxx | 3
12 files changed, 522 insertions(+), 686 deletions(-)
New commits:
commit 393ea89729e7a16a927c77836b338b8482562c36
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Fri Sep 27 11:55:15 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Sep 30 21:43:04 2024 +0200
chart2: No need to pass mxComponent around
While at it, move some methods where they are used
Change-Id: I56151046f068d355f9bfe9769c0aee7d9cf95f39
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174036
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/chart2/qa/extras/PivotChartTest.cxx
b/chart2/qa/extras/PivotChartTest.cxx
index fe1ae4437cd9..51210bc5a693 100644
--- a/chart2/qa/extras/PivotChartTest.cxx
+++ b/chart2/qa/extras/PivotChartTest.cxx
@@ -55,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
@@ -169,25 +172,6 @@ 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)
{
@@ -308,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;
@@ -319,7 +315,7 @@ void PivotChartTest::testRoundtrip()
loadFromFile(u"ods/PivotChartRoundTrip.ods");
- xChartDoc = getPivotChartDocFromSheet(1, mxComponent);
+ xChartDoc = getPivotChartDocFromSheet(1);
CPPUNIT_ASSERT(xChartDoc.is());
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getNumberOfDataSeries(xChartDoc));
@@ -328,17 +324,19 @@ void PivotChartTest::testRoundtrip()
{
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
0)->getData();
lclCheckSequence(aReference1, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(u"Exp."_ustr, 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(u"Rev."_ustr, 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, u"DataPilot1"_ustr, 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);
}
@@ -349,12 +347,13 @@ void PivotChartTest::testRoundtrip()
{
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
0)->getData();
lclCheckSequence(aReference2, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, lclGetLabel(xChartDoc, 0));
+ Reference<chart2::data::XDataSequence> xLabelDataSequence =
getLabelDataSequenceFromDoc(xChartDoc, 0);
+ CPPUNIT_ASSERT_EQUAL(u"Total"_ustr,
xLabelDataSequence->getData()[0].get<OUString>());
}
saveAndReload(u"calc8"_ustr);
- xChartDoc = getPivotChartDocFromSheet(1, mxComponent);
+ xChartDoc = getPivotChartDocFromSheet(1 );
CPPUNIT_ASSERT(xChartDoc.is());
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), getNumberOfDataSeries(xChartDoc));
@@ -363,7 +362,8 @@ void PivotChartTest::testRoundtrip()
{
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
0)->getData();
lclCheckSequence(aReference2, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, lclGetLabel(xChartDoc, 0));
+ Reference<chart2::data::XDataSequence> xLabelDataSequence =
getLabelDataSequenceFromDoc(xChartDoc, 0);
+ CPPUNIT_ASSERT_EQUAL(u"Total"_ustr,
xLabelDataSequence->getData()[0].get<OUString>());
}
}
@@ -376,11 +376,11 @@ void PivotChartTest::testChangePivotTable()
// Check we have the Pivot Table
OUString sPivotTableName(u"DataPilot1"_ustr);
- 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());
@@ -402,7 +402,8 @@ void PivotChartTest::testChangePivotTable()
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
0)->getData();
lclCheckSequence(aReference, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(u"Exp."_ustr, 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
@@ -412,7 +413,8 @@ void PivotChartTest::testChangePivotTable()
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
1)->getData();
lclCheckSequence(aReference, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(u"Rev."_ustr, 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,
@@ -436,7 +438,8 @@ void PivotChartTest::testChangePivotTable()
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
0)->getData();
lclCheckSequence(aReference, xSequence, 1E-3);
- CPPUNIT_ASSERT_EQUAL(u"Big"_ustr, 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
@@ -446,7 +449,8 @@ void PivotChartTest::testChangePivotTable()
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
1)->getData();
lclCheckSequence(aReference, xSequence, 1E-3);
- CPPUNIT_ASSERT_EQUAL(u"Medium"_ustr, 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
@@ -456,7 +460,8 @@ void PivotChartTest::testChangePivotTable()
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
2)->getData();
lclCheckSequence(aReference, xSequence, 1E-3);
- CPPUNIT_ASSERT_EQUAL(u"Small"_ustr, 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
@@ -474,21 +479,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(u"Big"_ustr, 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(u"Medium"_ustr, 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(u"Small"_ustr, 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
@@ -504,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(u"Big"_ustr, 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(u"Medium"_ustr, 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(u"Small"_ustr, lclGetLabel(xChartDoc, 2));
+ Reference<chart2::data::XDataSequence> xLabelDataSequence =
getLabelDataSequenceFromDoc(xChartDoc, 2);
+ CPPUNIT_ASSERT_EQUAL(u"Small"_ustr,
xLabelDataSequence->getData()[0].get<OUString>());
}
}
@@ -555,11 +566,11 @@ 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());
@@ -580,7 +591,8 @@ void PivotChartTest::testPivotChartWithOneColumnField()
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
0)->getData();
lclCheckSequence(aReference, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(u"DE"_ustr, 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(u"EN"_ustr, 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(u"FR"_ustr, lclGetLabel(xChartDoc, 2));
+ Reference<chart2::data::XDataSequence> xLabelDataSequence =
getLabelDataSequenceFromDoc(xChartDoc, 2);
+ CPPUNIT_ASSERT_EQUAL(u"FR"_ustr,
xLabelDataSequence->getData()[0].get<OUString>());
}
}
@@ -636,11 +650,11 @@ 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());
@@ -661,7 +675,8 @@ void PivotChartTest::testPivotChartWithOneRowField()
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
0)->getData();
lclCheckSequence(aReference, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, lclGetLabel(xChartDoc, 0));
+ Reference<chart2::data::XDataSequence> xLabelDataSequence =
getLabelDataSequenceFromDoc(xChartDoc, 0);
+ CPPUNIT_ASSERT_EQUAL(u"Total"_ustr,
xLabelDataSequence->getData()[0].get<OUString>());
}
}
@@ -699,14 +714,14 @@ 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());
@@ -800,14 +815,14 @@ 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());
@@ -830,7 +845,8 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode()
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
0)->getData();
lclCheckSequence(aReference, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, 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
{
@@ -861,7 +877,8 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode()
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
0)->getData();
lclCheckSequence(aReference, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, lclGetLabel(xChartDoc, 0));
+ Reference<chart2::data::XDataSequence> xLabelDataSequence =
getLabelDataSequenceFromDoc(xChartDoc, 0);
+ CPPUNIT_ASSERT_EQUAL(u"Total"_ustr,
xLabelDataSequence->getData()[0].get<OUString>());
}
// Check categories
{
@@ -890,7 +907,8 @@ void PivotChartTest::testPivotChartRowFieldInOutlineMode()
xSequence = getDataSequenceFromDocByRole(xChartDoc, u"values-y",
0)->getData();
lclCheckSequence(aReference, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(u"Total"_ustr, lclGetLabel(xChartDoc, 0));
+ Reference<chart2::data::XDataSequence> xLabelDataSequence =
getLabelDataSequenceFromDoc(xChartDoc, 0);
+ CPPUNIT_ASSERT_EQUAL(u"Total"_ustr,
xLabelDataSequence->getData()[0].get<OUString>());
}
// Check categories
{
@@ -934,14 +952,14 @@ 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());
diff --git a/chart2/qa/extras/chart2_trendcalculators.cxx
b/chart2/qa/extras/chart2_trendcalculators.cxx
index 60e3dad4e446..b4f362c0c3c2 100644
--- a/chart2/qa/extras/chart2_trendcalculators.cxx
+++ b/chart2/qa/extras/chart2_trendcalculators.cxx
@@ -72,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());
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx
b/chart2/qa/extras/chart2dump/chart2dump.cxx
index 07d55b30b272..b9fb4e455b74 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -270,7 +270,7 @@ DECLARE_DUMP_TEST(ChartDataTest, Chart2DumpTest, false)
{
setTestFileName(aTestFile);
loadFromFile(getTestFileName());
- uno::Reference< chart::XChartDocument > xChartDoc
(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
+ uno::Reference< chart::XChartDocument > xChartDoc
(getChartDocFromSheet(0), UNO_QUERY_THROW);
// Check title
uno::Reference< chart2::XChartDocument > xChartDoc2(xChartDoc,
UNO_QUERY_THROW);
@@ -477,7 +477,7 @@ DECLARE_DUMP_TEST(GridTest, Chart2DumpTest, false)
{
setTestFileName(sTestFile);
loadFromFile(getTestFileName());
- uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
+ 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);
@@ -705,7 +705,7 @@ DECLARE_DUMP_TEST(ColumnBarChartTest, Chart2DumpTest, false)
{
setTestFileName(sTestFile);
loadFromFile(getTestFileName());
- uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
+ 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);
@@ -840,7 +840,7 @@ DECLARE_DUMP_TEST(PieChartTest, Chart2DumpTest, false)
{
setTestFileName(sTestFile);
loadFromFile(getTestFileName());
- uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
+ 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);
@@ -913,7 +913,7 @@ DECLARE_DUMP_TEST(AreaChartTest, Chart2DumpTest, false)
{
setTestFileName(sTestFile);
loadFromFile(getTestFileName());
- uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
+ 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);
@@ -986,7 +986,7 @@ DECLARE_DUMP_TEST(PointLineChartTest, Chart2DumpTest, false)
{
setTestFileName(sTestFile);
loadFromFile(getTestFileName());
- uno::Reference< chart::XChartDocument >
xChartDoc(getChartDocFromSheet(0, mxComponent), UNO_QUERY_THROW);
+ 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);
@@ -1080,7 +1080,7 @@ DECLARE_DUMP_TEST( PivotChartDataButtonTest,
Chart2DumpTest, false )
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() );
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 9a81cc0d052a..babf3433a74b 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -163,13 +163,8 @@ void checkMovingAverageTrendline(
/*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() );
@@ -199,7 +194,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarXLSX)
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 );
@@ -215,7 +210,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testErrorBarXLSX)
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 );
@@ -256,25 +251,25 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendline)
// Error: tag name "chart:symbol-image" is not allowed. Possible tag names
are: <label-separator>
skipValidation();
loadFromFile(u"ods/trendline.ods");
- checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
+ checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0
));
saveAndReload(u"calc8"_ustr);
- checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
+ checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0
));
}
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineOOXML)
{
loadFromFile(u"ods/trendline.ods");
- checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
+ checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0
));
saveAndReload(u"Calc Office Open XML"_ustr);
- checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
+ checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0
));
}
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testTrendlineXLS)
{
loadFromFile(u"ods/trendline.ods");
- checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
+ checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0
));
saveAndReload(u"MS Excel 97"_ustr);
- checkTrendlinesInChart(getChartDocFromSheet( 0, mxComponent));
+ checkTrendlinesInChart(getDataSeriesFromDoc( getChartDocFromSheet( 0), 0
));
}
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testMovingAverage)
@@ -282,7 +277,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testMovingAverage)
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 );
@@ -649,107 +644,95 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testTdf126115IndividualMarker)
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(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);
- }
-
- } 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);
+ };
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.
saveAndReload(u"calc8"_ustr);
- xChartDoc = getChartDocFromSheet(0, mxComponent);
- aTest.check(xChartDoc);
+ xChartDoc = getChartDocFromSheet(0);
+ verify(xChartDoc);
}
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( u"LinkNumberFormatToSource"_ustr ) >>=
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( u"LinkNumberFormatToSource"_ustr, aAny );
-
- Reference<util::XNumberFormatsSupplier> xNFS( xChartDoc,
uno::UNO_QUERY_THROW );
- Reference<util::XNumberFormats> xNumberFormats =
xNFS->getNumberFormats();
- CPPUNIT_ASSERT( xNumberFormats.is() );
- lang::Locale aLocale{ u"en"_ustr, u"US"_ustr, u""_ustr };
- 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 );
- loadFromFile(u"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
saveAndReload( u"MS Excel 97"_ustr );
- xChartDoc = getChartDocFromSheet( 0, mxComponent );
- aTest.check( xChartDoc, false, util::NumberFormat::NUMBER );
+ xChartDoc = getChartDocFromSheet( 0 );
+ verify( xChartDoc, false, util::NumberFormat::NUMBER );
}
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabelBordersDOCX)
@@ -761,72 +744,39 @@ CPPUNIT_TEST_FIXTURE(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(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]);
- */
-
- 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 < 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(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;
@@ -834,10 +784,12 @@ CPPUNIT_TEST_FIXTURE(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;
+ };
loadFromFile(u"docx/data-label-borders.docx");
@@ -853,9 +805,12 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testDataLabelBordersDOCX)
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);
+
+ // Chart 2 has all its data labels with identical borders.
+ verify(xChartDoc, 1);
// FIXME: validation error in OOXML export: Errors: 3
skipValidation();
@@ -863,9 +818,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testDataLabelBordersDOCX)
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);
}
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataLabel3DChartDOCX)
@@ -1108,7 +1063,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest,
testErrorBarDataRangeODS)
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 );
@@ -1137,7 +1092,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_barOfPie)
loadFromFile(u"ods/tdf50934_barOfPie.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::XChartType > xChartType = getChartTypeFromDoc(
xChartDoc, 0 );
@@ -1160,7 +1115,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, tdf50934_pieOfPie)
loadFromFile(u"ods/tdf50934_pieOfPie.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::XChartType > xChartType = getChartTypeFromDoc(
xChartDoc, 0 );
@@ -1255,18 +1210,12 @@ 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);
-
}
}
@@ -1275,19 +1224,40 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testGapWidthXLSX)
{
loadFromFile(u"xlsx/gapWidth.xlsx");
- uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent );
- checkSheetForGapWidthAndOverlap(xChartDoc, 120, -60);
+ 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);
+}
+
+CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testDataseriesOverlapStackedChartXLSX)
+{
+ loadFromFile(u"xlsx/testDataseriesOverlapStackedChart.xlsx");
+
+ // 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);
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);
}
CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testSmoothedLines)
@@ -1303,7 +1273,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testLabelStringODS)
{
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());
@@ -1313,7 +1283,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testLabelStringODS)
saveAndReload(u"calc8"_ustr);
- xChartDoc = getChartDocFromSheet( 0, mxComponent );
+ xChartDoc = getChartDocFromSheet( 0 );
xLabelSeq = getLabelDataSequenceFromDoc(xChartDoc);
CPPUNIT_ASSERT(xLabelSeq.is());
@@ -1328,7 +1298,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testInvertNegative)
{
loadFromFile(u"xlsx/invertIfNeg_bar.xlsx");
// make sure the 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 );
@@ -1346,7 +1316,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest, testInvertNegative)
{
loadFromFile(u"xlsx/invertIfNeg_bubble.xlsx");
// make sure the 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 );
diff --git a/chart2/qa/extras/chart2export2.cxx
b/chart2/qa/extras/chart2export2.cxx
index 67907d3643cf..d4c060d5f381 100644
--- a/chart2/qa/extras/chart2export2.cxx
+++ b/chart2/qa/extras/chart2export2.cxx
@@ -32,7 +32,7 @@ public:
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testSetSeriesToSecondaryAxisXLSX)
{
loadFromFile(u"xlsx/add_series_secondary_axis.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
// Second series
Reference<chart2::XDataSeries> xSeries = getDataSeriesFromDoc(xChartDoc,
1);
CPPUNIT_ASSERT(xSeries.is());
@@ -353,7 +353,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataSeriesName)
{
loadFromFile(u"ods/ser_labels.ods");
saveAndReload(u"calc8"_ustr);
- uno::Reference<chart2::XChartDocument> xChartDoc =
getChartDocFromSheet(0, mxComponent);
+ uno::Reference<chart2::XChartDocument> xChartDoc =
getChartDocFromSheet(0);
uno::Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
CPPUNIT_ASSERT(xDataSeries.is());
uno::Reference<beans::XPropertySet> xPropertySet;
@@ -367,7 +367,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testDataSeriesName)
{
loadFromFile(u"xlsx/ser_labels.xlsx");
saveAndReload(u"Calc Office Open XML"_ustr);
- uno::Reference<chart2::XChartDocument> xChartDoc =
getChartDocFromSheet(0, mxComponent);
+ uno::Reference<chart2::XChartDocument> xChartDoc =
getChartDocFromSheet(0);
uno::Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
CPPUNIT_ASSERT(xDataSeries.is());
uno::Reference<beans::XPropertySet> xPropertySet;
@@ -439,7 +439,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCustomPositionofDataLabel)
{
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));
@@ -971,7 +971,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testDeletedLegendEntries)
loadFromFile(u"xlsx/deleted_legend_entry.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());
Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 1));
CPPUNIT_ASSERT(xDataSeries.is());
@@ -985,7 +985,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testDeletedLegendEntries)
loadFromFile(u"xlsx/deleted_legend_entry2.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());
Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
CPPUNIT_ASSERT(xDataSeries.is());
@@ -995,7 +995,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testDeletedLegendEntries)
>>= 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());
@@ -1070,7 +1070,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf75330)
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);
@@ -1080,7 +1080,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf75330)
}
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);
@@ -1110,7 +1110,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf131979)
loadFromFile(u"ods/tdf131115.ods");
{
saveAndReload(u"calc8"_ustr);
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
CPPUNIT_ASSERT(xDataSeries.is());
@@ -1126,7 +1126,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf131979)
loadFromFile(u"ods/tdf131979.ods");
{
saveAndReload(u"calc8"_ustr);
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
CPPUNIT_ASSERT(xDataSeries.is());
@@ -1271,7 +1271,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf134977)
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());
@@ -1327,8 +1327,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testDataLabelPlacementPieChart)
{
loadFromFile(u"xlsx/tdf134978.xlsx");
saveAndReload(u"calc8"_ustr);
- uno::Reference<chart::XChartDocument> xChartDoc(getChartCompFromSheet(0,
0, mxComponent),
- UNO_QUERY_THROW);
+ 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);
@@ -1366,7 +1365,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204)
{
loadFromFile(u"xlsx/tdf138204.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
struct CustomLabelsTestData
@@ -1438,8 +1437,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138204)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf138181)
{
loadFromFile(u"xlsx/piechart_deleted_legendentry.xlsx");
- 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);
@@ -1465,8 +1463,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testCustomShapeText)
{
loadFromFile(u"ods/tdf72776.ods");
saveAndReload(u"calc8"_ustr);
- Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0,
mxComponent),
- UNO_QUERY_THROW);
+ 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);
@@ -1482,7 +1479,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testuserShapesXLSX)
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
@@ -1538,7 +1535,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testGraphicBlipXLSX)
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
@@ -1581,7 +1578,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testTdf143942)
{
loadFromFile(u"xlsx/tdf143942.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -1693,7 +1690,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testDataTableImportExport)
{
loadFromFile(u"xlsx/ChartDataTable.xlsx");
{
- uno::Reference<chart2::XChartDocument> xChartDoc =
getChartDocFromSheet(0, mxComponent);
+ uno::Reference<chart2::XChartDocument> xChartDoc =
getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
auto xDiagram = xChartDoc->getFirstDiagram();
CPPUNIT_ASSERT(xDiagram.is());
@@ -1716,7 +1713,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest2,
testDataTableImportExport)
}
saveAndReload(u"calc8"_ustr);
{
- uno::Reference<chart2::XChartDocument> xChartDoc =
getChartDocFromSheet(0, mxComponent);
+ uno::Reference<chart2::XChartDocument> xChartDoc =
getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
auto xDiagram = xChartDoc->getFirstDiagram();
CPPUNIT_ASSERT(xDiagram.is());
diff --git a/chart2/qa/extras/chart2export3.cxx
b/chart2/qa/extras/chart2export3.cxx
index 48e1b0720718..a4654e7d1ed9 100644
--- a/chart2/qa/extras/chart2export3.cxx
+++ b/chart2/qa/extras/chart2export3.cxx
@@ -262,7 +262,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testDataPointLabelNumberFormatXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelDefaultValuesXLSX)
{
loadFromFile(u"xlsx/data_label.xlsx");
- Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0,
mxComponent);
+ 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);
@@ -280,7 +280,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testDataLabelDefaultValuesXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testDataLabelFillColor)
{
loadFromFile(u"xlsx/data_labels_fill_color.xlsx");
- Reference< chart2::XChartDocument> xDoc = getChartDocFromSheet(0,
mxComponent);
+ 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);
@@ -531,65 +531,6 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testBarChartDataPointPropXLSX)
assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dPt[2]/c:spPr/a:ln/a:solidFill/a:srgbClr"_ostr,
"val"_ostr, u"70ad47"_ustr);
}
-namespace {
-
-void checkGapWidth(Reference<beans::XPropertySet> const & xPropSet, sal_Int32
nValue)
-{
- uno::Any aAny = xPropSet->getPropertyValue(u"GapwidthSequence"_ustr);
- CPPUNIT_ASSERT(aAny.hasValue());
- uno::Sequence< sal_Int32 > aSequence;
- aAny >>= aSequence;
- CPPUNIT_ASSERT(aSequence.hasElements());
- CPPUNIT_ASSERT_EQUAL(nValue, aSequence[0]);
-}
-
-void checkOverlap(Reference<beans::XPropertySet> const & xPropSet, sal_Int32
nValue)
-{
- uno::Any aAny = xPropSet->getPropertyValue(u"OverlapSequence"_ustr);
- CPPUNIT_ASSERT(aAny.hasValue());
- uno::Sequence< sal_Int32 > aSequence;
- aAny >>= aSequence;
- CPPUNIT_ASSERT(aSequence.hasElements());
- CPPUNIT_ASSERT_EQUAL(nValue, aSequence[0]);
-}
-
-void checkSheetForGapWidthAndOverlap(uno::Reference< chart2::XChartDocument >
const & xChartDoc,
- 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(Chart2ExportTest3, testDataseriesOverlapStackedChartXLSX)
-{
- loadFromFile(u"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);
-
- saveAndReload(u"Calc Office Open XML"_ustr);
-
- xChartDoc = getChartDocFromSheet( 0, mxComponent );
- checkSheetForGapWidthAndOverlap(xChartDoc, 100, 100);
-
- xChartDoc = getChartDocFromSheet( 1, mxComponent );
- checkSheetForGapWidthAndOverlap(xChartDoc, 100, 100);
-}
-
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testAxisCharacterPropertiesXLSX)
{
loadFromFile(u"xlsx/axis_character_properties.xlsx");
@@ -749,7 +690,7 @@ 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,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XAxis> xAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
CPPUNIT_ASSERT(xAxis.is());
@@ -762,7 +703,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf148142)
// Check the X axis position after export.
saveAndReload(u"calc8"_ustr);
- Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc2 = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc2.is());
Reference<chart2::XAxis> xAxis2 = getAxisFromDoc(xChartDoc2, 0, 0, 0);
CPPUNIT_ASSERT(xAxis2.is());
@@ -930,7 +871,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ExportTest3,
testODSFormattedChartTitles)
// Check formatted strings after export.
saveAndReload(u"calc8"_ustr);
- Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChart2Doc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChart2Doc.is());
Reference< chart::XChartDocument > xChartDoc(xChart2Doc, uno::UNO_QUERY);
CPPUNIT_ASSERT(xChartDoc.is());
diff --git a/chart2/qa/extras/chart2geometry.cxx
b/chart2/qa/extras/chart2geometry.cxx
index 7c07fd32bf4a..f5d928379611 100644
--- a/chart2/qa/extras/chart2geometry.cxx
+++ b/chart2/qa/extras/chart2geometry.cxx
@@ -352,7 +352,7 @@ void Chart2GeometryTest::testTdf135366LabelOnSeries()
// Error was, that the fill and line properties of a <chart:data-label>
were not
// imported at all. Here they should be at the series.
loadFromFile(u"ods/tdf135366_data_label_series.ods");
- 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());
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index 3cef1b785fae..1a9485fb2ecc 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -53,12 +53,21 @@ 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
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo60083)
{
loadFromFile(u"ods/fdo60083.ods");
- 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 );
@@ -107,7 +116,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo60083)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testErrorBarRange)
{
loadFromFile(u"ods/error_bar_range.ods");
- 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 );
@@ -136,7 +145,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testErrorBarRange)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testErrorBarFormatting)
{
loadFromFile(u"ods/error_bar_properties.ods");
- 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 );
@@ -179,7 +188,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSteppedLines)
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 );
@@ -205,7 +214,7 @@ uno::Sequence < OUString > getChartColumnDescriptions(
uno::Reference< chart::XC
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODSChartSeries)
{
loadFromFile(u"ods/chart.ods");
- uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW);
+ uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, 0), UNO_QUERY_THROW);
uno::Sequence < OUString > seriesList = getChartColumnDescriptions(
xChart1Doc);
CPPUNIT_ASSERT_EQUAL(u"Col 1"_ustr, seriesList[0]);
CPPUNIT_ASSERT_EQUAL(u"Col2"_ustr, seriesList[1]);
@@ -216,7 +225,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODSChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSXChartSeries)
{
loadFromFile(u"xlsx/chart.xlsx");
- uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW);
+ uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, 0), UNO_QUERY_THROW);
uno::Sequence < OUString > seriesList =
getChartColumnDescriptions(xChart1Doc );
CPPUNIT_ASSERT_EQUAL(u"Col 1"_ustr, seriesList[0]);
CPPUNIT_ASSERT_EQUAL(u"Col2"_ustr, seriesList[1]);
@@ -227,7 +236,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSXChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSChartSeries)
{
loadFromFile(u"xls/chart.xls");
- uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW);
+ uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, 0), UNO_QUERY_THROW);
uno::Sequence < OUString > seriesList =
getChartColumnDescriptions(xChart1Doc );
CPPUNIT_ASSERT_EQUAL(u"Col 1"_ustr, seriesList[0]);
CPPUNIT_ASSERT_EQUAL(u"Col 2"_ustr, seriesList[1]);
@@ -238,7 +247,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testXLSChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODTChartSeries)
{
loadFromFile(u"odt/chart.odt");
- uno::Sequence< OUString > seriesList =
getWriterChartColumnDescriptions(mxComponent);
+ 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]);
@@ -248,7 +257,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODTChartSeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDOCChartSeries)
{
loadFromFile(u"doc/chart.doc");
- uno::Sequence< OUString > seriesList =
getWriterChartColumnDescriptions(mxComponent);
+ 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]);
@@ -299,7 +308,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testDOCXChartEmptySeries)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf81396)
{
loadFromFile(u"xlsx/tdf81396.xlsx");
- Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0,
mxComponent),
+ Reference<chart::XChartDocument> xChartDoc(getChartDocFromSheet(0),
UNO_QUERY_THROW);
Reference<chart2::XChartDocument> xChartDoc2(xChartDoc, UNO_QUERY_THROW);
@@ -351,7 +360,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPPTChartSeries)
{
//test chart series names for ppt
loadFromFile(u"ppt/chart.ppt");
- uno::Sequence < OUString > seriesList =
getImpressChartColumnDescriptions(0, 0);
+ 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]);
@@ -511,7 +522,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testPPTXPercentageNumberFormats)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPieChartLabelsNumFormat)
{
loadFromFile(u"xlsx/tdfPieNumFormat.xlsx");
- uno::Reference< chart::XChartDocument > xChartDoc(getChartCompFromSheet(0,
0, mxComponent), UNO_QUERY_THROW);
+ 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);
@@ -583,7 +594,9 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testODPChartSeries)
{
//test chart series names for odp
loadFromFile(u"odp/chart.odp");
- uno::Sequence < OUString > seriesList =
getImpressChartColumnDescriptions(0, 0);
+ 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]);
@@ -613,7 +626,28 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc889755)
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());
@@ -625,7 +659,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc889755)
};
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);
@@ -663,7 +697,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testBnc882383)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTransparencyGradientValue)
{
loadFromFile(u"xlsx/tdf128732.xlsx");
- uno::Reference< chart2::XChartDocument > xChartDoc =
getChartDocFromSheet(0, mxComponent);
+ uno::Reference< chart2::XChartDocument > xChartDoc =
getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
uno::Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
CPPUNIT_ASSERT(xDataSeries.is());
@@ -692,7 +726,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testTransparencyGradientValue)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSimpleStrictXLSX)
{
loadFromFile(u"xlsx/strict_chart.xlsx");
- 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 );
@@ -704,7 +738,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testDelayedCellImport)
{
// chart range referencing content on later sheets
loadFromFile(u"xlsx/fdo70609.xlsx");
- uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0, mxComponent );
+ uno::Reference< chart2::XChartDocument > xChartDoc = getChartDocFromSheet(
0);
Reference< chart2::data::XDataSequence > xDataSeq =
getDataSequenceFromDocByRole(xChartDoc, u"values-x");
@@ -715,7 +749,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testDelayedCellImport)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFlatODSStackedColumnChart)
{
loadFromFile(u"fods/stacked-column-chart.fods");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XChartType> xChartType = getChartTypeFromDoc(xChartDoc,
0);
@@ -732,7 +766,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testFlatODSStackedColumnChart)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo78080)
{
loadFromFile(u"xlsx/fdo78080.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT(xChartDoc.is());
Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW);
@@ -763,7 +797,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf86624)
{
// manually placed legends
loadFromFile(u"ods/tdf86624.ods");
- 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();
awt::Point aPos = xLegend->getPosition();
@@ -828,7 +862,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf108021)
uno::Reference< chart::XDiagram > mxDiagram;
uno::Reference< beans::XPropertySet > xAxisProp;
bool bTextBreak = false;
- uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet(
0, 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 );
@@ -843,7 +877,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf100084)
{
// The test file was created with IBM Cognos, make sure there is a diagram.
loadFromFile(u"xlsx/tdf100084.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ 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());
@@ -852,7 +886,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf100084)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf124817)
{
loadFromFile(u"xlsx/tdf124817.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
uno::Reference<chart2::XDataSeries> xDataSeries;
@@ -883,7 +917,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf124817)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf126033)
{
loadFromFile(u"xlsx/tdf126033.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
// Check symbol style and size of data points
@@ -900,7 +934,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTdf126033)
void Chart2ImportTest::testTransparentBackground(std::u16string_view filename)
{
loadFromFile(filename);
- uno::Reference< chart2::XChartDocument > xChartDoc =
getChartDocFromSheet(0, mxComponent);
+ 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);
@@ -928,7 +962,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testFdo54361_1)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoBackgroundXLSX)
{
loadFromFile(u"xlsx/chart-auto-background.xlsx");
- uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ 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.
@@ -945,7 +979,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testAutoBackgroundXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoChartAreaBorderPropXLSX)
{
loadFromFile(u"xlsx/chart-area-style-border.xlsx");
- uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
// Test "Automatic" chartarea border style/color/width.
@@ -979,7 +1013,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testAutoChartAreaBorderPropPPTX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testChartAreaStyleBackgroundXLSX)
{
loadFromFile(u"xlsx/chart-area-style-background.xlsx");
- uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ 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.
@@ -996,7 +1030,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testChartAreaStyleBackgroundXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testChartHatchFillXLSX)
{
loadFromFile(u"xlsx/chart-hatch-fill.xlsx");
- uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ uno::Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
// Check the chart background FillStyle is HATCH
@@ -1038,7 +1072,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testChartHatchFillXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAxisTextRotationXLSX)
{
loadFromFile(u"xlsx/axis-label-rotation.xlsx");
- 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> xYAxis = getAxisFromDoc(xChartDoc, 0, 0, 0);
@@ -1059,7 +1093,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testTextCanOverlapXLSX)
uno::Reference< chart::XDiagram > mxDiagram;
uno::Reference< beans::XPropertySet > xAxisProp;
bool bTextCanOverlap = false;
- uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet(
0, 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 );
@@ -1076,7 +1110,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTextBreakXLSX)
uno::Reference< chart::XDiagram > mxDiagram;
uno::Reference< beans::XPropertySet > xAxisProp;
bool textBreak = false;
- uno::Reference< chart::XChartDocument > xChartDoc ( getChartCompFromSheet(
0, 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());
@@ -1091,7 +1125,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTextBreakXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testNumberFormatsXLSX)
{
loadFromFile(u"xlsx/number-formats.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
uno::Reference<chart2::XDataSeries>
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
@@ -1211,7 +1245,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testAutoTitleDelDefaultValue2007XLSX)
// 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,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW);
@@ -1223,7 +1257,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testAutoTitleDelDefaultValue2007XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAutoTitleDelDefaultValue2013XLSX)
{
loadFromFile(u"xlsx/autotitledel_2013.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
Reference<chart2::XTitled> xTitled(xChartDoc, uno::UNO_QUERY_THROW);
@@ -1235,7 +1269,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testAutoTitleDelDefaultValue2013XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDispBlanksAsDefaultValue2007XLSX)
{
loadFromFile(u"xlsx/dispBlanksAs_2007.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
Reference<beans::XPropertySet> xDiagram(xChartDoc->getFirstDiagram(),
UNO_QUERY);
@@ -1249,7 +1283,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testDispBlanksAsDefaultValue2007XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testDispBlanksAsDefaultValue2013XLSX)
{
loadFromFile(u"xlsx/dispBlanksAs_2013.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
Reference<beans::XPropertySet> xDiagram(xChartDoc->getFirstDiagram(),
UNO_QUERY);
@@ -1263,7 +1297,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testDispBlanksAsDefaultValue2013XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSmoothDefaultValue2007XLSX)
{
loadFromFile(u"xlsx/smoothed_series2007.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1281,7 +1315,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testSmoothDefaultValue2007XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testSmoothDefaultValue2013XLSX)
{
loadFromFile(u"xlsx/smoothed_series.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0);
CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
CPPUNIT_ASSERT(xChartDoc.is());
@@ -1299,7 +1333,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testSmoothDefaultValue2013XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTrendlineDefaultValue2007XLSX)
{
loadFromFile(u"xlsx/trendline2007.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ 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);
@@ -1325,7 +1359,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testTrendlineDefaultValue2007XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testTrendlineDefaultValue2013XLSX)
{
loadFromFile(u"xlsx/trendline.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ 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);
@@ -1351,7 +1385,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testTrendlineDefaultValue2013XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testVaryColorDefaultValues2007XLSX)
{
loadFromFile(u"xlsx/vary_color2007.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ 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);
@@ -1366,7 +1400,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testVaryColorDefaultValues2007XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testVaryColorDefaultValues2013XLSX)
{
loadFromFile(u"xlsx/vary_color.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ 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);
@@ -1381,7 +1415,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testVaryColorDefaultValues2013XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testPlotVisOnlyDefaultValue2013XLSX)
{
loadFromFile(u"xlsx/plotVisOnly.xlsx");
- uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW);
+ 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(u"IncludeHiddenCells"_ustr);
CPPUNIT_ASSERT(aAny.hasValue());
@@ -1393,7 +1427,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testPlotVisOnlyDefaultValue2013XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testRAngAxDefaultValue2013XLSX)
{
loadFromFile(u"xlsx/rAngAx.xlsx");
- uno::Reference< chart::XChartDocument > xChart1Doc (
getChartCompFromSheet( 0, 0, mxComponent ), UNO_QUERY_THROW);
+ 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(u"RightAngledAxes"_ustr);
CPPUNIT_ASSERT(aAny.hasValue());
@@ -1405,7 +1439,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testRAngAxDefaultValue2013XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testMajorTickMarksDefaultValue2013XLSX)
{
loadFromFile(u"xlsx/majorTickMark.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ 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());
@@ -1420,7 +1454,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testMajorTickMarksDefaultValue2013XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testMinorTickMarksDefaultValue2013XLSX)
{
loadFromFile(u"xlsx/minorTickMark.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ 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());
@@ -1435,7 +1469,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testMinorTickMarksDefaultValue2013XLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAxisTitleDefaultRotationXLSX)
{
loadFromFile(u"xlsx/axis_title_default_rotation.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ 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());
@@ -1452,7 +1486,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testAxisTitleDefaultRotationXLSX)
CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testSecondaryAxisTitleDefaultRotationXLSX)
{
loadFromFile(u"xlsx/secondary_axis_title_default_rotation.xlsx");
- Reference<chart2::XChartDocument> xChartDoc = getChartDocFromSheet(0,
mxComponent);
+ 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());
@@ -1469,7 +1503,7 @@ CPPUNIT_TEST_FIXTURE(Chart2ImportTest,
testSecondaryAxisTitleDefaultRotationXLSX
CPPUNIT_TEST_FIXTURE(Chart2ImportTest, testAxisTitleRotationXLSX)
{
loadFromFile(u"xlsx/axis_title_rotated.xlsx");
-e
... etc. - the rest is truncated
