diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-17 16:40:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-17 16:42:29 +0100 |
| commit | 04683f14883f4cd64febadd71b327639f1e7edcc (patch) | |
| tree | d1195eec7abc45fcf3b28776278f3856638a4a32 | |
| parent | 734cf8395d745db73f52fd6d625d7deb77ba6d40 (diff) | |
Window::Notify should return bool
Change-Id: I72081b1022582c8b6f95a611e21d9c78f7581efe
151 files changed, 379 insertions, 396 deletions
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index b175f219e5bd..da1cac7e2a08 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -121,9 +121,9 @@ void BaseWindow::ExecuteGlobal (SfxRequest&) { } -long BaseWindow::Notify( NotifyEvent& rNEvt ) +bool BaseWindow::Notify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -140,14 +140,14 @@ long BaseWindow::Notify( NotifyEvent& rNEvt ) { if (Shell* pShell = GetShell()) pShell->NextPage( nCode == KEY_PAGEUP ); - nDone = 1; + nDone = true; } } break; } } - return nDone ? nDone : Window::Notify( rNEvt ); + return nDone || Window::Notify( rNEvt ); } diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index b5bb4004cac7..eb6d0ac42b3d 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -181,7 +181,7 @@ public: virtual void ExecuteCommand (SfxRequest&); virtual void ExecuteGlobal (SfxRequest&); virtual void GetState (SfxItemSet&) = 0; - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void StoreData(); virtual void UpdateData(); diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 55d3904dc8a8..fba6fb468a18 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -203,9 +203,9 @@ void SelectorListBox::Select() } } -long SelectorListBox::Notify( NotifyEvent& rNEvt ) +bool SelectorListBox::Notify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -219,7 +219,7 @@ long SelectorListBox::Notify( NotifyEvent& rNEvt ) if ( KEY_TAB == nCode ) m_bReleaseFocus = false; else - nHandled = 1; + nHandled = true; Select(); break; } @@ -236,7 +236,7 @@ long SelectorListBox::Notify( NotifyEvent& rNEvt ) SelectEntryPos( GetSavedValue() ); } - return nHandled ? nHandled : ListBox::Notify( rNEvt ); + return nHandled || ListBox::Notify( rNEvt ); } Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::CreateAccessible() diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index bcf5e82dc5bf..4971cbb9c39f 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -51,7 +51,7 @@ class SelectorListBox : public ListBox virtual ~SelectorListBox(); virtual void Select(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); void ReleaseFocus_Impl(); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 28804948ea21..511e9419febf 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -133,9 +133,9 @@ IMPL_LINK( _HeaderTabListBox, HeaderEndDrag_Impl, HeaderBar*, pBar ) return 1; } -long _HeaderTabListBox::Notify( NotifyEvent& rNEvt ) +bool _HeaderTabListBox::Notify( NotifyEvent& rNEvt ) { - long nRet = Control::Notify( rNEvt ); + bool nRet = Control::Notify( rNEvt ); if( rNEvt.GetType() == EVENT_GETFOCUS ) { diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 5eb92a36cd8a..034ada98cc9d 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -979,7 +979,7 @@ IMPL_LINK_NOARG(SpellDialog, CancelHdl) } //----------------------------------------------------------------------- -long SpellDialog::Notify( NotifyEvent& rNEvt ) +bool SpellDialog::Notify( NotifyEvent& rNEvt ) { /* #i38338# * FIXME: LoseFocus and GetFocus are signals from vcl that diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index d849ed927276..331a9ea47623 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -104,7 +104,7 @@ void SvxHyperURLBox::Modify() { SvtURLBox::Modify(); } -long SvxHyperURLBox::Notify( NotifyEvent& rNEvt ) +bool SvxHyperURLBox::Notify( NotifyEvent& rNEvt ) { return SvtURLBox::Notify( rNEvt ); } diff --git a/cui/source/inc/ControlFocusHelper.hxx b/cui/source/inc/ControlFocusHelper.hxx index ef61d83621aa..d09c76b81ea0 100644 --- a/cui/source/inc/ControlFocusHelper.hxx +++ b/cui/source/inc/ControlFocusHelper.hxx @@ -34,7 +34,7 @@ public: void SetFocusControl( Control* pCtrl ) { m_pFocusCtrl = pCtrl; } - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; #endif // INCLUDED_CUI_SOURCE_INC_CONTROLFOCUSHELPER_HXX diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 9c10a045fb5d..3cfe2ff60f2f 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -210,7 +210,7 @@ private: void SetTitle_Impl(LanguageType nLang); protected: - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); OUString getReplacementString() const; diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 0be8ebe0b20f..da178764035b 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -31,7 +31,7 @@ private: SvHeaderTabListBox maListBox; protected: DECL_LINK( HeaderEndDrag_Impl, HeaderBar* ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); public: _HeaderTabListBox( Window* pParent, const ResId& rId ); virtual ~_HeaderTabListBox(); diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index f765be926b73..874b2930365e 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -61,7 +61,7 @@ protected: virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void Select(); virtual void Modify(); virtual long PreNotify( NotifyEvent& rNEvt ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index c2ea60275cc8..3f60dfdaab9c 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -200,7 +200,7 @@ protected: DECL_LINK( HintHdl_Impl, Timer * ); void SelectHdl_Impl(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual short Execute(); public: diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index b92e271df7c9..56adb934854c 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -372,7 +372,7 @@ namespace offapp } //-------------------------------------------------------------------- - long ConnectionPoolOptionsPage::Notify( NotifyEvent& _rNEvt ) + bool ConnectionPoolOptionsPage::Notify( NotifyEvent& _rNEvt ) { if (EVENT_LOSEFOCUS == _rNEvt.GetType()) if (m_pTimeout->IsWindowOrChild(_rNEvt.GetWindow())) diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index c162ab0e4364..27397c0a462e 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -54,7 +54,7 @@ namespace offapp static SfxTabPage* Create(Window* _pParent, const SfxItemSet& _rAttrSet); protected: - virtual long Notify( NotifyEvent& _rNEvt ); + virtual bool Notify( NotifyEvent& _rNEvt ); virtual sal_Bool FillItemSet(SfxItemSet& _rSet); virtual void Reset(const SfxItemSet& _rSet); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index f33dde62c335..15ec74e149f3 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -164,9 +164,9 @@ OUString Convert_Impl( const OUString& rValue ) // class SvxControlFocusHelper --------------------------------------------- -long SvxControlFocusHelper::Notify( NotifyEvent& rNEvt ) +bool SvxControlFocusHelper::Notify( NotifyEvent& rNEvt ) { - long nRet = Control::Notify( rNEvt ); + bool nRet = Control::Notify( rNEvt ); if ( m_pFocusCtrl && rNEvt.GetWindow() != m_pFocusCtrl && rNEvt.GetType() == EVENT_GETFOCUS ) m_pFocusCtrl->GrabFocus(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 6d5c27eeb0db..04e995b29613 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -882,7 +882,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() aTreeLB.GrabFocus(); } -long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) +bool OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 012096da1471..6c2777e45a23 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -130,15 +130,15 @@ namespace virtual void DataChanged(const DataChangedEvent& rDCEvt); public: OTablePreviewWindow( Window* pParent, WinBits nStyle = 0 ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; OTablePreviewWindow::OTablePreviewWindow(Window* pParent, WinBits nStyle) : Window( pParent, nStyle) { ImplInitSettings( sal_True, sal_True, sal_True ); } - long OTablePreviewWindow::Notify( NotifyEvent& rNEvt ) + bool OTablePreviewWindow::Notify( NotifyEvent& rNEvt ) { - long nRet = Window::Notify( rNEvt ); + bool nRet = Window::Notify( rNEvt ); if ( rNEvt.GetType() == EVENT_INPUTENABLE && IsInputEnabled() ) PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput) ); return nRet; diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 67d20e03b381..3966b0362b02 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -34,7 +34,7 @@ class LimitBoxImpl: public LimitBox LimitBoxImpl( Window* pParent, LimitBoxController* pCtrl ); virtual ~LimitBoxImpl(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); private: LimitBoxController* m_pControl; @@ -50,9 +50,9 @@ LimitBoxImpl::~LimitBoxImpl() { } -long LimitBoxImpl::Notify( NotifyEvent& rNEvt ) +bool LimitBoxImpl::Notify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; switch ( rNEvt.GetType() ) { case EVENT_LOSEFOCUS: @@ -76,7 +76,7 @@ long LimitBoxImpl::Notify( NotifyEvent& rNEvt ) case KEY_RETURN: { GrabFocusToDocument(); - nHandled = 1; + nHandled = true; break; } case KEY_TAB: @@ -88,7 +88,7 @@ long LimitBoxImpl::Notify( NotifyEvent& rNEvt ) break; } } - return nHandled ? nHandled : LimitBox::Notify( rNEvt ); + return nHandled || LimitBox::Notify( rNEvt ); } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 913f53d7ac8a..df4b1245fb64 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -145,7 +145,7 @@ public: void InitFromDialog(ExtMgrDialog *pParentDialog); virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual Size GetOptimalSize() const; @@ -430,7 +430,7 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt ) } //------------------------------------------------------------------------------ -long ExtBoxWithBtns_Impl::Notify( NotifyEvent& rNEvt ) +bool ExtBoxWithBtns_Impl::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -1141,7 +1141,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl) //------------------------------------------------------------------------------ // VCL::Window / Dialog -long ExtMgrDialog::Notify( NotifyEvent& rNEvt ) +bool ExtMgrDialog::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 05f78fccd555..b4817edb213b 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -141,7 +141,7 @@ public: ExtMgrDialog( Window * pParent, TheExtensionManager *pManager ); virtual ~ExtMgrDialog(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual sal_Bool Close(); virtual void showProgress( bool bStart ); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 0ced6a11257c..5534a219b416 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -892,7 +892,7 @@ void ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt ) } //------------------------------------------------------------------------------ -long ExtensionBox_Impl::Notify( NotifyEvent& rNEvt ) +bool ExtensionBox_Impl::Notify( NotifyEvent& rNEvt ) { if ( !m_bInDelete ) DeleteRemoved(); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 73859d9357ec..199e2213a624 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -186,7 +186,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void Paint( const Rectangle &rPaintRect ); virtual void Resize(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); const Size GetMinOutputSizePixel() const; void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; } diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index fa6bfcc36aca..1333185d9843 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1265,7 +1265,7 @@ namespace pcr } //------------------------------------------------------------------ - long OBrowserListBox::Notify( NotifyEvent& _rNEvt ) + bool OBrowserListBox::Notify( NotifyEvent& _rNEvt ) { switch ( _rNEvt.GetType() ) { diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 347604136007..2001034dbec2 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -133,7 +133,7 @@ namespace pcr sal_uInt16 CalcVisibleLines(); void EnableUpdate(); void DisableUpdate(); - long Notify( NotifyEvent& _rNEvt ); + bool Notify( NotifyEvent& _rNEvt ); long PreNotify( NotifyEvent& _rNEvt ); void SetListener( IPropertyLineListener* _pListener ); diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index 05a41eb5bb02..d6071348e737 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -91,7 +91,7 @@ namespace pcr } //------------------------------------------------------------------------ - long OPropertyBrowserView::Notify( NotifyEvent& _rNEvt ) + bool OPropertyBrowserView::Notify( NotifyEvent& _rNEvt ) { if ( EVENT_KEYINPUT == _rNEvt.GetType() ) { @@ -101,7 +101,7 @@ namespace pcr // silence this, we don't want to propagate this outside the property // browser, as it will probably do harm there // #i63285# - return 1; + return true; } return Window::Notify( _rNEvt ); } diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 88a150fab092..4d5b482e2d1b 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -44,7 +44,7 @@ namespace pcr protected: virtual void Resize(); virtual void GetFocus(); - virtual long Notify( NotifyEvent& _rNEvt ); + virtual bool Notify( NotifyEvent& _rNEvt ); public: OPropertyBrowserView( Window* pParent, WinBits nBits = 0); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index c060691d5bee..0e13d7b2d859 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -1002,10 +1002,10 @@ void XMLFilterSettingsDialog::onClose() Close(); } -long XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt ) +bool XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt ) { // Because of of tab control first call the base class. - long nRet = ModelessDialog::Notify( rNEvt ); + bool nRet = ModelessDialog::Notify( rNEvt ); if ( !nRet ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -1018,7 +1018,7 @@ long XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt ) if( nKeyCode == KEY_ESCAPE || (bMod1 && (nKeyCode == KEY_W))) { Close(); - return sal_True; + return true; } } } @@ -1385,9 +1385,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPathControl(Window *pPar return new SvxPathControl(pParent); } -long SvxPathControl::Notify(NotifyEvent& rNEvt) +bool SvxPathControl::Notify(NotifyEvent& rNEvt) { - long nRet = VclVBox::Notify(rNEvt); + bool nRet = VclVBox::Notify(rNEvt); if ( m_pFocusCtrl && rNEvt.GetWindow() != m_pFocusCtrl && rNEvt.GetType() == EVENT_GETFOCUS ) m_pFocusCtrl->GrabFocus(); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index 60b99835a25a..ef17342c7a9f 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -51,7 +51,7 @@ public: XMLFilterListBox* getListBox() { return m_pFocusCtrl; } ~SvxPathControl(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; // -------------------------------------------------------------------- @@ -104,7 +104,7 @@ public: void updateStates(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); bool isClosable(); diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index c0e5828a83de..a145f62301d2 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -287,15 +287,15 @@ namespace frm } //-------------------------------------------------------------------- - long RichTextControl::Notify( NotifyEvent& _rNEvt ) + bool RichTextControl::Notify( NotifyEvent& _rNEvt ) { - long nDone = 0; + bool nDone = false; if ( _rNEvt.GetType() == EVENT_COMMAND ) { const CommandEvent& rEvent = *_rNEvt.GetCommandEvent(); nDone = m_pImpl->HandleCommand( rEvent ); } - return nDone ? nDone : Control::Notify( _rNEvt ); + return nDone || Control::Notify( _rNEvt ); } //-------------------------------------------------------------------- diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index dcbb3ee41b4b..35b59916560f 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -110,7 +110,7 @@ namespace frm virtual void GetFocus(); virtual void StateChanged( StateChangedType nStateChange ); virtual long PreNotify( NotifyEvent& _rNEvt ); - virtual long Notify( NotifyEvent& _rNEvt ); + virtual bool Notify( NotifyEvent& _rNEvt ); private: void applyAttributes( const SfxItemSet& _rAttributesToApply ); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 0e5b4679d2a9..63aa4a46b5fe 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1710,7 +1710,7 @@ IMPL_LINK_NOARG(SvtFileDialog, PlayButtonHdl_Impl) //***************************************************************************** -long SvtFileDialog::Notify( NotifyEvent& rNEvt ) +bool SvtFileDialog::Notify( NotifyEvent& rNEvt ) /* [Description] @@ -1719,7 +1719,7 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); - long nRet = 0; + long nRet = false; if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() ) { @@ -1729,16 +1729,16 @@ long SvtFileDialog::Notify( NotifyEvent& rNEvt ) if ( !rKeyCode.GetModifier() && KEY_BACKSPACE == nCode && !_pImp->_pEdFileName->HasChildPathFocus() ) { - nRet = 0; + nRet = false; if ( !nRet && _pImp->_pBtnUp->IsEnabled() ) { PrevLevel_Impl(); - nRet = 1; + nRet = true; } } } - return nRet ? nRet : ModalDialog::Notify( rNEvt ); + return nRet || ModalDialog::Notify( rNEvt ); } //***************************************************************************** diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 0126e17195ff..41ffff391074 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -165,7 +165,7 @@ private: void implUpdateImages( ); protected: - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); void EnableInternet( sal_Bool bInternet ); // originally from VclFileDialog diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 56ddacd7c8ae..def7d091e5fd 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -114,7 +114,7 @@ protected: public: virtual void FillInfo(SfxChildWinInfo&) const; void Initialize (SfxChildWinInfo* pInfo); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); SfxBindings& GetBindings() { return *pBindings; } @@ -148,7 +148,7 @@ protected: virtual sal_Bool Close(); virtual void Resize(); virtual void Move(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); SfxBindings& GetBindings() { return *pBindings; } diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index bc5d3b08f2ad..333bdc455891 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -98,7 +98,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); Size GetMinOutputSizePixel() const; - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void FadeIn( sal_Bool ); void AutoShow( sal_Bool bShow = sal_True ); DECL_LINK(TimerHdl, void *); diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index c160ba66fc4f..1d8575470d49 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -48,7 +48,7 @@ public: sal_Bool Construct(); virtual short Execute(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); SfxTabPage* GetTabPage() const { return pPage; } const SfxItemSet& GetOptions() const { return *pOptions; } diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 87f015f6e80c..c0e86e07733f 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -52,7 +52,7 @@ public: virtual void Paint (const Rectangle& rRect); - virtual long Notify (NotifyEvent& rEvent); + virtual bool Notify (NotifyEvent& rEvent); cssu::Reference<css::frame::XToolbarController> GetControllerForItemId ( const sal_uInt16 nItemId) const; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 517d61caf053..e28513efdc29 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -529,7 +529,7 @@ namespace svt using BrowseBox::MouseButtonDown; virtual long PreNotify(NotifyEvent& rNEvt ); - virtual long Notify(NotifyEvent& rNEvt); + virtual bool Notify(NotifyEvent& rNEvt); virtual void EndScroll(); diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 5c8274a22b93..7ff42f542b46 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -41,7 +41,7 @@ namespace svt protected: virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); 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 7137f5568099..fbc882edd335 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -235,7 +235,7 @@ public: bool IsUsingInputStringForFormatting() const; protected: - virtual long Notify(NotifyEvent& rNEvt); + virtual bool Notify(NotifyEvent& rNEvt); void impl_Modify(bool makeValueDirty = true); virtual void Modify(); diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 90651690f447..dfa15ca969ac 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 long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void Select(); virtual void Modify(); virtual long PreNotify( NotifyEvent& rNEvt ); diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 593b95ecae5f..1d43f2f39a24 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -66,7 +66,7 @@ public: Printer* GetPrinter() const { return mpPrinter; } virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual short Execute(); diff --git a/include/svtools/toolpanel/toolpaneldeck.hxx b/include/svtools/toolpanel/toolpaneldeck.hxx index 3ad4fcd8ae92..c4ed250a76ea 100644 --- a/include/svtools/toolpanel/toolpaneldeck.hxx +++ b/include/svtools/toolpanel/toolpaneldeck.hxx @@ -171,7 +171,7 @@ namespace svt protected: // Window overridables virtual void Resize(); - virtual long Notify( NotifyEvent& i_rNotifyEvent ); + virtual bool Notify( NotifyEvent& i_rNotifyEvent ); virtual void GetFocus(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index 2bc4d8520b13..155094ebfecb 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -41,7 +41,7 @@ namespace svt protected: virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; //......................................................................... diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 7c0304c3d720..f80a25a85cfa 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -258,7 +258,7 @@ public: virtual void Resize(); virtual void StateChanged( StateChangedType nStateChange ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void ActivatePage(); virtual long DeactivatePage(); diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index 41005d669d88..cf5b596e5099 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -111,7 +111,7 @@ public: void SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight ) { nLeftSlot = nLeft; nRightSlot = nRight; } - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; #endif diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 6cca82d58b38..66a8da951659 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -56,7 +56,7 @@ public: protected: virtual void Select(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; @@ -88,7 +88,7 @@ public: protected: virtual void Select(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; @@ -113,7 +113,7 @@ protected: virtual void Up(); // just to be sure virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: @@ -140,7 +140,7 @@ public: protected: virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); private: sal_uInt16 nCurPos; @@ -162,7 +162,7 @@ public: protected: virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void Select(); private: diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx index 630512409ba7..64cb2b70fddd 100644 --- a/include/svx/sidebar/PopupContainer.hxx +++ b/include/svx/sidebar/PopupContainer.hxx @@ -36,7 +36,7 @@ public: PopupContainer (Window* pParent); virtual ~PopupContainer (void); - virtual long Notify (NotifyEvent& rNEvt); + virtual bool Notify (NotifyEvent& rNEvt); }; diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 6cd3d5c1c806..81849c477b9f 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -97,7 +97,7 @@ public: virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 0a5fdf963df1..94527934ce51 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -130,7 +130,7 @@ public: virtual void GetFocus(); virtual void LoseFocus(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nStateChange ); virtual void Resize(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 1e9c6c9bbf5d..04279b6fb1b0 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -95,7 +95,7 @@ public: explicit Dialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~Dialog(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index ef2831691dc0..9d9c6f4d385a 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -296,7 +296,7 @@ public: virtual void Resizing( Size& rSize ); virtual sal_Bool Close(); virtual void Tracking( const TrackingEvent& rTEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx index aa591a866c1c..b75b4dd0aaf6 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -487,7 +487,7 @@ public: virtual ~PatternField(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void Modify(); }; @@ -507,7 +507,7 @@ public: virtual ~NumericField(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual Size CalcMinimumSize() const; @@ -537,7 +537,7 @@ public: virtual ~MetricField(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual Size CalcMinimumSize() const; @@ -605,7 +605,7 @@ public: ~CurrencyField(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void Modify(); @@ -637,7 +637,7 @@ public: virtual ~DateField(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void Modify(); @@ -673,7 +673,7 @@ public: virtual ~TimeField(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void Modify(); @@ -703,7 +703,7 @@ public: ~PatternBox(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void Modify(); @@ -725,7 +725,7 @@ public: virtual Size CalcMinimumSize() const; virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void Modify(); @@ -747,7 +747,7 @@ public: virtual ~MetricBox(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual Size CalcMinimumSize() const; @@ -781,7 +781,7 @@ public: virtual ~CurrencyBox(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void Modify(); @@ -802,7 +802,7 @@ public: virtual ~DateBox(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void Modify(); @@ -822,7 +822,7 @@ public: virtual ~TimeBox(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void Modify(); diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx index 9a9dbdcd11b1..a3ece25dfe8b 100644 --- a/include/vcl/floatwin.hxx +++ b/include/vcl/floatwin.hxx @@ -120,7 +120,7 @@ public: explicit FloatingWindow( Window* pParent, const ResId& ); virtual ~FloatingWindow(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 6c9e35559fb0..3ea8d3133758 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -567,7 +567,7 @@ protected: virtual void setAllocation(const Size &rAllocation); DECL_LINK(ScrollBarHdl, void *); void InitScrollBars(const Size &rRequest); - virtual long Notify(NotifyEvent& rNEvt); + virtual bool Notify(NotifyEvent& rNEvt); private: bool m_bUserManagedScrolling; ScrollBar m_aVScroll; diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index d3b7078e2239..be53773e9021 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -93,7 +93,7 @@ public: ~LongCurrencyField(); long PreNotify( NotifyEvent& rNEvt ); - long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); void Modify(); void Up(); @@ -120,7 +120,7 @@ public: ~LongCurrencyBox(); long PreNotify( NotifyEvent& rNEvt ); - long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); void Modify(); void ReformatAll(); diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 9e51a6f96eb9..d987743b87b7 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -61,7 +61,7 @@ private: protected: explicit SpinField( WindowType nTyp ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void Command( const CommandEvent& rCEvt ); void EndDropDown(); diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx index 932fd2cf8632..c5b97a775417 100644 --- a/include/vcl/split.hxx +++ b/include/vcl/split.hxx @@ -79,7 +79,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void Tracking( const TrackingEvent& rTEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void GetFocus(); virtual void LoseFocus(); diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index 6631944e03cf..c26c637c6455 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -175,7 +175,7 @@ protected: public: ~SystemWindow(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); virtual sal_Bool Close(); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 280006f51c69..e2534409e0e1 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -73,7 +73,7 @@ private: SAL_DLLPRIVATE void ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bool bLayout = false, bool bFirstInGroup = false, bool bLastInGroup = false, bool bIsCurrentItem = false ); SAL_DLLPRIVATE void ImplPaint( const Rectangle& rRect, bool bLayout = false ); SAL_DLLPRIVATE void ImplFreeLayoutData(); - SAL_DLLPRIVATE long ImplHandleKeyEvent( const KeyEvent& rKeyEvent ); + SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKeyEvent ); DECL_DLLPRIVATE_LINK( ImplListBoxSelectHdl, void* ); DECL_DLLPRIVATE_LINK( ImplWindowEventListener, VclSimpleEvent* ); @@ -103,7 +103,7 @@ public: virtual void LoseFocus(); virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void Command( const CommandEvent& rCEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 2b535721cfcb..e7668b857af9 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -320,7 +320,7 @@ public: virtual void Move(); virtual void Resize(); virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void Command( const CommandEvent& rCEvt ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index e1c69e3564af..ef12a376b484 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -48,7 +48,7 @@ protected: void StateChanged( StateChangedType nType ); void DataChanged( const DataChangedEvent& rDCEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); - long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); using Control::ImplInitSettings; void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); WinBits ImplInitStyle( WinBits nStyle ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 991daf6796d1..14d2b69c53e1 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -598,7 +598,7 @@ public: virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual Window* GetPreferredKeyInputWindow(); /*virtual*/ void AddEventListener( const Link& rEventListener ); diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx index 023923a52472..30f1af76ce67 100644 --- a/padmin/source/helper.cxx +++ b/padmin/source/helper.cxx @@ -140,15 +140,15 @@ void padmin::FindFiles( const OUString& rDirectory, ::std::list< OUString >& rRe * DelMultiListBox */ -long DelMultiListBox::Notify( NotifyEvent& rEvent ) +bool DelMultiListBox::Notify( NotifyEvent& rEvent ) { - long nRet = 0; + bool nRet = false; if( rEvent.GetType() == EVENT_KEYINPUT && rEvent.GetKeyEvent()->GetKeyCode().GetCode() == KEY_DELETE ) { m_aDelPressedLink.Call( this ); - nRet = 1; + nRet = true; } else nRet = MultiListBox::Notify( rEvent ); @@ -160,15 +160,15 @@ long DelMultiListBox::Notify( NotifyEvent& rEvent ) * DelListBox */ -long DelListBox::Notify( NotifyEvent& rEvent ) +bool DelListBox::Notify( NotifyEvent& rEvent ) { - long nRet = 0; + bool nRet = false; if( rEvent.GetType() == EVENT_KEYINPUT && rEvent.GetKeyEvent()->GetKeyCode().GetCode() == KEY_DELETE ) { m_aDelPressedLink.Call( this ); - nRet = 1; + nRet = true; } else nRet = ListBox::Notify( rEvent ); diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx index ea0babe61cf9..d229766c1836 100644 --- a/padmin/source/helper.hxx +++ b/padmin/source/helper.hxx @@ -49,7 +49,7 @@ public: MultiListBox( pParent, rResId ) {} ~DelMultiListBox() {} - virtual long Notify( NotifyEvent& rEvent ); + virtual bool Notify( NotifyEvent& rEvent ); Link setDelPressedLink( const Link& rLink ) { @@ -68,7 +68,7 @@ public: ListBox( pParent, rResId ) {} ~DelListBox() {} - virtual long Notify( NotifyEvent& rEvent ); + virtual bool Notify( NotifyEvent& rEvent ); Link setDelPressedLink( const Link& rLink ) { diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx index 2685e2d27146..fa20fa2938ae 100644 --- a/padmin/source/padialog.cxx +++ b/padmin/source/padialog.cxx @@ -147,7 +147,7 @@ PADialog::~PADialog() freePadminRC(); } -long PADialog::Notify( NotifyEvent& rEv ) +bool PADialog::Notify( NotifyEvent& rEv ) { if( IsVisible() && (rEv.GetType() == EVENT_GETFOCUS || rEv.GetType() == EVENT_LOSEFOCUS ) diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx index 031cab8abba1..6dd6834f1ce4 100644 --- a/padmin/source/padialog.hxx +++ b/padmin/source/padialog.hxx @@ -88,7 +88,7 @@ namespace padmin { void PrintTestPage(); void updateSettings(); - virtual long Notify( NotifyEvent& rEv ); + virtual bool Notify( NotifyEvent& rEv ); virtual void DataChanged( const DataChangedEvent& rEv ); OUString getSelectedDevice(); diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index c2b0816cd921..51e178a904df 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -68,7 +68,7 @@ namespace rptui virtual void DataChanged( const DataChangedEvent& rDCEvt ); // window virtual void Resize(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); // OPropertyChangeListener virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& _rEvent) throw( ::com::sun::star::uno::RuntimeException); public: diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index ca153c51a2f0..ac9ae7a12776 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -317,7 +317,7 @@ void OScrollWindowHelper::collapseSections(const uno::Sequence< ::com::sun::star m_aReportWindow.collapseSections(_aCollpasedSections); } //------------------------------------------------------------------------------ -long OScrollWindowHelper::Notify( NotifyEvent& rNEvt ) +bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt ) { const CommandEvent* pCommandEvent = rNEvt.GetCommandEvent(); if ( pCommandEvent && @@ -334,7 +334,7 @@ long OScrollWindowHelper::Notify( NotifyEvent& rNEvt ) pVScrBar = &m_aVScroll; if ( HandleScrollCommand( *pCommandEvent, pHScrBar, pVScrBar ) ) - return 1L; + return true; } return OScrollWindowHelper_BASE::Notify(rNEvt); } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 5f7b032d6132..a57d453c54de 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2481,9 +2481,9 @@ void ScPosWnd::DoEnter() ReleaseFocus_Impl(); } -long ScPosWnd::Notify( NotifyEvent& rNEvt ) +bool ScPosWnd::Notify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -2493,7 +2493,7 @@ long ScPosWnd::Notify( NotifyEvent& rNEvt ) { case KEY_RETURN: DoEnter(); - nHandled = 1; + nHandled = true; break; case KEY_ESCAPE: @@ -2508,7 +2508,7 @@ long ScPosWnd::Notify( NotifyEvent& rNEvt ) SetText( aPosStr ); ReleaseFocus_Impl(); } - nHandled = 1; + nHandled = true; break; } } diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 61ef14b2fa93..39d21738221b 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -1198,7 +1198,7 @@ void ScCheckListMenuWindow::MouseMove(const MouseEvent& rMEvt) queueCloseSubMenu(); } -long ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt) +bool ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt) { switch (rNEvt.GetType()) { diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index f4e3949eeec7..1d944cab910c 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -62,7 +62,7 @@ ScCondFrmtEntry::~ScCondFrmtEntry() { } -long ScCondFrmtEntry::Notify( NotifyEvent& rNEvt ) +bool ScCondFrmtEntry::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) { diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index f324482fee41..e58ce8b6addf 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -239,7 +239,7 @@ public: virtual ~ScCheckListMenuWindow(); virtual void MouseMove(const MouseEvent& rMEvt); - virtual long Notify(NotifyEvent& rNEvt); + virtual bool Notify(NotifyEvent& rNEvt); virtual void Paint(const Rectangle& rRect); virtual Window* GetPreferredKeyInputWindow(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 806c7ce9ca7d..be9bf2833ba3 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -67,7 +67,7 @@ public: ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); virtual ~ScCondFrmtEntry(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); bool IsSelected() const; void SetIndex(sal_Int32 nIndex); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index ff44c57ebe60..14579cdbc067 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -150,7 +150,7 @@ protected: virtual void Select(); virtual void Modify(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 185c6e417ea3..6aacd2c8e48a 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -68,7 +68,7 @@ public: protected: virtual void Select(); virtual void DoubleClick(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); private: struct ScenarioEntry @@ -131,7 +131,7 @@ public: void SetCol( SCCOL nColNo ); protected: - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void LoseFocus(); virtual void Up(); virtual void Down(); @@ -164,7 +164,7 @@ public: void SetRow( SCROW nRow ){ SetValue( nRow ); } protected: - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void LoseFocus(); private: diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index d69184451c79..4263a618d89d 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -98,9 +98,9 @@ ColumnEdit::~ColumnEdit() //------------------------------------------------------------------------ -long ColumnEdit::Notify( NotifyEvent& rNEvt ) +bool ColumnEdit::Notify( NotifyEvent& rNEvt ) { - long nHandled = SpinField::Notify( rNEvt ); + bool nHandled = SpinField::Notify( rNEvt ); sal_uInt16 nType = rNEvt.GetType(); if ( nType == EVENT_KEYINPUT ) @@ -118,7 +118,7 @@ long ColumnEdit::Notify( NotifyEvent& rNEvt ) { ScNavigatorDlg::ReleaseFocus(); ExecuteCol(); - nHandled = 1; + nHandled = true; } } } @@ -300,9 +300,9 @@ RowEdit::~RowEdit() //------------------------------------------------------------------------ -long RowEdit::Notify( NotifyEvent& rNEvt ) +bool RowEdit::Notify( NotifyEvent& rNEvt ) { - long nHandled = NumericField::Notify( rNEvt ); + bool nHandled = NumericField::Notify( rNEvt ); if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -312,7 +312,7 @@ long RowEdit::Notify( NotifyEvent& rNEvt ) { ScNavigatorDlg::ReleaseFocus(); ExecuteRow(); - nHandled = 1; + nHandled = true; } } diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index b62298c8c048..7572edff7c2e 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -108,7 +108,7 @@ void ScScenarioListBox::DoubleClick() SelectScenario(); } -long ScScenarioListBox::Notify( NotifyEvent& rNEvt ) +bool ScScenarioListBox::Notify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -156,7 +156,7 @@ long ScScenarioListBox::Notify( NotifyEvent& rNEvt ) } } - return bHandled ? 1 : ListBox::Notify( rNEvt ); + return bHandled || ListBox::Notify( rNEvt ); } const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedEntry() const diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx index a47f45aa553e..4964e43396cf 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx @@ -593,7 +593,7 @@ void ClientBox::MouseButtonDown( const MouseEvent& rMEvt ) } //------------------------------------------------------------------------------ -long ClientBox::Notify( NotifyEvent& rNEvt ) +bool ClientBox::Notify( NotifyEvent& rNEvt ) { if ( !m_bInDelete ) DeleteRemoved(); diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index d4f754f94fdd..9c5ca8f025fd 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -146,7 +146,7 @@ public: void Paint( const Rectangle &rPaintRect ); void Resize(); Size GetOptimalSize() const; - long Notify( NotifyEvent& rNEvt ); + bool Notify( NotifyEvent& rNEvt ); const Size GetMinOutputSizePixel() const; void SetExtraSize( long nSize ) { m_nExtraHeight = nSize; } diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index b13bf5106906..e7e0c76d2bb9 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -171,7 +171,7 @@ void SdDocPreviewWin::startPreview() } } -long SdDocPreviewWin::Notify( NotifyEvent& rNEvt ) +bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) { diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index a5cb425f9df5..b3a80b80a5f2 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -782,10 +782,10 @@ NavDocInfo* SdNavigatorWin::GetDocInfo() /** * PreNotify */ -long SdNavigatorWin::Notify(NotifyEvent& rNEvt) +bool SdNavigatorWin::Notify(NotifyEvent& rNEvt) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); - long nOK = sal_False; + bool nOK = false; if( pKEvt ) { @@ -794,7 +794,7 @@ long SdNavigatorWin::Notify(NotifyEvent& rNEvt) if( SdPageObjsTLB::IsInDrag() ) { // during drag'n'drop we just stop the drag but do not close the navigator - nOK = sal_True; + nOK = true; } else { diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 4aa5fddc49b3..7571f73dcf7a 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -180,7 +180,7 @@ protected: virtual void Command(const CommandEvent& rCEvt); virtual void RequestHelp( const HelpEvent& rEvt ); virtual void LoseFocus(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); /** 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 6e959316e027..7895129830c1 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -67,7 +67,7 @@ public: virtual void Resize(); void startPreview(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); void SetClickHdl( const Link& rLink ) { aClickHdl = rLink; } const Link& GetClickHdl() const { return aClickHdl; } diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx index 68d6bc95c283..2a9b910e69cd 100644 --- a/sd/source/ui/inc/navigatr.hxx +++ b/sd/source/ui/inc/navigatr.hxx @@ -110,7 +110,7 @@ public: protected: virtual void Resize(); - virtual long Notify(NotifyEvent& rNEvt); + virtual bool Notify(NotifyEvent& rNEvt); private: diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 4138c19c7c8b..4d1c54807a29 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -281,19 +281,6 @@ void ShowWindow::Paint(const Rectangle& rRect) } } - -long ShowWindow::Notify(NotifyEvent& rNEvt) -{ - long nOK = sal_False; - if (!nOK) - nOK = Window::Notify(rNEvt); - - return nOK; -} - - -// ----------------------------------------------------------------------------- - void ShowWindow::GetFocus() { // base class diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 41c0c31506b0..0acf993576cf 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -77,7 +77,6 @@ public: virtual void MouseButtonUp(const MouseEvent& rMEvt); virtual void MouseButtonDown(const MouseEvent& rMEvt); virtual void Paint(const Rectangle& rRect); - virtual long Notify(NotifyEvent& rNEvt); //Overload the sd::Window's CreateAccessible to create a different accessible object virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 88321d71433b..1ec3f117f854 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -60,7 +60,7 @@ public: virtual void MouseButtonUp (const MouseEvent& rEvent); virtual void MouseButtonDown (const MouseEvent& rEvent); virtual void Command (const CommandEvent& rEvent); - virtual long Notify (NotifyEvent& rEvent); + virtual bool Notify (NotifyEvent& rEvent); private: SlideSorter& mrSlideSorter; @@ -673,10 +673,9 @@ void ContentWindow::Command(const CommandEvent& rEvent) -long ContentWindow::Notify (NotifyEvent& rEvent) +bool ContentWindow::Notify (NotifyEvent&) { - (void)rEvent; - return 0; + return false; } diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index a8ddedf67c83..158ae91204bc 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -295,9 +295,9 @@ void Window::Command(const CommandEvent& rCEvt) } -long Window::Notify( NotifyEvent& rNEvt ) +bool Window::Notify( NotifyEvent& rNEvt ) { - long nResult = sal_False; + bool nResult = false; if ( mpViewShell ) { nResult = mpViewShell->Notify(rNEvt, this); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 77e7362b05ac..f0314e536652 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -387,17 +387,17 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) // ----------------------------------------------------------------------- -long ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) +bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT && KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) { GetDoubleClickHdl().Call( NULL ); - bHandled = sal_True; + bHandled = true; } - return bHandled ? 1 : SvTreeListBox::Notify( rNEvt ); + return bHandled || SvTreeListBox::Notify( rNEvt ); } // ----------------------------------------------------------------------- @@ -494,17 +494,17 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) // ----------------------------------------------------------------------- -long IndexBox_Impl::Notify( NotifyEvent& rNEvt ) +bool IndexBox_Impl::Notify( NotifyEvent& rNEvt ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT && KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) { GetDoubleClickHdl().Call( NULL ); - bHandled = sal_True; + bHandled = true; } - return bHandled ? 1 : ComboBox::Notify( rNEvt ); + return bHandled || ComboBox::Notify( rNEvt ); } // ----------------------------------------------------------------------- @@ -931,17 +931,17 @@ void SearchBox_Impl::Select() // class SearchResultsBox_Impl ------------------------------------------- -long SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt ) +bool SearchResultsBox_Impl::Notify( NotifyEvent& rNEvt ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT && KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) { GetDoubleClickHdl().Call( NULL ); - bHandled = sal_True; + bHandled = true; } - return bHandled ? 1 : ListBox::Notify( rNEvt ); + return bHandled || ListBox::Notify( rNEvt ); } // class SearchTabPage_Impl ---------------------------------------------- @@ -1308,9 +1308,9 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) // ----------------------------------------------------------------------- -long BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) +bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) { - long nRet = 0; + bool nRet = false; sal_uInt16 nType = rNEvt.GetType(); if ( EVENT_KEYINPUT == nType ) { @@ -1318,12 +1318,12 @@ long BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) if ( KEY_DELETE == nCode && GetEntryCount() > 0 ) { DoAction( MID_DELETE ); - nRet = 1; + nRet = true; } else if ( KEY_RETURN == nCode ) { GetDoubleClickHdl().Call( NULL ); - nRet = 1; + nRet = true; } } else if ( EVENT_COMMAND == nType ) @@ -1335,11 +1335,11 @@ long BookmarksBox_Impl::Notify( NotifyEvent& rNEvt ) sal_uInt16 nId = aMenu.Execute( this, pCEvt->GetMousePosPixel() ); if ( nId != MENU_ITEM_NOTFOUND ) DoAction( nId ); - nRet = 1; + nRet = true; } } - return nRet ? nRet : ListBox::Notify( rNEvt ); + return nRet || ListBox::Notify( rNEvt ); } // class BookmarksTabPage_Impl ------------------------------------------- @@ -1989,7 +1989,7 @@ TextWin_Impl::~TextWin_Impl() { } -long TextWin_Impl::Notify( NotifyEvent& rNEvt ) +bool TextWin_Impl::Notify( NotifyEvent& rNEvt ) { if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_TAB ) return GetParent()->Notify( rNEvt ); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 0ebbcf65d645..3a5226afa041 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -85,7 +85,7 @@ public: virtual void RequestingChildren( SvTreeListEntry* pParent ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); inline void SetOpenHdl( const Link& rLink ) { SetDoubleClickHdl( rLink ); } OUString GetSelectEntry() const; @@ -133,7 +133,7 @@ public: IndexBox_Impl( Window* pParent, const ResId& rResId ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); void SelectExecutableEntry(); }; @@ -207,7 +207,7 @@ class SearchResultsBox_Impl : public ListBox public: SearchResultsBox_Impl( Window* pParent, const ResId& rResId ) : ListBox( pParent, rResId ) {} - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; class SearchTabPage_Impl : public HelpTabPage_Impl @@ -264,7 +264,7 @@ public: BookmarksBox_Impl( Window* pParent, const ResId& rResId ); ~BookmarksBox_Impl(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; class BookmarksTabPage_Impl : public HelpTabPage_Impl @@ -419,7 +419,7 @@ public: TextWin_Impl( Window* pParent ); virtual ~TextWin_Impl(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; // class SfxHelpTextWindow_Impl ------------------------------------------ diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 8744b0789a8a..988a4a349fb9 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -305,7 +305,7 @@ void BackingWindow::Paint( const Rectangle& ) aDev ); } -long BackingWindow::Notify( NotifyEvent& rNEvt ) +bool BackingWindow::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -319,7 +319,7 @@ long BackingWindow::Notify( NotifyEvent& rNEvt ) const KeyEvent* pEvt = rNEvt.GetKeyEvent(); const KeyCode& rKeyCode(pEvt->GetKeyCode()); if( pEvt && mpAccExec->execute(rKeyCode) ) - return 1; + return true; } return Window::Notify( rNEvt ); diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 948265fa96b6..526a91b5e644 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -107,7 +107,7 @@ public: virtual void Paint( const Rectangle& rRect ); virtual void Resize(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual Size GetOptimalSize() const; diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 25998b0cbffd..628086493c2a 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -354,7 +354,7 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW) // ----------------------------------------------------------------------- -long SfxModelessDialog::Notify( NotifyEvent& rEvt ) +bool SfxModelessDialog::Notify( NotifyEvent& rEvt ) /* [Description] @@ -379,7 +379,7 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt ) if ( !ModelessDialog::Notify( rEvt ) && SfxViewShell::Current() ) // then also for valid global accelerators. return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() ); - return sal_True; + return true; } return ModelessDialog::Notify( rEvt ); @@ -442,7 +442,7 @@ void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const // ----------------------------------------------------------------------- -long SfxFloatingWindow::Notify( NotifyEvent& rEvt ) +bool SfxFloatingWindow::Notify( NotifyEvent& rEvt ) /* [Description] @@ -470,7 +470,7 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt ) if ( !FloatingWindow::Notify( rEvt ) && SfxViewShell::Current() ) // then also for valid global accelerators. return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() ); - return sal_True; + return true; } return FloatingWindow::Notify( rEvt ); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 2eb6bed0e3d9..72f95bc8d1e9 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -79,7 +79,7 @@ public: void SetWrappedWindow(Window* const pWindow); virtual void StateChanged( StateChangedType nType ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void Resize(); virtual void Resizing( Size& rSize ); virtual sal_Bool Close(); @@ -269,7 +269,7 @@ void SfxTitleDockingWindow::SetWrappedWindow( Window* const pWindow ) } } -long SfxTitleDockingWindow::Notify( NotifyEvent& rNEvt ) +bool SfxTitleDockingWindow::Notify( NotifyEvent& rNEvt ) { return SfxDockingWindow::Notify( rNEvt ); } @@ -1770,7 +1770,7 @@ Size SfxDockingWindow::GetMinOutputSizePixel() const //------------------------------------------------------------------------- -long SfxDockingWindow::Notify( NotifyEvent& rEvt ) +bool SfxDockingWindow::Notify( NotifyEvent& rEvt ) { if ( rEvt.GetType() == EVENT_GETFOCUS ) { @@ -1786,7 +1786,7 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt ) // base class, otherwise the parent learns nothing // if ( rEvt.GetWindow() == this ) PB: #i74693# not necessary any longer DockingWindow::Notify( rEvt ); - return sal_True; + return true; } else if( rEvt.GetType() == EVENT_KEYINPUT ) { @@ -1794,7 +1794,7 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt ) if ( !DockingWindow::Notify( rEvt ) && SfxViewShell::Current() ) // then also for valid global accelerators. return SfxViewShell::Current()->GlobalKeyInput_Impl( *rEvt.GetKeyEvent() ); - return sal_True; + return true; } else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() ) { diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index fb0058f9cb22..a0de0f568905 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -178,7 +178,7 @@ sal_Bool SfxPartDockWnd_Impl::QueryClose() //**************************************************************************** -long SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt ) +bool SfxPartDockWnd_Impl::Notify( NotifyEvent& rEvt ) { if( rEvt.GetType() == EVENT_GETFOCUS ) { diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 067eae9919e5..2a971592ea2c 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -302,9 +302,9 @@ IMPL_LINK_NOARG(DropListBox_Impl, OnAsyncExecuteDrop) return 0; } -long DropListBox_Impl::Notify( NotifyEvent& rNEvt ) +bool DropListBox_Impl::Notify( NotifyEvent& rNEvt ) { - long nRet = 0; + bool nRet = false; if( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); @@ -313,12 +313,12 @@ long DropListBox_Impl::Notify( NotifyEvent& rNEvt ) if( pDialog->bCanDel && KEY_DELETE == rKeyCode.GetCode()) { pDialog->DeleteHdl( NULL ); - nRet = 1; + nRet = true; } else if( KEY_RETURN == rKeyCode.GetCode()) { GetDoubleClickHdl().Call(this); - nRet = 1; + nRet = true; } } } @@ -524,7 +524,7 @@ private: protected: virtual void Command( const CommandEvent& rMEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual sal_Bool DoubleClickHdl(); virtual bool ExpandingHdl(); virtual void ExpandedHdl(); @@ -592,18 +592,18 @@ void StyleTreeListBox_Impl::Command( const CommandEvent& rCEvt ) //------------------------------------------------------------------------- -long StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt ) +bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt ) { // handle <RETURN> as double click - long nRet = 0; + bool nRet = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); if ( !rKeyCode.GetModifier() && KEY_RETURN == rKeyCode.GetCode() ) { aDoubleClickLink.Call( this ); - nRet = 1; + nRet = true; } } diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx index 7dd94611bf55..0ecf7e55557f 100644 --- a/sfx2/source/inc/partwnd.hxx +++ b/sfx2/source/inc/partwnd.hxx @@ -61,7 +61,7 @@ class SfxPartDockWnd_Impl : public SfxDockingWindow { protected: virtual void Resize(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); public: SfxPartDockWnd_Impl( SfxBindings* pBindings, diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 0011aed2796c..3520a5b4efa4 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -73,7 +73,7 @@ public: sal_uInt16 GetModifier() const { return nModifier; } - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; // class SfxActionListBox ------------------------------------------------ diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx index 3d0f43c0fecf..0df23ae41b98 100644 --- a/sfx2/source/sidebar/Deck.cxx +++ b/sfx2/source/sidebar/Deck.cxx @@ -197,7 +197,7 @@ void Deck::DataChanged (const DataChangedEvent& rEvent) -long Deck::Notify (NotifyEvent& rEvent) +bool Deck::Notify (NotifyEvent& rEvent) { if (rEvent.GetType() == EVENT_COMMAND) { @@ -206,9 +206,7 @@ long Deck::Notify (NotifyEvent& rEvent) switch (pCommandEvent->GetCommand()) { case COMMAND_WHEEL: - return ProcessWheelEvent(pCommandEvent, rEvent) - ? sal_True - : sal_False; + return ProcessWheelEvent(pCommandEvent, rEvent); default: break; diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index 33eff61d7454..fb382a5b4ea4 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -67,7 +67,7 @@ public: virtual void Paint (const Rectangle& rUpdateArea); virtual void DataChanged (const DataChangedEvent& rEvent); - virtual long Notify (NotifyEvent& rEvent); + virtual bool Notify (NotifyEvent& rEvent); void PrintWindowTree (void); void PrintWindowTree (const ::std::vector<Panel*>& rPanels); diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 95cf7d2246df..70eba9c0bca7 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -118,7 +118,7 @@ void SidebarToolBox::Paint (const Rectangle& rRect) -long SidebarToolBox::Notify (NotifyEvent& rEvent) +bool SidebarToolBox::Notify (NotifyEvent& rEvent) { if (rEvent.GetType() == EVENT_KEYINPUT) { diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 353a2bb4238c..27f451b867f7 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -277,9 +277,9 @@ void TabBar::DataChanged (const DataChangedEvent& rDataChangedEvent) -long TabBar::Notify (NotifyEvent&) +bool TabBar::Notify (NotifyEvent&) { - return sal_False; + return false; } diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx index 20d4cc9be173..01073ce6c30c 100644 --- a/sfx2/source/sidebar/TabBar.hxx +++ b/sfx2/source/sidebar/TabBar.hxx @@ -74,7 +74,7 @@ public: virtual void Paint (const Rectangle& rUpdateArea); virtual void DataChanged (const DataChangedEvent& rDataChangedEvent); - virtual long Notify (NotifyEvent& rEvent); + virtual bool Notify (NotifyEvent& rEvent); static sal_Int32 GetDefaultWidth (void); diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 4eec35f809b7..bfca6b754a1e 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -73,7 +73,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void StateChanged( StateChangedType nStateChange ); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rEvt ); + virtual bool Notify( NotifyEvent& rEvt ); virtual void Resize(); virtual void GetFocus(); void DoResize(); @@ -97,10 +97,10 @@ void SfxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) pWorkWin->DataChanged_Impl( rDCEvt ); } -long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) +bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) { if ( pFrame->IsClosing_Impl() || !pFrame->GetFrameInterface().is() ) - return sal_False; + return false; SfxViewFrame* pView = pFrame->GetCurrentViewFrame(); if ( !pView || !pView->GetObjectShell() ) @@ -117,22 +117,22 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) // if focus was on an external window, the clipboard content might have been changed pView->GetBindings().Invalidate( SID_PASTE ); pView->GetBindings().Invalidate( SID_PASTE_SPECIAL ); - return sal_True; + return true; } else if( rNEvt.GetType() == EVENT_KEYINPUT ) { if ( pView->GetViewShell()->KeyInput( *rNEvt.GetKeyEvent() ) ) - return sal_True; + return true; } else if ( rNEvt.GetType() == EVENT_EXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTDISABLE*/ ) { pView->SetModalMode( sal_True ); - return sal_True; + return true; } else if ( rNEvt.GetType() == EVENT_ENDEXECUTEDIALOG /*|| rNEvt.GetType() == EVENT_INPUTENABLE*/ ) { pView->SetModalMode( sal_False ); - return sal_True; + return true; } return Window::Notify( rNEvt ); diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index 9d8c36c4e560..1e8d2bf49f7d 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -247,12 +247,12 @@ short SfxPrintOptionsDialog::Execute() //-------------------------------------------------------------------- -long SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) +bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { if ( rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_F1 && pDlgImpl->mbHelpDisabled ) - return 1; // help disabled -> <F1> does nothing + return true; // help disabled -> <F1> does nothing } return ModalDialog::Notify( rNEvt ); diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index d4dada733050..79a98c2c2139 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -735,7 +735,7 @@ namespace svt } //------------------------------------------------------------------------------ - long EditBrowseBox::Notify(NotifyEvent& rEvt) + bool EditBrowseBox::Notify(NotifyEvent& rEvt) { switch (rEvt.GetType()) { diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 38fd65f41644..ca9171b35c07 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -2221,7 +2221,7 @@ public: PushButton* EnableNoneBtn( sal_Bool bEnable ); void ArrangeButtons(); - long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; // ----------------------------------------------------------------------- @@ -2376,7 +2376,7 @@ void ImplCFieldFloatWin::ArrangeButtons() // ----------------------------------------------------------------------- -long ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt ) +bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index b0279228eecb..c13dd2b86305 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -74,7 +74,7 @@ namespace svt } //--------------------------------------------------------------------- - long FileURLBox::Notify( NotifyEvent& _rNEvt ) + bool FileURLBox::Notify( NotifyEvent& _rNEvt ) { switch ( _rNEvt.GetType() ) { @@ -84,7 +84,7 @@ namespace svt && ( IsInDropDown() ) ) { - long nReturn = SvtURLBox::Notify(_rNEvt); + bool nReturn = SvtURLBox::Notify(_rNEvt); DisplayURL( m_sPreservedText ); return nReturn; } diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 551da379cb60..a0742b5d2e27 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -791,7 +791,7 @@ void FormattedField::ReFormat() } } -long FormattedField::Notify(NotifyEvent& rNEvt) +bool FormattedField::Notify(NotifyEvent& rNEvt) { DBG_CHKTHIS(FormattedField, NULL); @@ -809,7 +809,7 @@ long FormattedField::Notify(NotifyEvent& rNEvt) { // the base class would translate this into calls to Up/Down/First/Last, // but we don't want this if we are text-formatted - return 1; + return true; } } } @@ -825,7 +825,7 @@ long FormattedField::Notify(NotifyEvent& rNEvt) // same as above : prevent the base class from doing Up/Down-calls // (normally I should put this test into the Up/Down methods itself, shouldn't I ?) // FS - 71553 - 19.01.00 - return 1; + return true; } } } diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 4cbe2a68395e..5ab9dbad8f54 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1139,7 +1139,7 @@ IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl) } //------------------------------------------------------------------------- -long SvtURLBox::Notify( NotifyEvent &rEvt ) +bool SvtURLBox::Notify( NotifyEvent &rEvt ) { if ( EVENT_GETFOCUS == rEvt.GetType() ) { diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index ee62f1b49255..85765000ce4a 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -49,14 +49,14 @@ namespace svt } //--------------------------------------------------------------------- - long OFileURLControl::Notify( NotifyEvent& _rNEvt ) + bool OFileURLControl::Notify( NotifyEvent& _rNEvt ) { if (GetSubEdit() == _rNEvt.GetWindow()) if (EVENT_KEYINPUT == _rNEvt.GetType()) if (KEY_RETURN == _rNEvt.GetKeyEvent()->GetKeyCode().GetCode()) if (IsInDropDown()) { - long nReturn = SvtURLBox::Notify(_rNEvt); + bool nReturn = SvtURLBox::Notify(_rNEvt); // build a system dependent (thus more user readable) file name OFileNotation aTransformer(m_sPreservedText, OFileNotation::N_URL); diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 90f2e5317837..a493c719e94e 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -311,7 +311,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl) // ----------------------------------------------------------------------- -long PrinterSetupDialog::Notify( NotifyEvent& rNEvt ) +bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_GETFOCUS) && IsReallyVisible() ) ImplStatusHdl( &maStatusTimer ); diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index 153a29e28566..51bbd19e605c 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -445,7 +445,7 @@ void WizardDialog::StateChanged( StateChangedType nType ) // ----------------------------------------------------------------------- -long WizardDialog::Notify( NotifyEvent& rNEvt ) +bool WizardDialog::Notify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && mpPrevBtn && mpNextBtn ) { @@ -466,7 +466,7 @@ long WizardDialog::Notify( NotifyEvent& rNEvt ) mpPrevBtn->SetPressed( sal_False ); mpPrevBtn->Click(); } - return sal_True; + return true; } } else @@ -480,7 +480,7 @@ long WizardDialog::Notify( NotifyEvent& rNEvt ) mpNextBtn->SetPressed( sal_False ); mpNextBtn->Click(); } - return sal_True; + return true; } } } diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index b9551ece5c88..4a603a8143ef 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -627,7 +627,7 @@ long SvResizeWindow::PreNotify( NotifyEvent& rEvt ) return Window::PreNotify(rEvt); } -long SvResizeWindow::Notify( NotifyEvent& rEvt ) +bool SvResizeWindow::Notify( NotifyEvent& rEvt ) { if ( rEvt.GetType() == EVENT_LOSEFOCUS && m_bActive ) { diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx index a2703b0dea68..79425625cb67 100644 --- a/svtools/source/hatchwindow/ipwin.hxx +++ b/svtools/source/hatchwindow/ipwin.hxx @@ -91,7 +91,7 @@ public: virtual void KeyInput( const KeyEvent & rEvt ); virtual void Resize(); virtual void Paint( const Rectangle & ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); void QueryObjAreaPixel( Rectangle & ); diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx index 65703e5d45c5..9970338ddfc2 100644 --- a/svtools/source/table/tabledatawindow.cxx +++ b/svtools/source/table/tabledatawindow.cxx @@ -209,9 +209,9 @@ namespace svt { namespace table } //------------------------------------------------------------------------------------------------------------------ - long TableDataWindow::Notify(NotifyEvent& rNEvt ) + bool TableDataWindow::Notify(NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; if ( rNEvt.GetType() == EVENT_COMMAND ) { const CommandEvent& rCEvt = *rNEvt.GetCommandEvent(); @@ -224,7 +224,7 @@ namespace svt { namespace table } } } - return nDone ? nDone : Window::Notify( rNEvt ); + return nDone || Window::Notify( rNEvt ); } //...................................................................................................................... } } // namespace svt::table diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx index 4a7a771f02c3..594831db4ede 100644 --- a/svtools/source/table/tabledatawindow.hxx +++ b/svtools/source/table/tabledatawindow.hxx @@ -58,7 +58,7 @@ namespace svt { namespace table virtual void MouseMove( const MouseEvent& rMEvt); virtual void MouseButtonDown( const MouseEvent& rMEvt); virtual void MouseButtonUp( const MouseEvent& rMEvt); - virtual long Notify(NotifyEvent& rNEvt); + virtual bool Notify(NotifyEvent& rNEvt); virtual void SetControlBackground(const Color& rColor); virtual void SetControlBackground(); virtual void RequestHelp( const HelpEvent& rHEvt ); diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx index 92cbc8743e60..2653de04bc45 100644 --- a/svtools/source/toolpanel/toolpaneldeck.cxx +++ b/svtools/source/toolpanel/toolpaneldeck.cxx @@ -456,7 +456,7 @@ namespace svt } //-------------------------------------------------------------------- - long ToolPanelDeck::Notify( NotifyEvent& i_rNotifyEvent ) + bool ToolPanelDeck::Notify( NotifyEvent& i_rNotifyEvent ) { bool bHandled = false; if ( i_rNotifyEvent.GetType() == EVENT_KEYINPUT ) @@ -496,7 +496,7 @@ namespace svt } if ( bHandled ) - return 1; + return true; return Control::Notify( i_rNotifyEvent ); } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 200fc876eb05..a2b26ef26538 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -987,9 +987,9 @@ namespace svxform } //------------------------------------------------------------------------ - long XFormsPage::Notify( NotifyEvent& rNEvt ) + bool XFormsPage::Notify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -1003,7 +1003,7 @@ namespace svxform } } - return nHandled ? nHandled : Window::Notify( rNEvt ); + return nHandled || Window::Notify( rNEvt ); } //------------------------------------------------------------------------ void XFormsPage::Resize() diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 11216aa1957e..a1f65a8bf8ee 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -267,7 +267,7 @@ namespace svxform bool RemoveEntry(); protected: - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); public: XFormsPage( Window* pParent, DataNavigatorWindow* _pNaviWin, DataGroupType _eGroup ); diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.cxx b/svx/source/sidebar/text/SvxSBFontNameBox.cxx index b94c6131e361..27cd2a4dd0de 100644 --- a/svx/source/sidebar/text/SvxSBFontNameBox.cxx +++ b/svx/source/sidebar/text/SvxSBFontNameBox.cxx @@ -130,24 +130,24 @@ long SvxSBFontNameBox::PreNotify( NotifyEvent& rNEvt ) return FontNameBox::PreNotify( rNEvt ); } //<<modify -long SvxSBFontNameBox::Notify( NotifyEvent& rNEvt) //SfxBroadcaster& rBC, const SfxHint& rHint +bool SvxSBFontNameBox::Notify( NotifyEvent& rNEvt) //SfxBroadcaster& rBC, const SfxHint& rHint { //SfxItemSetHint* pHint = PTR_CAST(SfxItemSetHint, &rHint); //if ( pHint ) // EnableControls_Impl(); - bool bHandle = 0; + bool bHandle = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const sal_uInt16 nCode (rNEvt.GetKeyEvent()->GetKeyCode().GetCode()); if( nCode == KEY_RETURN) { - bHandle = 1; + bHandle = true; Select(); } } - return bHandle ? bHandle : FontNameBox::Notify( rNEvt ); + return bHandle || FontNameBox::Notify( rNEvt ); } void SvxSBFontNameBox::Select() { diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.hxx b/svx/source/sidebar/text/SvxSBFontNameBox.hxx index c7af9ed97338..12026465ebf8 100644 --- a/svx/source/sidebar/text/SvxSBFontNameBox.hxx +++ b/svx/source/sidebar/text/SvxSBFontNameBox.hxx @@ -51,7 +51,7 @@ public: nFtCount = pList->GetFontNameCount(); } void SetBindings(SfxBindings* pBinding);// virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt );// + virtual bool Notify( NotifyEvent& rNEvt );// }; } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/tools/PopupContainer.cxx b/svx/source/sidebar/tools/PopupContainer.cxx index 3ff8ad425355..7ac4e95a1289 100644 --- a/svx/source/sidebar/tools/PopupContainer.cxx +++ b/svx/source/sidebar/tools/PopupContainer.cxx @@ -36,7 +36,7 @@ PopupContainer::~PopupContainer (void) -long PopupContainer::Notify (NotifyEvent& rEvent) +bool PopupContainer::Notify (NotifyEvent& rEvent) { if (rEvent.GetType() == EVENT_LOSEFOCUS) { diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index da6c87b180e5..fb0c17b7e919 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -580,9 +580,9 @@ void SvxColorDockingWindow::GetFocus (void) aColorSet.GrabFocus(); } -long SvxColorDockingWindow::Notify( NotifyEvent& rNEvt ) +bool SvxColorDockingWindow::Notify( NotifyEvent& rNEvt ) { - long nRet = 0; + bool nRet = false; if( ( rNEvt.GetType() == EVENT_KEYINPUT ) ) { KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); @@ -591,12 +591,12 @@ long SvxColorDockingWindow::Notify( NotifyEvent& rNEvt ) { case KEY_ESCAPE: GrabFocusToDocument(); - nRet = 1; + nRet = true; break; } } - return nRet ? nRet : SfxDockingWindow::Notify( rNEvt ); + return nRet || SfxDockingWindow::Notify( rNEvt ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 200c8a3d5c91..5c5c46ed5ff4 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -319,7 +319,7 @@ private: virtual void Select(); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); void ImplReleaseFocus(); public: @@ -379,9 +379,9 @@ long ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt ) return ListBox::PreNotify( rNEvt ); } -long ImplGrafModeControl::Notify( NotifyEvent& rNEvt ) +bool ImplGrafModeControl::Notify( NotifyEvent& rNEvt ) { - long nHandled = ListBox::Notify( rNEvt ); + bool nHandled = ListBox::Notify( rNEvt ); if( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -392,7 +392,7 @@ long ImplGrafModeControl::Notify( NotifyEvent& rNEvt ) case KEY_RETURN: { Select(); - nHandled = 1; + nHandled = true; } break; @@ -400,7 +400,7 @@ long ImplGrafModeControl::Notify( NotifyEvent& rNEvt ) { SelectEntryPos( mnCurPos ); ImplReleaseFocus(); - nHandled = 1; + nHandled = true; } break; } diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 5cc75f622055..427b635e8379 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -186,9 +186,9 @@ long SvxLineBox::PreNotify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long SvxLineBox::Notify( NotifyEvent& rNEvt ) +bool SvxLineBox::Notify( NotifyEvent& rNEvt ) { - long nHandled = LineLB::Notify( rNEvt ); + bool nHandled = LineLB::Notify( rNEvt ); if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -198,13 +198,13 @@ long SvxLineBox::Notify( NotifyEvent& rNEvt ) { case KEY_RETURN: Select(); - nHandled = 1; + nHandled = true; break; case KEY_ESCAPE: SelectEntryPos( nCurPos ); ReleaseFocus_Impl(); - nHandled = 1; + nHandled = true; break; } } @@ -392,9 +392,9 @@ long SvxColorBox::PreNotify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long SvxColorBox::Notify( NotifyEvent& rNEvt ) +bool SvxColorBox::Notify( NotifyEvent& rNEvt ) { - long nHandled = ColorLB::Notify( rNEvt ); + bool nHandled = ColorLB::Notify( rNEvt ); if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -404,13 +404,13 @@ long SvxColorBox::Notify( NotifyEvent& rNEvt ) { case KEY_RETURN: Select(); - nHandled = 1; + nHandled = true; break; case KEY_ESCAPE: SelectEntryPos( nCurPos ); ReleaseFocus_Impl(); - nHandled = 1; + nHandled = true; break; } } @@ -576,9 +576,9 @@ long SvxMetricField::PreNotify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long SvxMetricField::Notify( NotifyEvent& rNEvt ) +bool SvxMetricField::Notify( NotifyEvent& rNEvt ) { - long nHandled = MetricField::Notify( rNEvt ); + bool nHandled = MetricField::Notify( rNEvt ); if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -607,7 +607,7 @@ long SvxMetricField::Notify( NotifyEvent& rNEvt ) if ( bHandled ) { - nHandled = 1; + nHandled = true; Modify(); ReleaseFocus_Impl(); } @@ -677,9 +677,9 @@ long SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) +bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) { - long nHandled = FillTypeLB::Notify( rNEvt ); + bool nHandled = FillTypeLB::Notify( rNEvt ); if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -687,7 +687,7 @@ long SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) switch ( pKEvt->GetKeyCode().GetCode() ) { case KEY_RETURN: - nHandled = 1; + nHandled = true; ( (Link&)GetSelectHdl() ).Call( this ); break; case KEY_TAB: @@ -699,7 +699,7 @@ long SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) case KEY_ESCAPE: SelectEntryPos( nCurPos ); ReleaseFocus_Impl(); - nHandled = 1; + nHandled = true; break; } } @@ -761,9 +761,9 @@ long SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) +bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) { - long nHandled = FillAttrLB::Notify( rNEvt ); + bool nHandled = FillAttrLB::Notify( rNEvt ); if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -773,7 +773,7 @@ long SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) { case KEY_RETURN: ( (Link&)GetSelectHdl() ).Call( this ); - nHandled = 1; + nHandled = true; break; case KEY_TAB: bRelease = sal_False; @@ -783,7 +783,7 @@ long SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) case KEY_ESCAPE: SelectEntryPos( nCurPos ); ReleaseFocus_Impl(); - nHandled = 1; + nHandled = true; break; } } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 23acf880dd7f..70b6a00d150b 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -135,7 +135,7 @@ public: inline bool IsVisible() { return bVisible; } virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void StateChanged( StateChangedType nStateChange ); @@ -220,7 +220,7 @@ public: nFtCount = pList->GetFontNameCount(); } virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); virtual Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); SAL_WNODEPRECATED_DECLARATIONS_PUSH void SetOwnFontList(::std::auto_ptr<FontList> _aOwnFontList) { m_aOwnFontList = _aOwnFontList; } @@ -488,9 +488,9 @@ long SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) +bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -504,7 +504,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) if ( KEY_TAB == nCode ) bRelease = false; else - nHandled = 1; + nHandled = true; Select(); break; } @@ -512,11 +512,11 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) case KEY_ESCAPE: SelectEntryPos( nCurSel ); ReleaseFocus(); - nHandled = 1; + nHandled = true; break; } } - return nHandled ? nHandled : ComboBox::Notify( rNEvt ); + return nHandled || ComboBox::Notify( rNEvt ); } void SvxStyleBox_Impl::DataChanged( const DataChangedEvent& rDCEvt ) @@ -882,9 +882,9 @@ long SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) +bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; mbEndPreview = false; if ( rNEvt.GetType() == EVENT_KEYUP ) mbEndPreview = true; @@ -901,7 +901,7 @@ long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) if ( KEY_TAB == nCode ) bRelease = false; else - nHandled = 1; + nHandled = true; Select(); break; } @@ -922,7 +922,7 @@ long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) EndPreview(); } - return nHandled ? nHandled : FontNameBox::Notify( rNEvt ); + return nHandled || FontNameBox::Notify( rNEvt ); } // --------------------------------------------------------------------------- diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index cefad038ddad..b20337fb88c1 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -92,7 +92,7 @@ public: void statusChanged_Impl( long nHeight, bool bErase = false ); void UpdateFont( const ::com::sun::star::awt::FontDescriptor& rCurrentFont ); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); protected: virtual void Select(); @@ -221,9 +221,9 @@ void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescripto // ----------------------------------------------------------------------- -long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) +bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -237,7 +237,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) if ( KEY_TAB == nCode ) m_bRelease = false; else - nHandled = 1; + nHandled = true; Select(); break; } @@ -245,7 +245,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) case KEY_ESCAPE: SetText( m_aCurText ); ReleaseFocus_Impl(); - nHandled = 1; + nHandled = true; break; } } @@ -256,7 +256,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) SetText(GetSavedValue()); } - return nHandled ? nHandled : FontSizeBox::Notify( rNEvt ); + return nHandled || FontSizeBox::Notify( rNEvt ); } // --------------------------------------------------------------------------- diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx index ff5beb57b6b9..b67303e345c1 100644 --- a/sw/source/ui/cctrl/actctrl.cxx +++ b/sw/source/ui/cctrl/actctrl.cxx @@ -28,9 +28,9 @@ void NumEditAction::Action() } -long NumEditAction::Notify( NotifyEvent& rNEvt ) +bool NumEditAction::Notify( NotifyEvent& rNEvt ) { - long nHandled = 0; + long nHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -41,7 +41,7 @@ long NumEditAction::Notify( NotifyEvent& rNEvt ) !nModifier) { Action(); - nHandled = 1; + nHandled = true; } } diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx index d69a29e0631f..8d775917ffde 100644 --- a/sw/source/ui/inc/actctrl.hxx +++ b/sw/source/ui/inc/actctrl.hxx @@ -31,7 +31,7 @@ class SW_DLLPUBLIC NumEditAction: public NumericField protected: virtual void Action(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); public: NumEditAction( Window* pParent, const ResId& rResId ) : NumericField(pParent, rResId) {} diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx index 3b1a0f25a4db..07a815577406 100644 --- a/sw/source/ui/inc/swuicnttab.hxx +++ b/sw/source/ui/inc/swuicnttab.hxx @@ -448,7 +448,7 @@ public: void PreTokenButtonRemoved(const SwFormToken& rToken); void SetFocus2theAllBtn(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); }; class SwTOXStylesTabPage : public SfxTabPage diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index d5e9a111dae7..e6171eb9fede 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2177,7 +2177,7 @@ void SwTOXEntryTabPage::SetFocus2theAllBtn() m_pAllLevelsPB->GrabFocus(); } -long SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt ) +bool SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index 31e0f66f2644..8e660dc829e4 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -623,7 +623,7 @@ public: protected: virtual void Select(); - virtual long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); void ReleaseFocus(); @@ -680,9 +680,9 @@ void SwZoomBox_Impl::Select() } } -long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt ) +bool SwZoomBox_Impl::Notify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = true; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -696,7 +696,7 @@ long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt ) if ( KEY_TAB == nCode ) bRelease = false; else - nHandled = 1; + nHandled = true; Select(); break; } @@ -714,7 +714,7 @@ long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt ) SetText( GetSavedValue() ); } - return nHandled ? nHandled : ComboBox::Notify( rNEvt ); + return nHandled || ComboBox::Notify( rNEvt ); } void SwZoomBox_Impl::ReleaseFocus() diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index d01c3260fce6..e8d6c2a4f504 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -423,7 +423,7 @@ protected: virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - long Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ); void ImplResizeControls(); void ImplCheckScrollBars(); diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index b725be4c3fc5..20148537ae5f 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -760,9 +760,9 @@ long ComboBox::PreNotify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long ComboBox::Notify( NotifyEvent& rNEvt ) +bool ComboBox::Notify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && ( rNEvt.GetWindow() == mpSubEdit ) && !IsReadOnly() ) { @@ -785,12 +785,12 @@ long ComboBox::Notify( NotifyEvent& rNEvt ) SetSelection( Selection( 0, SELECTION_MAX ) ); mpFloatWin->StartFloat( sal_False ); ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN ); - nDone = 1; + nDone = true; } else if( ( nKeyCode == KEY_UP ) && mpFloatWin && mpFloatWin->IsInPopupMode() && aKeyEvt.GetKeyCode().IsMod2() ) { mpFloatWin->EndPopupMode(); - nDone = 1; + nDone = true; } else { @@ -804,7 +804,7 @@ long ComboBox::Notify( NotifyEvent& rNEvt ) if( ( rNEvt.GetWindow() == mpSubEdit ) && IsInDropDown() ) { mpImplLB->ProcessKeyInput( aKeyEvt ); - nDone = 1; + nDone = true; } } break; @@ -832,7 +832,7 @@ long ComboBox::Notify( NotifyEvent& rNEvt ) } else { - nDone = 0; // don't eat this event, let the default handling happen (i.e. scroll the context) + nDone = false; // don't eat this event, let the default handling happen (i.e. scroll the context) } } else if( ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) && ( rNEvt.GetWindow() == mpImplLB->GetMainWindow() ) ) @@ -840,7 +840,7 @@ long ComboBox::Notify( NotifyEvent& rNEvt ) mpSubEdit->GrabFocus(); } - return nDone ? nDone : Edit::Notify( rNEvt ); + return nDone || Edit::Notify( rNEvt ); } // ----------------------------------------------------------------------- diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index 16841ec1656f..e312c18bb402 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -280,7 +280,7 @@ OUString Control::GetDisplayText() const // ----------------------------------------------------------------------- -long Control::Notify( NotifyEvent& rNEvt ) +bool Control::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) { @@ -290,7 +290,7 @@ long Control::Notify( NotifyEvent& rNEvt ) StateChanged( STATE_CHANGE_CONTROL_FOCUS ); if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_GETFOCUS, maGetFocusHdl, this ) ) // been destroyed within the handler - return sal_True; + return true; } } else @@ -304,7 +304,7 @@ long Control::Notify( NotifyEvent& rNEvt ) StateChanged( STATE_CHANGE_CONTROL_FOCUS ); if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_LOSEFOCUS, maLoseFocusHdl, this ) ) // been destroyed within the handler - return sal_True; + return true; } } } diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index aa8e06b994d5..f18442d9b544 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -785,7 +785,7 @@ long NumericField::PreNotify( NotifyEvent& rNEvt ) return SpinField::PreNotify( rNEvt ); } -long NumericField::Notify( NotifyEvent& rNEvt ) +bool NumericField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); @@ -937,7 +937,7 @@ long NumericBox::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } -long NumericBox::Notify( NotifyEvent& rNEvt ) +bool NumericBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); @@ -1668,7 +1668,7 @@ long MetricField::PreNotify( NotifyEvent& rNEvt ) return SpinField::PreNotify( rNEvt ); } -long MetricField::Notify( NotifyEvent& rNEvt ) +bool MetricField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); @@ -1769,7 +1769,7 @@ long MetricBox::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } -long MetricBox::Notify( NotifyEvent& rNEvt ) +bool MetricBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); @@ -2003,7 +2003,7 @@ long CurrencyField::PreNotify( NotifyEvent& rNEvt ) return SpinField::PreNotify( rNEvt ); } -long CurrencyField::Notify( NotifyEvent& rNEvt ) +bool CurrencyField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); @@ -2085,7 +2085,7 @@ long CurrencyBox::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } -long CurrencyBox::Notify( NotifyEvent& rNEvt ) +bool CurrencyBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 585f81a7f759..01aa8fcdd491 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -837,7 +837,7 @@ long PatternField::PreNotify( NotifyEvent& rNEvt ) return SpinField::PreNotify( rNEvt ); } -long PatternField::Notify( NotifyEvent& rNEvt ) +bool PatternField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); @@ -887,7 +887,7 @@ long PatternBox::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } -long PatternBox::Notify( NotifyEvent& rNEvt ) +bool PatternBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); @@ -1834,7 +1834,7 @@ long DateField::PreNotify( NotifyEvent& rNEvt ) return SpinField::PreNotify( rNEvt ); } -long DateField::Notify( NotifyEvent& rNEvt ) +bool DateField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); @@ -1949,7 +1949,7 @@ void DateBox::DataChanged( const DataChangedEvent& rDCEvt ) } } -long DateBox::Notify( NotifyEvent& rNEvt ) +bool DateBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); @@ -2713,7 +2713,7 @@ long TimeField::PreNotify( NotifyEvent& rNEvt ) return SpinField::PreNotify( rNEvt ); } -long TimeField::Notify( NotifyEvent& rNEvt ) +bool TimeField::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); @@ -2854,7 +2854,7 @@ long TimeBox::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } -long TimeBox::Notify( NotifyEvent& rNEvt ) +bool TimeBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_GETFOCUS ) MarkToBeReformatted( sal_False ); diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index 972447458935..cfd428242ed8 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -2639,9 +2639,9 @@ void ImplListBox::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -long ImplListBox::Notify( NotifyEvent& rNEvt ) +bool ImplListBox::Notify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; if ( rNEvt.GetType() == EVENT_COMMAND ) { const CommandEvent& rCEvt = *rNEvt.GetCommandEvent(); @@ -2655,7 +2655,7 @@ long ImplListBox::Notify( NotifyEvent& rNEvt ) } } - return nDone ? nDone : Window::Notify( rNEvt ); + return nDone || Window::Notify( rNEvt ); } // ----------------------------------------------------------------------- diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index e9e8ea2e1b49..bf9f49429aed 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -487,7 +487,7 @@ long LongCurrencyField::PreNotify( NotifyEvent& rNEvt ) } -long LongCurrencyField::Notify( NotifyEvent& rNEvt ) +bool LongCurrencyField::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_GETFOCUS ) { @@ -570,7 +570,7 @@ long LongCurrencyBox::PreNotify( NotifyEvent& rNEvt ) } -long LongCurrencyBox::Notify( NotifyEvent& rNEvt ) +bool LongCurrencyBox::Notify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_GETFOCUS ) { diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index 6f619ccc62cc..df691a861f4f 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -523,9 +523,9 @@ void SpinField::MouseMove( const MouseEvent& rMEvt ) // -------------------------------------------------------------------- -long SpinField::Notify( NotifyEvent& rNEvt ) +bool SpinField::Notify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; if( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyEvent& rKEvt = *rNEvt.GetKeyEvent(); @@ -539,7 +539,7 @@ long SpinField::Notify( NotifyEvent& rNEvt ) if ( !nMod ) { Up(); - nDone = 1; + nDone = true; } } break; @@ -548,13 +548,13 @@ long SpinField::Notify( NotifyEvent& rNEvt ) if ( !nMod ) { Down(); - nDone = 1; + nDone = true; } else if ( ( nMod == KEY_MOD2 ) && !mbInDropDown && ( GetStyle() & WB_DROPDOWN ) ) { mbInDropDown = ShowDropDown( sal_True ); Paint( Rectangle( Point(), GetOutputSizePixel() ) ); - nDone = 1; + nDone = true; } } break; @@ -563,7 +563,7 @@ long SpinField::Notify( NotifyEvent& rNEvt ) if ( !nMod ) { Last(); - nDone = 1; + nDone = true; } } break; @@ -572,7 +572,7 @@ long SpinField::Notify( NotifyEvent& rNEvt ) if ( !nMod ) { First(); - nDone = 1; + nDone = true; } } break; @@ -598,15 +598,15 @@ long SpinField::Notify( NotifyEvent& rNEvt ) Down(); else Up(); - nDone = 1; + nDone = true; } } else - nDone = 0; // don't eat this event, let the default handling happen (i.e. scroll the context) + nDone = false; // don't eat this event, let the default handling happen (i.e. scroll the context) } } - return nDone ? nDone : Edit::Notify( rNEvt ); + return nDone || Edit::Notify( rNEvt ); } // -------------------------------------------------------------------- diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 474d664534f1..314cf43d9a35 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1027,9 +1027,9 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo // ----------------------------------------------------------------------- -long TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) +bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) { - long nRet = 0; + bool nRet = false; if ( GetPageCount() > 1 ) { @@ -1043,7 +1043,7 @@ long TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) if ( (nKeyCode == KEY_TAB) || (nKeyCode == KEY_PAGEUP) ) { ImplActivateTabPage( sal_False ); - nRet = 1; + nRet = true; } } else @@ -1051,7 +1051,7 @@ long TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) if ( (nKeyCode == KEY_TAB) || (nKeyCode == KEY_PAGEDOWN) ) { ImplActivateTabPage( sal_True ); - nRet = 1; + nRet = true; } } } @@ -1680,14 +1680,14 @@ long TabControl::PreNotify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long TabControl::Notify( NotifyEvent& rNEvt ) +bool TabControl::Notify( NotifyEvent& rNEvt ) { - long nRet = 0; + bool nRet = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) nRet = ImplHandleKeyEvent( *rNEvt.GetKeyEvent() ); - return nRet ? nRet : Control::Notify( rNEvt ); + return nRet || Control::Notify( rNEvt ); } // ----------------------------------------------------------------------- diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index af2d417ce55d..c62f03732c7c 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -1400,14 +1400,14 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size& pDev->Pop(); } -long VclMultiLineEdit::Notify( NotifyEvent& rNEvt ) +bool VclMultiLineEdit::Notify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; if( rNEvt.GetType() == EVENT_COMMAND ) { nDone = pImpVclMEdit->HandleCommand( *rNEvt.GetCommandEvent() ); } - return nDone ? nDone : Edit::Notify( rNEvt ); + return nDone || Edit::Notify( rNEvt ); } long VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 1e08a5a1051a..88439c970366 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -594,10 +594,10 @@ IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl) // ----------------------------------------------------------------------- -long Dialog::Notify( NotifyEvent& rNEvt ) +bool Dialog::Notify( NotifyEvent& rNEvt ) { // Zuerst Basisklasse rufen wegen TabSteuerung - long nRet = SystemWindow::Notify( rNEvt ); + bool nRet = SystemWindow::Notify( rNEvt ); if ( !nRet ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -614,7 +614,7 @@ long Dialog::Notify( NotifyEvent& rNEvt ) // post this Close asynchronous so we can leave our key handler before // we get destroyed PostUserEvent( LINK( this, Dialog, ImplAsyncCloseHdl ), this ); - return sal_True; + return true; } } else if ( rNEvt.GetType() == EVENT_GETFOCUS ) diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 273f6344cdfa..12379f060649 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -596,7 +596,7 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt ) // ----------------------------------------------------------------------- -long DockingWindow::Notify( NotifyEvent& rNEvt ) +bool DockingWindow::Notify( NotifyEvent& rNEvt ) { if( GetDockingManager()->IsDockable( this ) ) // new docking interface return Window::Notify( rNEvt ); @@ -611,7 +611,7 @@ long DockingWindow::Notify( NotifyEvent& rNEvt ) if ( pMEvt->IsMod1() && (pMEvt->GetClicks() == 2) ) { SetFloatingMode( !IsFloatingMode() ); - return sal_True; + return true; } else if ( pMEvt->GetClicks() == 1 ) { @@ -629,7 +629,7 @@ long DockingWindow::Notify( NotifyEvent& rNEvt ) } ImplStartDocking( aPos ); } - return sal_True; + return true; } } } @@ -640,7 +640,7 @@ long DockingWindow::Notify( NotifyEvent& rNEvt ) rKey.IsShift() && rKey.IsMod1() ) { SetFloatingMode( !IsFloatingMode() ); - return sal_True; + return true; } } } diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 10f1e974b08b..6ff72f93f364 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -552,10 +552,10 @@ IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl) // ----------------------------------------------------------------------- -long FloatingWindow::Notify( NotifyEvent& rNEvt ) +bool FloatingWindow::Notify( NotifyEvent& rNEvt ) { // Zuerst Basisklasse rufen wegen TabSteuerung - long nRet = SystemWindow::Notify( rNEvt ); + bool nRet = SystemWindow::Notify( rNEvt ); if ( !nRet ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -567,7 +567,7 @@ long FloatingWindow::Notify( NotifyEvent& rNEvt ) if ( (nKeyCode == KEY_ESCAPE) && (GetStyle() & WB_CLOSEABLE) ) { Close(); - return sal_True; + return true; } } } diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index 73a1aaef4878..e3303ded6f53 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1773,9 +1773,9 @@ bool VclScrolledWindow::set_property(const OString &rKey, const OString &rValue) return bRet; } -long VclScrolledWindow::Notify(NotifyEvent& rNEvt) +bool VclScrolledWindow::Notify(NotifyEvent& rNEvt) { - long nDone = 0; + bool nDone = false; if ( rNEvt.GetType() == EVENT_COMMAND ) { const CommandEvent& rCEvt = *rNEvt.GetCommandEvent(); @@ -1789,7 +1789,7 @@ long VclScrolledWindow::Notify(NotifyEvent& rNEvt) } } - return nDone ? nDone : VclBin::Notify( rNEvt ); + return nDone || VclBin::Notify( rNEvt ); } const Window *VclEventBox::get_child() const diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index 13cc48663aa0..f21e3b3083ed 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -733,7 +733,7 @@ void Splitter::KeyInput( const KeyEvent& rKEvt ) // ----------------------------------------------------------------------- -long Splitter::Notify( NotifyEvent& rNEvt ) +bool Splitter::Notify( NotifyEvent& rNEvt ) { return Window::Notify( rNEvt ); } diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index d37abdd4c16b..8aa2c8b5c120 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -89,7 +89,7 @@ SystemWindow::~SystemWindow() // ----------------------------------------------------------------------- -long SystemWindow::Notify( NotifyEvent& rNEvt ) +bool SystemWindow::Notify( NotifyEvent& rNEvt ) { // capture KeyEvents for menu handling if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -102,7 +102,7 @@ long SystemWindow::Notify( NotifyEvent& rNEvt ) pMBar = ((SystemWindow*)pWin)->GetMenuBar(); } if ( pMBar && pMBar->ImplHandleKeyEvent( *rNEvt.GetKeyEvent(), sal_False ) ) - return sal_True; + return true; } return Window::Notify( rNEvt ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 1b4a2beffead..514d2efbbf0a 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4360,7 +4360,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) // ----------------------------------------------------------------------- -long ToolBox::Notify( NotifyEvent& rNEvt ) +bool ToolBox::Notify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -4382,7 +4382,7 @@ long ToolBox::Notify( NotifyEvent& rNEvt ) if( bNoTabCycling && ! (GetStyle() & WB_FORCETABCYCLE) ) return DockingWindow::Notify( rNEvt ); else if( ImplChangeHighlightUpDn( aKeyCode.IsShift() ? sal_True : sal_False , bNoTabCycling ) ) - return sal_False; + return false; else return DockingWindow::Notify( rNEvt ); } diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 1bd234bf437e..4e91535945d8 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -5084,9 +5084,9 @@ long Window::PreNotify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long Window::Notify( NotifyEvent& rNEvt ) +bool Window::Notify( NotifyEvent& rNEvt ) { - long nRet = sal_False; + bool nRet = false; // check for docking window // but do nothing if window is docked and locked @@ -5103,13 +5103,13 @@ long Window::Notify( NotifyEvent& rNEvt ) { // ctrl double click toggles floating mode pWrapper->SetFloatingMode( !pWrapper->IsFloatingMode() ); - return sal_True; + return true; } else if ( pMEvt->GetClicks() == 1 && bHit) { // allow start docking during mouse move pWrapper->ImplEnableStartDocking(); - return sal_True; + return true; } } } @@ -5133,7 +5133,7 @@ long Window::Notify( NotifyEvent& rNEvt ) } pWrapper->ImplStartDocking( aPos ); } - return sal_True; + return true; } } else if( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -5151,7 +5151,7 @@ long Window::Notify( NotifyEvent& rNEvt ) */ if( pWrapper->IsFloatingMode() ) ToTop( TOTOP_GRABFOCUSONLY ); - return sal_True; + return true; } } } |