loplugin:expandablemethods in comphelper..cppuhelper

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

4 files changed, 19 insertions, 29 deletions

diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index 55fbe2326d28..5f855ed20681 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -81,15 +81,17 @@ namespace comphelper
     }
 
 
-    void OAccessibleContextHelper::forgetExternalLock()
+    OAccessibleContextHelper::~OAccessibleContextHelper( )
     {
-        m_pImpl->setExternalLock( nullptr );
-    }
+        /* forgets the reference to the external lock, if present.
 
+           <p>This means any further locking will not be guard the external lock anymore, never.</p>
+
+           <p>To be used in derived classes which do not supply the external lock themself, but instead get
+           them passed from own derivees (or clients).</p>
+        */
+        m_pImpl->setExternalLock( nullptr );
 
-    OAccessibleContextHelper::~OAccessibleContextHelper( )
-    {
-        forgetExternalLock();
             // this ensures that the lock, which may be already destroyed as part of the derivee,
             // is not used anymore
 
diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx
index 2904e4675b23..9baec2363fa9 100644
--- a/comphelper/source/misc/componentbase.cxx
+++ b/comphelper/source/misc/componentbase.cxx
@@ -33,14 +33,14 @@ namespace comphelper
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
 
-    void ComponentBase::impl_checkDisposed_throw() const
+    void ComponentBase::checkDisposed( GuardAccess ) const
     {
         if ( m_rBHelper.bDisposed )
             throw DisposedException( OUString(), getComponent() );
     }
 
 
-    void ComponentBase::impl_checkInitialized_throw() const
+    void ComponentBase::checkInitialized( GuardAccess ) const
     {
         if ( !m_bInitialized )
             throw NotInitializedException( OUString(), getComponent() );
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index 452d2a365132..ed6a79c0c5f6 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -52,22 +52,16 @@ namespace comphelper
         Reference< XLogger >            m_xLogger;
 
     public:
-        EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName )
-            :m_aContext( _rxContext )
-            ,m_sLoggerName( _rLoggerName )
-        {
-            impl_createLogger_nothrow();
-        }
+        EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName );
 
         bool isValid() const { return m_xLogger.is(); }
         const Reference< XLogger >& getLogger() const { return m_xLogger; }
         const Reference< XComponentContext >& getContext() const { return m_aContext; }
-
-    private:
-        void    impl_createLogger_nothrow();
     };
 
-    void EventLogger_Impl::impl_createLogger_nothrow()
+    EventLogger_Impl::EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName )
+        :m_aContext( _rxContext )
+        ,m_sLoggerName( _rLoggerName )
     {
         try
         {
diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx
index 14de9eec0682..1f2181f6c13c 100644
--- a/comphelper/source/misc/proxyaggregation.cxx
+++ b/comphelper/source/misc/proxyaggregation.cxx
@@ -190,7 +190,11 @@ namespace comphelper
 
     OComponentProxyAggregation::~OComponentProxyAggregation()
     {
-        implEnsureDisposeInDtor( );
+        if ( !rBHelper.bDisposed )
+        {
+            acquire();  // to prevent duplicate dtor calls
+            dispose();
+        }
     }
 
 
@@ -213,16 +217,6 @@ namespace comphelper
     }
 
 
-    void OComponentProxyAggregation::implEnsureDisposeInDtor( )
-    {
-        if ( !rBHelper.bDisposed )
-        {
-            acquire();  // to prevent duplicate dtor calls
-            dispose();
-        }
-    }
-
-
     void SAL_CALL OComponentProxyAggregation::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception)
     {
         // Simply disambiguate---this is necessary for MSVC to distinguish