loplugin:mergeclasses

Change-Id: I1347e51ef727da81be0c7937cad6e3f5edbf15a8

3 files changed, 10 insertions, 24 deletions

diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index f64322c106a7..e00a7a604a8b 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -163,7 +163,6 @@ merge dbp::OModuleResourceClient with dbp::OUnoAutoPilot
 merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables
 merge formula::ExternalReferenceHelper with ScExternalRefManager
 merge formula::IStructHelper with formula::StructPage
-merge framework::IListBoxListener with framework::DropdownToolbarController
 merge framework::ISpinfieldListener with framework::SpinfieldToolbarController
 merge framework::IStorageListener with framework::XMLBasedAcceleratorConfiguration
 merge frm::IAttributeHandler with frm::AttributeHandler
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index 956b53b13eff..eab137d5aff0 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -35,20 +35,7 @@ namespace framework
 
 class ListBoxControl;
 
-class IListBoxListener
-{
-    public:
-        virtual void Select() = 0;
-        virtual void DoubleClick() = 0;
-        virtual void GetFocus() = 0;
-        virtual void LoseFocus() = 0;
-        virtual bool PreNotify( NotifyEvent& rNEvt ) = 0;
-    protected:
-        ~IListBoxListener() {}
-};
-
-class DropdownToolbarController : public IListBoxListener,
-                                  public ComplexToolbarController
+class DropdownToolbarController : public ComplexToolbarController
 
 {
     public:
@@ -63,12 +50,12 @@ class DropdownToolbarController : public IListBoxListener,
         // XComponent
         virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-        // IListBoxListener
-        virtual void Select() SAL_OVERRIDE;
-        virtual void DoubleClick() SAL_OVERRIDE;
-        virtual void GetFocus() SAL_OVERRIDE;
-        virtual void LoseFocus() SAL_OVERRIDE;
-        virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+        // called from ListBoxControl
+        void Select();
+        void DoubleClick();
+        void GetFocus();
+        void LoseFocus();
+        bool PreNotify( NotifyEvent& rNEvt );
 
     protected:
         virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) SAL_OVERRIDE;
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 34f0bfe842aa..8a086dd09690 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -52,7 +52,7 @@ namespace framework
 class ListBoxControl : public ListBox
 {
     public:
-        ListBoxControl( vcl::Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener );
+        ListBoxControl( vcl::Window* pParent, WinBits nStyle, DropdownToolbarController* pListBoxListener );
         virtual ~ListBoxControl();
         virtual void dispose() SAL_OVERRIDE;
 
@@ -63,10 +63,10 @@ class ListBoxControl : public ListBox
         virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
     private:
-        IListBoxListener* m_pListBoxListener;
+        DropdownToolbarController* m_pListBoxListener;
 };
 
-ListBoxControl::ListBoxControl( vcl::Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener ) :
+ListBoxControl::ListBoxControl( vcl::Window* pParent, WinBits nStyle, DropdownToolbarController* pListBoxListener ) :
     ListBox( pParent, nStyle )
     , m_pListBoxListener( pListBoxListener )
 {