loplugin:mergeclasses

Change-Id: I131d192a0029ec3eebacb72341ba3113de0e19ac

2 files changed, 39 insertions, 58 deletions

diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index b2f5efe2339e..a09663a064a7 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -35,26 +35,7 @@ namespace framework
 
 class SpinfieldControl;
 
-class ISpinfieldListener
-{
-    public:
-        virtual void Up() = 0;
-        virtual void Down() = 0;
-        virtual void First() = 0;
-        virtual void Last() = 0;
-        virtual void KeyInput( const KeyEvent& rKEvt ) = 0;
-        virtual void Modify() = 0;
-        virtual void GetFocus() = 0;
-        virtual void StateChanged( StateChangedType nType ) = 0;
-        virtual void DataChanged( const DataChangedEvent& rDCEvt ) = 0;
-        virtual bool PreNotify( NotifyEvent& rNEvt ) = 0;
-
-    protected:
-        ~ISpinfieldListener() {}
-};
-
-class SpinfieldToolbarController : public ISpinfieldListener,
-                                   public ComplexToolbarController
+class SpinfieldToolbarController : public ComplexToolbarController
 
 {
     public:
@@ -69,17 +50,17 @@ class SpinfieldToolbarController : public ISpinfieldListener,
         // XComponent
         virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-        // ISpinfieldListener
-        virtual void Up() SAL_OVERRIDE;
-        virtual void Down() SAL_OVERRIDE;
-        virtual void First() SAL_OVERRIDE;
-        virtual void Last() SAL_OVERRIDE;
-        virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
-        virtual void Modify() SAL_OVERRIDE;
-        virtual void GetFocus() SAL_OVERRIDE;
-        virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
-        virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
-        virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+        // called from SpinfieldControl
+        void Up();
+        void Down();
+        void First();
+        void Last();
+        void KeyInput( const KeyEvent& rKEvt );
+        void Modify();
+        void GetFocus();
+        void StateChanged( StateChangedType nType );
+        void DataChanged( const DataChangedEvent& rDCEvt );
+        bool PreNotify( NotifyEvent& rNEvt );
 
     protected:
         virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) SAL_OVERRIDE;
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index 21c2d572f92b..747c629a9046 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -56,7 +56,7 @@ namespace framework
 class SpinfieldControl : public SpinField
 {
     public:
-        SpinfieldControl( vcl::Window* pParent, WinBits nStyle, ISpinfieldListener* pSpinFieldListener );
+        SpinfieldControl( vcl::Window* pParent, WinBits nStyle, SpinfieldToolbarController* pSpinfieldToolbarController );
         virtual ~SpinfieldControl();
         virtual void dispose() SAL_OVERRIDE;
 
@@ -73,12 +73,12 @@ class SpinfieldControl : public SpinField
         virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
     private:
-        ISpinfieldListener* m_pSpinFieldListener;
+        SpinfieldToolbarController* m_pSpinfieldToolbarController;
 };
 
-SpinfieldControl::SpinfieldControl( vcl::Window* pParent, WinBits nStyle, ISpinfieldListener* pSpinFieldListener ) :
+SpinfieldControl::SpinfieldControl( vcl::Window* pParent, WinBits nStyle, SpinfieldToolbarController* pSpinfieldToolbarController ) :
     SpinField( pParent, nStyle )
-    , m_pSpinFieldListener( pSpinFieldListener )
+    , m_pSpinfieldToolbarController( pSpinfieldToolbarController )
 {
 }
 
@@ -89,85 +89,85 @@ SpinfieldControl::~SpinfieldControl()
 
 void SpinfieldControl::dispose()
 {
-    m_pSpinFieldListener = 0;
+    m_pSpinfieldToolbarController = 0;
     SpinField::dispose();
 }
 
 void SpinfieldControl::Up()
 {
     SpinField::Up();
-    if ( m_pSpinFieldListener )
-        m_pSpinFieldListener->Up();
+    if ( m_pSpinfieldToolbarController )
+        m_pSpinfieldToolbarController->Up();
 }
 
 void SpinfieldControl::Down()
 {
     SpinField::Down();
-    if ( m_pSpinFieldListener )
-        m_pSpinFieldListener->Down();
+    if ( m_pSpinfieldToolbarController )
+        m_pSpinfieldToolbarController->Down();
 }
 
 void SpinfieldControl::First()
 {
     SpinField::First();
-    if ( m_pSpinFieldListener )
-        m_pSpinFieldListener->First();
+    if ( m_pSpinfieldToolbarController )
+        m_pSpinfieldToolbarController->First();
 }
 
 void SpinfieldControl::Last()
 {
     SpinField::First();
-    if ( m_pSpinFieldListener )
-        m_pSpinFieldListener->Last();
+    if ( m_pSpinfieldToolbarController )
+        m_pSpinfieldToolbarController->Last();
 }
 
 void SpinfieldControl::KeyInput( const ::KeyEvent& rKEvt )
 {
     SpinField::KeyInput( rKEvt );
-    if ( m_pSpinFieldListener )
-        m_pSpinFieldListener->KeyInput( rKEvt );
+    if ( m_pSpinfieldToolbarController )
+        m_pSpinfieldToolbarController->KeyInput( rKEvt );
 }
 
 void SpinfieldControl::Modify()
 {
     SpinField::Modify();
-    if ( m_pSpinFieldListener )
-        m_pSpinFieldListener->Modify();
+    if ( m_pSpinfieldToolbarController )
+        m_pSpinfieldToolbarController->Modify();
 }
 
 void SpinfieldControl::GetFocus()
 {
     SpinField::GetFocus();
-    if ( m_pSpinFieldListener )
-        m_pSpinFieldListener->GetFocus();
+    if ( m_pSpinfieldToolbarController )
+        m_pSpinfieldToolbarController->GetFocus();
 }
 
 void SpinfieldControl::LoseFocus()
 {
     SpinField::GetFocus();
-    if ( m_pSpinFieldListener )
-        m_pSpinFieldListener->GetFocus();
+    if ( m_pSpinfieldToolbarController )
+        m_pSpinfieldToolbarController->GetFocus();
 }
 
 void SpinfieldControl::StateChanged( StateChangedType nType )
 {
     SpinField::StateChanged( nType );
-    if ( m_pSpinFieldListener )
-        m_pSpinFieldListener->StateChanged( nType );
+    if ( m_pSpinfieldToolbarController )
+        m_pSpinfieldToolbarController->StateChanged( nType );
 }
 
 void SpinfieldControl::DataChanged( const DataChangedEvent& rDCEvt )
 {
     SpinField::DataChanged( rDCEvt );
-    if ( m_pSpinFieldListener )
-        m_pSpinFieldListener->DataChanged( rDCEvt );
+    if ( m_pSpinfieldToolbarController )
+        m_pSpinfieldToolbarController->DataChanged( rDCEvt );
 }
 
 bool SpinfieldControl::PreNotify( NotifyEvent& rNEvt )
 {
     bool bRet = false;
-    if ( m_pSpinFieldListener )
-        bRet = m_pSpinFieldListener->PreNotify( rNEvt );
+    if ( m_pSpinfieldToolbarController )
+        bRet = m_pSpinfieldToolbarController->PreNotify( rNEvt );
     if ( !bRet )
         bRet = SpinField::PreNotify( rNEvt );