Kaydet (Commit) 3fbc3ade authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:mergeclasses

Change-Id: I1347e51ef727da81be0c7937cad6e3f5edbf15a8
üst 6fbbb850
...@@ -163,7 +163,6 @@ merge dbp::OModuleResourceClient with dbp::OUnoAutoPilot ...@@ -163,7 +163,6 @@ merge dbp::OModuleResourceClient with dbp::OUnoAutoPilot
merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables
merge formula::ExternalReferenceHelper with ScExternalRefManager merge formula::ExternalReferenceHelper with ScExternalRefManager
merge formula::IStructHelper with formula::StructPage merge formula::IStructHelper with formula::StructPage
merge framework::IListBoxListener with framework::DropdownToolbarController
merge framework::ISpinfieldListener with framework::SpinfieldToolbarController merge framework::ISpinfieldListener with framework::SpinfieldToolbarController
merge framework::IStorageListener with framework::XMLBasedAcceleratorConfiguration merge framework::IStorageListener with framework::XMLBasedAcceleratorConfiguration
merge frm::IAttributeHandler with frm::AttributeHandler merge frm::IAttributeHandler with frm::AttributeHandler
......
...@@ -35,20 +35,7 @@ namespace framework ...@@ -35,20 +35,7 @@ namespace framework
class ListBoxControl; class ListBoxControl;
class IListBoxListener class DropdownToolbarController : public ComplexToolbarController
{
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
{ {
public: public:
...@@ -63,12 +50,12 @@ class DropdownToolbarController : public IListBoxListener, ...@@ -63,12 +50,12 @@ class DropdownToolbarController : public IListBoxListener,
// XComponent // XComponent
virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL dispose() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// IListBoxListener // called from ListBoxControl
virtual void Select() SAL_OVERRIDE; void Select();
virtual void DoubleClick() SAL_OVERRIDE; void DoubleClick();
virtual void GetFocus() SAL_OVERRIDE; void GetFocus();
virtual void LoseFocus() SAL_OVERRIDE; void LoseFocus();
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; bool PreNotify( NotifyEvent& rNEvt );
protected: protected:
virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) SAL_OVERRIDE; virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ) SAL_OVERRIDE;
......
...@@ -52,7 +52,7 @@ namespace framework ...@@ -52,7 +52,7 @@ namespace framework
class ListBoxControl : public ListBox class ListBoxControl : public ListBox
{ {
public: public:
ListBoxControl( vcl::Window* pParent, WinBits nStyle, IListBoxListener* pListBoxListener ); ListBoxControl( vcl::Window* pParent, WinBits nStyle, DropdownToolbarController* pListBoxListener );
virtual ~ListBoxControl(); virtual ~ListBoxControl();
virtual void dispose() SAL_OVERRIDE; virtual void dispose() SAL_OVERRIDE;
...@@ -63,10 +63,10 @@ class ListBoxControl : public ListBox ...@@ -63,10 +63,10 @@ class ListBoxControl : public ListBox
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
private: 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 ) ListBox( pParent, nStyle )
, m_pListBoxListener( pListBoxListener ) , m_pListBoxListener( pListBoxListener )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment