summaryrefslogtreecommitdiff
path: root/chart2/source/model
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-11-10 15:06:03 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-11-11 06:59:15 +0000
commit22d0d2455f9aa699fac95c450da725c603333132 (patch)
tree2f619071b7967291b3767292c2a91fbc8b7a2d09 /chart2/source/model
parent78b4a1fb01af9ad3b3395a22f6e396be914b553e (diff)
loplugin:expandablemethods in chart2
Change-Id: Ie6650628683ec7c67359351eec0e09033f2b50cb Reviewed-on: https://gerrit.libreoffice.org/30750 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/model')
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx23
-rw-r--r--chart2/source/model/inc/CartesianCoordinateSystem.hxx9
-rw-r--r--chart2/source/model/inc/ChartTypeManager.hxx3
-rw-r--r--chart2/source/model/inc/DataSeries.hxx3
-rw-r--r--chart2/source/model/inc/Diagram.hxx3
-rw-r--r--chart2/source/model/inc/PolarCoordinateSystem.hxx9
-rw-r--r--chart2/source/model/inc/StockBar.hxx2
-rw-r--r--chart2/source/model/inc/XMLFilter.hxx9
-rw-r--r--chart2/source/model/main/Axis.cxx17
-rw-r--r--chart2/source/model/main/Axis.hxx3
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx7
-rw-r--r--chart2/source/model/main/CartesianCoordinateSystem.cxx51
-rw-r--r--chart2/source/model/main/ChartModel.cxx21
-rw-r--r--chart2/source/model/main/DataPoint.cxx27
-rw-r--r--chart2/source/model/main/DataPoint.hxx5
-rw-r--r--chart2/source/model/main/DataSeries.cxx19
-rw-r--r--chart2/source/model/main/Diagram.cxx20
-rw-r--r--chart2/source/model/main/FormattedString.cxx25
-rw-r--r--chart2/source/model/main/FormattedString.hxx3
-rw-r--r--chart2/source/model/main/GridProperties.cxx22
-rw-r--r--chart2/source/model/main/GridProperties.hxx5
-rw-r--r--chart2/source/model/main/Legend.cxx31
-rw-r--r--chart2/source/model/main/Legend.hxx5
-rw-r--r--chart2/source/model/main/PageBackground.cxx23
-rw-r--r--chart2/source/model/main/PageBackground.hxx5
-rw-r--r--chart2/source/model/main/PolarCoordinateSystem.cxx49
-rw-r--r--chart2/source/model/main/StockBar.cxx5
-rw-r--r--chart2/source/model/main/Title.cxx22
-rw-r--r--chart2/source/model/main/Title.hxx3
-rw-r--r--chart2/source/model/main/Wall.cxx5
-rw-r--r--chart2/source/model/main/Wall.hxx2
-rw-r--r--chart2/source/model/template/AreaChartType.cxx18
-rw-r--r--chart2/source/model/template/AreaChartType.hxx3
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/BarChartType.cxx18
-rw-r--r--chart2/source/model/template/BarChartType.hxx3
-rw-r--r--chart2/source/model/template/BubbleChartType.cxx20
-rw-r--r--chart2/source/model/template/BubbleChartType.hxx3
-rw-r--r--chart2/source/model/template/CandleStickChartType.cxx20
-rw-r--r--chart2/source/model/template/CandleStickChartType.hxx3
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx18
-rw-r--r--chart2/source/model/template/ColumnChartType.cxx18
-rw-r--r--chart2/source/model/template/ColumnChartType.hxx3
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/DataInterpreter.cxx13
-rw-r--r--chart2/source/model/template/DataInterpreter.hxx3
-rw-r--r--chart2/source/model/template/FilledNetChartType.cxx20
-rw-r--r--chart2/source/model/template/FilledNetChartType.hxx3
-rw-r--r--chart2/source/model/template/GL3DBarChartType.cxx19
-rw-r--r--chart2/source/model/template/GL3DBarChartType.hxx3
-rw-r--r--chart2/source/model/template/LineChartType.cxx20
-rw-r--r--chart2/source/model/template/LineChartType.hxx3
-rw-r--r--chart2/source/model/template/NetChartType.cxx20
-rw-r--r--chart2/source/model/template/NetChartType.hxx3
-rw-r--r--chart2/source/model/template/PieChartType.cxx20
-rw-r--r--chart2/source/model/template/PieChartType.hxx3
-rw-r--r--chart2/source/model/template/ScatterChartType.cxx20
-rw-r--r--chart2/source/model/template/ScatterChartType.hxx3
58 files changed, 116 insertions, 614 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 7302b71e6885..019dd864a402 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -732,17 +732,6 @@ sal_Int32 XMLFilter::impl_ExportStream(
return nWarning;
}
-Sequence< OUString > XMLFilter::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = "com.sun.star.document.ImportFilter";
- aServices[ 1 ] = "com.sun.star.document.ExportFilter";
-
- // todo: services are incomplete. Missing:
- // XInitialization, XNamed
- return aServices;
-}
-
void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS )
{
apphelper::MediaDescriptorHelper aMDHelper( _rMediaDescriptor );
@@ -757,11 +746,6 @@ OUString XMLFilter::getMediaType(bool _bOasis)
OUString SAL_CALL XMLFilter::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString XMLFilter::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.XMLFilter");
}
@@ -774,7 +758,12 @@ sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL XMLFilter::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ "com.sun.star.document.ImportFilter",
+ "com.sun.star.document.ExportFilter"
+ };
+ // todo: services are incomplete. Missing:
+ // XInitialization, XNamed
}
void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS )
diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
index 5cd12965bd36..79aac4c21bb1 100644
--- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx
+++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
@@ -50,9 +50,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
-
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
class CartesianCoordinateSystem2d : public CartesianCoordinateSystem
@@ -69,9 +66,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
-
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
class CartesianCoordinateSystem3d : public CartesianCoordinateSystem
@@ -89,9 +83,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
-
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
} // namespace chart
diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx
index b41664120019..30e2b24cffb1 100644
--- a/chart2/source/model/inc/ChartTypeManager.hxx
+++ b/chart2/source/model/inc/ChartTypeManager.hxx
@@ -55,9 +55,6 @@ public:
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
// ____ XMultiServiceFactory ____
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index 030d0ce3c219..27b9513e6528 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -78,9 +78,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx
index 9dbec671422c..7e724184ba1e 100644
--- a/chart2/source/model/inc/Diagram.hxx
+++ b/chart2/source/model/inc/Diagram.hxx
@@ -72,9 +72,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx
index 70773f03153e..f886d066895f 100644
--- a/chart2/source/model/inc/PolarCoordinateSystem.hxx
+++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx
@@ -50,9 +50,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
-
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
class PolarCoordinateSystem2d : public PolarCoordinateSystem
@@ -69,9 +66,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
-
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
class PolarCoordinateSystem3d : public PolarCoordinateSystem
@@ -88,9 +82,6 @@ public:
throw( css::uno::RuntimeException, std::exception ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
-
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
} // namespace chart
diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx
index 51d3db993fb5..40cf1f2ac212 100644
--- a/chart2/source/model/inc/StockBar.hxx
+++ b/chart2/source/model/inc/StockBar.hxx
@@ -92,8 +92,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
- void fireModifyEvent();
-
private:
const bool m_bRisingCourse;
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index 1c7ce84131ad..bc8b75ee4a2d 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -69,9 +69,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
protected:
// ____ XFilter ____
virtual sal_Bool SAL_CALL filter(
@@ -152,16 +149,12 @@ public:
explicit XMLReportFilterHelper( css::uno::Reference< css::uno::XComponentContext > const & _xContext )
:XMLFilter(_xContext)
{}
- static OUString getImplementationName_Static()
- {
- return OUString( "com.sun.star.comp.chart2.report.XMLFilter" );
- }
protected:
virtual OUString SAL_CALL
getImplementationName()
throw( css::uno::RuntimeException, std::exception ) override
{
- return getImplementationName_Static();
+ return OUString( "com.sun.star.comp.chart2.report.XMLFilter" );
}
// ____ XImporter ____
virtual void SAL_CALL setTargetDocument(
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index f29567c9b9fb..8ba10b145626 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -633,14 +633,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo()
return *StaticAxisInfo::get();
}
-Sequence< OUString > Axis::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = "com.sun.star.chart2.Axis";
- aServices[ 1 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
using impl::Axis_Base;
IMPLEMENT_FORWARD_XINTERFACE2( Axis, Axis_Base, ::property::OPropertySet )
@@ -650,11 +642,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet )
OUString SAL_CALL Axis::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString Axis::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.Axis");
}
@@ -667,7 +654,9 @@ sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ "com.sun.star.chart2.Axis",
+ "com.sun.star.beans.PropertySet" };
}
} // namespace chart
diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx
index 00f0d6503b19..6758b92d45b4 100644
--- a/chart2/source/model/main/Axis.hxx
+++ b/chart2/source/model/main/Axis.hxx
@@ -65,9 +65,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index d3eeedfade34..6a10d8404327 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -60,14 +60,9 @@ struct StaticCooSysDefaults_Initializer
::chart::tPropertyValueMap* operator()()
{
static ::chart::tPropertyValueMap aStaticDefaults;
- lcl_AddDefaultsToMap( aStaticDefaults );
+ ::chart::PropertyHelper::setPropertyValueDefault( aStaticDefaults, PROP_COORDINATESYSTEM_SWAPXANDYAXIS, false );
return &aStaticDefaults;
}
-private:
- static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
- {
- ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_COORDINATESYSTEM_SWAPXANDYAXIS, false );
- }
};
struct StaticCooSysDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticCooSysDefaults_Initializer >
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index 31961279ac8a..5befaffb9748 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -74,20 +74,9 @@ uno::Reference< util::XCloneable > SAL_CALL CartesianCoordinateSystem::createClo
}
// ____ XServiceInfo ____
-Sequence< OUString > CartesianCoordinateSystem::getSupportedServiceNames_Static()
-{
- return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME };
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL CartesianCoordinateSystem::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString CartesianCoordinateSystem::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.CartesianCoordinateSystem");
}
@@ -100,7 +89,7 @@ sal_Bool SAL_CALL CartesianCoordinateSystem::supportsService( const OUString& rS
css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME };
}
// ==== CartesianCoordinateSystem2d ====
@@ -114,23 +103,9 @@ CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d()
{}
// ____ XServiceInfo ____
-Sequence< OUString > CartesianCoordinateSystem2d::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME;
- aServices[ 1 ] = "com.sun.star.chart2.CartesianCoordinateSystem2d";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL CartesianCoordinateSystem2d::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString CartesianCoordinateSystem2d::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem2d");
}
@@ -143,7 +118,10 @@ sal_Bool SAL_CALL CartesianCoordinateSystem2d::supportsService( const OUString&
css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME,
+ "com.sun.star.chart2.CartesianCoordinateSystem2d"
+ };
}
// ==== CartesianCoordinateSystem3d ====
@@ -157,23 +135,9 @@ CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d()
{}
// ____ XServiceInfo ____
-Sequence< OUString > CartesianCoordinateSystem3d::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME;
- aServices[ 1 ] = "com.sun.star.chart2.CartesianCoordinateSystem3d";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL CartesianCoordinateSystem3d::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString CartesianCoordinateSystem3d::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem3d");
}
@@ -186,7 +150,10 @@ sal_Bool SAL_CALL CartesianCoordinateSystem3d::supportsService( const OUString&
css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME,
+ "com.sun.star.chart2.CartesianCoordinateSystem3d"
+ };
}
} // namespace chart
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index b9647eb16b67..1997c565101f 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -318,11 +318,6 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV
OUString SAL_CALL ChartModel::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString ChartModel::getImplementationName_Static()
-{
return OUString(CHART_MODEL_SERVICE_IMPLEMENTATION_NAME);
}
@@ -335,17 +330,11 @@ sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
-}
-
-uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aSNS( 3 );
- aSNS[0] = CHART_MODEL_SERVICE_NAME;
- aSNS[1] = "com.sun.star.document.OfficeDocument";
- aSNS[2] = "com.sun.star.chart.ChartDocument";
- //// @todo : add additional services if you support any further
- return aSNS;
+ return {
+ CHART_MODEL_SERVICE_NAME,
+ "com.sun.star.document.OfficeDocument",
+ "com.sun.star.chart.ChartDocument"
+ };
}
// frame::XModel (required interface)
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 19a54e067fb4..0f359648f31f 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -272,24 +272,9 @@ void SAL_CALL DataPoint::disposing( const lang::EventObject& )
// ____ OPropertySet ____
void DataPoint::firePropertyChangeEvent()
{
- fireModifyEvent();
-}
-
-void DataPoint::fireModifyEvent()
-{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
-Sequence< OUString > DataPoint::getSupportedServiceNames_Static()
-{
- return Sequence< OUString >{
- "com.sun.star.drawing.FillProperties",
- "com.sun.star.chart2.DataPoint",
- "com.sun.star.chart2.DataPointProperties",
- "com.sun.star.beans.PropertySet"
- };
-}
-
// needed by MSC compiler
using impl::DataPoint_Base;
@@ -299,11 +284,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertyS
OUString SAL_CALL DataPoint::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString DataPoint::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.DataPoint") ;
}
@@ -316,7 +296,12 @@ sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL DataPoint::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return Sequence< OUString >{
+ "com.sun.star.drawing.FillProperties",
+ "com.sun.star.chart2.DataPoint",
+ "com.sun.star.chart2.DataPointProperties",
+ "com.sun.star.beans.PropertySet"
+ };
}
} // namespace chart
diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx
index 2262079f0e59..8335509b8f8f 100644
--- a/chart2/source/model/main/DataPoint.hxx
+++ b/chart2/source/model/main/DataPoint.hxx
@@ -64,9 +64,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
protected:
explicit DataPoint( const DataPoint & rOther );
@@ -119,8 +116,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
- void fireModifyEvent();
-
private:
css::uno::WeakReference< css::beans::XPropertySet > m_xParentProperties;
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index d016f2160476..3f60181ac8ec 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -232,15 +232,6 @@ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone()
return xResult;
}
-Sequence< OUString > DataSeries::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 3 );
- aServices[ 0 ] = "com.sun.star.chart2.DataSeries";
- aServices[ 1 ] = "com.sun.star.chart2.DataPointProperties";
- aServices[ 2 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
// ____ OPropertySet ____
uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const
throw (beans::UnknownPropertyException,
@@ -569,11 +560,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet )
OUString SAL_CALL DataSeries::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString DataSeries::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.DataSeries");
}
@@ -586,7 +572,10 @@ sal_Bool SAL_CALL DataSeries::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ "com.sun.star.chart2.DataSeries",
+ "com.sun.star.chart2.DataPointProperties",
+ "com.sun.star.beans.PropertySet" };
}
} // namespace chart
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 8ab8c6609f28..f8323f06df61 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -646,16 +646,6 @@ void Diagram::fireModifyEvent()
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
-Sequence< OUString > Diagram::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 3 );
-
- aServices[ 0 ] = "com.sun.star.chart2.Diagram";
- aServices[ 1 ] = "com.sun.star.layout.LayoutElement";
- aServices[ 2 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
// ____ OPropertySet ____
uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const
throw(beans::UnknownPropertyException)
@@ -747,11 +737,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySe
OUString SAL_CALL Diagram::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString Diagram::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.Diagram");
}
@@ -764,7 +749,10 @@ sal_Bool SAL_CALL Diagram::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ "com.sun.star.chart2.Diagram",
+ "com.sun.star.layout.LayoutElement",
+ "com.sun.star.beans.PropertySet" };
}
} // namespace chart
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index d34dfa5b3440..4396a584b71a 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -39,14 +39,9 @@ struct StaticFormattedStringDefaults_Initializer
::chart::tPropertyValueMap* operator()()
{
static ::chart::tPropertyValueMap aStaticDefaults;
- lcl_AddDefaultsToMap( aStaticDefaults );
+ ::chart::CharacterProperties::AddDefaultsToMap( aStaticDefaults );
return &aStaticDefaults;
}
-private:
- static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
- {
- ::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
- }
};
struct StaticFormattedStringDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticFormattedStringDefaults_Initializer >
@@ -197,15 +192,6 @@ void FormattedString::fireModifyEvent()
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
-Sequence< OUString > FormattedString::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
-
- aServices[ 0 ] = "com.sun.star.chart2.FormattedString";
- aServices[ 1 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
// ____ OPropertySet ____
uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const
throw (beans::UnknownPropertyException, uno::RuntimeException)
@@ -241,11 +227,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope
OUString SAL_CALL FormattedString::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString FormattedString::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.FormattedString");
}
@@ -258,7 +239,9 @@ sal_Bool SAL_CALL FormattedString::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ "com.sun.star.chart2.FormattedString",
+ "com.sun.star.beans.PropertySet" };
}
} // namespace chart
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 8f4755405260..2eb5565bd64b 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -61,9 +61,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index cd506a4ba97f..6c6dee23a355 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -223,31 +223,13 @@ void SAL_CALL GridProperties::disposing( const lang::EventObject& /* Source */ )
// ____ OPropertySet ____
void GridProperties::firePropertyChangeEvent()
{
- fireModifyEvent();
-}
-
-void GridProperties::fireModifyEvent()
-{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
-Sequence< OUString > GridProperties::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = "com.sun.star.chart2.GridProperties";
- aServices[ 1 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL GridProperties::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString GridProperties::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.GridProperties");
}
@@ -260,7 +242,9 @@ sal_Bool SAL_CALL GridProperties::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL GridProperties::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ "com.sun.star.chart2.GridProperties",
+ "com.sun.star.beans.PropertySet" };
}
// needed by MSC compiler
diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx
index 75dd9a33ce1a..a38481edaf06 100644
--- a/chart2/source/model/main/GridProperties.hxx
+++ b/chart2/source/model/main/GridProperties.hxx
@@ -63,9 +63,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
@@ -111,8 +108,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
- void fireModifyEvent();
-
private:
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
};
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 29ebc46a081a..3df5156c86b0 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -252,26 +252,9 @@ void SAL_CALL Legend::disposing( const lang::EventObject& /* Source */ )
// ____ OPropertySet ____
void Legend::firePropertyChangeEvent()
{
- fireModifyEvent();
-}
-
-void Legend::fireModifyEvent()
-{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
-Sequence< OUString > Legend::getSupportedServiceNames_Static()
-{
- return Sequence< OUString >{
- "com.sun.star.chart2.Legend",
- "com.sun.star.beans.PropertySet",
- "com.sun.star.drawing.FillProperties",
- "com.sun.star.drawing.LineProperties",
- "com.sun.star.style.CharacterProperties",
- "com.sun.star.layout.LayoutElement"
- };
-}
-
// ____ OPropertySet ____
Any Legend::GetDefaultValue( sal_Int32 nHandle ) const
throw (beans::UnknownPropertyException, uno::RuntimeException)
@@ -299,11 +282,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo()
OUString SAL_CALL Legend::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString Legend::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.Legend");
}
@@ -316,7 +294,14 @@ sal_Bool SAL_CALL Legend::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL Legend::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ "com.sun.star.chart2.Legend",
+ "com.sun.star.beans.PropertySet",
+ "com.sun.star.drawing.FillProperties",
+ "com.sun.star.drawing.LineProperties",
+ "com.sun.star.style.CharacterProperties",
+ "com.sun.star.layout.LayoutElement"
+ };
}
// needed by MSC compiler
diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx
index 066a595b3606..8b1a270f1412 100644
--- a/chart2/source/model/main/Legend.hxx
+++ b/chart2/source/model/main/Legend.hxx
@@ -62,9 +62,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
@@ -111,8 +108,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
- void fireModifyEvent();
-
private:
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
};
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index c8654e31d2f0..117eafb212ee 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -203,31 +203,12 @@ void SAL_CALL PageBackground::disposing( const lang::EventObject& /* Source */ )
// ____ OPropertySet ____
void PageBackground::firePropertyChangeEvent()
{
- fireModifyEvent();
-}
-
-void PageBackground::fireModifyEvent()
-{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
-uno::Sequence< OUString > PageBackground::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = "com.sun.star.chart2.PageBackground";
- aServices[ 1 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL PageBackground::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString PageBackground::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.PageBackground");
}
@@ -240,7 +221,9 @@ sal_Bool SAL_CALL PageBackground::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL PageBackground::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ "com.sun.star.chart2.PageBackground",
+ "com.sun.star.beans.PropertySet" };
}
using impl::PageBackground_Base;
diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx
index 721642059028..99abf8150929 100644
--- a/chart2/source/model/main/PageBackground.hxx
+++ b/chart2/source/model/main/PageBackground.hxx
@@ -59,9 +59,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
@@ -106,8 +103,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
- void fireModifyEvent();
-
private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index aa982cd687f7..6c26feb60da2 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -74,20 +74,9 @@ uno::Reference< util::XCloneable > SAL_CALL PolarCoordinateSystem::createClone()
}
// ____ XServiceInfo ____
-Sequence< OUString > PolarCoordinateSystem::getSupportedServiceNames_Static()
-{
- return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME };
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL PolarCoordinateSystem::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString PolarCoordinateSystem::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.PolarCoordinateSystem");
}
@@ -100,7 +89,7 @@ sal_Bool SAL_CALL PolarCoordinateSystem::supportsService( const OUString& rServi
css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME };
}
// ==== PolarCoordinateSystem2d ====
@@ -114,23 +103,9 @@ PolarCoordinateSystem2d::~PolarCoordinateSystem2d()
{}
// ____ XServiceInfo ____
-Sequence< OUString > PolarCoordinateSystem2d::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = CHART2_COOSYSTEM_POLAR_SERVICE_NAME;
- aServices[ 1 ] = "com.sun.star.chart2.PolarCoordinateSystem2d";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL PolarCoordinateSystem2d::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString PolarCoordinateSystem2d::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem2d") ;
}
@@ -143,7 +118,9 @@ sal_Bool SAL_CALL PolarCoordinateSystem2d::supportsService( const OUString& rSer
css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem2d::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_COOSYSTEM_POLAR_SERVICE_NAME,
+ "com.sun.star.chart2.PolarCoordinateSystem2d" };
}
// ==== PolarCoordinateSystem3d ====
@@ -157,23 +134,9 @@ PolarCoordinateSystem3d::~PolarCoordinateSystem3d()
{}
// ____ XServiceInfo ____
-Sequence< OUString > PolarCoordinateSystem3d::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = CHART2_COOSYSTEM_POLAR_SERVICE_NAME;
- aServices[ 1 ] = "com.sun.star.chart2.PolarCoordinateSystem3d";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL PolarCoordinateSystem3d::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString PolarCoordinateSystem3d::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem3d");
}
@@ -186,7 +149,9 @@ sal_Bool SAL_CALL PolarCoordinateSystem3d::supportsService( const OUString& rSer
css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_COOSYSTEM_POLAR_SERVICE_NAME,
+ "com.sun.star.chart2.PolarCoordinateSystem3d" };
}
} // namespace chart
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index 4b922bbbe6e0..206e48bd85d9 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -212,11 +212,6 @@ void SAL_CALL StockBar::disposing( const lang::EventObject& /* Source */ )
// ____ OPropertySet ____
void StockBar::firePropertyChangeEvent()
{
- fireModifyEvent();
-}
-
-void StockBar::fireModifyEvent()
-{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index e704c1ffda81..621ec2b3143a 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -372,25 +372,9 @@ void Title::fireModifyEvent()
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
-uno::Sequence< OUString > Title::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 4 );
- aServices[ 0 ] = "com.sun.star.chart2.Title";
- aServices[ 1 ] = "com.sun.star.style.ParagraphProperties";
- aServices[ 2 ] = "com.sun.star.beans.PropertySet";
- aServices[ 3 ] = "com.sun.star.layout.LayoutElement";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL Title::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString Title::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.Title");
}
@@ -403,7 +387,11 @@ sal_Bool SAL_CALL Title::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL Title::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ "com.sun.star.chart2.Title",
+ "com.sun.star.style.ParagraphProperties",
+ "com.sun.star.beans.PropertySet",
+ "com.sun.star.layout.LayoutElement" };
}
// needed by MSC compiler
diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx
index b484ccec66cf..e6ff363c6019 100644
--- a/chart2/source/model/main/Title.hxx
+++ b/chart2/source/model/main/Title.hxx
@@ -60,9 +60,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
/// merge XInterface implementations
DECLARE_XINTERFACE()
/// merge XTypeProvider implementations
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index 40e7e43ce028..d47824fef502 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -205,11 +205,6 @@ void SAL_CALL Wall::disposing( const lang::EventObject& /* Source */ )
// ____ OPropertySet ____
void Wall::firePropertyChangeEvent()
{
- fireModifyEvent();
-}
-
-void Wall::fireModifyEvent()
-{
m_xModifyEventForwarder->modified( lang::EventObject( static_cast< uno::XWeak* >( this )));
}
diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx
index e35d936312b7..5a67938c1684 100644
--- a/chart2/source/model/main/Wall.hxx
+++ b/chart2/source/model/main/Wall.hxx
@@ -95,8 +95,6 @@ protected:
virtual void firePropertyChangeEvent() override;
using OPropertySet::disposing;
- void fireModifyEvent();
-
private:
css::uno::Reference< css::util::XModifyListener > m_xModifyEventForwarder;
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx
index e9e057f1e490..21d96fac7e9d 100644
--- a/chart2/source/model/template/AreaChartType.cxx
+++ b/chart2/source/model/template/AreaChartType.cxx
@@ -53,23 +53,9 @@ OUString SAL_CALL AreaChartType::getChartType()
return OUString(CHART2_SERVICE_NAME_CHARTTYPE_AREA);
}
-uno::Sequence< OUString > AreaChartType::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_AREA;
- aServices[ 1 ] = "com.sun.star.chart2.ChartType";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL AreaChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString AreaChartType::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.AreaChartType");
}
@@ -82,7 +68,9 @@ sal_Bool SAL_CALL AreaChartType::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_SERVICE_NAME_CHARTTYPE_AREA,
+ "com.sun.star.chart2.ChartType" };
}
} // namespace chart
diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx
index b3c2843197eb..2a9c99f5cd1d 100644
--- a/chart2/source/model/template/AreaChartType.hxx
+++ b/chart2/source/model/template/AreaChartType.hxx
@@ -39,9 +39,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
explicit AreaChartType( const AreaChartType & rOther );
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 0128bb043b6c..d26bc1569ddc 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -58,14 +58,9 @@ struct StaticAreaChartTypeTemplateDefaults_Initializer
::chart::tPropertyValueMap* operator()()
{
static ::chart::tPropertyValueMap aStaticDefaults;
- lcl_AddDefaultsToMap( aStaticDefaults );
+ ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aStaticDefaults, PROP_AREA_TEMPLATE_DIMENSION, 2 );
return &aStaticDefaults;
}
-private:
- static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
- {
- ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AREA_TEMPLATE_DIMENSION, 2 );
- }
};
struct StaticAreaChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticAreaChartTypeTemplateDefaults_Initializer >
diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx
index d7423110a126..3a61a04dc177 100644
--- a/chart2/source/model/template/BarChartType.cxx
+++ b/chart2/source/model/template/BarChartType.cxx
@@ -64,23 +64,9 @@ uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles()
return aPropRoles;
}
-uno::Sequence< OUString > BarChartType::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BAR;
- aServices[ 1 ] = "com.sun.star.chart2.ChartType";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL BarChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString BarChartType::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.BarChartType");
}
@@ -93,7 +79,9 @@ sal_Bool SAL_CALL BarChartType::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_SERVICE_NAME_CHARTTYPE_BAR,
+ "com.sun.star.chart2.ChartType" };
}
} // namespace chart
diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx
index 96b706e41999..6c79298d6609 100644
--- a/chart2/source/model/template/BarChartType.hxx
+++ b/chart2/source/model/template/BarChartType.hxx
@@ -39,9 +39,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
explicit BarChartType( const BarChartType & rOther );
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index d274060208ac..ba23686d24d7 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -204,24 +204,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertyS
return *StaticBubbleChartTypeInfo::get();
}
-uno::Sequence< OUString > BubbleChartType::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 3 );
- aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE;
- aServices[ 1 ] = "com.sun.star.chart2.ChartType";
- aServices[ 2 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL BubbleChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString BubbleChartType::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.BubbleChartType");
}
@@ -234,7 +219,10 @@ sal_Bool SAL_CALL BubbleChartType::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE,
+ "com.sun.star.chart2.ChartType",
+ "com.sun.star.beans.PropertySet" };
}
} // namespace chart
diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx
index 66d7508b00ae..cc0e94406f45 100644
--- a/chart2/source/model/template/BubbleChartType.hxx
+++ b/chart2/source/model/template/BubbleChartType.hxx
@@ -41,9 +41,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
explicit BubbleChartType( const BubbleChartType & rOther );
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index fb9d7023181b..3062cc2151c7 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -324,24 +324,9 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast(
::property::OPropertySet::setFastPropertyValue_NoBroadcast( nHandle, rValue );
}
-uno::Sequence< OUString > CandleStickChartType::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 3 );
- aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK;
- aServices[ 1 ] = "com.sun.star.chart2.ChartType";
- aServices[ 2 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL CandleStickChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString CandleStickChartType::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.CandleStickChartType") ;
}
@@ -354,7 +339,10 @@ sal_Bool SAL_CALL CandleStickChartType::supportsService( const OUString& rServic
css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK,
+ "com.sun.star.chart2.ChartType",
+ "com.sun.star.beans.PropertySet" };
}
} // namespace chart
diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx
index a4079f2b86fd..1bbca51d7814 100644
--- a/chart2/source/model/template/CandleStickChartType.hxx
+++ b/chart2/source/model/template/CandleStickChartType.hxx
@@ -40,9 +40,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
explicit CandleStickChartType( const CandleStickChartType & rOther );
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index 9871b1c11c10..664f3e2eeaa4 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -603,23 +603,9 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames()
}
// ____ XServiceInfo ____
-Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static()
-{
- Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = "com.sun.star.chart2.ChartTypeManager";
- aServices[ 1 ] = "com.sun.star.lang.MultiServiceFactory";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL ChartTypeManager::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString ChartTypeManager::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.ChartTypeManager");
}
@@ -632,7 +618,9 @@ sal_Bool SAL_CALL ChartTypeManager::supportsService( const OUString& rServiceNam
css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ "com.sun.star.chart2.ChartTypeManager",
+ "com.sun.star.lang.MultiServiceFactory" };
}
} // namespace chart
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index c2b01466da8f..3b6f23cca403 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -185,23 +185,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertyS
return *StaticColumnChartTypeInfo::get();
}
-uno::Sequence< OUString > ColumnChartType::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 2 );
- aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_COLUMN;
- aServices[ 1 ] = "com.sun.star.chart2.ChartType";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL ColumnChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString ColumnChartType::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.ColumnChartType");
}
@@ -214,7 +200,9 @@ sal_Bool SAL_CALL ColumnChartType::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_SERVICE_NAME_CHARTTYPE_COLUMN,
+ "com.sun.star.chart2.ChartType" };
}
} // namespace chart
diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx
index 3616a28ddece..f37f845c7ee4 100644
--- a/chart2/source/model/template/ColumnChartType.hxx
+++ b/chart2/source/model/template/ColumnChartType.hxx
@@ -39,9 +39,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
explicit ColumnChartType( const ColumnChartType & rOther );
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 55a8f1e6e685..100b6287a0cc 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -63,14 +63,9 @@ struct StaticColumnLineChartTypeTemplateDefaults_Initializer
::chart::tPropertyValueMap* operator()()
{
static ::chart::tPropertyValueMap aStaticDefaults;
- lcl_AddDefaultsToMap( aStaticDefaults );
+ ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( aStaticDefaults, PROP_COL_LINE_NUMBER_OF_LINES, 1 );
return &aStaticDefaults;
}
-private:
- static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
- {
- ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_COL_LINE_NUMBER_OF_LINES, 1 );
- }
};
struct StaticColumnLineChartTypeTemplateDefaults : public rtl::StaticAggregate< ::chart::tPropertyValueMap, StaticColumnLineChartTypeTemplateDefaults_Initializer >
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 73899a6d5976..9d106dabc2ca 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -379,20 +379,9 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > &
return bUseCategoriesAsX;
}
-Sequence< OUString > DataInterpreter::getSupportedServiceNames_Static()
-{
- return { "com.sun.star.chart2.DataInterpreter" };
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL DataInterpreter::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString DataInterpreter::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart2.DataInterpreter");
}
@@ -405,7 +394,7 @@ sal_Bool SAL_CALL DataInterpreter::supportsService( const OUString& rServiceName
css::uno::Sequence< OUString > SAL_CALL DataInterpreter::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return { "com.sun.star.chart2.DataInterpreter" };
}
} // namespace chart
diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx
index 8815496681fb..008144b54af8 100644
--- a/chart2/source/model/template/DataInterpreter.hxx
+++ b/chart2/source/model/template/DataInterpreter.hxx
@@ -46,9 +46,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-
// convenience methods
static OUString GetRole( const css::uno::Reference< css::chart2::data::XDataSequence > & xSeq );
diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx
index 6831eaa999ab..661805a4a474 100644
--- a/chart2/source/model/template/FilledNetChartType.cxx
+++ b/chart2/source/model/template/FilledNetChartType.cxx
@@ -62,24 +62,9 @@ OUString SAL_CALL FilledNetChartType::getChartType()
return OUString(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET);
}
-uno::Sequence< OUString > FilledNetChartType::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 3 );
- aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET;
- aServices[ 1 ] = "com.sun.star.chart2.ChartType";
- aServices[ 2 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL FilledNetChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString FilledNetChartType::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.FilledNetChartType");
}
@@ -92,7 +77,10 @@ sal_Bool SAL_CALL FilledNetChartType::supportsService( const OUString& rServiceN
css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET,
+ "com.sun.star.chart2.ChartType",
+ "com.sun.star.beans.PropertySet" };
}
} // namespace chart
diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx
index d7ddbaa9f790..e308258426ae 100644
--- a/chart2/source/model/template/FilledNetChartType.hxx
+++ b/chart2/source/model/template/FilledNetChartType.hxx
@@ -39,9 +39,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
explicit FilledNetChartType( const FilledNetChartType & rOther );
diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx
index e936caa983ce..f18c9c941b23 100644
--- a/chart2/source/model/template/GL3DBarChartType.cxx
+++ b/chart2/source/model/template/GL3DBarChartType.cxx
@@ -104,11 +104,6 @@ GL3DBarChartType::~GL3DBarChartType() {}
OUString SAL_CALL GL3DBarChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString GL3DBarChartType::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.GL3DBarChartType");
}
@@ -121,16 +116,10 @@ sal_Bool SAL_CALL GL3DBarChartType::supportsService( const OUString& rServiceNam
css::uno::Sequence< OUString > SAL_CALL GL3DBarChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
-}
-
-uno::Sequence<OUString> GL3DBarChartType::getSupportedServiceNames_Static()
-{
- uno::Sequence<OUString> aServices(3);
- aServices[0] = CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR;
- aServices[1] = "com.sun.star.chart2.ChartType";
- aServices[2] = "com.sun.star.beans.PropertySet";
- return aServices;
+ return {
+ CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR,
+ "com.sun.star.chart2.ChartType",
+ "com.sun.star.beans.PropertySet" };
}
OUString SAL_CALL GL3DBarChartType::getChartType()
diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx
index dc2680871c72..939b9819516c 100644
--- a/chart2/source/model/template/GL3DBarChartType.hxx
+++ b/chart2/source/model/template/GL3DBarChartType.hxx
@@ -36,9 +36,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
GL3DBarChartType( const GL3DBarChartType& rOther );
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index f2e2b5a5da34..db1a2bd2f748 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -186,24 +186,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySet
return *StaticLineChartTypeInfo::get();
}
-uno::Sequence< OUString > LineChartType::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 3 );
- aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_LINE;
- aServices[ 1 ] = "com.sun.star.chart2.ChartType";
- aServices[ 2 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL LineChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString LineChartType::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.LineChartType");
}
@@ -216,7 +201,10 @@ sal_Bool SAL_CALL LineChartType::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_SERVICE_NAME_CHARTTYPE_LINE,
+ "com.sun.star.chart2.ChartType",
+ "com.sun.star.beans.PropertySet" };
}
} // namespace chart
diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx
index 17190dd59084..fa7e2b405d4a 100644
--- a/chart2/source/model/template/LineChartType.hxx
+++ b/chart2/source/model/template/LineChartType.hxx
@@ -40,9 +40,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
explicit LineChartType( const LineChartType & rOther );
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index b04892f6bd45..b079b87e7360 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -166,24 +166,9 @@ OUString SAL_CALL NetChartType::getChartType()
return OUString(CHART2_SERVICE_NAME_CHARTTYPE_NET);
}
-uno::Sequence< OUString > NetChartType::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 3 );
- aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_NET;
- aServices[ 1 ] = "com.sun.star.chart2.ChartType";
- aServices[ 2 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL NetChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString NetChartType::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.NetChartType");
}
@@ -196,7 +181,10 @@ sal_Bool SAL_CALL NetChartType::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_SERVICE_NAME_CHARTTYPE_NET,
+ "com.sun.star.chart2.ChartType",
+ "com.sun.star.beans.PropertySet" };
}
} // namespace chart
diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx
index ea931ea702df..b12a4cc3e78c 100644
--- a/chart2/source/model/template/NetChartType.hxx
+++ b/chart2/source/model/template/NetChartType.hxx
@@ -66,9 +66,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
explicit NetChartType( const NetChartType & rOther );
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 1f7adf73f1df..70badb000b23 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -223,24 +223,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetI
return *StaticPieChartTypeInfo::get();
}
-uno::Sequence< OUString > PieChartType::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 3 );
- aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_PIE;
- aServices[ 1 ] = "com.sun.star.chart2.ChartType";
- aServices[ 2 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL PieChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString PieChartType::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.PieChartType");
}
@@ -253,7 +238,10 @@ sal_Bool SAL_CALL PieChartType::supportsService( const OUString& rServiceName )
css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_SERVICE_NAME_CHARTTYPE_PIE,
+ "com.sun.star.chart2.ChartType",
+ "com.sun.star.beans.PropertySet" };
}
} // namespace chart
diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx
index 19aa8f2050b0..f67987073cba 100644
--- a/chart2/source/model/template/PieChartType.hxx
+++ b/chart2/source/model/template/PieChartType.hxx
@@ -40,9 +40,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
explicit PieChartType( const PieChartType & rOther );
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 9caf5a0437d0..f178d5383ebb 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -246,24 +246,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getProperty
return *StaticScatterChartTypeInfo::get();
}
-uno::Sequence< OUString > ScatterChartType::getSupportedServiceNames_Static()
-{
- uno::Sequence< OUString > aServices( 3 );
- aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_SCATTER;
- aServices[ 1 ] = "com.sun.star.chart2.ChartType";
- aServices[ 2 ] = "com.sun.star.beans.PropertySet";
- return aServices;
-}
-
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
OUString SAL_CALL ScatterChartType::getImplementationName()
throw( css::uno::RuntimeException, std::exception )
{
- return getImplementationName_Static();
-}
-
-OUString ScatterChartType::getImplementationName_Static()
-{
return OUString("com.sun.star.comp.chart.ScatterChartType");
}
@@ -276,7 +261,10 @@ sal_Bool SAL_CALL ScatterChartType::supportsService( const OUString& rServiceNam
css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception )
{
- return getSupportedServiceNames_Static();
+ return {
+ CHART2_SERVICE_NAME_CHARTTYPE_SCATTER,
+ "com.sun.star.chart2.ChartType",
+ "com.sun.star.beans.PropertySet" };
}
} // namespace chart
diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx
index 117364065550..64ea32e308aa 100644
--- a/chart2/source/model/template/ScatterChartType.hxx
+++ b/chart2/source/model/template/ScatterChartType.hxx
@@ -44,9 +44,6 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
throw( css::uno::RuntimeException, std::exception ) override;
- static OUString getImplementationName_Static();
- static css::uno::Sequence< OUString >
- getSupportedServiceNames_Static();
protected:
explicit ScatterChartType( const ScatterChartType & rOther );