diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-11-18 10:58:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-11-19 15:50:48 +0100 |
| commit | ec6502a1f61fcbd4bf05b62f172650fe442c3a1d (patch) | |
| tree | 383be2227aa9d6dd0bef8577bf478b3af3e33767 /chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | |
| parent | vcl: use std::optional in PhysicalFontFace (diff) | |
| download | core-ec6502a1f61fcbd4bf05b62f172650fe442c3a1d.tar.gz core-ec6502a1f61fcbd4bf05b62f172650fe442c3a1d.zip | |
tdf#151846 Restore XChartTypeTemplate
Which I removed in commit 58766f997d59e4684f2887fd8cdeb12d2f8a9366.
Turns out it does have some usefulness for extensions. So restore most
of it. The exception is the getDataInterpreter method, for which I have
added a placeholder, so that the restored class has the same vtable
layout as the original.
Change-Id: Ief9b48ef2c408580bc24b5a8a0e11131edb3b943
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142908
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/model/template/ColumnLineChartTypeTemplate.cxx')
| -rw-r--r-- | chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 992db10553ba..3a39424de5fe 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -203,13 +203,13 @@ void ColumnLineChartTypeTemplate::createChartTypes( } } -void ColumnLineChartTypeTemplate::applyStyle( +void ColumnLineChartTypeTemplate::applyStyle2( const rtl::Reference< DataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) { - ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); + ChartTypeTemplate::applyStyle2( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); if( nChartTypeIndex==0 ) // columns { @@ -231,7 +231,7 @@ StackMode ColumnLineChartTypeTemplate::getStackMode( sal_Int32 nChartTypeIndex ) } // ____ XChartTypeTemplate ____ -bool ColumnLineChartTypeTemplate::matchesTemplate( +bool ColumnLineChartTypeTemplate::matchesTemplate2( const rtl::Reference< ::chart::Diagram >& xDiagram, bool bAdaptProperties ) { @@ -312,7 +312,7 @@ rtl::Reference< ChartType > ColumnLineChartTypeTemplate::getChartTypeForIndex( s return new LineChartType(); } -rtl::Reference< ChartType > ColumnLineChartTypeTemplate::getChartTypeForNewSeries( +rtl::Reference< ChartType > ColumnLineChartTypeTemplate::getChartTypeForNewSeries2( const std::vector< rtl::Reference< ChartType > >& aFormerlyUsedChartTypes ) { rtl::Reference< ChartType > xResult; @@ -330,7 +330,7 @@ rtl::Reference< ChartType > ColumnLineChartTypeTemplate::getChartTypeForNewSerie return xResult; } -rtl::Reference< DataInterpreter > ColumnLineChartTypeTemplate::getDataInterpreter() +rtl::Reference< DataInterpreter > ColumnLineChartTypeTemplate::getDataInterpreter2() { if( ! m_xDataInterpreter.is()) { |