loplugin:expandablemethods in UnoControls..vbahelper

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

20 files changed, 15 insertions, 74 deletions

diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 2be5cb5e68f9..f78686e483fb 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -352,12 +352,6 @@ public:
     virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
     virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override;
 
-    //  impl but public method to register service
-
-    static const css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
-
-    static const OUString impl_getStaticImplementationName();
-
 protected:
     using OComponentHelper::disposing;
 
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx
index 2bbf46556649..b9c7e4cf0052 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -196,7 +196,7 @@ Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeEx
 
 OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException, std::exception )
 {
-    return impl_getStaticImplementationName();
+    return OUString();
 }
 
 //  XServiceInfo
@@ -210,7 +210,7 @@ sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) t
 
 Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException, std::exception )
 {
-    return impl_getStaticSupportedServiceNames();
+    return Sequence< OUString >();
 }
 
 //  XComponent
@@ -702,22 +702,6 @@ void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw(
 {
 }
 
-//  impl but public method to register service in DLL
-//  (In this BASE-implementation not implemented! Overwrite it in derived classes.)
-
-const Sequence< OUString > BaseControl::impl_getStaticSupportedServiceNames()
-{
-    return Sequence< OUString >();
-}
-
-//  impl but public method to register service in DLL
-//  (In this BASE-implementation not implemented! Overwrite it in derived classes.)
-
-const OUString BaseControl::impl_getStaticImplementationName()
-{
-    return OUString();
-}
-
 //  protected method
 
 WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindowPeer >& xParentPeer )
diff --git a/compilerplugins/clang/expandablemethods.cxx b/compilerplugins/clang/expandablemethods.cxx
index 73946f5e3c1c..9d57ce8bb7b5 100644
--- a/compilerplugins/clang/expandablemethods.cxx
+++ b/compilerplugins/clang/expandablemethods.cxx
@@ -315,7 +315,7 @@ bool ExpandableMethods::isCalleeFunctionInteresting(const FunctionDecl* function
     return true;
 }
 
-loplugin::Plugin::Registration< ExpandableMethods > X("expandablemethods", false);
+loplugin::Plugin::Registration< ExpandableMethods > X("expandablemethods", true);
 
 }
 
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index c9ccf70d78ac..19ba94a9739c 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -186,7 +186,7 @@ UcbStore::createPropertySetRegistry( const OUString& )
     {
         osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
         if ( !m_pImpl->m_xTheRegistry.is() )
-            m_pImpl->m_xTheRegistry = new PropertySetRegistry( m_xContext, getInitArgs() );
+            m_pImpl->m_xTheRegistry = new PropertySetRegistry( m_xContext, m_pImpl->m_aInitArgs );
     }
 
     return m_pImpl->m_xTheRegistry;
@@ -205,11 +205,6 @@ void SAL_CALL UcbStore::initialize( const Sequence< Any >& aArguments )
 }
 
 
-const Sequence< Any >& UcbStore::getInitArgs() const
-{
-    return m_pImpl->m_aInitArgs;
-}
-
 
 // PropertySetRegistry_Impl.
 
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 312c5571932e..c0c8de3fb075 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -83,9 +83,6 @@ public:
     initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
         throw( css::uno::Exception,
                css::uno::RuntimeException, std::exception ) override;
-
-    const css::uno::Sequence< css::uno::Any >&
-    getInitArgs() const;
 };
 
 
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 8b873b6ef789..b9d530cbb531 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -1333,8 +1333,8 @@ void SortedResultSet::PropertyChanged( const PropertyChangeEvent& rEvt )
 
 void SortedResultSet::CopyData( SortedResultSet *pSource )
 {
-    const SortedEntryList& rSrcS2O = pSource->GetS2OList();
-    const SimpleList&      rSrcO2S = pSource->GetO2SList();
+    const SortedEntryList& rSrcS2O = pSource->maS2O;
+    const SimpleList&      rSrcO2S = pSource->maO2S;
 
     sal_IntPtr i, nCount;
 
@@ -1354,11 +1354,11 @@ void SortedResultSet::CopyData( SortedResultSet *pSource )
     }
 
     mnLastSort = maS2O.Count();
