mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#112006: the result is different using getFirstSeries

Browse Source 
Restore the old code and use c++11 for-statement

Change-Id: If85793d03fc9f022a938bcd365c605a7ddac2720
Reviewed-on: https://gerrit.libreoffice.org/42031
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
This commit is contained in:
Xisco Fauli
2017-09-06 23:26:27 +02:00
committed by Xisco Faulí
parent ba368643e6
commit 493d10b828
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
chart2/source/view/charttypes/VSeriesPlotter.cxx
View File

@@ -2060,13 +2060,25 @@ uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const
if( m_xChartTypeModel.is() ) if( m_xChartTypeModel.is() )
aRole = m_xChartTypeModel->getRoleOfSequenceForSeriesLabel(); aRole = m_xChartTypeModel->getRoleOfSequenceForSeriesLabel();
for (std::vector<VDataSeriesGroup> const & rGroup : m_aZSlots)
VDataSeries* pFirstSeries = getFirstSeries();
uno::Reference<XDataSeries> xSeries(pFirstSeries ? pFirstSeries->getModel() : nullptr);
if (xSeries.is())
{ {
OUString aSeriesName(DataSeriesHelper::getDataSeriesLabel(xSeries, aRole)); std::vector<VDataSeriesGroup>::const_iterator aXSlotIter = rGroup.begin();
aRetVector.push_back(aSeriesName); const std::vector<VDataSeriesGroup>::const_iterator aXSlotEnd = rGroup.end();
if (aXSlotIter != aXSlotEnd)
{
VDataSeriesGroup aSeriesGroup(*aXSlotIter);
if (aSeriesGroup.m_aSeriesVector.size())
{
VDataSeries* pSeries = aSeriesGroup.m_aSeriesVector[0];
uno::Reference< XDataSeries > xSeries( pSeries ? pSeries->getModel() : nullptr );
if( xSeries.is() )
{
OUString aSeriesName( DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ) );
aRetVector.push_back( aSeriesName );
}
}
}
} }
return comphelper::containerToSequence( aRetVector ); return comphelper::containerToSequence( aRetVector );
} }