chart2/source/view/axes/VCartesianGrid.cxx | 10 +++++-----
chart2/source/view/axes/VCartesianGrid.hxx | 8 ++++----
chart2/source/view/axes/VCoordinateSystem.cxx | 6 +++---
chart2/source/view/axes/VPolarGrid.cxx | 6 +++---
chart2/source/view/axes/VPolarGrid.hxx | 6 +++---
chart2/source/view/inc/VCoordinateSystem.hxx | 7 +++----
6 files changed, 21 insertions(+), 22 deletions(-)
New commits:
commit 11c4ec15f13bbcc1b7a85e966519d75e64f62c4a
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Feb 8 20:11:04 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Feb 9 07:32:54 2022 +0100
use more concrete types in chart2, Axis
Change-Id: Ia45eac5e63d4937310a52a88c142623274fd4e1b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129688
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx
b/chart2/source/view/axes/VCartesianGrid.cxx
index 19e60b4ecabd..a5c44c22b042 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -161,9 +161,9 @@ static void addLine3D(
std::vector<std::vector<css::drawing::Position3D>>& rPoin
}
VCartesianGrid::VCartesianGrid( sal_Int32 nDimensionIndex, sal_Int32
nDimensionCount
- , const Sequence< Reference<
beans::XPropertySet > > & rGridPropertiesList )
+ , const std::vector< Reference<
beans::XPropertySet > > aGridPropertiesList )
: VAxisOrGridBase( nDimensionIndex, nDimensionCount )
- , m_aGridPropertiesList( rGridPropertiesList )
+ , m_aGridPropertiesList( std::move(aGridPropertiesList) )
{
m_pPosHelper = new PlottingPositionHelper();
}
@@ -175,10 +175,10 @@ VCartesianGrid::~VCartesianGrid()
}
void VCartesianGrid::fillLinePropertiesFromGridModel(
std::vector<VLineProperties>& rLinePropertiesList
- , const Sequence< Reference<
beans::XPropertySet > > & rGridPropertiesList )
+ , const std::vector< Reference<
beans::XPropertySet > > & rGridPropertiesList )
{
rLinePropertiesList.clear();
- if( !rGridPropertiesList.hasElements() )
+ if( rGridPropertiesList.empty() )
return;
VLineProperties aLineProperties;
@@ -194,7 +194,7 @@ void VCartesianGrid::fillLinePropertiesFromGridModel(
std::vector<VLinePropertie
void VCartesianGrid::createShapes()
{
- if(!m_aGridPropertiesList.hasElements())
+ if(m_aGridPropertiesList.empty())
return;
//somehow equal to axis tickmarks
diff --git a/chart2/source/view/axes/VCartesianGrid.hxx
b/chart2/source/view/axes/VCartesianGrid.hxx
index 2302a1d5a69f..81ba1e16f1db 100644
--- a/chart2/source/view/axes/VCartesianGrid.hxx
+++ b/chart2/source/view/axes/VCartesianGrid.hxx
@@ -31,19 +31,19 @@ class VCartesianGrid : public VAxisOrGridBase
// public methods
public:
VCartesianGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount
- , const css::uno::Sequence<
- css::uno::Reference< css::beans::XPropertySet > >&
rGridPropertiesList //main grid, subgrid, subsubgrid etc
+ , std::vector<
+ css::uno::Reference< css::beans::XPropertySet > >
aGridPropertiesList //main grid, subgrid, subsubgrid etc
);
virtual ~VCartesianGrid() override;
virtual void createShapes() override;
static void fillLinePropertiesFromGridModel( std::vector<VLineProperties>&
rLinePropertiesList
- , const css::uno::Sequence<
+ , const std::vector<
css::uno::Reference< css::beans::XPropertySet > >&
rGridPropertiesList );
private:
- css::uno::Sequence<
+ std::vector<
css::uno::Reference< css::beans::XPropertySet > >
m_aGridPropertiesList; //main grid, subgrid, subsubgrid etc
};
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx
b/chart2/source/view/axes/VCoordinateSystem.cxx
index 416112749242..729fb32c8171 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -193,7 +193,7 @@ rtl::Reference< Axis >
VCoordinateSystem::getAxisByDimension( sal_Int32 nDimensi
return nullptr;
}
-Sequence< Reference< beans::XPropertySet > >
VCoordinateSystem::getGridListFromAxis( const Reference< XAxis >& xAxis )
+std::vector< Reference< beans::XPropertySet > >
VCoordinateSystem::getGridListFromAxis( const rtl::Reference< Axis >& xAxis )
{
std::vector< Reference< beans::XPropertySet > > aRet;
@@ -204,7 +204,7 @@ Sequence< Reference< beans::XPropertySet > >
VCoordinateSystem::getGridListFromA
aRet.insert( aRet.end(), aSubGrids.begin(), aSubGrids.end() );
}
- return comphelper::containerToSequence( aRet );
+ return aRet;
}
void VCoordinateSystem::impl_adjustDimension( sal_Int32& rDimensionIndex )
@@ -568,7 +568,7 @@ void VCoordinateSystem::setSeriesNamesForAxis( const
Sequence< OUString >& rSeri
}
sal_Int32 VCoordinateSystem::getNumberFormatKeyForAxis(
- const Reference< chart2::XAxis >& xAxis
+ const rtl::Reference< Axis >& xAxis
, const rtl::Reference<::chart::ChartModel>& xChartDoc)
{
return ExplicitValueProvider::getExplicitNumberFormatKeyForAxis(
diff --git a/chart2/source/view/axes/VPolarGrid.cxx
b/chart2/source/view/axes/VPolarGrid.cxx
index f64349d97662..e876c83b2de7 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -38,9 +38,9 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
VPolarGrid::VPolarGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount
- , const uno::Sequence< Reference< beans::XPropertySet >
> & rGridPropertiesList )
+ , std::vector< Reference< beans::XPropertySet > >
aGridPropertiesList )
: VAxisOrGridBase( nDimensionIndex, nDimensionCount )
- , m_aGridPropertiesList( rGridPropertiesList )
+ , m_aGridPropertiesList( std::move(aGridPropertiesList) )
, m_pPosHelper( new PolarPlottingPositionHelper() )
{
PlotterBase::m_pPosHelper = m_pPosHelper.get();
@@ -220,7 +220,7 @@ void VPolarGrid::createShapes()
OSL_PRECOND(m_xLogicTarget.is()&&m_xFinalTarget.is(),"Axis is not proper
initialized");
if(!(m_xLogicTarget.is()&&m_xFinalTarget.is()))
return;
- if(!m_aGridPropertiesList.hasElements())
+ if(m_aGridPropertiesList.empty())
return;
//create all scaled tickmark values
diff --git a/chart2/source/view/axes/VPolarGrid.hxx
b/chart2/source/view/axes/VPolarGrid.hxx
index c5a9df7bb6e9..9b15d0e5bcbc 100644
--- a/chart2/source/view/axes/VPolarGrid.hxx
+++ b/chart2/source/view/axes/VPolarGrid.hxx
@@ -35,8 +35,8 @@ class VPolarGrid : public VAxisOrGridBase
// public methods
public:
VPolarGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount
- , const css::uno::Sequence<
- css::uno::Reference< css::beans::XPropertySet > > &
rGridPropertiesList //main grid, subgrid, subsubgrid etc
+ , std::vector<
+ css::uno::Reference< css::beans::XPropertySet > >
aGridPropertiesList //main grid, subgrid, subsubgrid etc
);
virtual ~VPolarGrid() override;
@@ -53,7 +53,7 @@ public:
, double fLogicRadius, double fLogicZ );
private: //member
- css::uno::Sequence<
+ std::vector<
css::uno::Reference< css::beans::XPropertySet > >
m_aGridPropertiesList;//main grid, subgrid, subsubgrid etc
std::unique_ptr<PolarPlottingPositionHelper> m_pPosHelper;
std::vector< ExplicitIncrementData > m_aIncrements;
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx
b/chart2/source/view/inc/VCoordinateSystem.hxx
index 22b5833fecbf..0664a5462996 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -143,16 +143,15 @@ protected: //methods
rtl::Reference< ::chart::Axis >
getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
const;
- static css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet >
>
- getGridListFromAxis( const css::uno::Reference< css::chart2::XAxis >&
xAxis );
+ static std::vector< css::uno::Reference< css::beans::XPropertySet > >
+ getGridListFromAxis( const rtl::Reference< ::chart::Axis >& xAxis );
VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
OUString createCIDForAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex
);
OUString createCIDForGrid( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex
);
- sal_Int32 getNumberFormatKeyForAxis( const css::uno::Reference<
- css::chart2::XAxis >& xAxis
+ sal_Int32 getNumberFormatKeyForAxis( const rtl::Reference< ::chart::Axis
>& xAxis
, const rtl::Reference<::chart::ChartModel>& xChartDoc);
private: //methods