-    mxOther = pSource->GetResultSet();
+    mxOther = pSource->mxOriginal;
 
     if ( !mpSortInfo )
     {
-        mpSortInfo = pSource->GetSortInfo();
+        mpSortInfo = pSource->mpSortInfo;
         mbIsCopy = true;
     }
 }
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index 065405532e19..b0b575a05ea9 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -164,11 +164,7 @@ public:
                         SortedResultSet( css::uno::Reference< css::sdbc::XResultSet > const & aResult );
                         virtual ~SortedResultSet() override;
 
-    const SortedEntryList&      GetS2OList() const { return maS2O; }
-    const SimpleList&           GetO2SList() const { return maO2S; }
-    const css::uno::Reference < css::sdbc::XResultSet >& GetResultSet() const { return mxOriginal; }
-    SortInfo*                   GetSortInfo() const { return mpSortInfo; }
-    sal_IntPtr                  GetCount() const { return mnCount; }
+    sal_IntPtr          GetCount() const { return mnCount; }
 
     void                CopyData( SortedResultSet* pSource );
     void                Initialize( const css::uno::Sequence < css::ucb::NumberedSortingInfo > &xSortInfo,
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index 5007c9ac8e59..4eb418dba25c 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
@@ -119,7 +119,7 @@ Storage::~Storage()
         m_xAggProxy->setDelegator( uno::Reference< uno::XInterface >() );
 
     // Never dispose a document storage. Not owner!
-    if ( !isDocumentStorage() )
+    if ( !m_bIsDocumentStorage )
     {
         if ( m_xWrappedComponent.is() )
         {
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index 30c3cff93e79..4b7c370fb42f 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
@@ -81,8 +81,6 @@ public:
         const css::uno::Reference< css::embed::XStorage > & xStorageToWrap );
     virtual ~Storage() override;
 
-    bool isDocumentStorage() const { return m_bIsDocumentStorage; }
-
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface(
             const css::uno::Type& aType )
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 4b57e264a772..167db086a965 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -249,7 +249,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
             return;
 
         //TODO! remove this backwards compatibility?
-        OUString aContext(getContextProperty());
+        OUString aContext(m_aContextParam);
         if (aContext.isEmpty() && nErrorCode != 0)
         {
             SolarMutexGuard aGuard;
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index cec08b5d19df..e587a831e457 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -977,12 +977,6 @@ UUIInteractionHelper::getParentXWindow() const
     return m_xWindowParam;
 }
 
-const OUString&
-UUIInteractionHelper::getContextProperty()
-{
-    return m_aContextParam;
-}
-
 uno::Reference< task::XInteractionHandler2 >
 UUIInteractionHelper::getInteractionHandler()
 {
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 85361e2b0b38..6543b345247f 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -130,9 +130,6 @@ private:
     const css::uno::Reference< css::awt::XWindow>&
     getParentXWindow() const;
 
-    const OUString&
-    getContextProperty();
-
     css::uno::Reference< css::task::XInteractionHandler2 >
     getInteractionHandler();
 
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 53da63af1952..162df6553831 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -33,7 +33,7 @@ void SSLWarnDialog::ViewCert()
 
     xDocumentDigitalSignatures = css::security::DocumentDigitalSignatures::createDefault( m_xContext );
 
-    xDocumentDigitalSignatures.get()->showCertificate(getCert());
+    xDocumentDigitalSignatures.get()->showCertificate(m_rXCert);
 }
 
 
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index 436dfdc4f350..42aa51026146 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -42,8 +42,6 @@ public:
         const css::uno::Reference< css::security::XCertificate >& rXCert,
         const css::uno::Reference< css::uno::XComponentContext >& xContext );
 
-    const css::uno::Reference< css::security::XCertificate >& getCert() { return m_rXCert; }
-
     virtual void response(short nResponseId) override;
 
     void setDescription1Text(const OUString &aText) { set_primary_text(aText); }
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index e3e38e72062c..291d618c9276 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -45,7 +45,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl, Button*, void)
     uno::Reference< css::security::XDocumentDigitalSignatures > xDocumentDigitalSignatures(
         css::security::DocumentDigitalSignatures::createDefault(m_xContext) );
 
