5 files changed, 5 insertions, 42 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index c79a917ba285..5998cfd8343f 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -361,11 +361,6 @@ bool ChartController::impl_isDisposedOrSuspended() const
 OUString SAL_CALL ChartController::getImplementationName()
     throw( css::uno::RuntimeException, std::exception )
 {
-    return getImplementationName_Static();
-}
-
-OUString ChartController::getImplementationName_Static()
-{
     return OUString(CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME);
 }
 
@@ -378,16 +373,11 @@ sal_Bool SAL_CALL ChartController::supportsService( const OUString& rServiceName
 css::uno::Sequence< OUString > SAL_CALL ChartController::getSupportedServiceNames()
     throw( css::uno::RuntimeException, std::exception )
 {
-    return getSupportedServiceNames_Static();
-}
-
-uno::Sequence< OUString > ChartController::getSupportedServiceNames_Static()
-{
-    uno::Sequence< OUString > aSNS( 2 );
-    aSNS.getArray()[ 0 ] = CHART_CONTROLLER_SERVICE_NAME;
-    aSNS.getArray()[ 1 ] = "com.sun.star.frame.Controller";
-    //// @todo : add additional services if you support any further
-    return aSNS;
+    return {
+        CHART_CONTROLLER_SERVICE_NAME,
+        "com.sun.star.frame.Controller"
+        //// @todo : add additional services if you support any further
+    };
 }
 
 namespace {
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index 594be4bd3dc2..a8d506834150 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -59,11 +59,6 @@ bool ChartFrameLoader::impl_checkCancel()
 OUString SAL_CALL ChartFrameLoader::getImplementationName()
     throw( css::uno::RuntimeException, std::exception )
 {
-    return getImplementationName_Static();
-}
-
-OUString ChartFrameLoader::getImplementationName_Static()
-{
     return OUString(CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME);
 }
 
@@ -76,11 +71,6 @@ sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString& rServiceNam
 css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNames()
     throw( css::uno::RuntimeException, std::exception )
 {
-    return getSupportedServiceNames_Static();
-}
-
-uno::Sequence< OUString > ChartFrameLoader::getSupportedServiceNames_Static()
-{
     return { CHART_FRAMELOADER_SERVICE_NAME };
 }
 
diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx
index 765fdfc8e5b4..159375b21d36 100644
--- a/chart2/source/controller/main/ChartFrameloader.hxx
+++ b/chart2/source/controller/main/ChartFrameloader.hxx
@@ -55,9 +55,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();
-
     // css::frame::XFrameLoader
 
     virtual sal_Bool SAL_CALL
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index e45b280d6f94..ef9a4515a41d 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -243,15 +243,9 @@ Reference< css::accessibility::XAccessible > SelectorListBox::CreateAccessible()
     return ListBox::CreateAccessible();
 }
 
-// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
 OUString SAL_CALL ElementSelectorToolbarController::getImplementationName()
     throw( css::uno::RuntimeException, std::exception )
 {
-    return getImplementationName_Static();
-}
-
-OUString ElementSelectorToolbarController::getImplementationName_Static()
-{
     return OUString(lcl_aServiceName);
 }
 
@@ -264,11 +258,6 @@ sal_Bool SAL_CALL ElementSelectorToolbarController::supportsService( const OUStr
 css::uno::Sequence< OUString > SAL_CALL ElementSelectorToolbarController::getSupportedServiceNames()
     throw( css::uno::RuntimeException, std::exception )
 {
-    return getSupportedServiceNames_Static();
-}
-
-Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static()
-{
     return { "com.sun.star.frame.ToolbarController" };
 }
 ElementSelectorToolbarController::ElementSelectorToolbarController()
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index d8e6e896c213..acb7d2cf3034 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -80,9 +80,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();
-
     // XInterface
      virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
      virtual void SAL_CALL acquire() throw () override;