mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:mergeclasses

Browse Source 
Change-Id: I1347e51ef727da81be0c7937cad6e3f5edbf15a8
This commit is contained in:
Noel Grandin
2015-10-06 14:33:28 +02:00
parent 6fbbb8504a
commit 3fbc3adefd
3 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@@ -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

27
framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
View File

@@ -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;

6
framework/source/uielement/dropdownboxtoolbarcontroller.cxx
View File

@@ -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 )
{