summaryrefslogtreecommitdiff
path: root/chart2/source
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-12-18 09:28:50 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-12-19 11:32:50 +0100
commit48251502a8143570810a05bd46e22efa34ed5600 (patch)
tree289b9467cb0fcd6241528834fb57f0ec2a23fab3 /chart2/source
parent79827580ce7f6be4ff9017b516dc45c9eba5e01e (diff)
loplugin:unusedfields
Change-Id: I84a7bcb891548416f0e1f1b20059f9b20c890d4c Reviewed-on: https://gerrit.libreoffice.org/46686 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/model/inc/BaseCoordinateSystem.hxx6
-rw-r--r--chart2/source/model/inc/CartesianCoordinateSystem.hxx11
-rw-r--r--chart2/source/model/inc/PolarCoordinateSystem.hxx10
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx3
-rw-r--r--chart2/source/model/main/CartesianCoordinateSystem.cxx21
-rw-r--r--chart2/source/model/main/PolarCoordinateSystem.cxx24
-rw-r--r--chart2/source/model/template/BubbleChartType.cxx2
-rw-r--r--chart2/source/model/template/ChartType.cxx2
-rw-r--r--chart2/source/model/template/NetChartType.cxx2
-rw-r--r--chart2/source/model/template/PieChartType.cxx2
-rw-r--r--chart2/source/model/template/ScatterChartType.cxx2
11 files changed, 31 insertions, 54 deletions
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index 82df7be4599b..06955837a955 100644
--- a/chart2/source/model/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx
@@ -54,9 +54,7 @@ class BaseCoordinateSystem :
public ::property::OPropertySet
{
public:
- BaseCoordinateSystem(
- const css::uno::Reference< css::uno::XComponentContext > & xContext,
- sal_Int32 nDimensionCount );
+ BaseCoordinateSystem( sal_Int32 nDimensionCount );
explicit BaseCoordinateSystem( const BaseCoordinateSystem & rSource );
virtual ~BaseCoordinateSystem() override;
@@ -115,8 +113,6 @@ protected:
void fireModifyEvent();
protected:
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
-
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
private:
diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
index 0b3c5c0a0172..7b2847cd8b84 100644
--- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx
+++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
@@ -27,9 +27,7 @@ namespace chart
class CartesianCoordinateSystem : public BaseCoordinateSystem
{
public:
- explicit CartesianCoordinateSystem(
- const css::uno::Reference< css::uno::XComponentContext > & xContext,
- sal_Int32 nDimensionCount );
+ explicit CartesianCoordinateSystem( sal_Int32 nDimensionCount );
explicit CartesianCoordinateSystem( const CartesianCoordinateSystem & rSource );
virtual ~CartesianCoordinateSystem() override;
@@ -49,8 +47,7 @@ public:
class CartesianCoordinateSystem2d : public CartesianCoordinateSystem
{
public:
- explicit CartesianCoordinateSystem2d(
- const css::uno::Reference< css::uno::XComponentContext > & xContext );
+ explicit CartesianCoordinateSystem2d();
virtual ~CartesianCoordinateSystem2d() override;
// ____ XServiceInfo ____
@@ -62,9 +59,7 @@ public:
class CartesianCoordinateSystem3d : public CartesianCoordinateSystem
{
public:
- explicit CartesianCoordinateSystem3d(
- const css::uno::Reference<
- css::uno::XComponentContext > & xContext );
+ explicit CartesianCoordinateSystem3d();
virtual ~CartesianCoordinateSystem3d() override;
// ____ XServiceInfo ____
diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx
index 2c0017caa8b7..4572201f5ce9 100644
--- a/chart2/source/model/inc/PolarCoordinateSystem.hxx
+++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx
@@ -27,9 +27,7 @@ namespace chart
class PolarCoordinateSystem : public BaseCoordinateSystem
{
public:
- explicit PolarCoordinateSystem(
- const css::uno::Reference< css::uno::XComponentContext > & xContext,
- sal_Int32 nDimensionCount );
+ explicit PolarCoordinateSystem( sal_Int32 nDimensionCount );
explicit PolarCoordinateSystem( const PolarCoordinateSystem & rSource );
virtual ~PolarCoordinateSystem() override;
@@ -49,8 +47,7 @@ public:
class PolarCoordinateSystem2d : public PolarCoordinateSystem
{
public:
- explicit PolarCoordinateSystem2d(
- const css::uno::Reference< css::uno::XComponentContext > & xContext );
+ explicit PolarCoordinateSystem2d();
virtual ~PolarCoordinateSystem2d() override;
// ____ XServiceInfo ____
@@ -62,8 +59,7 @@ public:
class PolarCoordinateSystem3d : public PolarCoordinateSystem
{
public:
- explicit PolarCoordinateSystem3d(
- const css::uno::Reference< css::uno::XComponentContext > & xContext );
+ explicit PolarCoordinateSystem3d();
virtual ~PolarCoordinateSystem3d() override;
// ____ XServiceInfo ____
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index ec8d16100b46..0079926c4f04 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -114,10 +114,8 @@ namespace chart
{
BaseCoordinateSystem::BaseCoordinateSystem(
- const Reference< uno::XComponentContext > & xContext,
sal_Int32 nDimensionCount /* = 2 */ ) :
::property::OPropertySet( m_aMutex ),
- m_xContext( xContext ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
m_nDimensionCount( nDimensionCount )
{
@@ -158,7 +156,6 @@ BaseCoordinateSystem::BaseCoordinateSystem(
impl::BaseCoordinateSystem_Base(),
MutexContainer(),
::property::OPropertySet( rSource, m_aMutex ),
- m_xContext( rSource.m_xContext ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
m_nDimensionCount( rSource.m_nDimensionCount ),
m_aOrigin( rSource.m_aOrigin )
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index e2f2f5f2fda0..39d86ff53cb1 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -39,9 +39,8 @@ namespace chart
// explicit
CartesianCoordinateSystem::CartesianCoordinateSystem(
- const uno::Reference< uno::XComponentContext > & xContext,
sal_Int32 nDimensionCount /* = 2 */ ) :
- BaseCoordinateSystem( xContext, nDimensionCount )
+ BaseCoordinateSystem( nDimensionCount )
{}
CartesianCoordinateSystem::CartesianCoordinateSystem(
@@ -87,9 +86,8 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem::getSupportedS
// ==== CartesianCoordinateSystem2d ====
-CartesianCoordinateSystem2d::CartesianCoordinateSystem2d(
- const uno::Reference< uno::XComponentContext > & xContext ) :
- CartesianCoordinateSystem( xContext, 2 )
+CartesianCoordinateSystem2d::CartesianCoordinateSystem2d() :
+ CartesianCoordinateSystem( 2 )
{}
CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d()
@@ -116,9 +114,8 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupporte
// ==== CartesianCoordinateSystem3d ====
-CartesianCoordinateSystem3d::CartesianCoordinateSystem3d(
- const uno::Reference< uno::XComponentContext > & xContext ) :
- CartesianCoordinateSystem( xContext, 3 )
+CartesianCoordinateSystem3d::CartesianCoordinateSystem3d() :
+ CartesianCoordinateSystem( 3 )
{}
CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d()
@@ -146,17 +143,17 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupporte
} // namespace chart
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
-com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::CartesianCoordinateSystem2d(context));
+ return cppu::acquire(new ::chart::CartesianCoordinateSystem2d);
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
-com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::CartesianCoordinateSystem3d(context));
+ return cppu::acquire(new ::chart::CartesianCoordinateSystem3d);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index a47f5a2add6c..49bede5f2b1b 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -38,10 +38,8 @@ namespace chart
{
// explicit
-PolarCoordinateSystem::PolarCoordinateSystem(
- const uno::Reference< uno::XComponentContext > & xContext,
- sal_Int32 nDimensionCount /* = 2 */ ) :
- BaseCoordinateSystem( xContext, nDimensionCount )
+PolarCoordinateSystem::PolarCoordinateSystem( sal_Int32 nDimensionCount /* = 2 */ ) :
+ BaseCoordinateSystem( nDimensionCount )
{}
PolarCoordinateSystem::PolarCoordinateSystem(
@@ -87,9 +85,8 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem::getSupportedServi
// ==== PolarCoordinateSystem2d ====
-PolarCoordinateSystem2d::PolarCoordinateSystem2d(
- const uno::Reference< uno::XComponentContext > & xContext ) :
- PolarCoordinateSystem( xContext, 2 )
+PolarCoordinateSystem2d::PolarCoordinateSystem2d() :
+ PolarCoordinateSystem( 2 )
{}
PolarCoordinateSystem2d::~PolarCoordinateSystem2d()
@@ -115,9 +112,8 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem2d::getSupportedSer
// ==== PolarCoordinateSystem3d ====
-PolarCoordinateSystem3d::PolarCoordinateSystem3d(
- const uno::Reference< uno::XComponentContext > & xContext ) :
- PolarCoordinateSystem( xContext, 3 )
+PolarCoordinateSystem3d::PolarCoordinateSystem3d() :
+ PolarCoordinateSystem( 3 )
{}
PolarCoordinateSystem3d::~PolarCoordinateSystem3d()
@@ -144,17 +140,17 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedSer
} // namespace chart
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
-com_sun_star_comp_chart2_PolarCoordinateSystem2d_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_PolarCoordinateSystem2d_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::PolarCoordinateSystem2d(context));
+ return cppu::acquire(new ::chart::PolarCoordinateSystem2d);
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
-com_sun_star_comp_chart2_PolarCoordinateSystem3d_get_implementation(css::uno::XComponentContext *context,
+com_sun_star_comp_chart2_PolarCoordinateSystem3d_get_implementation(css::uno::XComponentContext *,
css::uno::Sequence<css::uno::Any> const &)
{
- return cppu::acquire(new ::chart::PolarCoordinateSystem3d(context));
+ return cppu::acquire(new ::chart::PolarCoordinateSystem3d);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 49a43c3134f9..505e4bf60414 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -118,7 +118,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
BubbleChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
{
Reference< chart2::XCoordinateSystem > xResult(
- new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
+ new CartesianCoordinateSystem( DimensionCount ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index d7eb954901bc..1e8e10ecd2d3 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -72,7 +72,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
ChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
{
Reference< chart2::XCoordinateSystem > xResult(
- new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
+ new CartesianCoordinateSystem( DimensionCount ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index b124d9cbda93..78e14faad28d 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -60,7 +60,7 @@ Reference< XCoordinateSystem > SAL_CALL
static_cast< ::cppu::OWeakObject* >( this ), 0 );
Reference< XCoordinateSystem > xResult(
- new PolarCoordinateSystem( GetComponentContext(), DimensionCount ));
+ new PolarCoordinateSystem( DimensionCount ));
Reference< XAxis > xAxis( xResult->getAxisByDimension( 0, MAIN_AXIS_INDEX ) );
if( xAxis.is() )
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 689ef9b491a2..96a6da5c64a0 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -151,7 +151,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
PieChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
{
Reference< chart2::XCoordinateSystem > xResult(
- new PolarCoordinateSystem( GetComponentContext(), DimensionCount ));
+ new PolarCoordinateSystem( DimensionCount ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 3e5a1fb0c633..1663e419a2b7 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -173,7 +173,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
ScatterChartType::createCoordinateSystem( ::sal_Int32 DimensionCount )
{
Reference< chart2::XCoordinateSystem > xResult(
- new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
+ new CartesianCoordinateSystem( DimensionCount ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{