diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-16 11:04:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-21 17:25:46 +0000 |
| commit | 0f691fe670526c1c0ba5c9bab8dfe8209bfe698e (patch) | |
| tree | ac449ffe9e7097e465dd4772b52fd420071212d2 /chart2/source/view/charttypes | |
| parent | move getAllRegressionCurvesNotMeanValueLine inside chart2::Diagram (diff) | |
| download | core-0f691fe670526c1c0ba5c9bab8dfe8209bfe698e.tar.gz core-0f691fe670526c1c0ba5c9bab8dfe8209bfe698e.zip | |
move getLabel inside chart2::DataSeries
Change-Id: I38baff5980d8cae5f63ee9163d667385837d249b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149198
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/view/charttypes')
| -rw-r--r-- | chart2/source/view/charttypes/VSeriesPlotter.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 130bb300cb66..6b2659538b11 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -517,7 +517,7 @@ rtl::Reference<SvxShapeText> VSeriesPlotter::createDataLabel( const rtl::Referen if ( m_xChartTypeModel ) aRole = m_xChartTypeModel->getRoleOfSequenceForSeriesLabel(); const rtl::Reference< DataSeries >& xSeries( rDataSeries.getModel() ); - pTextList[i] = DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ); + pTextList[i] = xSeries->getLabelForRole( aRole ); break; } case DataPointCustomLabelFieldType_PERCENTAGE: @@ -575,7 +575,7 @@ rtl::Reference<SvxShapeText> VSeriesPlotter::createDataLabel( const rtl::Referen if ( m_xChartTypeModel ) aRole = m_xChartTypeModel->getRoleOfSequenceForSeriesLabel(); const rtl::Reference< DataSeries >& xSeries( rDataSeries.getModel() ); - pTextList[1] = DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ); + pTextList[1] = xSeries->getLabelForRole( aRole ); } if( pLabel->ShowNumber ) @@ -2351,7 +2351,7 @@ uno::Sequence<OUString> VSeriesPlotter::getSeriesNames() const rtl::Reference< DataSeries > xSeries( pSeries ? pSeries->getModel() : nullptr ); if( xSeries.is() ) { - OUString aSeriesName( DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ) ); + OUString aSeriesName( xSeries->getLabelForRole( aRole ) ); aRetVector.push_back( aSeriesName ); } } @@ -2372,7 +2372,7 @@ uno::Sequence<OUString> VSeriesPlotter::getAllSeriesNames() const { if (pSeries) { - OUString aSeriesName(DataSeriesHelper::getDataSeriesLabel(pSeries->getModel(), aRole)); + OUString aSeriesName(pSeries->getModel()->getLabelForRole(aRole)); aRetVector.push_back(aSeriesName); } } @@ -2812,7 +2812,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries( } // label - aLabelText = DataSeriesHelper::getDataSeriesLabel( rSeries.getModel(), m_xChartTypeModel.is() ? m_xChartTypeModel->getRoleOfSequenceForSeriesLabel() : "values-y"); + aLabelText = rSeries.getModel()->getLabelForRole( m_xChartTypeModel.is() ? m_xChartTypeModel->getRoleOfSequenceForSeriesLabel() : "values-y"); aEntry.aLabel = FormattedStringHelper::createFormattedStringSequence( xContext, aLabelText, xTextProperties ); aResult.push_back(aEntry); |