diff options
Diffstat (limited to 'desktop')
5 files changed, 7 insertions, 10 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 2b257a3994dd..45c5fd491e6c 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -984,7 +984,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl, Idle *, void) // VCL::Window / Dialog -bool ExtMgrDialog::Notify( NotifyEvent& rNEvt ) +bool ExtMgrDialog::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -994,11 +994,11 @@ bool ExtMgrDialog::Notify( NotifyEvent& rNEvt ) vcl::KeyCode aKeyCode = pKEvt->GetKeyCode(); if ( aKeyCode.GetGroup() == KEYGROUP_CURSOR ) - bHandled = m_pExtensionBox->Notify( rNEvt ); + bHandled = m_pExtensionBox->EventNotify(rNEvt); } // VCLEVENT_WINDOW_CLOSE if ( !bHandled ) - return ModelessDialog::Notify( rNEvt ); + return ModelessDialog::EventNotify(rNEvt); else return true; } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index f96e40d97c19..0f0b54f4b261 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -152,7 +152,7 @@ public: virtual ~ExtMgrDialog() override; virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual bool Close() override; virtual void showProgress( bool bStart ) override; diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index df198dc16115..37f9430c9482 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -792,7 +792,7 @@ void ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt ) } -bool ExtensionBox_Impl::Notify( NotifyEvent& rNEvt ) +bool ExtensionBox_Impl::EventNotify( NotifyEvent& rNEvt ) { if ( !m_bInDelete ) DeleteRemoved(); @@ -830,7 +830,7 @@ bool ExtensionBox_Impl::Notify( NotifyEvent& rNEvt ) } if ( !bHandled ) - return Control::Notify( rNEvt ); + return Control::EventNotify(rNEvt); else return true; } diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 7543ad20761d..2e2ec85ec723 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -172,7 +172,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle &rPaintRect ) override; virtual void Resize() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual Size GetOptimalSize() const override; void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; } diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 801d7f0eacf2..119496aeefa1 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -68,9 +68,6 @@ public: void SetScrolledHdl( const Link<LicenseView&,void>& rHdl ) { maScrolledHdl = rHdl; } virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - -protected: - using MultiLineEdit::Notify; }; struct LicenseDialogImpl : public ModalDialog |