basctl/source/basicide/baside2.hxx | 1 basctl/source/basicide/bastypes.cxx | 4 basctl/source/inc/bastypes.hxx | 2 chart2/source/controller/main/ElementSelector.cxx | 4 chart2/source/controller/main/ElementSelector.hxx | 2 cui/source/customize/macropg.cxx | 4 cui/source/dialogs/SpellDialog.cxx | 4 cui/source/inc/SpellDialog.hxx | 2 cui/source/inc/headertablistbox.hxx | 2 cui/source/inc/treeopt.hxx | 2 cui/source/options/connpooloptions.cxx | 4 cui/source/options/connpooloptions.hxx | 2 cui/source/options/treeopt.cxx | 4 dbaccess/source/ui/app/AppDetailPageHelper.cxx | 6 dbaccess/source/ui/inc/sqledit.hxx | 1 dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 8 desktop/source/deployment/gui/dp_gui_dialog2.cxx | 6 desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2 desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 4 desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 2 desktop/source/deployment/gui/license_dialog.cxx | 3 extensions/source/propctrlr/browserlistbox.cxx | 4 extensions/source/propctrlr/browserlistbox.hxx | 2 extensions/source/propctrlr/browserview.cxx | 4 extensions/source/propctrlr/browserview.hxx | 2 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 8 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 4 forms/source/richtext/richtextvclcontrol.cxx | 4 forms/source/richtext/richtextvclcontrol.hxx | 2 formula/source/ui/dlg/funcutl.cxx | 2 fpicker/source/office/PlacesListBox.cxx | 4 fpicker/source/office/PlacesListBox.hxx | 2 fpicker/source/office/RemoteFilesDialog.cxx | 4 fpicker/source/office/iodlg.cxx | 8 fpicker/source/office/iodlg.hxx | 2 include/sfx2/basedlgs.hxx | 4 include/sfx2/dockwin.hxx | 2 include/sfx2/prnmon.hxx | 2 include/sfx2/sidebar/Deck.hxx | 2 include/sfx2/sidebar/SidebarToolBox.hxx | 2 include/sfx2/sidebar/TabBar.hxx | 2 include/svtools/editbrowsebox.hxx | 2 include/svtools/fileurlbox.hxx | 2 include/svtools/fmtfield.hxx | 2 include/svtools/inettbc.hxx | 2 include/svtools/prnsetup.hxx | 2 include/svtools/urlcontrol.hxx | 2 include/svtools/wizdlg.hxx | 2 include/svx/colrctrl.hxx | 2 include/svx/itemwin.hxx | 8 include/svx/ruler.hxx | 1 include/svx/sidebar/PanelLayout.hxx | 2 include/vcl/combobox.hxx | 2 include/vcl/ctrl.hxx | 2 include/vcl/dialog.hxx | 2 include/vcl/dockwin.hxx | 2 include/vcl/field.hxx | 24 +- include/vcl/floatwin.hxx | 2 include/vcl/layout.hxx | 2 include/vcl/longcurr.hxx | 4 include/vcl/spinfld.hxx | 2 include/vcl/syswin.hxx | 2 include/vcl/tabctrl.hxx | 2 include/vcl/toolbox.hxx | 2 include/vcl/vclmedit.hxx | 2 include/vcl/window.hxx | 2 reportdesign/source/ui/inc/ColorListener.hxx | 1 reportdesign/source/ui/inc/ScrollHelper.hxx | 2 reportdesign/source/ui/inc/StartMarker.hxx | 1 reportdesign/source/ui/report/ScrollHelper.cxx | 4 sc/source/ui/app/inputwin.cxx | 4 sc/source/ui/cctrl/checklistmenu.cxx | 4 sc/source/ui/condformat/condformatdlgentry.cxx | 4 sc/source/ui/inc/checklistmenu.hxx | 2 sc/source/ui/inc/condformatdlgentry.hxx | 5 sc/source/ui/inc/inputwin.hxx | 2 sc/source/ui/inc/navipi.hxx | 9 sc/source/ui/navipi/navipi.cxx | 8 sc/source/ui/navipi/scenwnd.cxx | 4 sd/source/ui/dlg/RemoteDialogClientBox.cxx | 4 sd/source/ui/dlg/RemoteDialogClientBox.hxx | 2 sd/source/ui/dlg/docprev.cxx | 4 sd/source/ui/dlg/navigatr.cxx | 6 sd/source/ui/inc/Window.hxx | 2 sd/source/ui/inc/docprev.hxx | 2 sd/source/ui/inc/navigatr.hxx | 2 sd/source/ui/slidesorter/shell/SlideSorter.cxx | 4 sd/source/ui/view/sdwindow.cxx | 4 sfx2/source/appl/newhelp.cxx | 22 +- sfx2/source/appl/newhelp.hxx | 10 sfx2/source/dialog/basedlgs.cxx | 16 - sfx2/source/dialog/dockwin.cxx | 14 - sfx2/source/dialog/partwnd.cxx | 4 sfx2/source/dialog/templdlg.cxx | 8 sfx2/source/inc/partwnd.hxx | 2 sfx2/source/inc/templdgi.hxx | 4 sfx2/source/sidebar/Deck.cxx | 4 sfx2/source/sidebar/SidebarToolBox.cxx | 6 sfx2/source/sidebar/TabBar.cxx | 2 sfx2/source/view/frame2.cxx | 8 sfx2/source/view/printer.cxx | 4 svtools/source/brwbox/editbrowsebox.cxx | 4 svtools/source/contnr/simptabl.cxx | 2 svtools/source/control/calendar.cxx | 6 svtools/source/control/fileurlbox.cxx | 6 svtools/source/control/fmtfield.cxx | 4 svtools/source/control/inettbc.cxx | 4 svtools/source/control/urlcontrol.cxx | 6 svtools/source/dialogs/prnsetup.cxx | 4 svtools/source/dialogs/wizdlg.cxx | 4 svtools/source/hatchwindow/ipwin.cxx | 4 svtools/source/hatchwindow/ipwin.hxx | 2 svtools/source/table/tabledatawindow.cxx | 4 svtools/source/table/tabledatawindow.hxx | 2 svx/inc/galbrws2.hxx | 1 svx/source/form/datanavi.cxx | 4 svx/source/gallery2/galbrws1.hxx | 1 svx/source/inc/datanavi.hxx | 2 svx/source/inc/filtnav.hxx | 1 svx/source/inc/fmexpl.hxx | 1 svx/source/sidebar/PanelLayout.cxx | 4 svx/source/tbxctrls/colrctrl.cxx | 4 svx/source/tbxctrls/grafctrl.cxx | 6 svx/source/tbxctrls/itemwin.cxx | 16 - svx/source/tbxctrls/tbcontrl.cxx | 12 - svx/source/tbxctrls/tbunocontroller.cxx | 6 sw/source/ui/dbui/mmaddressblockpage.hxx | 2 sw/source/ui/index/cnttab.cxx | 4 sw/source/uibase/cctrl/actctrl.cxx | 4 sw/source/uibase/inc/actctrl.hxx | 3 sw/source/uibase/inc/conttree.hxx | 17 - sw/source/uibase/inc/dbinsdlg.hxx | 1 sw/source/uibase/inc/navipi.hxx | 1 sw/source/uibase/inc/redlndlg.hxx | 1 sw/source/uibase/inc/srcedtw.hxx | 1 sw/source/uibase/inc/swuicnttab.hxx | 2 sw/source/uibase/ribbar/workctrl.cxx | 12 - sw/source/uibase/utlui/content.cxx | 196 +++++++++++------- vcl/inc/listbox.hxx | 2 vcl/qa/cppunit/lifecycle.cxx | 2 vcl/source/control/combobox.cxx | 4 vcl/source/control/ctrl.cxx | 4 vcl/source/control/field.cxx | 24 +- vcl/source/control/field2.cxx | 24 +- vcl/source/control/imp_listbox.cxx | 4 vcl/source/control/longcurr.cxx | 8 vcl/source/control/spinfld.cxx | 4 vcl/source/control/tabctrl.cxx | 4 vcl/source/edit/vclmedit.cxx | 4 vcl/source/window/dialog.cxx | 4 vcl/source/window/dockwin.cxx | 6 vcl/source/window/event.cxx | 2 vcl/source/window/floatwin.cxx | 4 vcl/source/window/layout.cxx | 4 vcl/source/window/mouse.cxx | 6 vcl/source/window/syswin.cxx | 4 vcl/source/window/toolbox.cxx | 10 vcl/source/window/window.cxx | 4 158 files changed, 454 insertions(+), 426 deletions(-)
New commits: commit 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7 Author: Michael Stahl <[email protected]> Date: Thu Nov 24 22:40:33 2016 +0100 vcl: rename Window::Notify to EventNotify There is annoying overloading between Window::Notify and SfxListener::Notify, and the Window one has apparently fewer implementations, so rename that and remove lots of disambiguating "using Notify" in multiply inheriting classes. Change-Id: I8b597fd9e70cf2e7103b9dfa7cc666e79e7aff49 diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 465be0b..d1799d1 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -94,7 +94,6 @@ private: class ProgressInfo; std::unique_ptr<ProgressInfo> pProgress; - using Window::Notify; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; void ImpDoHighlight( sal_uLong nLineOff ); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 5b0f9de..11f8342 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -102,7 +102,7 @@ void BaseWindow::ExecuteGlobal (SfxRequest&) { } -bool BaseWindow::Notify( NotifyEvent& rNEvt ) +bool BaseWindow::EventNotify( NotifyEvent& rNEvt ) { bool bDone = false; @@ -128,7 +128,7 @@ bool BaseWindow::Notify( NotifyEvent& rNEvt ) } } - return bDone || Window::Notify( rNEvt ); + return bDone || Window::EventNotify( rNEvt ); } diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index b487d40..77fb024 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -184,7 +184,7 @@ public: virtual void ExecuteCommand (SfxRequest&); virtual void ExecuteGlobal (SfxRequest&); virtual void GetState (SfxItemSet&) = 0; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void StoreData(); virtual void UpdateData(); diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index ef9a451..920658d 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -201,7 +201,7 @@ void SelectorListBox::Select() } } -bool SelectorListBox::Notify( NotifyEvent& rNEvt ) +bool SelectorListBox::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -234,7 +234,7 @@ bool SelectorListBox::Notify( NotifyEvent& rNEvt ) SelectEntryPos( GetSavedValue() ); } - return bHandled || ListBox::Notify( rNEvt ); + return bHandled || ListBox::EventNotify(rNEvt); } Reference< css::accessibility::XAccessible > SelectorListBox::CreateAccessible() diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index acb7d2c..b7dd570 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -47,7 +47,7 @@ class SelectorListBox : public ListBox SelectorListBox( vcl::Window* pParent, WinBits nStyle ); virtual void Select() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; void ReleaseFocus_Impl(); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 70dbf42..1fcf314 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -115,9 +115,9 @@ IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) } } -bool MacroEventListBox::Notify( NotifyEvent& rNEvt ) +bool MacroEventListBox::EventNotify( NotifyEvent& rNEvt ) { - bool bRet = Control::Notify( rNEvt ); + bool bRet = Control::EventNotify(rNEvt); if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index e0bdeb0..0abdd39 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -969,7 +969,7 @@ IMPL_LINK_NOARG(SpellDialog, CancelHdl, Button*, void) } -bool SpellDialog::Notify( NotifyEvent& rNEvt ) +bool SpellDialog::EventNotify( NotifyEvent& rNEvt ) { /* #i38338# * FIXME: LoseFocus and GetFocus are signals from vcl that @@ -993,7 +993,7 @@ bool SpellDialog::Notify( NotifyEvent& rNEvt ) rParent.LoseFocus(); } } - return SfxModelessDialog::Notify(rNEvt); + return SfxModelessDialog::EventNotify(rNEvt); } diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 4ca5eee..04af246 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -215,7 +215,7 @@ private: void SetTitle_Impl(LanguageType nLang); protected: - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; OUString getReplacementString() const; diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 085213f..2b8cea7 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -31,7 +31,7 @@ private: VclPtr<SvHeaderTabListBox> maListBox; protected: DECL_LINK( HeaderEndDrag_Impl, HeaderBar*, void ); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; public: MacroEventListBox( vcl::Window* pParent, WinBits nStyle ); virtual ~MacroEventListBox() override; diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 7cbbe3a..0510327 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -168,7 +168,7 @@ protected: DECL_LINK(OKHdl_Impl, Button*, void); void SelectHdl_Impl(); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual short Execute() override; public: diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index bf34078..514581f 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -363,13 +363,13 @@ namespace offapp } - bool ConnectionPoolOptionsPage::Notify( NotifyEvent& _rNEvt ) + bool ConnectionPoolOptionsPage::EventNotify( NotifyEvent& _rNEvt ) { if (MouseNotifyEvent::LOSEFOCUS == _rNEvt.GetType()) if (m_pTimeout->IsWindowOrChild(_rNEvt.GetWindow())) commitTimeoutField(); - return SfxTabPage::Notify(_rNEvt); + return SfxTabPage::EventNotify(_rNEvt); } diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index e143b39..b91f6a3 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -54,7 +54,7 @@ namespace offapp static VclPtr<SfxTabPage> Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet); protected: - virtual bool Notify( NotifyEvent& _rNEvt ) override; + virtual bool EventNotify( NotifyEvent& _rNEvt ) override; virtual bool FillItemSet(SfxItemSet* _rSet) override; virtual void Reset(const SfxItemSet* _rSet) override; diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index a9e9e30..3c2cd5b 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -865,7 +865,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() pTreeLB->GrabFocus(); } -bool OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) +bool OfaTreeOptionsDialog::EventNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -903,7 +903,7 @@ bool OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) } } } - return SfxModalDialog::Notify(rNEvt); + return SfxModalDialog::EventNotify(rNEvt); } void OfaTreeOptionsDialog::SelectHdl_Impl() diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 74706f5..7a2db42 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -134,15 +134,15 @@ namespace virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: OTablePreviewWindow( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; OTablePreviewWindow::OTablePreviewWindow(vcl::Window* pParent, WinBits nStyle) : Window( pParent, nStyle) { ImplInitSettings(); } - bool OTablePreviewWindow::Notify( NotifyEvent& rNEvt ) + bool OTablePreviewWindow::EventNotify( NotifyEvent& rNEvt ) { - bool bRet = Window::Notify( rNEvt ); + bool bRet = Window::EventNotify(rNEvt); if ( rNEvt.GetType() == MouseNotifyEvent::INPUTENABLE && IsInputEnabled() ) PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), nullptr, true ); return bRet; diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 038fa36..c144cde 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -82,7 +82,6 @@ namespace dbaui void startTimer(); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, ConfigurationHints ) override; - using MultiLineEditSyntaxHighlight::Notify; }; } diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index cf17ee4..890c63f 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -35,7 +35,7 @@ class LimitBoxImpl: public LimitBox public: LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl ); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; private: LimitBoxController* m_pControl; @@ -47,14 +47,14 @@ LimitBoxImpl::LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl ) { } -bool LimitBoxImpl::Notify( NotifyEvent& rNEvt ) +bool LimitBoxImpl::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; switch ( rNEvt.GetType() ) { case MouseNotifyEvent::LOSEFOCUS: { - bHandled = LimitBox::Notify( rNEvt ); + bHandled = LimitBox::EventNotify(rNEvt); uno::Sequence< beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = "DBLimit.Value"; aArgs[0].Value = uno::makeAny( GetValue() ); @@ -82,7 +82,7 @@ bool LimitBoxImpl::Notify( NotifyEvent& rNEvt ) default: break; } - return bHandled || LimitBox::Notify( rNEvt ); + return bHandled || LimitBox::EventNotify(rNEvt); } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 2b257a3..45c5fd4 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 f96e40d..0f0b54f 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 df198dc..37f9430 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 7543ad2..2e2ec85 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 801d7f0..119496a 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 diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 9d6b899..2ea57a2 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1231,7 +1231,7 @@ namespace pcr return Control::PreNotify( _rNEvt ); } - bool OBrowserListBox::Notify( NotifyEvent& _rNEvt ) + bool OBrowserListBox::EventNotify( NotifyEvent& _rNEvt ) { if ( _rNEvt.GetType() == MouseNotifyEvent::COMMAND) { @@ -1248,7 +1248,7 @@ namespace pcr } } } - return Control::Notify( _rNEvt ); + return Control::EventNotify(_rNEvt); } diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 21710f2..a0b6089 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -112,7 +112,7 @@ namespace pcr sal_uInt16 CalcVisibleLines(); void EnableUpdate(); void DisableUpdate(); - bool Notify( NotifyEvent& _rNEvt ) override; + bool EventNotify( NotifyEvent& _rNEvt ) override; virtual bool PreNotify( NotifyEvent& _rNEvt ) override; void SetListener( IPropertyLineListener* _pListener ); diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index d31417c..48f19b5 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -81,7 +81,7 @@ namespace pcr } - bool OPropertyBrowserView::Notify( NotifyEvent& _rNEvt ) + bool OPropertyBrowserView::EventNotify( NotifyEvent& _rNEvt ) { if ( MouseNotifyEvent::KEYINPUT == _rNEvt.GetType() ) { @@ -93,7 +93,7 @@ namespace pcr // #i63285# return true; } - return Window::Notify( _rNEvt ); + return Window::EventNotify(_rNEvt); } diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 9057f75..d88ce3c 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -41,7 +41,7 @@ namespace pcr protected: virtual void Resize() override; virtual void GetFocus() override; - virtual bool Notify( NotifyEvent& _rNEvt ) override; + virtual bool EventNotify( NotifyEvent& _rNEvt ) override; public: explicit OPropertyBrowserView( vcl::Window* pParent); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 02b30e9..a99d35a 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -992,10 +992,10 @@ void XMLFilterSettingsDialog::onOpen() } } -bool XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt ) +bool XMLFilterSettingsDialog::EventNotify( NotifyEvent& rNEvt ) { // Because of tab control first call the base class. - bool bRet = ModelessDialog::Notify( rNEvt ); + bool bRet = ModelessDialog::EventNotify(rNEvt); if ( !bRet ) { if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) @@ -1394,9 +1394,9 @@ void SvxPathControl::dispose() VCL_BUILDER_FACTORY(SvxPathControl) -bool SvxPathControl::Notify(NotifyEvent& rNEvt) +bool SvxPathControl::EventNotify(NotifyEvent& rNEvt) { - bool bRet = Window::Notify(rNEvt); + bool bRet = Window::EventNotify(rNEvt); if ( m_pFocusCtrl && rNEvt.GetWindow() != m_pFocusCtrl && rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) m_pFocusCtrl->GrabFocus(); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index a44e5da..24617d0 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -52,7 +52,7 @@ public: virtual ~SvxPathControl() override; virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; class HeaderBar; @@ -103,7 +103,7 @@ public: void updateStates(); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; bool isClosable() { return m_bIsClosable;} diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 5dcf54c..253ffa0 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -284,7 +284,7 @@ namespace frm } - bool RichTextControl::Notify( NotifyEvent& _rNEvt ) + bool RichTextControl::EventNotify( NotifyEvent& _rNEvt ) { bool bDone = false; if ( _rNEvt.GetType() == MouseNotifyEvent::COMMAND ) @@ -292,7 +292,7 @@ namespace frm const CommandEvent& rEvent = *_rNEvt.GetCommandEvent(); bDone = m_pImpl->HandleCommand( rEvent ); } - return bDone || Control::Notify( _rNEvt ); + return bDone || Control::EventNotify(_rNEvt); } diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 00c3663..b83f4e9 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -109,7 +109,7 @@ namespace frm virtual void GetFocus() override; virtual void StateChanged( StateChangedType nStateChange ) override; virtual bool PreNotify( NotifyEvent& _rNEvt ) override; - virtual bool Notify( NotifyEvent& _rNEvt ) override; + virtual bool EventNotify( NotifyEvent& _rNEvt ) override; private: void applyAttributes( const SfxItemSet& _rAttributesToApply ); diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 1fc5a9e9..f312b38 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -353,7 +353,7 @@ bool EditBox::PreNotify( NotifyEvent& rNEvt ) sal_uInt16 nKey=aKeyCode.GetCode(); if( (nKey==KEY_RETURN && !aKeyCode.IsShift()) || nKey==KEY_TAB ) { - bResult = GetParent()->Notify(rNEvt); + bResult = GetParent()->EventNotify(rNEvt); } else { diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index e3a832b..eb77e55 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -167,7 +167,7 @@ void PlacesListBox::SetSizePixel( const Size& rNewSize ) mpDelBtn->SetPosPixel( Point( 6 + 24, nBtnY ) ); } -bool PlacesListBox::Notify( NotifyEvent& rNEvt ) +bool PlacesListBox::EventNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -181,7 +181,7 @@ bool PlacesListBox::Notify( NotifyEvent& rNEvt ) return true; } } - return Control::Notify( rNEvt ); + return Control::EventNotify(rNEvt); } Image PlacesListBox::getEntryIcon( const PlacePtr& pPlace ) diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index d4c10de..ddc92d8 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -70,7 +70,7 @@ class PlacesListBox : public Control const VclPtr<PushButton>& GetDeleteButton() const { return mpDelBtn; } const VclPtr<PlacesListBox_Impl>& GetPlacesListBox() const { return mpImpl; } - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; private: diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 0453bfc..0ddd997 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -135,7 +135,7 @@ class FileViewContainer : public vcl::Window } } - virtual bool Notify( NotifyEvent& rNEvt ) override + virtual bool EventNotify( NotifyEvent& rNEvt ) override { if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { @@ -164,7 +164,7 @@ class FileViewContainer : public vcl::Window return true; } } - return Window::Notify( rNEvt ); + return Window::EventNotify(rNEvt); } }; diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index fc6418b..b820f60 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -444,7 +444,7 @@ public: } } - virtual bool Notify( NotifyEvent& rNEvt ) override + virtual bool EventNotify( NotifyEvent& rNEvt ) override { if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { @@ -473,7 +473,7 @@ public: return true; } } - return Window::Notify( rNEvt ); + return Window::EventNotify(rNEvt); } }; @@ -1548,7 +1548,7 @@ IMPL_LINK_NOARG(SvtFileDialog, PlayButtonHdl_Impl, Button*, void) } -bool SvtFileDialog::Notify( NotifyEvent& rNEvt ) +bool SvtFileDialog::EventNotify( NotifyEvent& rNEvt ) /* [Description] @@ -1576,7 +1576,7 @@ bool SvtFileDialog::Notify( NotifyEvent& rNEvt ) } } } - return bRet || ModalDialog::Notify( rNEvt ); + return bRet || ModalDialog::EventNotify(rNEvt); } namespace diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index cd9f3f2..04f3ebf 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -146,7 +146,7 @@ private: void implUpdateImages( ); protected: - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; OUString _aPath; OUString _aDefExt; diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 6e1ef12..1ed1eb4 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -101,7 +101,7 @@ protected: public: virtual void FillInfo(SfxChildWinInfo&) const; void Initialize (SfxChildWinInfo* pInfo); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; SfxBindings& GetBindings() { return *pBindings; } @@ -137,7 +137,7 @@ protected: virtual bool Close() override; virtual void Resize() override; virtual void Move() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; SfxBindings& GetBindings() { return *pBindings; } diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 29063e7..cadc840 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -98,7 +98,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); const Size& GetMinOutputSizePixel() const; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; DECL_LINK(TimerHdl, Idle *, void); SAL_DLLPRIVATE void Initialize_Impl(); diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index 8df11c8..adc57e7 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -47,7 +47,7 @@ public: virtual void dispose() override; virtual short Execute() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; const SfxItemSet& GetOptions() const { return *pOptions; } void DisableHelp(); diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx index 8eb06e5..cdd58b2 100644 --- a/include/sfx2/sidebar/Deck.hxx +++ b/include/sfx2/sidebar/Deck.hxx @@ -65,7 +65,7 @@ public: virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rUpdateArea) override; virtual void DataChanged (const DataChangedEvent& rEvent) override; - virtual bool Notify(NotifyEvent& rEvent) override; + virtual bool EventNotify(NotifyEvent& rEvent) override; static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation); diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index e36f6c6..19d923d 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -52,7 +52,7 @@ public: const Size& rRequestedSize, sal_uInt16 nPos = TOOLBOX_APPEND) override; - virtual bool Notify (NotifyEvent& rEvent) override; + virtual bool EventNotify(NotifyEvent& rEvent) override; void SetController(const sal_uInt16 nItemId, const css::uno::Reference<css::frame::XToolbarController>& rxController); diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 5ea6a94..df4b0c0 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -77,7 +77,7 @@ public: virtual void Paint (vcl::RenderContext& /*rRenderContext*/, const Rectangle& rUpdateArea) override; virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) override; - virtual bool Notify (NotifyEvent& rEvent) override; + virtual bool EventNotify (NotifyEvent& rEvent) override; static sal_Int32 GetDefaultWidth(); diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index ab2679c..e31bcf0 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -524,7 +524,7 @@ namespace svt using BrowseBox::MouseButtonDown; virtual bool PreNotify(NotifyEvent& rNEvt ) override; - virtual bool Notify(NotifyEvent& rNEvt) override; + virtual bool EventNotify(NotifyEvent& rNEvt) override; virtual void EndScroll() override; diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 5c9cc0d..584b1da 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -40,7 +40,7 @@ namespace svt protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; public: /** transforms the given URL content into a system-dependent notation, if possible, and diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index bce4e63..f59389c 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -226,7 +226,7 @@ public: bool IsUsingInputStringForFormatting() const { return m_bUseInputStringForFormatting;} protected: - virtual bool Notify(NotifyEvent& rNEvt) override; + virtual bool EventNotify(NotifyEvent& rNEvt) override; void impl_Modify(bool makeValueDirty = true); virtual void Modify() override; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 46b2233..0954185 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -52,7 +52,7 @@ friend class SvtURLBox_Impl; SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID); protected: - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void Select() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 33b8cff..383c718 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -62,7 +62,7 @@ public: Printer* GetPrinter() const { return mpPrinter; } virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual short Execute() override; diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index e97d6d8..cdc830b2 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -40,7 +40,7 @@ namespace svt protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 39b9d3f..9f9ffe1 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -235,7 +235,7 @@ public: virtual void Resize() override; virtual void StateChanged( StateChangedType nStateChange ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void ActivatePage(); virtual bool DeactivatePage(); diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index 03ba6c9..c3b8eaf 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -107,7 +107,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; #endif diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index f992be4..0dbba2e 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -54,7 +54,7 @@ public: protected: virtual void Select() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; @@ -76,7 +76,7 @@ protected: virtual void Modify() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: @@ -100,7 +100,7 @@ public: protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; private: sal_uInt16 nCurPos; @@ -119,7 +119,7 @@ public: protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; private: sal_uInt16 nCurPos; diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index d8a7851..71d5e78 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -77,7 +77,6 @@ namespace o3tl class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener { friend class SvxRulerItem; - using Window::Notify; std::vector<std::unique_ptr<SvxRulerItem> > pCtrlItems; diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index ca4086f..7492b88 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -39,7 +39,7 @@ public: virtual Size GetOptimalSize() const override; virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override; virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; - virtual bool Notify(NotifyEvent& rNEvt) override; + virtual bool EventNotify(NotifyEvent& rNEvt) override; }; #endif diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 07f5427..6796975 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -58,7 +58,7 @@ public: virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; virtual void Resize() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void StateChanged( StateChangedType nType ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index bdf9520..0d1f5f5 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -125,7 +125,7 @@ public: virtual void EnableRTL ( bool bEnable = true ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void StateChanged( StateChangedType nStateChange ) override; virtual void Resize() override; diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 0d763bd..78a0c3c 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -83,7 +83,7 @@ public: virtual ~Dialog() override; virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void StateChanged( StateChangedType nStateChange ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 1a6910e..f394616 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -285,7 +285,7 @@ public: virtual void Resizing( Size& rSize ); virtual bool Close(); virtual void Tracking( const TrackingEvent& rTEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void StateChanged( StateChangedType nType ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index bca7e4e..c19865b 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -430,7 +430,7 @@ public: explicit PatternField( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void Modify() override; virtual void dispose() override; }; @@ -442,7 +442,7 @@ public: explicit NumericField( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual Size CalcMinimumSize() const override; @@ -464,7 +464,7 @@ public: explicit MetricField( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual Size CalcMinimumSize() const override; @@ -527,7 +527,7 @@ public: CurrencyField( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void Modify() override; @@ -553,7 +553,7 @@ public: explicit DateField( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void Modify() override; @@ -584,7 +584,7 @@ public: explicit TimeField( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void Modify() override; @@ -610,7 +610,7 @@ public: PatternBox( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void Modify() override; @@ -627,7 +627,7 @@ public: virtual Size CalcMinimumSize() const override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void Modify() override; @@ -645,7 +645,7 @@ public: explicit MetricBox( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual Size CalcMinimumSize() const override; @@ -675,7 +675,7 @@ public: explicit CurrencyBox( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void Modify() override; @@ -693,7 +693,7 @@ public: explicit DateBox( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void Modify() override; @@ -709,7 +709,7 @@ public: explicit TimeBox( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void Modify() override; diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 680cc13..9279f5e 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -137,7 +137,7 @@ public: virtual ~FloatingWindow() override; virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void StateChanged( StateChangedType nType ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 542788e..59a0817 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -503,7 +503,7 @@ protected: virtual void setAllocation(const Size &rAllocation) override; DECL_LINK(ScrollBarHdl, ScrollBar*, void); void InitScrollBars(const Size &rRequest); - virtual bool Notify(NotifyEvent& rNEvt) override; + virtual bool EventNotify(NotifyEvent& rNEvt) override; private: bool m_bUserManagedScrolling; VclPtr<ScrollBar> m_pVScroll; diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 3bc36f3..9bcbe30 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -84,7 +84,7 @@ public: LongCurrencyField( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; void Modify() override; void Up() override; @@ -107,7 +107,7 @@ public: LongCurrencyBox( vcl::Window* pParent, WinBits nWinStyle ); virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; void Modify() override; void ReformatAll() override; diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 7d05f38..7549aa5 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -71,7 +71,7 @@ protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; void EndDropDown(); diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 2c1681e..2253484 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -194,7 +194,7 @@ public: virtual ~SystemWindow() override; virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual bool Close(); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index fbd7d28..e9a9dc8 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -103,7 +103,7 @@ public: virtual void LoseFocus() override; virtual void RequestHelp( const HelpEvent& rHEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void StateChanged( StateChangedType nType ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 66bd8cf..03319ba 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -281,7 +281,7 @@ public: virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; virtual void Resize() override; virtual void RequestHelp( const HelpEvent& rHEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void Command( const CommandEvent& rCEvt ) override; virtual void StateChanged( StateChangedType nType ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 84b5a6b..41663b4 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -47,7 +47,7 @@ protected: void StateChanged( StateChangedType nType ) override; void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; using Control::ImplInitSettings; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); static WinBits ImplInitStyle( WinBits nStyle ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 4fdb805..87c7f7b 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -802,7 +802,7 @@ public: virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool EventNotify( NotifyEvent& rNEvt ); // These methods call the relevant virtual method when not in/post dispose void CompatGetFocus(); diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index 110e3bf..1dfddaf 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -50,7 +50,6 @@ namespace rptui virtual ~OColorListener() override; virtual void dispose() override; - using Window::Notify; // SfxListener virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint) override; diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index 3c1d31a..c995b96 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -67,7 +67,7 @@ namespace rptui virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; // window virtual void Resize() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; // OPropertyChangeListener virtual void _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException, std::exception) override; public: diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx index b5179cf..305fc10 100644 --- a/reportdesign/source/ui/inc/StartMarker.hxx +++ b/reportdesign/source/ui/inc/StartMarker.hxx @@ -62,7 +62,6 @@ namespace rptui virtual void MouseButtonUp(const MouseEvent& rMEvt) override; virtual void Resize() override; virtual void RequestHelp(const HelpEvent& rHEvt) override; - using Window::Notify; void setTitle(const OUString& _sTitle); sal_Int32 getMinHeight() const; diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index 55cf12a..994dc51 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -325,7 +325,7 @@ void OScrollWindowHelper::collapseSections(const uno::Sequence< css::beans::Prop m_aReportWindow->collapseSections(_aCollpasedSections); } -bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt ) +bool OScrollWindowHelper::EventNotify( NotifyEvent& rNEvt ) { const CommandEvent* pCommandEvent = rNEvt.GetCommandEvent(); if ( pCommandEvent && @@ -344,7 +344,7 @@ bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt ) if ( HandleScrollCommand( *pCommandEvent, pHScrBar, pVScrBar ) ) return true; } - return OScrollWindowHelper_BASE::Notify(rNEvt); + return OScrollWindowHelper_BASE::EventNotify(rNEvt); } void OScrollWindowHelper::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 902c1f7..c014cf6 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2189,7 +2189,7 @@ void ScPosWnd::DoEnter() ReleaseFocus_Impl(); } -bool ScPosWnd::Notify( NotifyEvent& rNEvt ) +bool ScPosWnd::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = true; @@ -2241,7 +2241,7 @@ bool ScPosWnd::Notify( NotifyEvent& rNEvt ) } if (!bHandled) - bHandled = ComboBox::Notify(rNEvt); + bHandled = ComboBox::EventNotify(rNEvt); return bHandled; } diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index fd56093..bdf2b70 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1321,7 +1321,7 @@ void ScCheckListMenuWindow::MouseMove(const MouseEvent& rMEvt) queueCloseSubMenu(); } -bool ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt) +bool ScCheckListMenuWindow::EventNotify(NotifyEvent& rNEvt) { if (rNEvt.GetType() == MouseNotifyEvent::KEYUP) { @@ -1334,7 +1334,7 @@ bool ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt) return true; } } - return ScMenuFloatingWindow::Notify(rNEvt); + return ScMenuFloatingWindow::EventNotify(rNEvt); } void ScCheckListMenuWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index f427399..fb613d8 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -94,13 +94,13 @@ void ScCondFrmtEntry::dispose() VclContainer::dispose(); } -bool ScCondFrmtEntry::Notify( NotifyEvent& rNEvt ) +bool ScCondFrmtEntry::EventNotify( NotifyEvent& rNEvt ) { if (rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN) { maClickHdl.Call(*this); } - return VclContainer::Notify(rNEvt); + return VclContainer::EventNotify(rNEvt); } void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex) diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 1ee9e7b..5c0b2df 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -320,7 +320,7 @@ public: virtual void dispose() override; virtual void MouseMove(const MouseEvent& rMEvt) override; - virtual bool Notify(NotifyEvent& rNEvt) override; + virtual bool EventNotify(NotifyEvent& rNEvt) override; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index f7d446f..27a4fbc 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -72,7 +72,7 @@ public: virtual void setAllocation(const Size &rAllocation) override; virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; bool IsSelected() const { return mbActive;} void SetIndex(sal_Int32 nIndex); @@ -131,7 +131,6 @@ public: virtual void SetInactive() override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - using ScCondFrmtEntry::Notify; virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::CONDITION; } }; @@ -272,7 +271,7 @@ public: virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::DATE; } virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - using ScCondFrmtEntry::Notify; + protected: virtual OUString GetExpressionString() override; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 4b7ec0c..b53d794 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -170,7 +170,7 @@ protected: virtual void Select() override; virtual void Modify() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 7a21bf8..166e37a 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -60,7 +60,7 @@ public: protected: virtual void Select() override; virtual void DoubleClick() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; private: struct ScenarioEntry @@ -116,7 +116,7 @@ public: void SetCol( SCCOL nColNo ); protected: - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void LoseFocus() override; virtual void Up() override; virtual void Down() override; @@ -144,7 +144,7 @@ public: void SetRow(SCROW nRow) { SetValue(nRow); } protected: - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual Size GetOptimalSize() const override; virtual void LoseFocus() override; virtual void dispose() override; @@ -253,8 +253,7 @@ public: virtual ~ScNavigatorDlg() override; virtual void dispose() override; - using Window::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; }; class ScNavigatorDialogWrapper: public SfxChildWindowContext diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index e3782a5..abdc36d4e 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -85,9 +85,9 @@ ColumnEdit::~ColumnEdit() VCL_BUILDER_FACTORY_ARGS(ColumnEdit, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT) -bool ColumnEdit::Notify( NotifyEvent& rNEvt ) +bool ColumnEdit::EventNotify( NotifyEvent& rNEvt ) { - bool bHandled = SpinField::Notify( rNEvt ); + bool bHandled = SpinField::EventNotify(rNEvt); MouseNotifyEvent nType = rNEvt.GetType(); if ( nType == MouseNotifyEvent::KEYINPUT ) @@ -262,9 +262,9 @@ RowEdit::~RowEdit() VCL_BUILDER_FACTORY_ARGS(RowEdit, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT) -bool RowEdit::Notify( NotifyEvent& rNEvt ) +bool RowEdit::EventNotify( NotifyEvent& rNEvt ) { - bool bHandled = NumericField::Notify( rNEvt ); + bool bHandled = NumericField::EventNotify(rNEvt); if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 9c6884b..6255cb2 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -107,7 +107,7 @@ void ScScenarioListBox::DoubleClick() SelectScenario(); } -bool ScScenarioListBox::Notify( NotifyEvent& rNEvt ) +bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -155,7 +155,7 @@ bool ScScenarioListBox::Notify( NotifyEvent& rNEvt ) } } - return bHandled || ListBox::Notify( rNEvt ); + return bHandled || ListBox::EventNotify(rNEvt); } const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedEntry() const diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index cd67fbd..bef3554 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -583,7 +583,7 @@ void ClientBox::MouseButtonDown( const MouseEvent& rMEvt ) } } -bool ClientBox::Notify( NotifyEvent& rNEvt ) +bool ClientBox::EventNotify( NotifyEvent& rNEvt ) { if ( !m_bInDelete ) DeleteRemoved(); @@ -619,7 +619,7 @@ bool ClientBox::Notify( NotifyEvent& rNEvt ) } if ( !bHandled ) - return Control::Notify( rNEvt ); + return Control::EventNotify(rNEvt); else return true; } diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index f953a0f..d6ffe9d 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -137,7 +137,7 @@ public: void Paint( vcl::RenderContext& rRenderContext, const Rectangle &rPaintRect ) override; void Resize() override; Size GetOptimalSize() const override; - bool Notify( NotifyEvent& rNEvt ) override; + bool EventNotify( NotifyEvent& rNEvt ) override; TClientBoxEntry GetEntryData( long nPos ) { return m_vEntries[ nPos ]; } long GetActiveEntryIndex(); diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 4d8e4bb..6d987cb 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -154,7 +154,7 @@ void SdDocPreviewWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Recta } } -bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt ) +bool SdDocPreviewWin::EventNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN ) { @@ -168,7 +168,7 @@ bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt ) } } - return Control::Notify( rNEvt ); + return Control::EventNotify(rNEvt); } void SdDocPreviewWin::updateViewSettings() diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 084fdaf..0f3c15f 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -649,7 +649,7 @@ NavDocInfo* SdNavigatorWin::GetDocInfo() /** * PreNotify */ -bool SdNavigatorWin::Notify(NotifyEvent& rNEvt) +bool SdNavigatorWin::EventNotify(NotifyEvent& rNEvt) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); bool bOK = false; @@ -671,7 +671,7 @@ bool SdNavigatorWin::Notify(NotifyEvent& rNEvt) sd::SlideShow::Stop( *pBase ); // Stopping the slide show may result in a synchronous // deletion of the navigator window. Calling the - // parents Notify after this is unsafe. Therefore we + // parent's EventNotify after this is unsafe. Therefore we // return now. return true; } @@ -680,7 +680,7 @@ bool SdNavigatorWin::Notify(NotifyEvent& rNEvt) } if( !bOK ) - bOK = Window::Notify( rNEvt ); + bOK = Window::EventNotify(rNEvt); return bOK; } diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 4a9a3da..5c3e08a 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -177,7 +177,7 @@ protected: virtual void Command(const CommandEvent& rCEvt) override; virtual void RequestHelp( const HelpEvent& rEvt ) override; virtual void LoseFocus() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; /** Create an accessibility object that makes this window accessible. diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 4826980..2fe0e85 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -63,7 +63,7 @@ public: virtual void dispose() override; virtual void Resize() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 419a144..93c9509 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -103,7 +103,7 @@ public: NavigatorDragType GetNavigatorDragType(); protected: - virtual bool Notify(NotifyEvent& rNEvt) override; + virtual bool EventNotify(NotifyEvent& rNEvt) override; private: friend class ::sd::NavigatorChildWindow; diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 78dd6be..0c7b22a 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -59,7 +59,7 @@ public: virtual void MouseButtonUp (const MouseEvent& rEvent) override; virtual void MouseButtonDown (const MouseEvent& rEvent) override; virtual void Command (const CommandEvent& rEvent) override; - virtual bool Notify (NotifyEvent& rEvent) override; + virtual bool EventNotify (NotifyEvent& rEvent) override; private: SlideSorter& mrSlideSorter; @@ -483,7 +483,7 @@ void ContentWindow::Command(const CommandEvent& rEvent) mpCurrentFunction->Command(rEvent); } -bool ContentWindow::Notify (NotifyEvent&) +bool ContentWindow::EventNotify(NotifyEvent&) { return false; } diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index af5ddf9..e1b4fa5 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -273,7 +273,7 @@ void Window::Command(const CommandEvent& rCEvt) vcl::Window::Command(rCEvt); } -bool Window::Notify( NotifyEvent& rNEvt ) +bool Window::EventNotify( NotifyEvent& rNEvt ) { bool bResult = false; if ( mpViewShell ) @@ -281,7 +281,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) bResult = mpViewShell->Notify(rNEvt, this); } if( !bResult ) - bResult = vcl::Window::Notify( rNEvt ); + bResult = vcl::Window::EventNotify(rNEvt); return bResult; } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index c803c15..ed5cc6f 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -389,7 +389,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) } -bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) +bool ContentListBox_Impl::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT && @@ -399,7 +399,7 @@ bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) bHandled = true; } - return bHandled || SvTreeListBox::Notify( rNEvt ); + return bHandled || SvTreeListBox::EventNotify( rNEvt ); } @@ -502,7 +502,7 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) } -bool IndexBox_Impl::Notify( NotifyEvent& rNEvt ) +bool IndexBox_Impl::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT && @@ -512,7 +512,7 @@ bool IndexBox_Impl::Notify( NotifyEvent& rNEvt ) bHandled = true; } - return bHandled || ComboBox::Notify( rNEvt ); + return bHandled || ComboBox::EventNotify( rNEvt ); } @@ -893,7 +893,7 @@ VCL_BUILDER_DECL_FACTORY(SearchResultsBox) rRet = pListBox; } -bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt ) +bool SearchResultsBox_Impl::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT && @@ -903,7 +903,7 @@ bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt ) bHandled = true; } - return bHandled || ListBox::Notify( rNEvt ); + return bHandled || ListBox::EventNotify( rNEvt ); } // class SearchTabPage_Impl ---------------------------------------------- @@ -1226,7 +1226,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) } -bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) +bool BookmarksBox_Impl::EventNotify( NotifyEvent& rNEvt ) { bool bRet = false; MouseNotifyEvent nType = rNEvt.GetType(); @@ -1257,7 +1257,7 @@ bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) } } - return bRet || ListBox::Notify( rNEvt ); + return bRet || ListBox::EventNotify( rNEvt ); } // class BookmarksTabPage_Impl ------------------------------------------- @@ -1831,12 +1831,12 @@ TextWin_Impl::TextWin_Impl( vcl::Window* p ) : DockingWindow( p, 0 ) { } -bool TextWin_Impl::Notify( NotifyEvent& rNEvt ) +bool TextWin_Impl::EventNotify( NotifyEvent& rNEvt ) { if( ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) && rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_TAB ) - return GetParent()->Notify( rNEvt ); + return GetParent()->EventNotify( rNEvt ); else - return DockingWindow::Notify( rNEvt ); + return DockingWindow::EventNotify( rNEvt ); } diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 4f80ffa..215ce2a 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -63,7 +63,7 @@ public: virtual void dispose() override; virtual void RequestingChildren( SvTreeListEntry* pParent ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; inline void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { SetDoubleClickHdl( rLink ); } OUString GetSelectEntry() const; @@ -115,7 +115,7 @@ public: IndexBox_Impl(vcl::Window* pParent, WinBits nStyle); virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; void SelectExecutableEntry(); }; @@ -194,7 +194,7 @@ public: { } - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; class SearchTabPage_Impl : public HelpTabPage_Impl @@ -251,7 +251,7 @@ public: virtual ~BookmarksBox_Impl() override; virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; class BookmarksTabPage_Impl : public HelpTabPage_Impl @@ -406,7 +406,7 @@ class TextWin_Impl : public DockingWindow public: explicit TextWin_Impl( vcl::Window* pParent ); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; // class SfxHelpTextWindow_Impl ------------------------------------------ diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index dd35973..266f98f 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -316,7 +316,7 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW) If a ModelessDialog is enabled its ViewFrame wil be activated. This is necessary by PluginInFrames. */ -bool SfxModelessDialog::Notify( NotifyEvent& rEvt ) +bool SfxModelessDialog::EventNotify( NotifyEvent& rEvt ) { if ( pImpl ) { @@ -332,14 +332,16 @@ bool SfxModelessDialog::Notify( NotifyEvent& rEvt ) else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { // First, allow KeyInput for Dialog functions ( TAB etc. ) - if ( !ModelessDialog::Notify( rEvt ) && SfxViewShell::Current() ) + if (!ModelessDialog::EventNotify(rEvt) && SfxViewShell::Current()) + { // then also for valid global accelerators. return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() ); + } return true; } } - return ModelessDialog::Notify( rEvt ); + return ModelessDialog::EventNotify( rEvt ); } SfxModelessDialog::~SfxModelessDialog() @@ -394,7 +396,7 @@ void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const } -bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) +bool SfxFloatingWindow::EventNotify( NotifyEvent& rEvt ) /* [Description] @@ -420,14 +422,16 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { // First, allow KeyInput for Dialog functions - if ( !FloatingWindow::Notify( rEvt ) && SfxViewShell::Current() ) + if (!FloatingWindow::EventNotify(rEvt) && SfxViewShell::Current()) + { // then also for valid global accelerators. return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() ); + } return true; } } - return FloatingWindow::Notify( rEvt ); + return FloatingWindow::EventNotify( rEvt ); } SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 0179228..16d7154 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1626,10 +1626,10 @@ const Size& SfxDockingWindow::GetMinOutputSizePixel() const return pImpl->aMinSize; } -bool SfxDockingWindow::Notify( NotifyEvent& rEvt ) +bool SfxDockingWindow::EventNotify( NotifyEvent& rEvt ) { if ( !pImpl ) - return DockingWindow::Notify( rEvt ); + return DockingWindow::EventNotify( rEvt ); if ( rEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { @@ -1641,18 +1641,20 @@ bool SfxDockingWindow::Notify( NotifyEvent& rEvt ) else if (pMgr != nullptr) pMgr->Activate_Impl(); - // In VCL Notify goes first to the window itself, also call the + // In VCL EventNotify goes first to the window itself, also call the // base class, otherwise the parent learns nothing // if ( rEvt.GetWindow() == this ) PB: #i74693# not necessary any longer - DockingWindow::Notify( rEvt ); + DockingWindow::EventNotify( rEvt ); return true; } else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { // First, allow KeyInput for Dialog functions - if ( !DockingWindow::Notify( rEvt ) && SfxViewShell::Current() ) + if (!DockingWindow::EventNotify(rEvt) && SfxViewShell::Current()) + { // then also for valid global accelerators. return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() ); + } return true; } else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() ) @@ -1660,7 +1662,7 @@ bool SfxDockingWindow::Notify( NotifyEvent& rEvt ) pBindings->SetActiveFrame( nullptr ); } - return DockingWindow::Notify( rEvt ); + return DockingWindow::EventNotify( rEvt ); } diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index 6f2f1fe..badfed0 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -157,7 +157,7 @@ bool SfxPartDockWnd_Impl::QueryClose() } -bool SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt ) +bool SfxPartDockWnd_Impl::EventNotify( NotifyEvent& rEvt ) { if( rEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { @@ -170,7 +170,7 @@ bool SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt ) } } - return SfxDockingWindow::Notify( rEvt ); + return SfxDockingWindow::EventNotify( rEvt ); } void SfxPartDockWnd_Impl::FillInfo( SfxChildWinInfo& rInfo ) const diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index bb25c2b..69eba42 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -288,7 +288,7 @@ IMPL_LINK_NOARG(DropListBox_Impl, OnAsyncExecuteDrop, void*, void) pDialog->ActionSelect( SID_STYLE_NEW_BY_EXAMPLE ); } -bool DropListBox_Impl::Notify( NotifyEvent& rNEvt ) +bool DropListBox_Impl::EventNotify( NotifyEvent& rNEvt ) { bool bRet = false; if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) @@ -309,7 +309,7 @@ bool DropListBox_Impl::Notify( NotifyEvent& rNEvt ) } } if(!bRet) - bRet = SvTreeListBox::Notify( rNEvt ); + bRet = SvTreeListBox::EventNotify( rNEvt ); return bRet; } @@ -417,7 +417,7 @@ bool StyleTreeListBox_Impl::DoubleClickHdl() return false; } -bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt ) +bool StyleTreeListBox_Impl::EventNotify( NotifyEvent& rNEvt ) { // handle <RETURN> as double click @@ -433,7 +433,7 @@ bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt ) } if ( !bRet ) - bRet = DropListBox_Impl::Notify( rNEvt ); + bRet = DropListBox_Impl::EventNotify( rNEvt ); return bRet; } diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx index 487659e..c8bfad2 100644 --- a/sfx2/source/inc/partwnd.hxx +++ b/sfx2/source/inc/partwnd.hxx @@ -59,7 +59,7 @@ public: class SfxPartDockWnd_Impl : public SfxDockingWindow { protected: - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; public: SfxPartDockWnd_Impl( SfxBindings* pBindings, diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index d24373c..738f8b2 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -80,7 +80,7 @@ public: return nModifier; } - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; typedef std::vector<OUString> ExpandedEntries_t; @@ -97,7 +97,7 @@ private: OUString aStyle; protected: - virtual bool Notify(NotifyEvent& rNEvt) override; + virtual bool EventNotify(NotifyEvent& rNEvt) override; virtual bool DoubleClickHdl() override; virtual bool ExpandingHdl() override; virtual void ExpandedHdl() override; diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 15a9c3a..acac122 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -147,7 +147,7 @@ void Deck::DataChanged (const DataChangedEvent& rEvent) RequestLayout(); } -bool Deck::Notify (NotifyEvent& rEvent) +bool Deck::EventNotify(NotifyEvent& rEvent) { if (rEvent.GetType() == MouseNotifyEvent::COMMAND) { @@ -163,7 +163,7 @@ bool Deck::Notify (NotifyEvent& rEvent) } } - return Window::Notify(rEvent); + return Window::EventNotify(rEvent); } bool Deck::ProcessWheelEvent(CommandEvent* pCommandEvent) diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 26a758d..bb948b0 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -138,7 +138,7 @@ void SidebarToolBox::InsertItem(const OUString& rCommand, RegisterHandlers(); } -bool SidebarToolBox::Notify (NotifyEvent& rEvent) +bool SidebarToolBox::EventNotify (NotifyEvent& rEvent) { if (rEvent.GetType() == MouseNotifyEvent::KEYINPUT) { @@ -147,10 +147,10 @@ bool SidebarToolBox::Notify (NotifyEvent& rEvent) // Special handling for transferring handling of KEY_TAB // that becomes necessary because of our parent that is // not the dialog but a background control. - return DockingWindow::Notify(rEvent); + return DockingWindow::EventNotify(rEvent); } } - return ToolBox::Notify(rEvent); + return ToolBox::EventNotify(rEvent); } void SidebarToolBox::CreateController ( diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 62826f7..1bf3847 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -240,7 +240,7 @@ void TabBar::DataChanged (const DataChangedEvent& rDataChangedEvent) Window::DataChanged(rDataChangedEvent); } -bool TabBar::Notify (NotifyEvent& rEvent) +bool TabBar::EventNotify(NotifyEvent& rEvent) { if(rEvent.GetType() == MouseNotifyEvent::COMMAND) { diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 4a88eea..91e9e61 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -70,7 +70,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void StateChanged( StateChangedType nStateChange ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rEvt ) override; + virtual bool EventNotify( NotifyEvent& rEvt ) override; virtual void Resize() override; virtual void GetFocus() override; void DoResize(); @@ -90,14 +90,14 @@ void SfxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) pWorkWin->DataChanged_Impl( rDCEvt ); } -bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) +bool SfxFrameWindow_Impl::EventNotify( NotifyEvent& rNEvt ) { if ( pFrame->IsClosing_Impl() || !pFrame->GetFrameInterface().is() ) return false; SfxViewFrame* pView = pFrame->GetCurrentViewFrame(); if ( !pView || !pView->GetObjectShell() ) - return Window::Notify( rNEvt ); + return Window::EventNotify( rNEvt ); if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { @@ -128,7 +128,7 @@ bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) return true; } - return Window::Notify( rNEvt ); + return Window::EventNotify( rNEvt ); } bool SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index 45f98ad..1ff1d91 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -244,7 +244,7 @@ short SfxPrintOptionsDialog::Execute() } -bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) +bool SfxPrintOptionsDialog::EventNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -252,7 +252,7 @@ bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) return true; // help disabled -> <F1> does nothing } - return ModalDialog::Notify( rNEvt ); + return ModalDialog::EventNotify( rNEvt ); } diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index df1df08..bf46a5a 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -688,7 +688,7 @@ namespace svt } - bool EditBrowseBox::Notify(NotifyEvent& rEvt) + bool EditBrowseBox::EventNotify(NotifyEvent& rEvt) { switch (rEvt.GetType()) { @@ -703,7 +703,7 @@ namespace svt default: break; } - return BrowseBox::Notify(rEvt); + return BrowseBox::EventNotify(rEvt); } diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 95725e6..aa1c614 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -64,7 +64,7 @@ bool SvSimpleTableContainer::PreNotify( NotifyEvent& rNEvt ) const vcl::KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); sal_uInt16 nKey = aKeyCode.GetCode(); if (nKey == KEY_TAB) - GetParent()->Notify( rNEvt ); + GetParent()->EventNotify( rNEvt ); else if (m_pTable && m_pTable->IsFocusOnCellEnabled() && ( nKey == KEY_LEFT || nKey == KEY_RIGHT)) return false; else diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 9865781..80b9b50 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -1989,7 +1989,7 @@ public: PushButton* EnableNoneBtn( bool bEnable ); void ArrangeButtons(); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; ImplCFieldFloatWin::ImplCFieldFloatWin( vcl::Window* pParent ) : @@ -2127,7 +2127,7 @@ void ImplCFieldFloatWin::ArrangeButtons() } } -bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt ) +bool ImplCFieldFloatWin::EventNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -2136,7 +2136,7 @@ bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt ) mpCalendar->Select(); } - return FloatingWindow::Notify( rNEvt ); + return FloatingWindow::EventNotify( rNEvt ); } CalendarField::CalendarField(vcl::Window* pParent, WinBits nWinStyle) diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index c4cc63c..6033efa 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -75,7 +75,7 @@ namespace svt return SvtURLBox::PreNotify(_rNEvt); } - bool FileURLBox::Notify( NotifyEvent& _rNEvt ) + bool FileURLBox::EventNotify( NotifyEvent& _rNEvt ) { if (_rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) { @@ -84,13 +84,13 @@ namespace svt && ( IsInDropDown() ) ) { - bool bReturn = SvtURLBox::Notify(_rNEvt); + bool bReturn = SvtURLBox::EventNotify(_rNEvt); DisplayURL( m_sPreservedText ); return bReturn; } } - return SvtURLBox::Notify(_rNEvt); + return SvtURLBox::EventNotify(_rNEvt); } } // namespace svt diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 910ed3d..90d7926 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -745,7 +745,7 @@ void FormattedField::ReFormat() } } -bool FormattedField::Notify(NotifyEvent& rNEvt) +bool FormattedField::EventNotify(NotifyEvent& rNEvt) { if ((rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !IsReadOnly()) @@ -813,7 +813,7 @@ bool FormattedField::Notify(NotifyEvent& rNEvt) } } - return SpinField::Notify( rNEvt ); + return SpinField::EventNotify( rNEvt ); } void FormattedField::SetMinValue(double dMin) diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index c2218b1..38ddacc 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1098,7 +1098,7 @@ IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl, Edit&, void) TryAutoComplete(); } -bool SvtURLBox::Notify( NotifyEvent &rEvt ) +bool SvtURLBox::EventNotify( NotifyEvent &rEvt ) { if ( MouseNotifyEvent::GETFOCUS == rEvt.GetType() ) { @@ -1119,7 +1119,7 @@ bool SvtURLBox::Notify( NotifyEvent &rEvt ) } } - return ComboBox::Notify( rEvt ); + return ComboBox::EventNotify( rEvt ); } diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index 9a5334f..75dbf99 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -52,14 +52,14 @@ namespace svt return SvtURLBox::PreNotify(_rNEvt); } - bool OFileURLControl::Notify( NotifyEvent& _rNEvt ) + bool OFileURLControl::EventNotify( NotifyEvent& _rNEvt ) { if (GetSubEdit() == _rNEvt.GetWindow()) if (MouseNotifyEvent::KEYINPUT == _rNEvt.GetType()) if (KEY_RETURN == _rNEvt.GetKeyEvent()->GetKeyCode().GetCode()) if (IsInDropDown()) { - bool bReturn = SvtURLBox::Notify(_rNEvt); + bool bReturn = SvtURLBox::EventNotify(_rNEvt); // build a system dependent (thus more user readable) file name OFileNotation aTransformer(m_sPreservedText, OFileNotation::N_URL); @@ -72,7 +72,7 @@ namespace svt return bReturn; } - return SvtURLBox::Notify(_rNEvt); + return SvtURLBox::EventNotify(_rNEvt); } } // namespace svt diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 1107584..d5cba5f 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -305,12 +305,12 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl, ListBox&, void) } -bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt ) +bool PrinterSetupDialog::EventNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) && IsReallyVisible() ) ImplStatusHdl( &maStatusTimer ); - return ModalDialog::Notify( rNEvt ); + return ModalDialog::EventNotify( rNEvt ); } diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index 2829ce2..7ff932e 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -418,7 +418,7 @@ void WizardDialog::StateChanged( StateChangedType nType ) } -bool WizardDialog::Notify( NotifyEvent& rNEvt ) +bool WizardDialog::EventNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && mpPrevBtn && mpNextBtn ) { @@ -459,7 +459,7 @@ bool WizardDialog::Notify( NotifyEvent& rNEvt ) } } - return Dialog::Notify( rNEvt ); + return Dialog::EventNotify( rNEvt ); } diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index c4014ba..8ec5c97 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -599,7 +599,7 @@ bool SvResizeWindow::PreNotify( NotifyEvent& rEvt ) return Window::PreNotify(rEvt); } -bool SvResizeWindow::Notify( NotifyEvent& rEvt ) +bool SvResizeWindow::EventNotify( NotifyEvent& rEvt ) { if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && m_bActive ) { @@ -611,7 +611,7 @@ bool SvResizeWindow::Notify( NotifyEvent& rEvt ) } } - return Window::Notify(rEvt); + return Window::EventNotify(rEvt); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx index bc61297..07da606 100644 --- a/svtools/source/hatchwindow/ipwin.hxx +++ b/svtools/source/hatchwindow/ipwin.hxx @@ -84,7 +84,7 @@ public: virtual void KeyInput( const KeyEvent & rEvt ) override; virtual void Resize() override; virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle & ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; }; diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index d4fd7cd..a295b2e 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -175,7 +175,7 @@ namespace svt { namespace table } - bool TableDataWindow::Notify(NotifyEvent& rNEvt ) + bool TableDataWindow::EventNotify(NotifyEvent& rNEvt ) { bool bDone = false; if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND ) @@ -190,7 +190,7 @@ namespace svt { namespace table } } } - return bDone || Window::Notify( rNEvt ); + return bDone || Window::EventNotify( rNEvt ); } }} // namespace svt::table diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx index a3e2273..99def26 100644 --- a/svtools/source/table/tabledatawindow.hxx +++ b/svtools/source/table/tabledatawindow.hxx @@ -54,7 +54,7 @@ namespace svt { namespace table virtual void MouseMove( const MouseEvent& rMEvt) override; virtual void MouseButtonDown( const MouseEvent& rMEvt) override; virtual void MouseButtonUp( const MouseEvent& rMEvt) override; - virtual bool Notify(NotifyEvent& rNEvt) override; + virtual bool EventNotify(NotifyEvent& rNEvt) override; virtual void RequestHelp( const HelpEvent& rHEvt ) override; private: diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index b753fd1..e7168f0 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -91,7 +91,6 @@ class GalleryBrowser2 : public Control, public SfxListener { friend class GalleryBrowser; friend class svx::sidebar::GalleryControl; - using Control::Notify; using Window::KeyInput; private: diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 3ce5917..6ee7271 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1027,7 +1027,7 @@ namespace svxform } - bool XFormsPage::Notify( NotifyEvent& rNEvt ) + bool XFormsPage::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -1043,7 +1043,7 @@ namespace svxform } } - return bHandled || Window::Notify( rNEvt ); + return bHandled || Window::EventNotify( rNEvt ); } void XFormsPage::Resize() diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 999d8a6..896fca1 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -72,7 +72,6 @@ class GalleryBrowser1 : public Control, public SfxListener friend class GalleryBrowser; friend class svx::sidebar::GalleryControl; friend class GalleryThemeListBox; - using Control::Notify; using Window::KeyInput; private: diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index dd027cc..2141695 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -273,7 +273,7 @@ namespace svxform bool RemoveEntry(); protected: - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; public: XFormsPage( vcl::Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index ce5a592..5f458f7 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -253,7 +253,6 @@ public: const FmFilterModel* GetFilterModel() const {return m_pModel;} protected: - using Control::Notify; virtual void KeyInput( const KeyEvent& rKEvt ) override; virtual void Command( const CommandEvent& rEvt ) override; diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index a05a218..fdceac9 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -512,7 +512,6 @@ namespace svxform using SvTreeListBox::Insert; using SvTreeListBox::ExecuteDrop; using SvTreeListBox::Select; - using SvTreeListBox::Notify; private: sal_Int8 implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, bool _bDnD ); diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx index 2f492fe..74451ec 100644 --- a/svx/source/sidebar/PanelLayout.cxx +++ b/svx/source/sidebar/PanelLayout.cxx @@ -105,11 +105,11 @@ void PanelLayout::setPosSizePixel(long nX, long nY, long nWidth, long nHeight, P VclContainer::setLayoutAllocation(*pChild, Point(0, 0), Size(nWidth, nHeight)); } -bool PanelLayout::Notify(NotifyEvent& rNEvt) +bool PanelLayout::EventNotify(NotifyEvent& rNEvt) { if (rNEvt.GetType() == MouseNotifyEvent::COMMAND) Accelerator::ToggleMnemonicsOnHierarchy(*rNEvt.GetCommandEvent(), this); - return Control::Notify( rNEvt ); + return Control::EventNotify( rNEvt ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index acef715..87187f6 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -494,7 +494,7 @@ void SvxColorDockingWindow::GetFocus() } } -bool SvxColorDockingWindow::Notify( NotifyEvent& rNEvt ) +bool SvxColorDockingWindow::EventNotify( NotifyEvent& rNEvt ) { bool bRet = false; if( ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) ) @@ -510,7 +510,7 @@ bool SvxColorDockingWindow::Notify( NotifyEvent& rNEvt ) } } - return bRet || SfxDockingWindow::Notify( rNEvt ); + return bRet || SfxDockingWindow::EventNotify(rNEvt); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 114f23f..11b27ac 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -320,7 +320,7 @@ private: virtual void Select() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; static void ImplReleaseFocus(); public: @@ -374,9 +374,9 @@ bool ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt ) return ListBox::PreNotify( rNEvt ); } -bool ImplGrafModeControl::Notify( NotifyEvent& rNEvt ) +bool ImplGrafModeControl::EventNotify( NotifyEvent& rNEvt ) { - bool bHandled = ListBox::Notify( rNEvt ); + bool bHandled = ListBox::EventNotify( rNEvt ); if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index fcf4af6..de7c5bb 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -173,9 +173,9 @@ bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) } -bool SvxLineBox::Notify( NotifyEvent& rNEvt ) +bool SvxLineBox::EventNotify( NotifyEvent& rNEvt ) { - bool bHandled = LineLB::Notify( rNEvt ); + bool bHandled = LineLB::EventNotify( rNEvt ); if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -331,9 +331,9 @@ bool SvxMetricField::PreNotify( NotifyEvent& rNEvt ) } -bool SvxMetricField::Notify( NotifyEvent& rNEvt ) +bool SvxMetricField::EventNotify( NotifyEvent& rNEvt ) { - bool bHandled = MetricField::Notify( rNEvt ); + bool bHandled = MetricField::EventNotify( rNEvt ); if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -419,9 +419,9 @@ bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) } -bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) +bool SvxFillTypeBox::EventNotify( NotifyEvent& rNEvt ) { - bool bHandled = FillTypeLB::Notify( rNEvt ); + bool bHandled = FillTypeLB::EventNotify( rNEvt ); if (isDisposed()) return false; @@ -487,9 +487,9 @@ bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) } -bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) +bool SvxFillAttrBox::EventNotify( NotifyEvent& rNEvt ) { - bool bHandled = FillAttrLB::Notify( rNEvt ); + bool bHandled = FillAttrLB::EventNotify( rNEvt ); if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index aa725a7..d704135 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -134,7 +134,7 @@ public: bool IsVisible() const { return bVisible; } virtual bool PreNotify( NotifyEvent& rNEvt ) override; ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
