[Libreoffice-commits] core.git: chart2/qa sc/inc sc/source
Tomaž Vajngerl
tomaz.vajngerl at collabora.co.uk
Mon Apr 24 06:37:16 UTC 2017
chart2/qa/extras/PivotChartTest.cxx | 4
sc/inc/PivotTableDataProvider.hxx | 6 -
sc/source/ui/unoobj/PivotTableDataProvider.cxx | 115 +++++++++----------------
3 files changed, 46 insertions(+), 79 deletions(-)
New commits:
commit c45358e928b9b9419bba10a0fcb661696cb7647a
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Mon Apr 24 00:09:08 2017 +0200
preserve "Total" label on round-trip, remove code duplication
Change-Id: Ic4e682f2193291798a3ebbf5a7f3f435d40a0645
Reviewed-on: https://gerrit.libreoffice.org/36867
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
diff --git a/chart2/qa/extras/PivotChartTest.cxx b/chart2/qa/extras/PivotChartTest.cxx
index fae7137fc0dc..0d7056f974e4 100644
--- a/chart2/qa/extras/PivotChartTest.cxx
+++ b/chart2/qa/extras/PivotChartTest.cxx
@@ -266,7 +266,7 @@ void PivotChartTest::testRoundtrip()
{
xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 0)->getData();
lclCheckSequence(aReference2, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(OUString(""), lclGetLabel(xChartDoc, 0));
+ CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0));
}
reload("calc8");
@@ -280,7 +280,7 @@ void PivotChartTest::testRoundtrip()
{
xSequence = getDataSequenceFromDocByRole(xChartDoc, "values-y", 0)->getData();
lclCheckSequence(aReference2, xSequence, 1E-4);
- CPPUNIT_ASSERT_EQUAL(OUString(""), lclGetLabel(xChartDoc, 0));
+ CPPUNIT_ASSERT_EQUAL(OUString("Total"), lclGetLabel(xChartDoc, 0));
}
}
diff --git a/sc/inc/PivotTableDataProvider.hxx b/sc/inc/PivotTableDataProvider.hxx
index 1a88939c7a3e..06d6778a8661 100644
--- a/sc/inc/PivotTableDataProvider.hxx
+++ b/sc/inc/PivotTableDataProvider.hxx
@@ -153,11 +153,9 @@ private:
OUString const & sRoleLabel, OUString const & sIdLabel,
std::vector<ValueAndFormat> const & rLabel);
- void assignLabelsToDataSequence(css::uno::Reference<css::chart2::data::XDataSequence> & rDataSequence,
- size_t nIndex);
+ css::uno::Reference<css::chart2::data::XDataSequence> assignLabelsToDataSequence(size_t nIndex);
- void assignValuesToDataSequence(css::uno::Reference<css::chart2::data::XDataSequence> & rDataSequence,
- size_t nIndex);
+ css::uno::Reference<css::chart2::data::XDataSequence> assignValuesToDataSequence(size_t nIndex);
void collectPivotTableData();
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index be7e74c62a05..23323663c45b 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -213,20 +213,6 @@ void PivotTableDataProvider::setLabeledDataSequenceValues(uno::Reference<chart2:
xResult->setValues(uno::Reference<chart2::data::XDataSequence>(pSequence.release()));
}
-void PivotTableDataProvider::setLabeledDataSequence(uno::Reference<chart2::data::XLabeledDataSequence> & xResult,
- OUString const & sRoleValues, OUString const & sIdValues,
- std::vector<ValueAndFormat> const & rValues,
- OUString const & sRoleLabel, OUString const & sIdLabel,
- std::vector<ValueAndFormat> const & rLabel)
-{
- setLabeledDataSequenceValues(xResult, sRoleValues, sIdValues, rValues);
-
- std::unique_ptr<PivotTableDataSequence> pLabelSequence(
- new PivotTableDataSequence(m_pDocument, m_sPivotTableName, sIdLabel, rLabel));
- pLabelSequence->setRole(sRoleLabel);
- xResult->setLabel(uno::Reference<chart2::data::XDataSequence>(pLabelSequence.release()));
-}
-
uno::Reference<chart2::data::XDataSource>
PivotTableDataProvider::createCategoriesDataSource(bool bOrientationIsColumn)
{
@@ -362,8 +348,7 @@ void PivotTableDataProvider::collectPivotTableData()
size_t i = 0;
OUString sCaption;
OUString sName;
- m_aLabels.resize(aSequence.getLength());
- for (sheet::MemberResult & rMember : aSequence)
+ for (sheet::MemberResult const & rMember : aSequence)
{
if (rMember.Flags & sheet::MemberResultFlags::HASMEMBER ||
rMember.Flags & sheet::MemberResultFlags::CONTINUE)
@@ -374,6 +359,9 @@ void PivotTableDataProvider::collectPivotTableData()
sName = rMember.Name;
}
+ if (i >= m_aLabels.size())
+ m_aLabels.resize(i + 1);
+
if (size_t(nDimPos) >= m_aLabels[i].size())
m_aLabels[i].resize(nDimPos + 1);
m_aLabels[i][nDimPos] = ValueAndFormat(sCaption);
@@ -397,9 +385,9 @@ void PivotTableDataProvider::collectPivotTableData()
m_aRowFields.push_back(chart2::data::PivotTableFieldEntry{xLevelName->getName(), nDim, nDimPos, bHasHiddenMember});
uno::Sequence<sheet::MemberResult> aSequence = xLevelResult->getResults();
- m_aCategoriesRowOrientation.resize(aSequence.getLength());
+
size_t i = 0;
- for (sheet::MemberResult & rMember : aSequence)
+ for (sheet::MemberResult const & rMember : aSequence)
{
bool bHasContinueFlag = rMember.Flags & sheet::MemberResultFlags::CONTINUE;
@@ -422,6 +410,9 @@ void PivotTableDataProvider::collectPivotTableData()
pItem.reset(new ValueAndFormat(fValue, nNumberFormat));
}
+ if (i >= m_aCategoriesRowOrientation.size())
+ m_aCategoriesRowOrientation.resize(i + 1);
+
if (size_t(nDimPos) >= m_aCategoriesColumnOrientation.size())
m_aCategoriesColumnOrientation.resize(nDimPos + 1);
m_aCategoriesColumnOrientation[nDimPos].push_back(*pItem);
@@ -518,11 +509,12 @@ void PivotTableDataProvider::collectPivotTableData()
m_bNeedsUpdate = false;
}
-void PivotTableDataProvider::assignValuesToDataSequence(uno::Reference<chart2::data::XDataSequence> & rDataSequence,
- size_t nIndex)
+uno::Reference<chart2::data::XDataSequence>
+PivotTableDataProvider::assignValuesToDataSequence(size_t nIndex)
{
+ uno::Reference<chart2::data::XDataSequence> xDataSequence;
if (nIndex >= m_aDataRowVector.size())
- return;
+ return xDataSequence;
OUString sDataID = lcl_identifierForData(nIndex);
@@ -530,29 +522,37 @@ void PivotTableDataProvider::assignValuesToDataSequence(uno::Reference<chart2::d
std::unique_ptr<PivotTableDataSequence> pSequence(new PivotTableDataSequence(m_pDocument, m_sPivotTableName,
sDataID, rRowOfData));
pSequence->setRole("values-y");
- rDataSequence.set(uno::Reference<chart2::data::XDataSequence>(pSequence.release()));
+ xDataSequence.set(pSequence.release());
+ return xDataSequence;
}
-void PivotTableDataProvider::assignLabelsToDataSequence(uno::Reference<chart2::data::XDataSequence> & rDataSequence,
- size_t nIndex)
+uno::Reference<chart2::data::XDataSequence>
+PivotTableDataProvider::assignLabelsToDataSequence(size_t nIndex)
{
- if (nIndex >= m_aLabels.size())
- return;
+ uno::Reference<chart2::data::XDataSequence> xDataSequence;
OUString sLabelID = lcl_identifierForLabel(nIndex);
OUString aLabel;
bool bFirst = true;
- for (ValueAndFormat const & rItem : m_aLabels[size_t(nIndex)])
+
+ if (m_aLabels.empty())
{
- if (bFirst)
- {
- aLabel += rItem.m_aString;
- bFirst = false;
- }
- else
+ aLabel = ScGlobal::GetRscString(STR_PIVOT_TOTAL);
+ }
+ else
+ {
+ for (ValueAndFormat const & rItem : m_aLabels[nIndex])
{
- aLabel += " - " + rItem.m_aString;
+ if (bFirst)
+ {
+ aLabel += rItem.m_aString;
+ bFirst = false;
+ }
+ else
+ {
+ aLabel += " - " + rItem.m_aString;
+ }
}
}
@@ -561,7 +561,8 @@ void PivotTableDataProvider::assignLabelsToDataSequence(uno::Reference<chart2::d
std::unique_ptr<PivotTableDataSequence> pSequence(new PivotTableDataSequence(m_pDocument, m_sPivotTableName,
sLabelID, aLabelVector));
pSequence->setRole("values-y");
- rDataSequence.set(uno::Reference<chart2::data::XDataSequence>(pSequence.release()));
+ xDataSequence.set(pSequence.release());
+ return xDataSequence;
}
uno::Reference<chart2::data::XDataSource>
@@ -587,42 +588,14 @@ uno::Reference<chart2::data::XDataSource>
}
{
- int i = 0;
- for (std::vector<ValueAndFormat> const & rRowOfData : m_aDataRowVector)
+ for (size_t i = 0; i < m_aDataRowVector.size(); ++i)
{
- OUString aValuesId = lcl_identifierForData(i);
- OUString aLabelsId = lcl_identifierForLabel(i);
-
- OUString aLabel;
- bool bFirst = true;
-
- if (m_aLabels.empty())
- {
- aLabel = ScGlobal::GetRscString(STR_PIVOT_TOTAL);
- }
- else
- {
- for (ValueAndFormat const & rItem : m_aLabels[i])
- {
- if (bFirst)
- {
- aLabel += rItem.m_aString;
- bFirst = false;
- }
- else
- {
- aLabel += " - " + rItem.m_aString;
- }
- }
- }
+ uno::Reference<chart2::data::XLabeledDataSequence> xResult = newLabeledDataSequence();
- std::vector<ValueAndFormat> aLabelVector { ValueAndFormat(aLabel) };
+ xResult->setValues(assignValuesToDataSequence(i));
+ xResult->setLabel(assignLabelsToDataSequence(i));
- uno::Reference<chart2::data::XLabeledDataSequence> xResult = newLabeledDataSequence();
- setLabeledDataSequence(xResult, "values-y", aValuesId, rRowOfData,
- "values-y", aLabelsId, aLabelVector);
aLabeledSequences.push_back(xResult);
- i++;
}
}
@@ -731,9 +704,7 @@ uno::Reference<chart2::data::XDataSequence>
if (m_bNeedsUpdate)
collectPivotTableData();
- uno::Reference<chart2::data::XDataSequence> xDataSequence;
- assignValuesToDataSequence(xDataSequence, size_t(nIndex));
- return xDataSequence;
+ return assignValuesToDataSequence(size_t(nIndex));
}
uno::Reference<css::chart2::data::XDataSequence>
@@ -744,9 +715,7 @@ uno::Reference<css::chart2::data::XDataSequence>
if (m_bNeedsUpdate)
collectPivotTableData();
- uno::Reference<chart2::data::XDataSequence> xDataSequence;
- assignLabelsToDataSequence(xDataSequence, size_t(nIndex));
- return xDataSequence;
+ return assignLabelsToDataSequence(size_t(nIndex));
}
uno::Reference<css::chart2::data::XDataSequence>
More information about the Libreoffice-commits
mailing list