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>

3 files changed, 2 insertions, 22 deletions

diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index 44ca2824f041..1074d1e7138a 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -140,16 +140,6 @@ namespace comphelper
         css::uno::Reference< css::accessibility::XAccessible >
                 getAccessibleCreator( ) const;
 
-    private:
-        /** 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>
-        */
-        void    forgetExternalLock();
-
     public:
         // XAccessibleEventBroadcaster
         virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx
index b5cce3d17292..079c40d8f7bb 100644
--- a/include/comphelper/componentbase.hxx
+++ b/include/comphelper/componentbase.hxx
@@ -73,9 +73,9 @@ namespace comphelper
         /// retrieves the component's mutex
         inline  ::osl::Mutex&   getMutex( GuardAccess )                 { return getMutex(); }
         /// checks whether the component is already disposed, throws a DisposedException if so.
-        inline  void            checkDisposed( GuardAccess ) const      { impl_checkDisposed_throw(); }
+        void                    checkDisposed( GuardAccess ) const;
         /// checks whether the component is already initialized, throws a NotInitializedException if not.
-        inline  void            checkInitialized( GuardAccess ) const   { impl_checkInitialized_throw(); }
+        void                    checkInitialized( GuardAccess ) const;
 
     protected:
         /// retrieves the component's broadcast helper
@@ -85,12 +85,6 @@ namespace comphelper
         /// determines whether the instance is already disposed
         inline  bool                        impl_isDisposed() const { return m_rBHelper.bDisposed; }
 
-        /// checks whether the component is already disposed. Throws a DisposedException if so.
-        void    impl_checkDisposed_throw() const;
-
-        /// checks whether the component is already initialized. Throws a NotInitializedException if not.
-        void    impl_checkInitialized_throw() const;
-
         /// determines whether the component is already initialized
         inline  bool
                 impl_isInitialized_nothrow() const { return m_bInitialized; }
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index 756004234be7..2af3737e415a 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -202,10 +202,6 @@ namespace comphelper
         // XComponent/OComponentProxyAggregationHelper
         virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override;
 
-    protected:
-        // be called from within the dtor of derived classes
-        void implEnsureDisposeInDtor( );
-
     private:
         OComponentProxyAggregation( const OComponentProxyAggregation& ) = delete;
         OComponentProxyAggregation& operator=( const OComponentProxyAggregation& ) = delete;