loplugin:expandablemethodds in filter..forms

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

4 files changed, 3 insertions, 17 deletions

diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx
index 8e4cdfaa0d0f..e1011b17f26f 100644
--- a/forms/source/component/EventThread.cxx
+++ b/forms/source/component/EventThread.cxx
@@ -135,28 +135,18 @@ void OComponentEventThread::addEvent( const EventObject* _pEvt,
     m_aCond.set();
 }
 
-void OComponentEventThread::implStarted( )
-{
-    acquire( );
-}
-
-void OComponentEventThread::implTerminated( )
-{
-    release( );
-}
-
 void SAL_CALL OComponentEventThread::onTerminated()
 {
     OComponentEventThread_TBASE::onTerminated();
 
-    implTerminated( );
+    release( );
 }
 
 void OComponentEventThread::run()
 {
     osl_setThreadName("frm::OComponentEventThread");
 
-    implStarted( );
+    acquire( );
 
     // Hold on to ourselves, so that we're not deleted if a dispose is called at some point in time
     css::uno::Reference<css::uno::XInterface> xThis(static_cast<XWeak*>(this));
diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx
index 71edb846e855..e8472f54419c 100644
--- a/forms/source/component/EventThread.hxx
+++ b/forms/source/component/EventThread.hxx
@@ -101,9 +101,6 @@ public:
     void SAL_CALL operator delete( void * p ) throw() { osl::Thread::operator delete(p); }
 
 private:
-    void    implStarted( );
-    void    implTerminated( );
-
     void    impl_clearEventQueue();
 };
 
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index 4bde4ddf7085..1ff40b5abb27 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -62,7 +62,7 @@ OGroupCompAcc::OGroupCompAcc(const Reference<XPropertySet>& rxElement, const OGr
 
 bool OGroupCompAcc::operator==( const OGroupCompAcc& rCompAcc ) const
 {
-    return (m_xComponent == rCompAcc.GetComponent());
+    return m_xComponent == rCompAcc.m_xComponent;
 }
 
 class OGroupCompAccLess : public ::std::binary_function<OGroupCompAcc, OGroupCompAcc, sal_Bool>
diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx
index d0b45fd5f424..35f1c9ecb40b 100644
--- a/forms/source/component/GroupManager.hxx
+++ b/forms/source/component/GroupManager.hxx
@@ -127,7 +127,6 @@ public:
 
     bool operator==( const OGroupCompAcc& rCompAcc ) const;
 
-    inline const css::uno::Reference< css::beans::XPropertySet>&  GetComponent() const { return m_xComponent; }
     const OGroupComp&   GetGroupComponent() const { return m_aGroupComp; }
 };