-    xDocumentDigitalSignatures.get()->showCertificate(getCert());
+    xDocumentDigitalSignatures.get()->showCertificate(m_rXCert);
 }
 
 
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 6dfd3bea41f1..ad87b7579784 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -49,11 +49,6 @@ public:
     virtual ~UnknownAuthDialog() override;
     virtual void dispose() override;
 
-    const css::uno::Reference< css::security::XCertificate >& getCert()
-    {
-        return m_rXCert;
-    }
-
     void setDescriptionText(const OUString &rText)
     {
         set_primary_text(rText);
diff --git a/vbahelper/source/msforms/vbamultipage.cxx b/vbahelper/source/msforms/vbamultipage.cxx
index 605e1bca7c80..5ac79e3ad333 100644
--- a/vbahelper/source/msforms/vbamultipage.cxx
+++ b/vbahelper/source/msforms/vbamultipage.cxx
@@ -51,11 +51,6 @@ public:
         return ( mnPages > 0 );
     }
 };
-uno::Reference< container::XIndexAccess >
-ScVbaMultiPage::getPages( sal_Int32 nPages )
-{
-    return new PagesImpl( nPages );
-}
 
 ScVbaMultiPage::ScVbaMultiPage(
         const uno::Reference< ov::XHelperInterface >& xParent,
@@ -99,7 +94,7 @@ ScVbaMultiPage::Pages( const uno::Any& index ) throw (uno::RuntimeException, std
 {
     // get the container model
     uno::Reference< container::XNameContainer > xContainer( m_xProps, uno::UNO_QUERY_THROW );
-    uno::Reference< XCollection > xColl( new ScVbaPages( this, mxContext, getPages( xContainer->getElementNames().getLength() ) ) );
+    uno::Reference< XCollection > xColl( new ScVbaPages( this, mxContext, new PagesImpl( xContainer->getElementNames().getLength() ) ) );
     if ( !index.hasValue() )
         return uno::makeAny( xColl );
     return xColl->Item( index, uno::Any() );
diff --git a/vbahelper/source/msforms/vbamultipage.hxx b/vbahelper/source/msforms/vbamultipage.hxx
index 56555c344d25..ba260cfb0cc0 100644
--- a/vbahelper/source/msforms/vbamultipage.hxx
+++ b/vbahelper/source/msforms/vbamultipage.hxx
@@ -31,7 +31,6 @@ typedef cppu::ImplInheritanceHelper< ScVbaControl, ov::msforms::XMultiPage > Mul
 
 class ScVbaMultiPage : public MultiPageImpl_BASE
 {
-    static css::uno::Reference< css::container::XIndexAccess > getPages( sal_Int32 nPages );
 public:
     ScVbaMultiPage(
         const css::uno::Reference< ov::XHelperInterface >& xParent,
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index 1a622050adc2..e6be3a8a3a08 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -208,7 +208,7 @@ ScVbaCommandBarControls::Add( const uno::Any& Type, const uno::Any& Id, const un
     uno::Sequence< beans::PropertyValue > aProps;
     OUString sHelpUrl;
     sal_uInt16 nItemType = 0;
-    if( IsMenu() )
+    if( m_bIsMenu )
     {
         aProps = CreateMenuItemData( sCommandUrl, sHelpUrl, sLabel, nItemType, aSubMenu, true, true );
     }
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
index 14348b515c61..28ec91fdb29e 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.hxx
@@ -46,7 +46,6 @@ private:
 
 public:
     ScVbaCommandBarControls( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess, VbaCommandBarHelperRef const & pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl ) throw( css::uno::RuntimeException );
-    bool IsMenu(){ return m_bIsMenu; }
 
     // XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) override;