diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2022-04-28 23:07:57 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2022-05-06 10:51:50 +0200 |
commit | 7aa0730d6cdf1b2e74e1d8c9adb666cfb51d8fc6 (patch) | |
tree | 13504dfb45e942a1eb65b8a51194db45daacf934 /chart2 | |
parent | cc1be7312d9f6bd4a4ea742c6d1e3cb9293631cc (diff) |
chart2: typedef SeriesPlottersType is not needed
Change-Id: I457bfa5eab8b403c4b00a72068e427082709995c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133919
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/view/main/ChartView.cxx | 6 | ||||
-rw-r--r-- | chart2/source/view/main/SeriesPlotterContainer.hxx | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 56d53a78aa25..6f22d5f438ae 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -520,7 +520,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D basegfx::B2IRectangle aAvailableOuterRect = BaseGFXHelper::makeRectangle(rParam.maRemainingSpace); const std::vector< std::unique_ptr<VCoordinateSystem> >& rVCooSysList( rParam.mpSeriesPlotterContainer->getCooSysList() ); - SeriesPlottersType& rSeriesPlotterList = rParam.mpSeriesPlotterContainer->getSeriesPlotterList(); + auto& rSeriesPlotterList = rParam.mpSeriesPlotterContainer->getSeriesPlotterList(); //create VAxis, so they can give necessary information for automatic scaling uno::Reference<util::XNumberFormatsSupplier> const xNumberFormatsSupplier( @@ -1897,7 +1897,7 @@ void ChartView::createShapes2D( const awt::Size& rPageSize ) aParam.mpSeriesPlotterContainer->initializeCooSysAndSeriesPlotter( mrChartModel ); if(maTimeBased.bTimeBased && maTimeBased.nFrame != 0) { - SeriesPlottersType& rSeriesPlotter = aParam.mpSeriesPlotterContainer->getSeriesPlotterList(); + auto& rSeriesPlotter = aParam.mpSeriesPlotterContainer->getSeriesPlotterList(); size_t n = rSeriesPlotter.size(); for(size_t i = 0; i < n; ++i) { @@ -1957,7 +1957,7 @@ void ChartView::createShapes2D( const awt::Size& rPageSize ) if(maTimeBased.bTimeBased && maTimeBased.nFrame % 60 == 0) { // create copy of the data for next frame - SeriesPlottersType& rSeriesPlotter = aParam.mpSeriesPlotterContainer->getSeriesPlotterList(); + auto& rSeriesPlotter = aParam.mpSeriesPlotterContainer->getSeriesPlotterList(); size_t n = rSeriesPlotter.size(); maTimeBased.m_aDataSeriesList.clear(); maTimeBased.m_aDataSeriesList.resize(n); diff --git a/chart2/source/view/main/SeriesPlotterContainer.hxx b/chart2/source/view/main/SeriesPlotterContainer.hxx index 07677f2aca28..e34d07a962ff 100644 --- a/chart2/source/view/main/SeriesPlotterContainer.hxx +++ b/chart2/source/view/main/SeriesPlotterContainer.hxx @@ -24,8 +24,6 @@ namespace chart { -typedef std::vector<std::unique_ptr<VSeriesPlotter>> SeriesPlottersType; - /** This class is a container of `SeriesPlotter` objects (such as `PieChart` * instances). It is used for initializing coordinate systems, axes and scales * of all series plotters which belongs to the container. @@ -108,7 +106,10 @@ public: void setNumberFormatsFromAxes(); css::drawing::Direction3D getPreferredAspectRatio(); - SeriesPlottersType& getSeriesPlotterList() { return m_aSeriesPlotterList; } + std::vector<std::unique_ptr<VSeriesPlotter>>& getSeriesPlotterList() + { + return m_aSeriesPlotterList; + } std::vector<std::unique_ptr<VCoordinateSystem>>& getCooSysList() { return m_rVCooSysList; } std::vector<LegendEntryProvider*> getLegendEntryProviderList(); @@ -130,7 +131,7 @@ public: private: /** A vector of series plotters. */ - SeriesPlottersType m_aSeriesPlotterList; + std::vector<std::unique_ptr<VSeriesPlotter>> m_aSeriesPlotterList; /** A vector of coordinate systems. */ |