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>

14 files changed, 12 insertions, 76 deletions

diff --git a/hwpfilter/source/hwpfile.cxx b/hwpfilter/source/hwpfile.cxx
index 0c8a88c07be6..3abfcac3086b 100644
--- a/hwpfilter/source/hwpfile.cxx
+++ b/hwpfilter/source/hwpfile.cxx
@@ -138,15 +138,10 @@ int HWPFile::SetState(int errcode)
     return error_code;
 }
 
-bool HWPFile::Read1b(unsigned char &out)
-{
-    return hiodev && hiodev->read1b(out);
-}
-
 bool HWPFile::Read1b(char &out)
 {
     unsigned char tmp8;
-    if (!Read1b(tmp8))
+    if (!hiodev || !hiodev->read1b(tmp8))
         return false;
     out = tmp8;
     return true;
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index 36e332de80c8..793354e4c508 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -125,7 +125,6 @@ class DLLEXPORT HWPFile
  * Reads one byte from HIODev
  */
         bool Read1b(char &out);
-        bool Read1b(unsigned char &out);
 /**
  * Reads two byte from HIODev
  */
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index d65ef5e6c29a..5140a553ef6b 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -39,7 +39,6 @@ class DefaultNumberingProvider : public cppu::WeakImplHelper
     css::lang::XServiceInfo
 >
 {
-    void impl_loadTranslit();
 public:
     DefaultNumberingProvider(
         const css::uno::Reference < css::uno::XComponentContext >& rxContext );
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index fe5bf48a6a16..a8ec5b2c4425 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -271,12 +271,6 @@ DefaultNumberingProvider::~DefaultNumberingProvider()
     delete translit;
 }
 
-void DefaultNumberingProvider::impl_loadTranslit()
-{
-    if ( !translit )
-        translit = new TransliterationImpl(m_xContext);
-}
-
 Sequence< Reference<container::XIndexAccess> >
 DefaultNumberingProvider::getDefaultOutlineNumberings(const Locale& rLocale ) throw(RuntimeException, std::exception)
 {
@@ -647,7 +641,8 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
                     const OUString &tmp = OUString::number( number );
                     OUString transliteration;
                     getPropertyByName(aProperties, "Transliteration", true) >>= transliteration;
-                    impl_loadTranslit();
+                    if ( !translit )
+                        translit = new TransliterationImpl(m_xContext);
                     translit->loadModuleByImplName(transliteration, aLocale);
                     result += translit->transliterateString2String(tmp, 0, tmp.getLength());
                } catch (Exception& ) {
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 87118d6cf8de..5513009ce3a4 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -88,9 +88,6 @@ public:
             }
 
 public:
-            SvMetaObject *  MakeClone() const;
-            SvMetaSlot *Clone() const { return static_cast<SvMetaSlot *>(MakeClone()); }
-
             SvMetaSlot();
             SvMetaSlot( SvMetaType * pType );
 
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index eee05ade65ea..9ae31d437cc9 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -27,11 +27,6 @@
 #include <database.hxx>
 
 
-SvMetaObject *SvMetaSlot::MakeClone() const
-{
-        return new SvMetaSlot( *this );
-}
-
 SvMetaSlot::SvMetaSlot()
     : aRecordPerSet( true )
     , aRecordAbsolute( false )
@@ -480,7 +475,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
                 if (aSId.equals(pAttr->GetSlotId().getString()))
                 {
                     SvMetaSlot& rSlot = dynamic_cast<SvMetaSlot&>(*pAttr);
-                    xEnumSlot = rSlot.Clone();
+                    xEnumSlot = new SvMetaSlot( rSlot );
                     break;
                 }
             }
@@ -488,7 +483,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
             if ( m == rBase.GetSlotList().size() )
             {
                 OSL_FAIL("Invalid EnumSlot!");
-                xEnumSlot = Clone();
+                xEnumSlot = new SvMetaSlot( *this );
                 sal_uLong nValue;
                 if ( rBase.FindId(aSId , &nValue) )
                 {
diff --git a/idlc/inc/astoperation.hxx b/idlc/inc/astoperation.hxx
index 85b12c8321d0..a4837cbe5ab0 100644
--- a/idlc/inc/astoperation.hxx
+++ b/idlc/inc/astoperation.hxx
@@ -42,8 +42,6 @@ public:
     bool isConstructor() const { return m_pReturnType == nullptr; }
 
     void setExceptions(DeclList const * pExceptions);
-    sal_uInt16 nExceptions()
-        { return (sal_uInt16)(m_exceptions.size()); }
 
     bool dumpBlob(typereg::Writer & rBlob, sal_uInt16 index);
 
diff --git a/idlc/source/astoperation.cxx b/idlc/source/astoperation.cxx
index cd6076b1f3a8..e88656f25db5 100644
--- a/idlc/source/astoperation.cxx
+++ b/idlc/source/astoperation.cxx
@@ -41,7 +41,7 @@ bool AstOperation::isVariadic() const {
 bool AstOperation::dumpBlob(typereg::Writer & rBlob, sal_uInt16 index)
 {
     sal_uInt16      nParam = getNodeCount(NT_parameter);
-    sal_uInt16      nExcep = nExceptions();
+    sal_uInt16      nExcep = (sal_uInt16)m_exceptions.size();
     RTMethodMode    methodMode = RTMethodMode::TWOWAY;
 
     OUString returnTypeName;
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 3c59d46d0198..8e8f57439bbe 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -162,8 +162,6 @@ private:
 
     static void CutComment( OString &rText );
 
-    void WriteUTF8ByteOrderMarkToOutput() { *aOutput.mSimple << '\xEF' << '\xBB' << '\xBF'; }
-
 public:
     Export( const OString &rOutput );
     Export(const OString &rMergeSource, const OString &rOutput, bool bUTF8BOM);
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index bb1aeab116ae..5a29d8d9a265 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -236,7 +236,8 @@ Export::Export(
         std::exit(EXIT_FAILURE);
     }
 
-    if ( bUTF8BOM ) WriteUTF8ByteOrderMarkToOutput();
+    if ( bUTF8BOM )
+        *aOutput.mSimple << '\xEF' << '\xBB' << '\xBF';
 }
 
 void Export::Init()
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