3 files changed, 22 insertions, 37 deletions

diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results
index ef38b98dab58..22678bfe5323 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::IEditListener with framework::EditToolbarController
 merge framework::ILayoutNotifications with framework::LayoutManager
 merge framework::IListBoxListener with framework::DropdownToolbarController
 merge framework::ISpinfieldListener with framework::SpinfieldToolbarController
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index 0b8f9b6c90dc..8af5eeb93933 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -34,21 +34,7 @@ namespace framework
 
 class EditControl;
 
-class IEditListener
-{
-    public:
-        virtual void Modify() = 0;
-        virtual void KeyInput( const KeyEvent& rKEvt ) = 0;
-        virtual void GetFocus() = 0;
-        virtual void LoseFocus() = 0;
-        virtual bool PreNotify( NotifyEvent& rNEvt ) = 0;
-
-    protected:
-        ~IEditListener() {}
-};
-
-class EditToolbarController : public IEditListener,
-                              public ComplexToolbarController
+class EditToolbarController : public ComplexToolbarController
 
 {
     public:
@@ -63,12 +49,12 @@ class EditToolbarController : public IEditListener,
         // XComponent
         virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-        // IEditListener
-        virtual void Modify() SAL_OVERRIDE;
-        virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-        virtual void GetFocus() SAL_OVERRIDE;
-        virtual void LoseFocus() SAL_OVERRIDE;
-        virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+        // called from EditControl
+        void Modify();
+        void KeyInput( const KeyEvent& rKEvt );
+        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/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 1ec905902d76..e780d291ebbf 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -51,7 +51,7 @@ namespace framework
 class EditControl : public Edit
 {
     public:
-        EditControl( vcl::Window* pParent, WinBits nStyle, IEditListener* pEditListener );
+        EditControl( vcl::Window* pParent, WinBits nStyle, EditToolbarController* pEditToolbarController );
         virtual ~EditControl();
         virtual void dispose() SAL_OVERRIDE;
 
@@ -62,12 +62,12 @@ class EditControl : public Edit
         virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
     private:
-        IEditListener* m_pEditListener;
+        EditToolbarController* m_pEditToolbarController;
 };
 
-EditControl::EditControl( vcl::Window* pParent, WinBits nStyle, IEditListener* pEditListener ) :
+EditControl::EditControl( vcl::Window* pParent, WinBits nStyle, EditToolbarController* pEditToolbarController ) :
     Edit( pParent, nStyle )
-    , m_pEditListener( pEditListener )
+    , m_pEditToolbarController( pEditToolbarController )
 {
 }
 
@@ -78,43 +78,43 @@ EditControl::~EditControl()
 
 void EditControl::dispose()
 {
-    m_pEditListener = 0;
+    m_pEditToolbarController = 0;
     Edit::dispose();
 }
 
 void EditControl::Modify()
 {
     Edit::Modify();
-    if ( m_pEditListener )
-        m_pEditListener->Modify();
+    if ( m_pEditToolbarController )
+        m_pEditToolbarController->Modify();
 }
 
 void EditControl::KeyInput( const ::KeyEvent& rKEvt )
 {
     Edit::KeyInput( rKEvt );
-    if ( m_pEditListener )
-        m_pEditListener->KeyInput( rKEvt );
+    if ( m_pEditToolbarController )
+        m_pEditToolbarController->KeyInput( rKEvt );
 }
 
 void EditControl::GetFocus()
 {
     Edit::GetFocus();
-    if ( m_pEditListener )
-        m_pEditListener->GetFocus();
+    if ( m_pEditToolbarController )
+        m_pEditToolbarController->GetFocus();
 }
 
 void EditControl::LoseFocus()
 {
     Edit::LoseFocus();
-    if ( m_pEditListener )
-        m_pEditListener->LoseFocus();
+    if ( m_pEditToolbarController )
+        m_pEditToolbarController->LoseFocus();
 }
 
 bool EditControl::PreNotify( NotifyEvent& rNEvt )
 {
     bool bRet = false;
-    if ( m_pEditListener )
-        bRet = m_pEditListener->PreNotify( rNEvt );
+    if ( m_pEditToolbarController )
+        bRet = m_pEditToolbarController->PreNotify( rNEvt );
     if ( !bRet )
         bRet = Edit::PreNotify( rNEvt );