loplugin:expandablemethods in hwpfilter..linguistic

Change-Id: I62ae20ab4a47b3b7e2b0d503cedcad3319cc9c85
Reviewed-on: https://gerrit.libreoffice.org/30683
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 4 insertions, 45 deletions

diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index d955c4c29a63..73953556b0fe 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -644,7 +644,7 @@ void SAL_CALL ConvDic::removeFlushListener(
 OUString SAL_CALL ConvDic::getImplementationName(  )
     throw (RuntimeException, std::exception)
 {
-    return getImplementationName_Static();
+    return OUString( "com.sun.star.lingu2.ConvDic" );
 }
 
 sal_Bool SAL_CALL ConvDic::supportsService( const OUString& rServiceName )
@@ -656,15 +656,7 @@ sal_Bool SAL_CALL ConvDic::supportsService( const OUString& rServiceName )
 uno::Sequence< OUString > SAL_CALL ConvDic::getSupportedServiceNames(  )
     throw (RuntimeException, std::exception)
 {
-    return getSupportedServiceNames_Static();
-}
-
-
-uno::Sequence< OUString > ConvDic::getSupportedServiceNames_Static()
-    throw()
-{
-    uno::Sequence<OUString> aSNS { SN_CONV_DICTIONARY };
-    return aSNS;
+    return { SN_CONV_DICTIONARY };
 }
 
 
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index 44815515674e..e5d28b2a9489 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -122,23 +122,11 @@ public:
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
 
-
-    static inline OUString
-        getImplementationName_Static() throw();
-    static css::uno::Sequence< OUString >
-        getSupportedServiceNames_Static() throw();
-
     bool    HasEntry( const OUString &rLeftText, const OUString &rRightText );
     void    AddEntry( const OUString &rLeftText, const OUString &rRightText );
     void    RemoveEntry( const OUString &rLeftText, const OUString &rRightText );
 };
 
-inline OUString ConvDic::getImplementationName_Static() throw()
-{
-    return OUString( "com.sun.star.lingu2.ConvDic" );
-}
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index 66f9375a9969..fcb4a329cd2f 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -110,7 +110,7 @@ void SAL_CALL HHConvDic::addEntry(
 OUString SAL_CALL HHConvDic::getImplementationName(  )
     throw (RuntimeException, std::exception)
 {
-    return getImplementationName_Static();
+    return OUString( "com.sun.star.lingu2.HHConvDic" );
 }
 
 
@@ -124,17 +124,7 @@ sal_Bool SAL_CALL HHConvDic::supportsService( const OUString& rServiceName )
 uno::Sequence< OUString > SAL_CALL HHConvDic::getSupportedServiceNames(  )
     throw (RuntimeException, std::exception)
 {
-    return getSupportedServiceNames_Static();
-}
-
-
-uno::Sequence< OUString > HHConvDic::getSupportedServiceNames_Static()
-    throw()
-{
-    uno::Sequence< OUString > aSNS( 2 );
-    aSNS.getArray()[0] = SN_CONV_DICTIONARY;
-    aSNS.getArray()[1] = SN_HH_CONV_DICTIONARY;
-    return aSNS;
+    return { SN_CONV_DICTIONARY, SN_HH_CONV_DICTIONARY };
 }
 
 
diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index ed7c4497221e..e925c17d3dd8 100644
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -47,19 +47,8 @@ public:
     virtual OUString SAL_CALL getImplementationName(  ) throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (css::uno::RuntimeException, std::exception) override;
-
-
-    static inline OUString
-        getImplementationName_Static() throw();
-    static css::uno::Sequence< OUString >
-        getSupportedServiceNames_Static() throw();
 };
 
-inline OUString HHConvDic::getImplementationName_Static() throw()
-{
-    return OUString( "com.sun.star.lingu2.HHConvDic" );
-}
-
 
 #endif