diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-18 00:18:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-18 00:37:49 +0100 |
| commit | 602c87b4259d118e5db6d8a990c4695103f916dd (patch) | |
| tree | 1cbc6cf8309b680476f5116cd5320f8f6a99c32a | |
| parent | 849482c0ea88c4aa70ec56adfefe7e59b6060950 (diff) | |
Window::PreNotify should return bool
Change-Id: Ic9903fd887f2c3fab2630ebeb20df39392177c8d
177 files changed, 458 insertions, 459 deletions
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index db86fdfaffc7..2ccad9bc35e9 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -254,9 +254,9 @@ void LibBox::InsertEntries( const ScriptDocument& rDocument, LibraryLocation eLo } } -long LibBox::PreNotify( NotifyEvent& rNEvt ) +bool LibBox::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; if( rNEvt.GetType() == EVENT_KEYINPUT ) { KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); @@ -266,7 +266,7 @@ long LibBox::PreNotify( NotifyEvent& rNEvt ) case KEY_RETURN: { NotifyIDE(); - nDone = 1; + nDone = true; } break; @@ -274,7 +274,7 @@ long LibBox::PreNotify( NotifyEvent& rNEvt ) { SelectEntry( aCurText ); ReleaseFocus(); - nDone = 1; + nDone = true; } break; } @@ -296,7 +296,7 @@ long LibBox::PreNotify( NotifyEvent& rNEvt ) } } - return nDone ? nDone : ListBox::PreNotify( rNEvt ); + return nDone || ListBox::PreNotify( rNEvt ); } void LibBox::Select() @@ -473,9 +473,9 @@ void LanguageBox::Select() SelectEntry( m_sCurrentText ); // Select after Escape } -long LanguageBox::PreNotify( NotifyEvent& rNEvt ) +bool LanguageBox::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; if( rNEvt.GetType() == EVENT_KEYINPUT ) { sal_uInt16 nKeyCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode(); @@ -484,14 +484,14 @@ long LanguageBox::PreNotify( NotifyEvent& rNEvt ) case KEY_RETURN: { SetLanguage(); - nDone = 1; + nDone = true; } break; case KEY_ESCAPE: { SelectEntry( m_sCurrentText ); - nDone = 1; + nDone = true; } break; } @@ -503,7 +503,7 @@ long LanguageBox::PreNotify( NotifyEvent& rNEvt ) { } - return nDone ? nDone : ListBox::PreNotify( rNEvt ); + return nDone || ListBox::PreNotify( rNEvt ); } void LanguageBox::Update( const SfxStringItem* pItem ) diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx index 54f476dbf5d2..b3a8501a1736 100644 --- a/basctl/source/basicide/basicbox.hxx +++ b/basctl/source/basicide/basicbox.hxx @@ -92,7 +92,7 @@ private: protected: virtual void Select(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: LibBox( Window* pParent, @@ -132,7 +132,7 @@ private: protected: virtual void Select(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: LanguageBox( Window* pParent ); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 034ada98cc9d..97829c7a356d 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1274,7 +1274,7 @@ SentenceEditWindow_Impl::~SentenceEditWindow_Impl() #define ACTION_SELECTFIELD 2 #define ACTION_EXPAND 3 -long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) +bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { bool bChange = false; const TextCharAttrib* pErrorAttrib = 0; @@ -1538,8 +1538,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt ) else bChange = false; } - long nRet = bChange ? 1 : MultiLineEdit::PreNotify(rNEvt); - return nRet; + return bChange || MultiLineEdit::PreNotify(rNEvt); } //----------------------------------------------------------------------- diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 34849a0023a5..e0ca149e799f 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -140,7 +140,7 @@ class HexColorControl : public Edit public: HexColorControl( Window* pParent, const ResId& rResId ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void Paste(); void SetColor( sal_Int32 nColor ); @@ -192,12 +192,12 @@ sal_Int32 HexColorControl::GetColor() // ----------------------------------------------------------------------- -long HexColorControl::PreNotify( NotifyEvent& rNEvt ) +bool HexColorControl::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplProcessKeyInput( *rNEvt.GetKeyEvent() ) ) - return 1; + return true; } return Edit::PreNotify( rNEvt ); diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index d94a074b655f..012895d388cf 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -46,7 +46,7 @@ void SvxClickInfoCtr::MouseButtonDown( const MouseEvent& ) } //----------------------------------------------------------------------------- -long SvxClickInfoCtr::PreNotify( NotifyEvent& rNEvt ) +bool SvxClickInfoCtr::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType()==EVENT_GETFOCUS || rNEvt.GetType()==EVENT_MOUSEBUTTONDOWN) { diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 5f53283549f8..1795f016956a 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -49,7 +49,7 @@ public: protected: virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); }; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index dd244e0dc3cb..2dfba19c33fa 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1388,9 +1388,9 @@ namespace svx { } - long SuggestionEdit::PreNotify( NotifyEvent& rNEvt ) + bool SuggestionEdit::PreNotify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; if( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); @@ -1405,7 +1405,7 @@ namespace svx DoJump( bUp ); SetSelection( Selection( 0, SELECTION_MAX ) ); // Tab-travel doesn't really happen, so emulate it by setting a selection manually - nHandled = 1; + nHandled = true; } } else if( KEY_UP == nCode || KEY_DOWN == nCode ) @@ -1414,20 +1414,20 @@ namespace svx if( ShouldScroll( bUp ) ) { DoJump( bUp ); - nHandled = 1; + nHandled = true; } else if( bUp ) { if( m_pPrev ) { m_pPrev->GrabFocus(); - nHandled = 1; + nHandled = true; } } else if( m_pNext ) { m_pNext->GrabFocus(); - nHandled = 1; + nHandled = true; } } } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 331a9ea47623..29774ddacb60 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -108,7 +108,7 @@ bool SvxHyperURLBox::Notify( NotifyEvent& rNEvt ) { return SvtURLBox::Notify( rNEvt ); } -long SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt ) +bool SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt ) { return SvtURLBox::PreNotify( rNEvt ); } diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 3cfe2ff60f2f..5f88f3b526cb 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -72,7 +72,7 @@ private: SpellDialog* GetSpellDialog() const {return (SpellDialog*)GetParentDialog();} protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: SentenceEditWindow_Impl(Window* pParent, WinBits nBits); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index faf5af02dc7d..58f7851153cb 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -407,7 +407,7 @@ class OfaAutoCompleteTabPage : public SfxTabPage const ResId& rResId ) : MultiListBox( &rPg, rResId ), rPage( rPg ) {} - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); }; CheckBox aCBActiv; ///<Enable word completion diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 4536197ff661..8bde65e13234 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -264,7 +264,7 @@ namespace svx ScrollBar& _rScrollBar, SuggestionEdit* _pPrev, SuggestionEdit* _pNext ); virtual ~SuggestionEdit(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); }; diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 874b2930365e..847a079acb1f 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -64,7 +64,7 @@ protected: virtual bool Notify( NotifyEvent& rNEvt ); virtual void Select(); virtual void Modify(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE ); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 40b065f277de..33f4381b6e8d 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -84,7 +84,7 @@ public: void SetOkHdl( const Link& rOkHandler ); void HideLanguage(sal_Bool nFlag=sal_True); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void PageCreated (SfxAllItemSet aSet); private: SvxNumberFormatTabPage( Window* pParent, diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 20160e683ab7..846e5e987355 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -837,7 +837,7 @@ class ColorConfigCtrl_Impl : public VclVBox DECL_LINK(ColorHdl, ColorListBox*); DECL_LINK(ControlFocusHdl, Control*); - virtual long PreNotify (NotifyEvent& rNEvt); + virtual bool PreNotify (NotifyEvent& rNEvt); virtual void Command (CommandEvent const& rCEvt); virtual void DataChanged (DataChangedEvent const& rDCEvt); public: @@ -934,7 +934,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar) return 0; } -long ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt ) +bool ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType() == EVENT_COMMAND) { @@ -943,7 +943,7 @@ long ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt ) if( COMMAND_WHEEL == nCmd ) { Command(*pCEvt); - return 1; + return true; } } return VclVBox::PreNotify(rNEvt); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index c4e7f9ead034..0fb4c17fcdc8 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2286,10 +2286,10 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const } } -long OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify( +bool OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify( NotifyEvent& rNEvt ) { - long nHandled = MultiListBox::PreNotify( rNEvt ); + bool nHandled = MultiListBox::PreNotify( rNEvt ); if( !nHandled && EVENT_KEYUP == rNEvt.GetType() ) { @@ -2298,14 +2298,14 @@ long OfaAutoCompleteTabPage::AutoCompleteMultiListBox::PreNotify( { case KEY_DELETE: rPage.DeleteHdl( 0 ); - nHandled = 1; + nHandled = true; break; default: if( KEYFUNC_COPY == rKeyCode.GetFunction() ) { rPage.CopyToClipboard(); - nHandled = 1; + nHandled = true; } break; } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 3212d48d8d05..8fdc964e7aa0 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1639,7 +1639,7 @@ void SvxNumberFormatTabPage::ChangePreviewText( sal_uInt16 nPos ) m_pWndPreview->NotifyChange( aPreviewString, pPreviewColor ); } -long SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) +bool SvxNumberFormatTabPage::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType()==EVENT_LOSEFOCUS) { diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index f9dac6a931ab..6083b2ea4657 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -274,7 +274,7 @@ void OApplicationView::resizeDocumentView(Rectangle& _rPlayground) _rPlayground.SetSize( Size( 0, 0 ) ); } -long OApplicationView::PreNotify( NotifyEvent& rNEvt ) +bool OApplicationView::PreNotify( NotifyEvent& rNEvt ) { switch(rNEvt.GetType()) { @@ -292,11 +292,11 @@ long OApplicationView::PreNotify( NotifyEvent& rNEvt ) // give the pane the chance to intercept mnemonic accelerators // #i34790# if ( getPanel() && getPanel()->interceptKeyInput( *pKeyEvent ) ) - return 1L; + return true; // and ditto the detail view // #i72799# if ( getDetailView() && getDetailView()->interceptKeyInput( *pKeyEvent ) ) - return 1L; + return true; } break; } diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 0e4b48d058a1..70569f5e6e6b 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -111,7 +111,7 @@ namespace dbaui void setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics ); // window overloads - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); inline IApplicationController& getAppController() const { return m_rAppController; } diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 488142c4f2ef..d7a2d0cce3b8 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -304,9 +304,9 @@ void UnoDataBrowserView::_disposing( const ::com::sun::star::lang::EventObject& m_pVclControl = NULL; } -long UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt ) +bool UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0L; + bool nDone = false; if(rNEvt.GetType() == EVENT_KEYINPUT) { sal_Bool bGrabAllowed = isGrabVclControlFocusAllowed(this); @@ -323,11 +323,11 @@ long UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt ) else if ( m_pTreeView && m_pVclControl && m_pVclControl->HasChildPathFocus() ) m_pTreeView->GrabFocus(); - nDone = 1L; + nDone = true; } } } - return nDone ? nDone : ODataView::PreNotify(rNEvt); + return nDone || ODataView::PreNotify(rNEvt); } DBG_NAME(BrowserViewStatusDisplay) diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index 45340ecb014e..7426382ce785 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -119,7 +119,7 @@ namespace dbaui Window::Resize(); resizeAll( Rectangle( Point( 0, 0), GetSizePixel() ) ); } - long ODataView::PreNotify( NotifyEvent& _rNEvt ) + bool ODataView::PreNotify( NotifyEvent& _rNEvt ) { bool bHandled = false; switch ( _rNEvt.GetType() ) @@ -139,7 +139,7 @@ namespace dbaui bHandled = m_rController.interceptUserInput( _rNEvt ); break; } - return bHandled ? 1L : Window::PreNotify( _rNEvt ); + return bHandled || Window::PreNotify( _rNEvt ); } void ODataView::StateChanged( StateChangedType nType ) { diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index c10f70f8f807..26e6587bd19e 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -100,7 +100,7 @@ namespace dbaui protected: virtual void Resize(); - virtual long PreNotify(NotifyEvent& rNEvt ); + virtual bool PreNotify(NotifyEvent& rNEvt ); virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; @@ -186,7 +186,7 @@ namespace dbaui SetColumnWidth(2, (nOutputWidth / 2)); } - long ORelationControl::PreNotify(NotifyEvent& rNEvt) + bool ORelationControl::PreNotify(NotifyEvent& rNEvt) { DBG_CHKTHIS(ORelationControl,NULL); if (rNEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() ) diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 27f3d7f450e4..5286eaddb3a1 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -148,7 +148,7 @@ void OTableGrantControl::Resize() EditBrowseBox::Resize(); } -long OTableGrantControl::PreNotify(NotifyEvent& rNEvt) +bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt) { DBG_CHKTHIS(OTableGrantControl,NULL); if (rNEvt.GetType() == EVENT_LOSEFOCUS) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 351c345e7d38..1936193485c2 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -550,7 +550,7 @@ DBG_NAME(OConnectionHelper) } return eExists; } - long OConnectionHelper::PreNotify( NotifyEvent& _rNEvt ) + bool OConnectionHelper::PreNotify( NotifyEvent& _rNEvt ) { if ( m_pCollection->isFileSystemBased(m_eType) ) { @@ -567,7 +567,7 @@ DBG_NAME(OConnectionHelper) if (m_aConnectionURL.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus) { // a descendant of the URL edit field lost the focus if (!commitURL()) - return 1L; // handled + return true; // handled } break; } diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 5d6f5e2f74f9..b770d46cb251 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -53,7 +53,7 @@ namespace dbaui // setting/retrieving the current connection URL // necessary because for some types, the URL must be decoded for display purposes ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance - virtual long PreNotify( NotifyEvent& _rNEvt ); + virtual bool PreNotify( NotifyEvent& _rNEvt ); // <method>OGenericAdministrationPage::fillControls</method> virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index e8da81c3bbd1..8d3a82f98b54 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -223,7 +223,7 @@ namespace dbaui /** @note used by AddTabDlg to see if more tables can be added */ virtual sal_Bool IsAddAllowed(); - virtual long PreNotify(NotifyEvent& rNEvt); + virtual bool PreNotify(NotifyEvent& rNEvt); // DnD stuff virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index e006fe8dea7b..e4341a0229e4 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -97,7 +97,7 @@ namespace dbaui virtual void Construct(); virtual void initialize(); // window overloads - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); sal_Bool isSlotEnabled(sal_Int32 _nSlotId); diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index a9ad6778aa70..5371d3c5a73e 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -41,7 +41,7 @@ namespace dbaui virtual void initialize(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); }; } diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 635842b71521..d192fde38f49 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -68,7 +68,7 @@ namespace dbaui } // Window overload - // virtual long PreNotify( NotifyEvent& rNEvt ); + // virtual bool PreNotify( NotifyEvent& rNEvt ); // Edit virtual void Modify(); }; diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index a54d2ddf7b6e..f691de93fc5d 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -45,7 +45,7 @@ namespace dbaui void SetHelpText( const OUString& rText ); OUString GetHelpText() const { return m_sHelpText; } - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); // IClipboardTest virtual sal_Bool isCutAllowed(); diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index bd98b672e7f8..c3dc7a94a517 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -79,7 +79,7 @@ namespace dbaui virtual ~OTableDesignView(); // window overloads - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); OTableEditorCtrl* GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; } diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index ccf4a77d4ca3..6e360cbf01df 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -82,7 +82,7 @@ public: protected: virtual void Resize(); - virtual long PreNotify(NotifyEvent& rNEvt ); + virtual bool PreNotify(NotifyEvent& rNEvt ); virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ); diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index d822cf9df9cd..855d5a604aad 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -176,7 +176,7 @@ namespace dbaui // window override virtual void StateChanged( StateChangedType nStateChange ); virtual void GetFocus(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void Command(const CommandEvent& rEvt); // Accessibility diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index a4425e33d3cb..8d0cf2fc5c93 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -69,7 +69,7 @@ namespace dbaui virtual void NotifyScrolled(); virtual void NotifyEndScroll(); - virtual long PreNotify(NotifyEvent& rNEvt); + virtual bool PreNotify(NotifyEvent& rNEvt); virtual void dragFinished( ); diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index d4aaf989988b..b7f66d0df886 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -67,7 +67,7 @@ namespace dbaui sal_uInt16 _nPos, sal_Bool _bSet=sal_False); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: OWizTypeSelectList( Window* pParent, WinBits nStyle = WB_BORDER ) : MultiListBox(pParent,nStyle) {}; OWizTypeSelectList( Window* pParent, const ResId& rResId ) : MultiListBox(pParent,rResId) {}; diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index b0f54cb41942..801dca595c12 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -81,7 +81,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getContainer() { return m_xMe; } protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); virtual void resizeDocumentView(Rectangle& rRect); virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource ); diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index 45f5feeed90c..fdc57d450922 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -53,7 +53,7 @@ namespace dbaui virtual void Construct(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); // show the beamer void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index af4fca058e72..b1c3c970f645 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -387,16 +387,16 @@ void OWizTypeSelectList::setPrimaryKey(OFieldDescription* _pFieldDescr,sal_uInt1 SetEntryData(_nPos,_pFieldDescr); } -long OWizTypeSelectList::PreNotify( NotifyEvent& rEvt ) +bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt ) { - long nDone = 0; + bool nDone = false; switch( rEvt.GetType() ) { case EVENT_MOUSEBUTTONDOWN: { const MouseEvent* pMEvt = rEvt.GetMouseEvent(); if(pMEvt->IsRight() && !pMEvt->GetModifier()) - nDone = 1; + nDone = true; } break; case EVENT_COMMAND: @@ -436,11 +436,11 @@ long OWizTypeSelectList::PreNotify( NotifyEvent& rEvt ) } break; } - nDone = 1; + nDone = true; } break; } - return nDone ? nDone : MultiListBox::PreNotify(rEvt); + return nDone || MultiListBox::PreNotify(rEvt); } void OWizTypeSelect::fillColumnList(sal_uInt32 nRows) diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 0d412d3b092e..0d804f53e01c 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1269,7 +1269,7 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab return pConn; } -long OJoinTableView::PreNotify(NotifyEvent& rNEvt) +bool OJoinTableView::PreNotify(NotifyEvent& rNEvt) { sal_Bool bHandled = sal_False; switch (rNEvt.GetType()) @@ -1460,7 +1460,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt) if (!bHandled) return Window::PreNotify(rNEvt); - return 1L; + return true; } void OJoinTableView::GrabTabWinFocus() diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index fad78e1b76d1..80d6b1f3bd21 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2778,7 +2778,7 @@ void OQueryDesignView::fillValidFields(const OUString& sAliasName, ComboBox* pFi } } -long OQueryDesignView::PreNotify(NotifyEvent& rNEvt) +bool OQueryDesignView::PreNotify(NotifyEvent& rNEvt) { switch (rNEvt.GetType()) { diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 6b734e8b6ee7..beedbae5e4c0 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -607,7 +607,7 @@ void OTableWindow::Command(const CommandEvent& rEvt) } } -long OTableWindow::PreNotify(NotifyEvent& rNEvt) +bool OTableWindow::PreNotify(NotifyEvent& rNEvt) { sal_Bool bHandled = sal_False; switch (rNEvt.GetType()) @@ -737,7 +737,7 @@ long OTableWindow::PreNotify(NotifyEvent& rNEvt) } if (!bHandled) return Window::PreNotify(rNEvt); - return 1L; + return true; } OUString OTableWindow::getTitle() const diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 9c587855124c..746947dbcaa9 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -130,7 +130,7 @@ void OTableWindowListBox::NotifyEndScroll() m_bReallyScrolled = sal_False; } -long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) +bool OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) { sal_Bool bHandled = sal_False; switch (rNEvt.GetType()) @@ -159,7 +159,7 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) if (!bHandled) return SvTreeListBox::PreNotify(rNEvt); - return 1L; + return true; } IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ ) diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 8cc0b6e8470a..79abb14feef1 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -156,7 +156,7 @@ namespace dbaui Resize(); } } - long OQueryContainerWindow::PreNotify( NotifyEvent& rNEvt ) + bool OQueryContainerWindow::PreNotify( NotifyEvent& rNEvt ) { sal_Bool bHandled = sal_False; switch (rNEvt.GetType()) @@ -170,7 +170,7 @@ namespace dbaui rController.InvalidateFeature(SID_PASTE); } } - return bHandled ? 1L : ODataView::PreNotify(rNEvt); + return bHandled || ODataView::PreNotify(rNEvt); } void OQueryContainerWindow::showPreview(const Reference<XFrame>& _xFrame) { diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 9f72313c1a98..b97fe50eb370 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -71,15 +71,15 @@ void ORelationDesignView::initialize() OJoinDesignView::initialize(); } -long ORelationDesignView::PreNotify( NotifyEvent& rNEvt ) +bool ORelationDesignView::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0L; + bool nDone = false; if(rNEvt.GetType() == EVENT_GETFOCUS) { if(!m_pTableView->HasChildPathFocus()) { m_pTableView->GrabTabWinFocus(); - nDone = 1L; + nDone = true; } } if(!nDone) diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 820ba0f279d0..664d4c9dc92e 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -1745,7 +1745,7 @@ void OTableEditorCtrl::DeactivateCell(sal_Bool bUpdate) pDescrWin->SetReadOnly(bReadOnly || !SetDataPtr(nRow) || GetActRow()->IsReadOnly()); } -long OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt ) +bool OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt ) { if (rNEvt.GetType() == EVENT_GETFOCUS) { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 34d696645593..02c4c1d66518 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -165,7 +165,7 @@ namespace dbaui OFieldDescription* GetFieldDescr( long nRow ); // window overloads - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); // IClipboardTest virtual sal_Bool isCutAllowed() { return IsCutAllowed(); } diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index ebc9f39139e4..e2681b021ba3 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -66,7 +66,7 @@ void OTableDesignHelpBar::Resize() } -long OTableDesignHelpBar::PreNotify( NotifyEvent& rNEvt ) +bool OTableDesignHelpBar::PreNotify( NotifyEvent& rNEvt ) { if (rNEvt.GetType() == EVENT_LOSEFOCUS) SetHelpText(OUString()); diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 29c8c5554b67..c459c7615035 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -229,7 +229,7 @@ void OTableDesignView::resizeDocumentView(Rectangle& _rPlayground) _rPlayground.SetSize( Size( 0, 0 ) ); } -long OTableDesignView::PreNotify( NotifyEvent& rNEvt ) +bool OTableDesignView::PreNotify( NotifyEvent& rNEvt ) { sal_Bool bHandled = sal_False; switch(rNEvt.GetType()) @@ -244,7 +244,7 @@ long OTableDesignView::PreNotify( NotifyEvent& rNEvt ) break; } - return bHandled ? 1L : ODataView::PreNotify(rNEvt); + return bHandled || ODataView::PreNotify(rNEvt); } IClipboardTest* OTableDesignView::getActiveChild() const diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index e3b9bfb245ef..fd6633619786 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -276,7 +276,7 @@ void OTableFieldDescWin::LoseFocus() getGenPage()->LoseFocus(); } -long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt ) +bool OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt ) { sal_Bool bHandled = sal_False; switch(rNEvt.GetType()) @@ -289,7 +289,7 @@ long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt ) break; } - return bHandled ? 1L : TabPage::PreNotify(rNEvt); + return bHandled || TabPage::PreNotify(rNEvt); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index 94223eab9e10..8f5eca58ebef 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -63,7 +63,7 @@ namespace dbaui void SetReadOnly( sal_Bool bReadOnly ); // window overloads - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); virtual void LoseFocus(); diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx index 123c146d51e0..21be478b5d48 100644 --- a/extensions/source/bibliography/bibcont.cxx +++ b/extensions/source/bibliography/bibcont.cxx @@ -210,9 +210,9 @@ void BibBookContainer::GetFocus() pBottomWin->GrabFocus(); } -long BibBookContainer::PreNotify( NotifyEvent& rNEvt ) +bool BibBookContainer::PreNotify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; if( EVENT_KEYINPUT == rNEvt.GetType() ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); @@ -235,10 +235,10 @@ long BibBookContainer::PreNotify( NotifyEvent& rNEvt ) SetItemSize( nFirstWinId, nHeight ); SetItemSize( nSecondWinId, 100 - nHeight ); } - nHandled = 1; + nHandled = true; } else if( pKEvt->GetCharCode() && HandleShortCutKey( *pKEvt ) ) - nHandled = 1; + nHandled = true; } } diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx index cb5bbee09bb1..f63fef02d5ab 100644 --- a/extensions/source/bibliography/bibcont.hxx +++ b/extensions/source/bibliography/bibcont.hxx @@ -79,7 +79,7 @@ class BibBookContainer: public BibSplitWindow virtual void Split(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 9b5139c72ee0..06cf39225a97 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -428,9 +428,9 @@ void BibToolBar::SetQueryString(const OUString& aStr) } -long BibToolBar::PreNotify( NotifyEvent& rNEvt ) +bool BibToolBar::PreNotify( NotifyEvent& rNEvt ) { - long nResult=sal_True; + bool nResult = true; sal_uInt16 nSwitch=rNEvt.GetType(); if(aEdQuery.HasFocus() && nSwitch==EVENT_KEYINPUT) diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 58229c7c6084..c80b68953b32 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -143,7 +143,7 @@ class BibToolBar: public ToolBox void InitListener(); virtual void Select(); virtual void Click(); - long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 1333185d9843..ac52c6aee332 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1207,7 +1207,7 @@ namespace pcr } //------------------------------------------------------------------ - long OBrowserListBox::PreNotify( NotifyEvent& _rNEvt ) + bool OBrowserListBox::PreNotify( NotifyEvent& _rNEvt ) { switch ( _rNEvt.GetType() ) { @@ -1255,7 +1255,7 @@ namespace pcr } } - return 1L; + return true; // handled this. In particular, we also consume PageUp/Down events if we do not use them for scrolling, // otherwise they would be used to scroll the document view, which does not sound like it is desired by // the user. diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 2001034dbec2..6b1da47ba8a9 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -134,7 +134,7 @@ namespace pcr void EnableUpdate(); void DisableUpdate(); bool Notify( NotifyEvent& _rNEvt ); - long PreNotify( NotifyEvent& _rNEvt ); + virtual bool PreNotify( NotifyEvent& _rNEvt ); void SetListener( IPropertyLineListener* _pListener ); void SetObserver( IPropertyControlObserver* _pObserver ); diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index f8aaa357c0cf..fe1405a604ec 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -58,7 +58,7 @@ namespace pcr protected: // Window overridables - inline virtual long PreNotify( NotifyEvent& rNEvt ); + inline virtual bool PreNotify( NotifyEvent& rNEvt ); }; //======================================================================== @@ -231,10 +231,10 @@ namespace pcr //------------------------------------------------------------------------ template< class WINDOW > - inline long ControlWindow< WINDOW >::PreNotify( NotifyEvent& rNEvt ) + inline bool ControlWindow< WINDOW >::PreNotify( NotifyEvent& rNEvt ) { if ( m_pHelper && m_pHelper->handlePreNotify( rNEvt ) ) - return 1; + return true; return WindowType::PreNotify( rNEvt ); } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index ced964c690e0..fe471ac93573 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -971,7 +971,7 @@ namespace pcr MultiLineEdit* getEdit() { return &m_aImplEdit; } protected: - virtual long PreNotify(NotifyEvent& _rNEvt); + virtual bool PreNotify(NotifyEvent& _rNEvt); }; //------------------------------------------------------------------ @@ -989,9 +989,9 @@ namespace pcr } //------------------------------------------------------------------ - long OMultilineFloatingEdit::PreNotify(NotifyEvent& _rNEvt) + bool OMultilineFloatingEdit::PreNotify(NotifyEvent& _rNEvt) { - long nResult = sal_True; + bool nResult = true; sal_uInt16 nSwitch = _rNEvt.GetType(); if (EVENT_KEYINPUT == nSwitch) @@ -1095,9 +1095,9 @@ namespace pcr } //------------------------------------------------------------------ - long DropDownEditControl::PreNotify( NotifyEvent& rNEvt ) + bool DropDownEditControl::PreNotify( NotifyEvent& rNEvt ) { - long nResult = 1; + bool nResult = true; if (rNEvt.GetType() == EVENT_KEYINPUT) { diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index b7cd14efb3c7..5d8f62718565 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -66,12 +66,12 @@ namespace pcr void SetModifyHdl( const Link& _rLink ) { ListBoxType::SetSelectHdl( _rLink ); } protected: - long PreNotify( NotifyEvent& _rNEvt ); + bool PreNotify( NotifyEvent& _rNEvt ); }; //------------------------------------------------------------------------ template< class LISTBOX_WINDOW > - long ListLikeControlWithModifyHandler< LISTBOX_WINDOW >::PreNotify( NotifyEvent& _rNEvt ) + bool ListLikeControlWithModifyHandler< LISTBOX_WINDOW >::PreNotify( NotifyEvent& _rNEvt ) { if ( _rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -399,7 +399,7 @@ namespace pcr protected: // Window overridables - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void Resize(); protected: diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 9433c6d0f559..833dd60df576 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -45,7 +45,7 @@ namespace pcr // NumberFormatSampleField //================================================================== //------------------------------------------------------------------ - long NumberFormatSampleField::PreNotify( NotifyEvent& rNEvt ) + bool NumberFormatSampleField::PreNotify( NotifyEvent& rNEvt ) { // want to handle two keys myself : Del/Backspace should empty the window (setting my prop to "standard" this way) if (EVENT_KEYINPUT == rNEvt.GetType()) @@ -57,7 +57,7 @@ namespace pcr SetText( "" ); if ( m_pHelper ) m_pHelper->ModifiedHdl( this ); - return 1; + return true; } } diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index c860b772398c..e87071134a44 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -49,7 +49,7 @@ namespace pcr void SetFormatSupplier( const SvNumberFormatsSupplierObj* pSupplier ); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); }; //======================================================================== diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index a145f62301d2..67a4f7c43746 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -194,7 +194,7 @@ namespace frm } //-------------------------------------------------------------------- - long RichTextControl::PreNotify( NotifyEvent& _rNEvt ) + bool RichTextControl::PreNotify( NotifyEvent& _rNEvt ) { if ( IsWindowOrChild( _rNEvt.GetWindow() ) ) { @@ -213,7 +213,7 @@ namespace frm KeyCode aNewCode( KEY_TAB, bShift, sal_False, sal_False, sal_False ); ::KeyEvent aNewEvent( pKeyEvent->GetCharCode(), aNewCode ); Control::KeyInput( aNewEvent ); - return 1; // handled + return true; // handled } #if OSL_DEBUG_LEVEL > 0 @@ -278,7 +278,7 @@ namespace frm } DELETEZ( pStream ); } - return 1; // handled + return true; // handled } #endif } diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 35b59916560f..e603af87481f 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -109,7 +109,7 @@ namespace frm virtual void Resize(); virtual void GetFocus(); virtual void StateChanged( StateChangedType nStateChange ); - virtual long PreNotify( NotifyEvent& _rNEvt ); + virtual bool PreNotify( NotifyEvent& _rNEvt ); virtual bool Notify( NotifyEvent& _rNEvt ); private: diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 86f4f1d01c4c..fe62907592c8 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -55,7 +55,7 @@ private: protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void SelectionChanged(); virtual void Resize(); virtual void GetFocus(); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 4e2ba70725c4..2bfd9b3fdb00 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1707,7 +1707,7 @@ void FormulaModalDialog::SetFocusWin(Window *pWin,const OString& nUniqueId) } } -long FormulaModalDialog::PreNotify( NotifyEvent& rNEvt ) +bool FormulaModalDialog::PreNotify( NotifyEvent& rNEvt ) { m_pImpl->PreNotify( rNEvt ); @@ -1820,7 +1820,7 @@ void FormulaDlg::SetFocusWin(Window *pWin,const OString& nUniqueId) } -long FormulaDlg::PreNotify( NotifyEvent& rNEvt ) +bool FormulaDlg::PreNotify( NotifyEvent& rNEvt ) { m_pImpl->PreNotify( rNEvt ); return SfxModelessDialog::PreNotify(rNEvt); diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index ef38e18b2bce..eef85961bee5 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -43,11 +43,11 @@ void FormulaListBox::KeyInput( const KeyEvent& rKEvt ) DoubleClick(); } -long FormulaListBox::PreNotify( NotifyEvent& rNEvt ) +bool FormulaListBox::PreNotify( NotifyEvent& rNEvt ) { NotifyEvent aNotifyEvt=rNEvt; - long nResult=ListBox::PreNotify(rNEvt); + bool nResult = ListBox::PreNotify(rNEvt); sal_uInt16 nSwitch=aNotifyEvt.GetType(); if(nSwitch==EVENT_KEYINPUT) diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 056c4a5a4399..eb2985b66cd4 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -47,7 +47,7 @@ class FormulaListBox : public ListBox protected: virtual void KeyInput( const KeyEvent& rKEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: FormulaListBox( Window* pParent, const ResId& rResId ); diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 06ef245a3bc7..895fa67c767c 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -428,9 +428,9 @@ void EditBox::GetFocus() //When an Event is cleared, this Routine is //first called and a PostUserEvent is sent. -long EditBox::PreNotify( NotifyEvent& rNEvt ) +bool EditBox::PreNotify( NotifyEvent& rNEvt ) { - long nResult=sal_True; + bool nResult = true; if(pMEdit==NULL) return nResult; @@ -441,7 +441,7 @@ long EditBox::PreNotify( NotifyEvent& rNEvt ) sal_uInt16 nKey=aKeyCode.GetCode(); if( (nKey==KEY_RETURN && !aKeyCode.IsShift()) || nKey==KEY_TAB ) { - nResult=long(GetParent()->Notify(rNEvt)); + nResult = GetParent()->Notify(rNEvt); } else { diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx index cd577f8badb6..ea3a2acab330 100644 --- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx @@ -42,7 +42,7 @@ class IComboBoxListener virtual void KeyInput( const KeyEvent& rKEvt ) = 0; virtual void GetFocus() = 0; virtual void LoseFocus() = 0; - virtual long PreNotify( NotifyEvent& rNEvt ) = 0; + virtual bool PreNotify( NotifyEvent& rNEvt ) = 0; protected: ~IComboBoxListener() {} @@ -71,7 +71,7 @@ class ComboboxToolbarController : public IComboBoxListener, virtual void KeyInput( const KeyEvent& rKEvt ); virtual void GetFocus(); virtual void LoseFocus(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); protected: virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ); diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx index da4472cf9b68..a6c6ab8e7192 100644 --- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx @@ -41,7 +41,7 @@ class IListBoxListener virtual void DoubleClick() = 0; virtual void GetFocus() = 0; virtual void LoseFocus() = 0; - virtual long PreNotify( NotifyEvent& rNEvt ) = 0; + virtual bool PreNotify( NotifyEvent& rNEvt ) = 0; protected: ~IListBoxListener() {} }; @@ -67,7 +67,7 @@ class DropdownToolbarController : public IListBoxListener, virtual void DoubleClick(); virtual void GetFocus(); virtual void LoseFocus(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); protected: virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ); diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index 5e43474d30fd..36305040138c 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -41,7 +41,7 @@ class IEditListener virtual void KeyInput( const KeyEvent& rKEvt ) = 0; virtual void GetFocus() = 0; virtual void LoseFocus() = 0; - virtual long PreNotify( NotifyEvent& rNEvt ) = 0; + virtual bool PreNotify( NotifyEvent& rNEvt ) = 0; protected: ~IEditListener() {} @@ -68,7 +68,7 @@ class EditToolbarController : public IEditListener, virtual void KeyInput( const KeyEvent& rKEvt ); virtual void GetFocus(); virtual void LoseFocus(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); protected: virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ); diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index 7312ac2d34db..4755c0c2dd80 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -47,7 +47,7 @@ class ISpinfieldListener virtual void LoseFocus() = 0; virtual void StateChanged( StateChangedType nType ) = 0; virtual void DataChanged( const DataChangedEvent& rDCEvt ) = 0; - virtual long PreNotify( NotifyEvent& rNEvt ) = 0; + virtual bool PreNotify( NotifyEvent& rNEvt ) = 0; protected: ~ISpinfieldListener() {} @@ -80,7 +80,7 @@ class SpinfieldToolbarController : public ISpinfieldListener, virtual void LoseFocus(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); protected: virtual void executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand ); diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index 6310d92cef19..755da4671850 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -65,7 +65,7 @@ class ComboBoxControl : public ComboBox virtual void KeyInput( const ::KeyEvent& rKEvt ); virtual void GetFocus(); virtual void LoseFocus(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); private: IComboBoxListener* m_pComboBoxListener; @@ -124,12 +124,12 @@ void ComboBoxControl::LoseFocus() m_pComboBoxListener->LoseFocus(); } -long ComboBoxControl::PreNotify( NotifyEvent& rNEvt ) +bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt ) { - long nRet( 0 ); + bool nRet = false; if ( m_pComboBoxListener ) nRet = m_pComboBoxListener->PreNotify( rNEvt ); - if ( nRet == 0 ) + if ( !nRet ) nRet = ComboBox::PreNotify( rNEvt ); return nRet; @@ -230,7 +230,7 @@ void ComboboxToolbarController::LoseFocus() notifyFocusLost(); } -long ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) +bool ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) { switch ( rNEvt.GetType() ) { @@ -243,7 +243,7 @@ long ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) // Call execute only with non-empty text if ( !m_pComboBox->GetText().isEmpty() ) execute( rKeyCode.GetModifier() ); - return 1; + return true; } } break; @@ -256,7 +256,7 @@ long ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt ) default : break; } - return 0; + return false; } // -------------------------------------------------------- diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 2bca0970361a..190428d918df 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -62,7 +62,7 @@ class ListBoxControl : public ListBox virtual void DoubleClick(); virtual void GetFocus(); virtual void LoseFocus(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); private: IListBoxListener* m_pListBoxListener; @@ -107,12 +107,12 @@ void ListBoxControl::LoseFocus() m_pListBoxListener->LoseFocus(); } -long ListBoxControl::PreNotify( NotifyEvent& rNEvt ) +bool ListBoxControl::PreNotify( NotifyEvent& rNEvt ) { - long nRet( 0 ); + bool nRet = false; if ( m_pListBoxListener ) nRet = m_pListBoxListener->PreNotify( rNEvt ); - if ( nRet == 0 ) + if ( !nRet ) nRet = ListBox::PreNotify( rNEvt ); return nRet; @@ -205,9 +205,9 @@ void DropdownToolbarController::LoseFocus() notifyFocusLost(); } -long DropdownToolbarController::PreNotify( NotifyEvent& /*rNEvt*/ ) +bool DropdownToolbarController::PreNotify( NotifyEvent& /*rNEvt*/ ) { - return 0; + return false; } // -------------------------------------------------------- diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 251f5b508fe0..954d3ae5056b 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -61,7 +61,7 @@ class EditControl : public Edit virtual void KeyInput( const ::KeyEvent& rKEvt ); virtual void GetFocus(); virtual void LoseFocus(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); private: IEditListener* m_pEditListener; @@ -106,12 +106,12 @@ void EditControl::LoseFocus() m_pEditListener->LoseFocus(); } -long EditControl::PreNotify( NotifyEvent& rNEvt ) +bool EditControl::PreNotify( NotifyEvent& rNEvt ) { - long nRet( 0 ); + bool nRet = false; if ( m_pEditListener ) nRet = m_pEditListener->PreNotify( rNEvt ); - if ( nRet == 0 ) + if ( !nRet ) nRet = Edit::PreNotify( rNEvt ); return nRet; @@ -196,7 +196,7 @@ void EditToolbarController::LoseFocus() notifyFocusLost(); } -long EditToolbarController::PreNotify( NotifyEvent& rNEvt ) +bool EditToolbarController::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -207,11 +207,11 @@ long EditToolbarController::PreNotify( NotifyEvent& rNEvt ) // Call execute only with non-empty text if ( !m_pEditControl->GetText().isEmpty() ) execute( rKeyCode.GetModifier() ); - return 1; + return true; } } - return 0; + return false; } // -------------------------------------------------------- diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index ad0f09dc4071..a6f702d53da2 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -73,7 +73,7 @@ class SpinfieldControl : public SpinField virtual void LoseFocus(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); private: ISpinfieldListener* m_pSpinFieldListener; @@ -160,12 +160,12 @@ void SpinfieldControl::DataChanged( const DataChangedEvent& rDCEvt ) m_pSpinFieldListener->DataChanged( rDCEvt ); } -long SpinfieldControl::PreNotify( NotifyEvent& rNEvt ) +bool SpinfieldControl::PreNotify( NotifyEvent& rNEvt ) { - long nRet( 0 ); + bool nRet = false; if ( m_pSpinFieldListener ) nRet = m_pSpinFieldListener->PreNotify( rNEvt ); - if ( nRet == 0 ) + if ( !nRet ) nRet = SpinField::PreNotify( rNEvt ); return nRet; @@ -318,7 +318,7 @@ void SpinfieldToolbarController::DataChanged( const DataChangedEvent& /*rDCEvt*/ { } -long SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt ) +bool SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -329,11 +329,11 @@ long SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt ) // Call execute only with non-empty text if ( !m_pSpinfieldControl->GetText().isEmpty() ) execute( rKeyCode.GetModifier() ); - return 1; + return true; } } - return 0; + return false; } // -------------------------------------------------------- diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index a8f3fb1e7eca..94cfa9399c0d 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -53,7 +53,7 @@ namespace dbaui // initialize will be called when after the controller finished his initialize method virtual void initialize(){} // window overridables - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index fc0c8b3f00b4..683a9e3f93d0 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -64,7 +64,7 @@ private: protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( sal_Bool bForced = sal_False ); @@ -108,7 +108,7 @@ protected: protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( sal_Bool bForced = sal_False ); diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 254318777a3d..7985bd6817fe 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -108,7 +108,7 @@ namespace svt void implConstruct(); // Window overridables - virtual long PreNotify( NotifyEvent& _rNEvt ); + virtual bool PreNotify( NotifyEvent& _rNEvt ); // implementations void implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar); diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index e28513efdc29..6d36aeaa8267 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -203,7 +203,7 @@ namespace svt protected: // Window overridables - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); // MultiLineEdit overridables virtual void Modify(); @@ -288,7 +288,7 @@ namespace svt ~CheckBoxControl(); virtual void GetFocus(); - virtual long PreNotify(NotifyEvent& rEvt); + virtual bool PreNotify(NotifyEvent& rEvt); virtual void Paint(const Rectangle& rClientRect); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void StateChanged( StateChangedType nStateChange ); @@ -337,7 +337,7 @@ namespace svt ComboBoxControl(Window* pParent, WinBits nWinStyle = 0); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); }; //================================================================== @@ -370,7 +370,7 @@ namespace svt ListBoxControl(Window* pParent, WinBits nWinStyle = 0); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); }; //================================================================== @@ -528,7 +528,7 @@ namespace svt using BrowseBox::MouseButtonUp; using BrowseBox::MouseButtonDown; - virtual long PreNotify(NotifyEvent& rNEvt ); + virtual bool PreNotify(NotifyEvent& rNEvt ); virtual bool Notify(NotifyEvent& rNEvt); virtual void EndScroll(); diff --git a/include/svtools/editsyntaxhighlighter.hxx b/include/svtools/editsyntaxhighlighter.hxx index 6f1444c93a74..2276e0132644 100644 --- a/include/svtools/editsyntaxhighlighter.hxx +++ b/include/svtools/editsyntaxhighlighter.hxx @@ -36,7 +36,7 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit virtual void DoBracketHilight(sal_uInt16 aKey); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: MultiLineEditSyntaxHighlight( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL); diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 7ff42f542b46..2d113cfb0450 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -40,7 +40,7 @@ namespace svt FileURLBox( Window* _pParent, WinBits _nStyle ); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); public: diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index fbc882edd335..e70f147677cc 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -255,7 +255,7 @@ protected: virtual SvNumberFormatter* CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; } SvNumberFormatter* ImplGetFormatter() const { return m_pFormatter ? m_pFormatter : ((FormattedField*)this)->CreateFormatter(); } - long PreNotify(NotifyEvent& rNEvt); + bool PreNotify(NotifyEvent& rNEvt); virtual void ReFormat(); }; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index dfa15ca969ac..d0d3a00ff561 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -55,7 +55,7 @@ protected: virtual bool Notify( NotifyEvent& rNEvt ); virtual void Select(); virtual void Modify(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: SvtURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_NOT_VALID, bool bSetDefaultHelpID = true ); diff --git a/include/svtools/roadmap.hxx b/include/svtools/roadmap.hxx index d1c51c004c5d..1febec3cbb4a 100644 --- a/include/svtools/roadmap.hxx +++ b/include/svtools/roadmap.hxx @@ -89,7 +89,7 @@ namespace svt protected: - long PreNotify( NotifyEvent& rNEvt ); + bool PreNotify( NotifyEvent& rNEvt ); protected: /// called when an item has been selected by any means diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index b105fbebdd1d..7c5368a51d5d 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -31,7 +31,7 @@ private: SvSimpleTable* m_pTable; protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: SvSimpleTableContainer( Window* pParent, const ResId& rResId ); diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index 155094ebfecb..ed136c6ed130 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -40,7 +40,7 @@ namespace svt OFileURLControl(Window* _pParent, const ResId& _rId); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); }; diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index e3e59f1abd83..673f60442a57 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -309,7 +309,7 @@ protected: virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY); virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); virtual void Command(const CommandEvent& rEvt); - virtual long PreNotify(NotifyEvent& rEvt); + virtual bool PreNotify(NotifyEvent& rEvt); virtual void KeyInput(const KeyEvent& rEvt); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 66a8da951659..584c38296eae 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -55,7 +55,7 @@ public: protected: virtual void Select(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -87,7 +87,7 @@ public: protected: virtual void Select(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -112,7 +112,7 @@ protected: virtual void Down(); virtual void Up(); // just to be sure - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -139,7 +139,7 @@ public: sal_Bool IsRelease() { return bRelease;} protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); private: @@ -161,7 +161,7 @@ public: sal_Bool IsRelease() { return bRelease;} protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void Select(); diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 0afca8cf2625..149f73aefa52 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -70,7 +70,7 @@ class RubyEdit : public Edit Link aScrollHdl; Link aJumpHdl; virtual void GetFocus(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: RubyEdit(Window* pParent, const ResId& rResId) : Edit(pParent, rResId) diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index b1a1179eb05e..17a2228eaf55 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -159,7 +159,7 @@ public: virtual void LoseFocus(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void Toggle(); @@ -357,7 +357,7 @@ public: virtual void LoseFocus(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void Toggle(); @@ -472,7 +472,7 @@ public: virtual void LoseFocus(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void Toggle(); diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 81849c477b9f..fd49eaab8ad6 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -96,7 +96,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 bool PreNotify( 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 b75b4dd0aaf6..acc59a3e2cc6 100644 --- a/include/vcl/field.hxx +++ b/include/vcl/field.hxx @@ -486,7 +486,7 @@ public: explicit PatternField( Window* pParent, WinBits nWinStyle ); virtual ~PatternField(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void Modify(); }; @@ -506,7 +506,7 @@ public: explicit NumericField( Window* pParent, const ResId& ); virtual ~NumericField(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -536,7 +536,7 @@ public: explicit MetricField( Window* pParent, const ResId& ); virtual ~MetricField(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -604,7 +604,7 @@ public: ~CurrencyField(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -636,7 +636,7 @@ public: explicit DateField( Window* pParent, const ResId& ); virtual ~DateField(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -672,7 +672,7 @@ public: explicit TimeField( Window* pParent, const ResId& ); virtual ~TimeField(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -702,7 +702,7 @@ public: PatternBox( Window* pParent, WinBits nWinStyle ); ~PatternBox(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void Modify(); @@ -724,7 +724,7 @@ public: virtual Size CalcMinimumSize() const; - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -746,7 +746,7 @@ public: explicit MetricBox( Window* pParent, WinBits nWinStyle ); virtual ~MetricBox(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -780,7 +780,7 @@ public: explicit CurrencyBox( Window* pParent, const ResId& ); virtual ~CurrencyBox(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -801,7 +801,7 @@ public: explicit DateBox( Window* pParent, WinBits nWinStyle ); virtual ~DateBox(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -821,7 +821,7 @@ public: explicit TimeBox( Window* pParent, WinBits nWinStyle ); virtual ~TimeBox(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index be53773e9021..cc08b9518a1d 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -92,7 +92,7 @@ public: LongCurrencyField( Window* pParent, WinBits nWinStyle ); ~LongCurrencyField(); - long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); void Modify(); @@ -119,7 +119,7 @@ public: LongCurrencyBox( Window* pParent, WinBits nWinStyle ); ~LongCurrencyBox(); - long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); void Modify(); diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index e57ea803a7fc..c918d1e598ae 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -84,7 +84,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 bool PreNotify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index f78bda1d85d6..e17042cd2210 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -102,7 +102,7 @@ public: virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); virtual void LoseFocus(); diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index c7b50b2ae138..dedff1495a0b 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -83,7 +83,7 @@ public: long GetValue() const { return mnValue; } void SetValueStep( long nNewStep ) { mnValueStep = nNewStep; } long GetValueStep() const { return mnValueStep; } - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } const Link& GetUpHdl() const { return maUpHdlLink; } diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index d987743b87b7..06e31e4c446d 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -89,7 +89,7 @@ public: virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } const Link& GetUpHdl() const { return maUpHdlLink; } diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx index 6eb6dfbbc52e..65fe65bfae35 100644 --- a/include/vcl/splitwin.hxx +++ b/include/vcl/splitwin.hxx @@ -161,7 +161,7 @@ public: virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); void InsertItem( sal_uInt16 nId, Window* pWindow, long nSize, sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index c26c637c6455..8223483cbac3 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -176,7 +176,7 @@ protected: public: ~SystemWindow(); virtual bool Notify( NotifyEvent& rNEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual sal_Bool Close(); virtual void TitleButtonClick( sal_uInt16 nButton ); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index e2534409e0e1..263e64891e91 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -106,7 +106,7 @@ public: virtual bool Notify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void ActivatePage(); virtual long DeactivatePage(); diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index ef12a376b484..29f6a359e344 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -47,7 +47,7 @@ protected: DECL_LINK( ImpUpdateDataHdl, void* ); void StateChanged( StateChangedType nType ); void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); using Control::ImplInitSettings; void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 14d2b69c53e1..b2ef51cb9d8d 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -597,7 +597,7 @@ public: virtual void UserEvent( sal_uLong nEvent, void* pEventData ); virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual Window* GetPreferredKeyInputWindow(); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index db7fea27e703..a938abede1e3 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -245,7 +245,7 @@ uno::Sequence< beans::PropertyValue > OAddFieldWindow::getSelectedFieldDescripto } //----------------------------------------------------------------------- -long OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt ) +bool OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt ) { if ( EVENT_KEYINPUT == _rNEvt.GetType() ) { @@ -255,7 +255,7 @@ long OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt ) if ( m_aCreateLink.IsSet() ) { m_aCreateLink.Call(this); - return 1; + return true; } } } diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 3b6d97d37304..3bf741a5bef7 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -494,7 +494,7 @@ namespace rptui } // ----------------------------------------------------------------------------- - long ConditionalFormattingDialog::PreNotify( NotifyEvent& _rNEvt ) + bool ConditionalFormattingDialog::PreNotify( NotifyEvent& _rNEvt ) { switch ( _rNEvt.GetType() ) { @@ -507,12 +507,12 @@ namespace rptui if ( rKeyCode.GetCode() == 0x0508 ) // - { impl_deleteCondition_nothrow( impl_getFocusedConditionIndex( 0 ) ); - return 1; + return true; } if ( rKeyCode.GetCode() == 0x0507 ) // + { impl_addCondition_nothrow( impl_getFocusedConditionIndex( impl_getConditionCount() - 1 ) + 1 ); - return 1; + return true; } } } diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index bee27840d260..ba882ec9e7a2 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -82,7 +82,7 @@ public: virtual ~OAddFieldWindow(); virtual void Resize(); virtual void GetFocus(); - virtual long PreNotify( NotifyEvent& _rNEvt ); + virtual bool PreNotify( NotifyEvent& _rNEvt ); inline const OUString& GetCommand() const { return m_aCommandName; } inline sal_Int32 GetCommandType() const { return m_nCommandType; } diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 4d8fa7c515cd..57cf2145b718 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -110,7 +110,7 @@ namespace rptui virtual OUString getDataField() const; protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); private: DECL_LINK( OnScroll, ScrollBar* ); diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index 9bf6818d57ad..3ad28623e8e9 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -102,7 +102,7 @@ namespace rptui // window overloads virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); // set the view readonly or not diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 3ca115c83e62..b07fb4b03b05 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -192,29 +192,29 @@ void ODesignView::DataChanged( const DataChangedEvent& rDCEvt ) } } //------------------------------------------------------------------------------ -long ODesignView::PreNotify( NotifyEvent& rNEvt ) +bool ODesignView::PreNotify( NotifyEvent& rNEvt ) { - long nRet = ODataView::PreNotify(rNEvt); // 1 := has to be handled here + bool nRet = ODataView::PreNotify(rNEvt); // 1 := has to be handled here switch(rNEvt.GetType()) { case EVENT_KEYINPUT: if ( (m_pPropWin && m_pPropWin->HasChildPathFocus()) ) - return 0L; + return false; if ( (m_pAddField && m_pAddField->HasChildPathFocus()) ) - return 0L; + return false; if ( (m_pReportExplorer && m_pReportExplorer->HasChildPathFocus()) ) - return 0L; + return false; { const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); if ( handleKeyEvent(*pKeyEvent) ) - nRet = 1L; - else if ( nRet == 1L && m_pAccel.get() ) + nRet = true; + else if ( nRet && m_pAccel.get() ) { const KeyCode& rCode = pKeyEvent->GetKeyCode(); util::URL aUrl; aUrl.Complete = m_pAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rCode)); if ( aUrl.Complete.isEmpty() || !m_rController.isCommandEnabled( aUrl.Complete ) ) - nRet = 0L; + nRet = false; } } break; diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index d097dd8e3db9..941d6502d691 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -213,7 +213,7 @@ public: void ReInit(ScViewData* ptrViewData); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); void Initialize (SfxChildWinInfo* pInfo); virtual void FillInfo(SfxChildWinInfo&) const; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index afea5fd873ce..873a4c3958cf 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -180,7 +180,7 @@ class ScRefHdlModalImpl : public ModalDialog, public ScRefHandler { public: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nStateChange ); protected: ScRefHdlModalImpl(Window* pParent, const OString& rID, @@ -193,7 +193,7 @@ template< class TWindow, bool bBindRef = true > class ScRefHdlrImplBase: public TWindow, public ScRefHandler { public: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nStateChange ); private: @@ -255,7 +255,7 @@ template<class TWindow, bool bBindRef > ScRefHdlrImplBase<TWindow,bBindRef>::~ScRefHdlrImplBase(){} template<class TWindow, bool bBindRef> -long ScRefHdlrImplBase<TWindow, bBindRef>::PreNotify( NotifyEvent& rNEvt ) +bool ScRefHdlrImplBase<TWindow, bBindRef>::PreNotify( NotifyEvent& rNEvt ) { ScRefHandler::preNotify( rNEvt, bBindRef ); return TWindow::PreNotify( rNEvt ); diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 232bb74c8555..57301c22cd00 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -45,7 +45,7 @@ class ScListBox : public ListBox protected: virtual void KeyInput( const KeyEvent& rKEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: ScListBox( Window* pParent, const ResId& rResId ); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index d5311da6e093..2e1d9badf700 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -319,7 +319,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void Tracking( const TrackingEvent& rTEvt ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index ec779d11a3b6..af0776924ecc 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -131,7 +131,7 @@ public: void SetMenuHdl( const Link& rLink ) { aMLink = rLink; } const Link& GetMenuHdl() const { return aMLink; } - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); }; #endif // SC_TPHFEDIT_HXX diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index c6aadee3a211..49f3da52b960 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -749,7 +749,7 @@ SvTreeListEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionC return pEntry; } -long ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt ) +bool ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType()==EVENT_GETFOCUS && bNeedsUpdate) { diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 5f04c4caa769..5a1db2244f29 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -1038,7 +1038,7 @@ ScRefHdlModalImpl::ScRefHdlModalImpl(Window* pParent, const OString& rID, { } -long ScRefHdlModalImpl::PreNotify( NotifyEvent& rNEvt ) +bool ScRefHdlModalImpl::PreNotify( NotifyEvent& rNEvt ) { ScRefHandler::preNotify( rNEvt, true ); return ModalDialog::PreNotify( rNEvt ); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 22ac0d4c92fd..abcb31c066d6 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -440,7 +440,7 @@ void ScExtIButton::StartPopup() } } -long ScExtIButton::PreNotify( NotifyEvent& rNEvt ) +bool ScExtIButton::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nSwitch=rNEvt.GetType(); if(nSwitch==EVENT_MOUSEBUTTONUP) diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 5782e7c8164e..e6ec4cb8674d 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -221,7 +221,7 @@ public: SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ); ~ScFilterListBox(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void Select(); SCCOL GetCol() const { return nCol; } @@ -281,9 +281,9 @@ void ScFilterListBox::LoseFocus() // ----------------------------------------------------------------------- -long ScFilterListBox::PreNotify( NotifyEvent& rNEvt ) +bool ScFilterListBox::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); @@ -294,17 +294,17 @@ long ScFilterListBox::PreNotify( NotifyEvent& rNEvt ) if ( nKey == KEY_RETURN ) { SelectHdl(); // auswaehlen - nDone = 1; + nDone = true; } else if ( nKey == KEY_ESCAPE ) { pGridWin->ClickExtern(); // loescht die List-Box !!! - nDone = 1; + nDone = true; } } } - return nDone ? nDone : ListBox::PreNotify( rNEvt ); + return nDone || ListBox::PreNotify( rNEvt ); } void ScFilterListBox::Select() @@ -2707,7 +2707,7 @@ static void lcl_InitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent, const rEvent.PopupTrigger = false; } -long ScGridWindow::PreNotify( NotifyEvent& rNEvt ) +bool ScGridWindow::PreNotify( NotifyEvent& rNEvt ) { bool bDone = false; sal_uInt16 nType = rNEvt.GetType(); @@ -2751,7 +2751,7 @@ long ScGridWindow::PreNotify( NotifyEvent& rNEvt ) } } - return 1; + return true; } else return Window::PreNotify( rNEvt ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 809f3a86856c..7c3677d9438b 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -361,7 +361,7 @@ public: ~DropdownMenuBox(); void Resize(); - long PreNotify( NotifyEvent& rNEvt ); + bool PreNotify( NotifyEvent& rNEvt ); void SetMenuSelectHdl( const Link& rLink ) { mpDropdownButton->SetSelectHdl( rLink ); } @@ -411,9 +411,9 @@ void DropdownMenuBox::Resize() // -------------------------------------------------------------------- -long DropdownMenuBox::PreNotify( NotifyEvent& rNEvt ) +bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt ) { - long nResult=sal_True; + bool nResult = true; sal_uInt16 nSwitch=rNEvt.GetType(); if (nSwitch==EVENT_KEYINPUT) diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index f0314e536652..a1eed29606a5 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -907,7 +907,7 @@ void IndexTabPage_Impl::OpenKeyword() // class SearchBox_Impl -------------------------------------------------- -long SearchBox_Impl::PreNotify( NotifyEvent& rNEvt ) +bool SearchBox_Impl::PreNotify( NotifyEvent& rNEvt ) { sal_Bool bHandled = sal_False; if ( !IsInDropDown() && @@ -918,7 +918,7 @@ long SearchBox_Impl::PreNotify( NotifyEvent& rNEvt ) aSearchLink.Call( NULL ); bHandled = sal_True; } - return bHandled ? 1 : ComboBox::PreNotify( rNEvt ); + return bHandled || ComboBox::PreNotify( rNEvt ); } // ----------------------------------------------------------------------- @@ -1764,9 +1764,9 @@ void SfxHelpIndexWindow_Impl::Resize() // ----------------------------------------------------------------------- -long SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt ) +bool SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; sal_uInt16 nType = rNEvt.GetType(); if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() ) { @@ -1784,12 +1784,12 @@ long SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if ( !bCtrl && bShift && aActiveLB.HasChildPathFocus() ) { pControl->GrabFocus(); - nDone = 1; + nDone = true; } else if ( !bCtrl && !bShift && pControl->HasChildPathFocus() ) { aActiveLB.GrabFocus(); - nDone = 1; + nDone = true; } else if ( bCtrl ) { @@ -1800,7 +1800,7 @@ long SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt ) nPageId = HELP_INDEX_PAGE_FIRST; aTabCtrl.SetCurPageId( (sal_uInt16)nPageId ); ActivatePageHdl( &aTabCtrl ); - nDone = 1; + nDone = true; } } else if ( aTabCtrl.HasFocus() && ( KEY_LEFT == nCode || KEY_RIGHT == nCode ) ) @@ -1809,7 +1809,7 @@ long SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt ) } } - return nDone ? nDone : Window::PreNotify( rNEvt ); + return nDone || Window::PreNotify( rNEvt ); } // ----------------------------------------------------------------------- @@ -2498,9 +2498,9 @@ void SfxHelpTextWindow_Impl::Resize() // ----------------------------------------------------------------------- -long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) +bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; sal_uInt16 nType = rNEvt.GetType(); if ( EVENT_COMMAND == nType && rNEvt.GetCommandEvent() ) { @@ -2592,7 +2592,7 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) sal_uInt16 nId = aMenu.Execute( this, aPos ); pHelpWin->DoAction( nId ); - nDone = 1; + nDone = true; } } else if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() ) @@ -2604,22 +2604,22 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if ( KEYGROUP_ALPHA == nKeyGroup && !isHandledKey( rKeyCode ) ) { // do nothing disables the writer accelerators - nDone = 1; + nDone = true; } else if ( rKeyCode.IsMod1() && ( KEY_F4 == nKey || KEY_W == nKey ) ) { // <CTRL><F4> or <CTRL><W> -> close top frame pHelpWin->CloseWindow(); - nDone = 1; + nDone = true; } else if ( KEY_TAB == nKey && aOnStartupCB.HasChildPathFocus() ) { aToolBox.GrabFocus(); - nDone = 1; + nDone = true; } } - return nDone ? nDone : Window::PreNotify( rNEvt ); + return nDone || Window::PreNotify( rNEvt ); } // ----------------------------------------------------------------------- @@ -3188,7 +3188,7 @@ SfxHelpWindow_Impl::~SfxHelpWindow_Impl() // ----------------------------------------------------------------------- -long SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt ) +bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { sal_Bool bHandled = sal_False; if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -3209,7 +3209,7 @@ long SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt ) bHandled = sal_True; } } - return bHandled ? 1 : Window::PreNotify( rNEvt ); + return bHandled || Window::PreNotify( rNEvt ); } // ----------------------------------------------------------------------- diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 3a5226afa041..69f92bb06d12 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -196,7 +196,7 @@ public: SearchBox_Impl( Window* pParent, const ResId& rResId ) : ComboBox( pParent, rResId ) { SetDropDownLineCount( 5 ); } - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void Select(); inline void SetSearchLink( const Link& rLink ) { aSearchLink = rLink; } @@ -340,7 +340,7 @@ public: ~SfxHelpIndexWindow_Impl(); virtual void Resize(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); void SetDoubleClickHdl( const Link& rLink ); @@ -478,7 +478,7 @@ public: ~SfxHelpTextWindow_Impl(); virtual void Resize(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void GetFocus(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -546,7 +546,7 @@ public: Window* pParent, WinBits nBits ); ~SfxHelpWindow_Impl(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); void setContainerWindow( ::com::sun::star::uno::Reference < ::com::sun::star::awt::XWindow > xWin ); diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index 5ca236ee3ab5..2ed6c5d6b045 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -57,7 +57,7 @@ class ResizableMultiLineEdit : public VclMultiLineEdit void SetInGrabFocus(bool bInGrabFocus) { mbIsInGrabFocus = bInGrabFocus; } - virtual long PreNotify(NotifyEvent& rNEvt); + virtual bool PreNotify(NotifyEvent& rNEvt); virtual void Modify(); }; @@ -72,9 +72,9 @@ ResizableMultiLineEdit::~ResizableMultiLineEdit () { } -long ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt) +bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt) { - long nDone = 0; + bool nDone = false; if( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyEvent& rKEvt = *rNEvt.GetKeyEvent(); @@ -85,7 +85,7 @@ long ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt) mpItem->setTitle( GetText() ); case KEY_ESCAPE: mpItem->setEditTitle(false); - nDone = 1; + nDone = true; break; default: break; @@ -96,7 +96,7 @@ long ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt) mpItem->setTitle( GetText() ); mpItem->setEditTitle(false, false); } - return nDone ? nDone : VclMultiLineEdit::PreNotify(rNEvt); + return nDone || VclMultiLineEdit::PreNotify(rNEvt); } void ResizableMultiLineEdit::Modify() diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index bfca6b754a1e..fe8163d642d6 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -72,7 +72,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void StateChanged( StateChangedType nStateChange ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rEvt ); virtual void Resize(); virtual void GetFocus(); @@ -138,7 +138,7 @@ bool SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) return Window::Notify( rNEvt ); } -long SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) +bool SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); if ( nType == EVENT_KEYINPUT || nType == EVENT_KEYUP ) @@ -146,7 +146,7 @@ long SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) SfxViewFrame* pView = pFrame->GetCurrentViewFrame(); SfxViewShell* pShell = pView ? pView->GetViewShell() : NULL; if ( pShell && pShell->HasKeyListeners_Impl() && pShell->HandleNotifyEvent_Impl( rNEvt ) ) - return sal_True; + return true; } else if ( nType == EVENT_MOUSEBUTTONUP || nType == EVENT_MOUSEBUTTONDOWN ) { @@ -156,7 +156,7 @@ long SfxFrameWindow_Impl::PreNotify( NotifyEvent& rNEvt ) if ( pShell ) if ( pWindow == pShell->GetWindow() || pShell->GetWindow()->IsChild( pWindow ) ) if ( pShell->HasMouseClickListeners_Impl() && pShell->HandleNotifyEvent_Impl( rNEvt ) ) - return sal_True; + return true; } if ( nType == EVENT_MOUSEBUTTONDOWN ) diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 890ccb73107f..8407828a664a 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -50,7 +50,7 @@ namespace svt } //------------------------------------------------------------------ - long ComboBoxControl::PreNotify( NotifyEvent& rNEvt ) + bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt ) { switch (rNEvt.GetType()) { @@ -71,7 +71,7 @@ namespace svt if (nPos >= GetEntryCount()) nPos = GetEntryCount() - 1; SetText(GetEntry(sal::static_int_cast< sal_uInt16 >(nPos))); - return 1; + return true; } } break; @@ -157,7 +157,7 @@ namespace svt } //------------------------------------------------------------------ - long ListBoxControl::PreNotify( NotifyEvent& rNEvt ) + bool ListBoxControl::PreNotify( NotifyEvent& rNEvt ) { switch (rNEvt.GetType()) { @@ -179,10 +179,10 @@ namespace svt nPos = GetEntryCount() - 1; SelectEntryPos(sal::static_int_cast< sal_uInt16 >(nPos)); Select(); // for calling Modify - return 1; + return true; } else if (GetParent()->PreNotify(rNEvt)) - return 1; + return true; } break; } @@ -322,7 +322,7 @@ namespace svt } //------------------------------------------------------------------ - long CheckBoxControl::PreNotify(NotifyEvent& rEvt) + bool CheckBoxControl::PreNotify(NotifyEvent& rEvt) { switch (rEvt.GetType()) { @@ -568,7 +568,7 @@ namespace svt } //------------------------------------------------------------------ - long MultiLineTextCell::PreNotify( NotifyEvent& rNEvt ) + bool MultiLineTextCell::PreNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -591,13 +591,13 @@ namespace svt pKeyEvent->GetRepeat() ); if ( dispatchKeyEvent( aEvent ) ) - return 1; + return true; } if ( ( nCode != KEY_TAB ) && ( nCode != KEY_RETURN ) ) // everything but tab and enter { if ( dispatchKeyEvent( *pKeyEvent ) ) - return 1; + return true; } } } diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 79a98c2c2139..6488120b3b30 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -610,7 +610,7 @@ namespace svt } //------------------------------------------------------------------------------ - long EditBrowseBox::PreNotify(NotifyEvent& rEvt) + bool EditBrowseBox::PreNotify(NotifyEvent& rEvt) { switch (rEvt.GetType()) { @@ -652,7 +652,7 @@ namespace svt // maybe we're not visible ... EnableAndShow(); aController->GetWindow().GrabFocus(); - return 1; + return true; } // ask if traveling to the next cell is allowed if (IsTabAllowed(sal_True)) @@ -713,7 +713,7 @@ namespace svt // maybe we're not visible ... EnableAndShow(); aController->GetWindow().GrabFocus(); - return 1; + return true; } } @@ -721,7 +721,7 @@ namespace svt if (bLocalSelect && (GetSelectRowCount() || GetSelection() != NULL)) DeactivateCell(); - return 1; + return true; } } } diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 1e96c5561523..489554e6dc31 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -85,7 +85,7 @@ public: ~IcnViewEdit_Impl(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); sal_Bool EditingCanceled() const { return bCanceled; } void StopEditing( sal_Bool bCancel = sal_False ); sal_Bool IsGrabFocus() const { return bGrabFocus; } @@ -3415,7 +3415,7 @@ void IcnViewEdit_Impl::KeyInput( const KeyEvent& rKEvt ) } } -long IcnViewEdit_Impl::PreNotify( NotifyEvent& rNEvt ) +bool IcnViewEdit_Impl::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_LOSEFOCUS ) { @@ -3428,7 +3428,7 @@ long IcnViewEdit_Impl::PreNotify( NotifyEvent& rNEvt ) aTimer.Start(); } } - return 0; + return false; } void IcnViewEdit_Impl::StopEditing( sal_Bool bCancel ) diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 6f25107d621d..4253831fca57 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -51,9 +51,9 @@ void SvSimpleTableContainer::SetTable(SvSimpleTable* pTable) m_pTable = pTable; } -long SvSimpleTableContainer::PreNotify( NotifyEvent& rNEvt ) +bool SvSimpleTableContainer::PreNotify( NotifyEvent& rNEvt ) { - long nResult = sal_True; + bool nResult = true; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); @@ -61,7 +61,7 @@ long SvSimpleTableContainer::PreNotify( NotifyEvent& rNEvt ) if (nKey == KEY_TAB) GetParent()->Notify( rNEvt ); else if (m_pTable && m_pTable->IsFocusOnCellEnabled() && ( nKey == KEY_LEFT || nKey == KEY_RIGHT)) - return 0; + return false; else nResult = Control::PreNotify( rNEvt ); } diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index a57a15a76b21..955ae3d042f8 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -1108,10 +1108,10 @@ void SvtTemplateWindow::UpdateIcons() // ------------------------------------------------------------------------ -long SvtTemplateWindow::PreNotify( NotifyEvent& rNEvt ) +bool SvtTemplateWindow::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); - long nRet = 0; + bool nRet = false; if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() ) { @@ -1121,15 +1121,15 @@ long SvtTemplateWindow::PreNotify( NotifyEvent& rNEvt ) if ( KEY_BACKSPACE == nCode && !rKeyCode.GetModifier() && pFileWin->HasChildPathFocus() ) { DoAction( TI_DOCTEMPLATE_BACK ); - nRet = 1; + nRet = true; } else if ( pIconWin->ProcessKeyEvent( *rNEvt.GetKeyEvent() ) ) { - nRet = 1; + nRet = true; } } - return nRet ? nRet : Window::PreNotify( rNEvt ); + return nRet || Window::PreNotify( rNEvt ); } // ----------------------------------------------------------------------------- diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx index caf3682591a8..a38f9de2fdd7 100644 --- a/svtools/source/contnr/templwin.hxx +++ b/svtools/source/contnr/templwin.hxx @@ -248,7 +248,7 @@ private: void UpdateIcons(); protected: - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx index c13dd2b86305..7b3c794fd78c 100644 --- a/svtools/source/control/fileurlbox.cxx +++ b/svtools/source/control/fileurlbox.cxx @@ -52,7 +52,7 @@ namespace svt } //--------------------------------------------------------------------- - long FileURLBox::PreNotify( NotifyEvent& _rNEvt ) + bool FileURLBox::PreNotify( NotifyEvent& _rNEvt ) { switch ( _rNEvt.GetType() ) { diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index a0742b5d2e27..95587f1dcf23 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -554,7 +554,7 @@ void FormattedField::ImplSetTextImpl(const OUString& rNew, Selection* pNewSel) m_bValueDirty = sal_True; // not always necessary, but better re-evaluate for safety reasons } -long FormattedField::PreNotify(NotifyEvent& rNEvt) +bool FormattedField::PreNotify(NotifyEvent& rNEvt) { DBG_CHKTHIS(FormattedField, NULL); if (rNEvt.GetType() == EVENT_KEYINPUT) diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 5ab9dbad8f54..e3a1da1426b1 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -1094,7 +1094,7 @@ void SvtURLBox::Modify() } //------------------------------------------------------------------------- -long SvtURLBox::PreNotify( NotifyEvent& rNEvt ) +bool SvtURLBox::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetWindow() == GetSubEdit() && rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -1104,7 +1104,7 @@ long SvtURLBox::PreNotify( NotifyEvent& rNEvt ) KeyCode aCode( rKey.GetCode() ); if( ProcessKey( rKey ) ) { - return sal_True; + return true; } else if( ( aCode == KEY_UP || aCode == KEY_DOWN ) && !rKey.IsMod2() ) { @@ -1112,7 +1112,7 @@ long SvtURLBox::PreNotify( NotifyEvent& rNEvt ) sal_uInt16 nLen = (sal_uInt16)aSelection.Min(); GetSubEdit()->KeyInput( rEvent ); SetSelection( Selection( nLen, GetText().getLength() ) ); - return sal_True; + return true; } if ( MatchesPlaceHolder( GetText() ) ) diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 582aebf44ee1..16a169758130 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -638,7 +638,7 @@ namespace svt } //--------------------------------------------------------------------- - long ORoadmap::PreNotify( NotifyEvent& _rNEvt ) + bool ORoadmap::PreNotify( NotifyEvent& _rNEvt ) { // capture KeyEvents for taskpane cycling if ( _rNEvt.GetType() == EVENT_KEYINPUT ) diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 07bdb4d1c6cd..88d958a6f87f 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -104,7 +104,7 @@ public: TabBar* GetParent() const { return (TabBar*)Window::GetParent(); } - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); @@ -129,14 +129,14 @@ void ImplTabButton::Command( const CommandEvent& rCEvt ) // ======================================================================= -long ImplTabButton::PreNotify( NotifyEvent& rNEvt ) +bool ImplTabButton::PreNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) { if ( GetParent()->IsInEditMode() ) { GetParent()->EndEditMode(); - return sal_True; + return true; } } @@ -266,7 +266,7 @@ public: void SetPostEvent() { mbPostEvt = sal_True; } void ResetPostEvent() { mbPostEvt = sal_False; } - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void LoseFocus(); }; @@ -280,7 +280,7 @@ TabBarEdit::TabBarEdit( TabBar* pParent, WinBits nWinStyle ) : // ----------------------------------------------------------------------- -long TabBarEdit::PreNotify( NotifyEvent& rNEvt ) +bool TabBarEdit::PreNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_KEYINPUT ) { @@ -294,7 +294,7 @@ long TabBarEdit::PreNotify( NotifyEvent& rNEvt ) if ( PostUserEvent( LINK( this, TabBarEdit, ImplEndEditHdl ), (void*)sal_False ) ) mbPostEvt = sal_True; } - return sal_True; + return true; } else if ( pKEvt->GetKeyCode().GetCode() == KEY_ESCAPE ) { @@ -303,7 +303,7 @@ long TabBarEdit::PreNotify( NotifyEvent& rNEvt ) if ( PostUserEvent( LINK( this, TabBarEdit, ImplEndEditHdl ), (void*)sal_True ) ) mbPostEvt = sal_True; } - return sal_True; + return true; } } } diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx index 85765000ce4a..3a39ccaad402 100644 --- a/svtools/source/control/urlcontrol.cxx +++ b/svtools/source/control/urlcontrol.cxx @@ -37,7 +37,7 @@ namespace svt } //--------------------------------------------------------------------- - long OFileURLControl::PreNotify( NotifyEvent& _rNEvt ) + bool OFileURLControl::PreNotify( NotifyEvent& _rNEvt ) { if (GetSubEdit() == _rNEvt.GetWindow()) if (EVENT_KEYINPUT == _rNEvt.GetType()) diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index bcf1eb455c8f..6176fe09e350 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -1260,7 +1260,7 @@ void AssignmentPersistentData::Commit() } // ------------------------------------------------------------------- - long AddressBookSourceDialog::PreNotify( NotifyEvent& _rNEvt ) + bool AddressBookSourceDialog::PreNotify( NotifyEvent& _rNEvt ) { switch (_rNEvt.GetType()) { @@ -1286,7 +1286,7 @@ void AssignmentPersistentData::Commit() // give the left control in the "next" line the focus m_pImpl->pFields[nNextFocusList]->GrabFocus(); // return saying "have handled this" - return 1; + return true; } } else if (!bAlt && !bCtrl && bShift) @@ -1300,7 +1300,7 @@ void AssignmentPersistentData::Commit() // give the right control in the "prebious" line the focus m_pImpl->pFields[0 - 1 + 2]->GrabFocus(); // return saying "have handled this" - return 1; + return true; } } } diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index 68343968643e..178a13c4b733 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -113,7 +113,7 @@ void MultiLineEditSyntaxHighlight::DoBracketHilight(sal_uInt16 nKey) } } -long MultiLineEditSyntaxHighlight::PreNotify( NotifyEvent& rNEvt ) +bool MultiLineEditSyntaxHighlight::PreNotify( NotifyEvent& rNEvt ) { if ( mbDoBracketHilight && (rNEvt.GetType() == EVENT_KEYINPUT) ) DoBracketHilight(rNEvt.GetKeyEvent()->GetCharCode()); diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index 4a603a8143ef..9bd715a0ca5f 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -616,7 +616,7 @@ void SvResizeWindow::Paint( const Rectangle & /*rRect*/ ) m_aResizer.Draw( this ); } -long SvResizeWindow::PreNotify( NotifyEvent& rEvt ) +bool SvResizeWindow::PreNotify( NotifyEvent& rEvt ) { if ( rEvt.GetType() == EVENT_GETFOCUS && !m_bActive ) { diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx index 79425625cb67..a71fa46b30d9 100644 --- a/svtools/source/hatchwindow/ipwin.hxx +++ b/svtools/source/hatchwindow/ipwin.hxx @@ -92,7 +92,7 @@ public: virtual void Resize(); virtual void Paint( const Rectangle & ); virtual bool Notify( NotifyEvent& rNEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); void QueryObjAreaPixel( Rectangle & ); void RequestObjAreaPixel( const Rectangle & ); diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 51d31de94fc8..f1aaa583326b 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -50,7 +50,7 @@ public: const css::uno::Reference< css::uno::XComponentContext >& xContext ); virtual ~FindTextFieldControl(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); void Remember_Impl(const OUString& rStr); void SetTextToSelected_Impl(); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 2e113dc5d8b0..29a50f8d52bf 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -887,9 +887,9 @@ void RubyEdit::GetFocus() Edit::GetFocus(); } -long RubyEdit::PreNotify( NotifyEvent& rNEvt ) +bool RubyEdit::PreNotify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); @@ -900,7 +900,7 @@ long RubyEdit::PreNotify( NotifyEvent& rNEvt ) { sal_Int32 nParam = KEY_SHIFT == nMod ? -1 : 1; if(aScrollHdl.IsSet() && aScrollHdl.Call(&nParam)) - nHandled = 1; + nHandled = true; } else if(KEY_UP == nCode || KEY_DOWN == nCode) { diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 789dc5fff947..4c7641bf98c8 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -3199,7 +3199,7 @@ sal_Bool DbGridControl::SaveRow() return sal_True; } -long DbGridControl::PreNotify(NotifyEvent& rEvt) +bool DbGridControl::PreNotify(NotifyEvent& rEvt) { // do not handle events of the Navbar if (m_aBar.IsWindowOrChild(rEvt.GetWindow())) @@ -3226,7 +3226,7 @@ long DbGridControl::PreNotify(NotifyEvent& rEvt) // call the Control - our direct base class will interpret this in a way we do not want (and do // a cell traveling) Control::KeyInput( aNewEvent ); - return 1; + return true; } if ( !bShift && !bCtrl && ( KEY_ESCAPE == nCode ) ) @@ -3234,7 +3234,7 @@ long DbGridControl::PreNotify(NotifyEvent& rEvt) if (IsModified()) { Undo(); - return 1; + return true; } } else if ( ( KEY_DELETE == nCode ) && !bShift && !bCtrl ) // delete rows @@ -3245,7 +3245,7 @@ long DbGridControl::PreNotify(NotifyEvent& rEvt) if (m_nDeleteEvent) Application::RemoveUserEvent(m_nDeleteEvent); m_nDeleteEvent = Application::PostUserEvent(LINK(this,DbGridControl,OnDelete)); - return 1; + return true; } } } // no break! diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index bd1b51017d11..8e77dfe2457d 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -270,7 +270,7 @@ sal_Bool FmFieldWin::createSelectionControls( ) } //----------------------------------------------------------------------- -long FmFieldWin::PreNotify( NotifyEvent& _rNEvt ) +bool FmFieldWin::PreNotify( NotifyEvent& _rNEvt ) { if ( EVENT_KEYINPUT == _rNEvt.GetType() ) { @@ -278,7 +278,7 @@ long FmFieldWin::PreNotify( NotifyEvent& _rNEvt ) if ( ( 0 == rKeyCode.GetModifier() ) && ( KEY_RETURN == rKeyCode.GetCode() ) ) { if ( createSelectionControls() ) - return 1; + return true; } } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 84fbb560c688..ed9402b951db 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -87,9 +87,9 @@ void GalleryThemeListBox::DataChanged( const DataChangedEvent& rDCEvt ) ListBox::DataChanged( rDCEvt ); } -long GalleryThemeListBox::PreNotify( NotifyEvent& rNEvt ) +bool GalleryThemeListBox::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = true; if( rNEvt.GetType() == EVENT_COMMAND ) { @@ -106,7 +106,7 @@ long GalleryThemeListBox::PreNotify( NotifyEvent& rNEvt ) nDone = static_cast< GalleryBrowser1* >( GetParent() )->KeyInput( *pKEvt, this ); } - return( nDone ? nDone : ListBox::PreNotify( rNEvt ) ); + return( nDone || ListBox::PreNotify( rNEvt ) ); } // - GalleryBrowser1 - diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 4d446758c758..f805d07f5aff 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -49,7 +49,7 @@ protected: void InitSettings(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index cc56869750db..1b7d5e5e82ae 100644 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -91,7 +91,7 @@ public: virtual void Resize(); virtual sal_Bool Close(); virtual void GetFocus(); - virtual long PreNotify( NotifyEvent& _rNEvt ); + virtual bool PreNotify( NotifyEvent& _rNEvt ); virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState); diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.cxx b/svx/source/sidebar/text/SvxSBFontNameBox.cxx index 27cd2a4dd0de..c52ce7edb04f 100644 --- a/svx/source/sidebar/text/SvxSBFontNameBox.cxx +++ b/svx/source/sidebar/text/SvxSBFontNameBox.cxx @@ -121,7 +121,7 @@ void SvxSBFontNameBox::FillList() SetSelection( aOldSel ); } -long SvxSBFontNameBox::PreNotify( NotifyEvent& rNEvt ) +bool SvxSBFontNameBox::PreNotify( NotifyEvent& rNEvt ) { const sal_uInt16 nType (rNEvt.GetType()); diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.hxx b/svx/source/sidebar/text/SvxSBFontNameBox.hxx index 12026465ebf8..e8db278b3caf 100644 --- a/svx/source/sidebar/text/SvxSBFontNameBox.hxx +++ b/svx/source/sidebar/text/SvxSBFontNameBox.hxx @@ -50,7 +50,7 @@ public: { FontNameBox::Fill( pList ); nFtCount = pList->GetFontNameCount(); } void SetBindings(SfxBindings* pBinding);// - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt );// }; diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 5c5c46ed5ff4..84b4844ebd4e 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -318,7 +318,7 @@ private: Reference< XFrame > mxFrame; virtual void Select(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); void ImplReleaseFocus(); @@ -369,7 +369,7 @@ void ImplGrafModeControl::Select() } } -long ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt ) +bool ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 427b635e8379..90beb8e40b8d 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -157,7 +157,7 @@ void SvxLineBox::Select() // ----------------------------------------------------------------------- -long SvxLineBox::PreNotify( NotifyEvent& rNEvt ) +bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); @@ -362,7 +362,7 @@ void SvxColorBox::Select() // ----------------------------------------------------------------------- -long SvxColorBox::PreNotify( NotifyEvent& rNEvt ) +bool SvxColorBox::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); @@ -564,7 +564,7 @@ void SvxMetricField::RefreshDlgUnit() // ----------------------------------------------------------------------- -long SvxMetricField::PreNotify( NotifyEvent& rNEvt ) +bool SvxMetricField::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); @@ -656,7 +656,7 @@ SvxFillTypeBox::~SvxFillTypeBox() // ----------------------------------------------------------------------- -long SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) +bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); @@ -749,7 +749,7 @@ SvxFillAttrBox::~SvxFillAttrBox() // ----------------------------------------------------------------------- -long SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) +bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 70b6a00d150b..5118449c165d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -134,7 +134,7 @@ public: void SetFamily( SfxStyleFamily eNewFamily ); inline bool IsVisible() { return bVisible; } - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual void StateChanged( StateChangedType nStateChange ); @@ -219,7 +219,7 @@ public: { FontNameBox::Fill( pList ); nFtCount = pList->GetFontNameCount(); } virtual void UserDraw( const UserDrawEvent& rUDEvt ); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual bool Notify( NotifyEvent& rNEvt ); virtual Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -471,7 +471,7 @@ void SvxStyleBox_Impl::SetFamily( SfxStyleFamily eNewFamily ) // ----------------------------------------------------------------------- -long SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt ) +bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); @@ -868,7 +868,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem ) // ----------------------------------------------------------------------- -long SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt ) +bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt ) { sal_uInt16 nType = rNEvt.GetType(); diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 79e78785fb74..b3fdbfbf8c7f 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -180,9 +180,9 @@ void FindTextFieldControl::SetTextToSelected_Impl() } } -long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) +bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) { - long nRet= ComboBox::PreNotify( rNEvt ); + bool nRet= ComboBox::PreNotify( rNEvt ); switch ( rNEvt.GetType() ) { @@ -195,7 +195,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) if ( KEY_ESCAPE == nCode || (bMod1 && (KEY_F == nCode)) ) { - nRet = 1; + nRet = true; GrabFocusToDocument(); // hide the findbar @@ -222,7 +222,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) ToolBox* pToolBox = (ToolBox*)pWindow; impl_executeSearch( m_xContext, m_xFrame, pToolBox, bShift); - nRet = 1; + nRet = true; } break; } diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 0c5375972c61..59b4bc201add 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -66,7 +66,7 @@ class SwAddressControl_Impl : public Control void MakeVisible(const Rectangle& aRect); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void Command( const CommandEvent& rCEvt ); using Window::SetData; @@ -327,7 +327,7 @@ void SwAddressControl_Impl::Command( const CommandEvent& rCEvt ) } } -long SwAddressControl_Impl::PreNotify( NotifyEvent& rNEvt ) +bool SwAddressControl_Impl::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType() == EVENT_COMMAND) { @@ -336,7 +336,7 @@ long SwAddressControl_Impl::PreNotify( NotifyEvent& rNEvt ) if( COMMAND_WHEEL == nCmd ) { Command(*pCEvt); - return 1; + return true; } } return Control::PreNotify(rNEvt); diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 62a7b4057dc6..57f255e40593 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -847,7 +847,7 @@ class SwAssignFieldsControl : public Control DECL_LINK(MatchHdl_Impl, ListBox*); DECL_LINK(GotFocusHdl_Impl, ListBox*); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); virtual void Command( const CommandEvent& rCEvt ); void MakeVisible( sal_Int32 nIndex ); @@ -1021,7 +1021,7 @@ void SwAssignFieldsControl::Command( const CommandEvent& rCEvt ) } } -long SwAssignFieldsControl::PreNotify( NotifyEvent& rNEvt ) +bool SwAssignFieldsControl::PreNotify( NotifyEvent& rNEvt ) { if(rNEvt.GetType() == EVENT_COMMAND) { @@ -1030,7 +1030,7 @@ long SwAssignFieldsControl::PreNotify( NotifyEvent& rNEvt ) if( COMMAND_WHEEL == nCmd ) { Command(*pCEvt); - return 1; + return true; } } return Control::PreNotify(rNEvt); @@ -1305,18 +1305,18 @@ void AddressMultiLineEdit::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rH } } -long AddressMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) +bool AddressMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; if( EVENT_KEYINPUT == rNEvt.GetType() && rNEvt.GetKeyEvent()->GetCharCode()) { - nHandled = 1; + nHandled = true; } else if(EVENT_MOUSEBUTTONDOWN == rNEvt.GetType()) { const MouseEvent *pMEvt = rNEvt.GetMouseEvent(); if(pMEvt->GetClicks() >= 2) - nHandled = 1; + nHandled = true; } if(!nHandled) nHandled = VclMultiLineEdit::PreNotify( rNEvt ); diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 40dfe88038dc..4451bae26997 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -157,7 +157,7 @@ class AddressMultiLineEdit : public VclMultiLineEdit, public SfxListener using VclMultiLineEdit::SetText; protected: - long PreNotify( NotifyEvent& rNEvt ); + bool PreNotify( NotifyEvent& rNEvt ); public: AddressMultiLineEdit(Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER); ~AddressMultiLineEdit(); diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 9e416951a34c..a41cf73e9e6a 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1255,9 +1255,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSelectionListBox(Window *pP return pListBox; } -long SelectionListBox::PreNotify( NotifyEvent& rNEvt ) +bool SelectionListBox::PreNotify( NotifyEvent& rNEvt ) { - long nHandled = ListBox::PreNotify( rNEvt ); + bool nHandled = ListBox::PreNotify( rNEvt ); if ( rNEvt.GetType() == EVENT_KEYUP ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 5b97b6ba43ed..2d85f0ae2254 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -37,7 +37,7 @@ class SelectionListBox : public ListBox { bool bCallAddSelection; - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: SelectionListBox(Window* pParent, WinBits nStyle); diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index c68f4caf730f..c6ea424b0107 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -491,9 +491,9 @@ void SwSequenceOptionDialog::SetCharacterStyle(const OUString& rStyle) m_pLbCharStyle->SelectEntry(rStyle); } -long CategoryBox::PreNotify( NotifyEvent& rNEvt ) +bool CategoryBox::PreNotify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; if( rNEvt.GetType() == EVENT_KEYINPUT && rNEvt.GetKeyEvent()->GetCharCode() ) { @@ -513,7 +513,7 @@ long CategoryBox::PreNotify( NotifyEvent& rNEvt ) + sText.copy(aSel.Max()); if( !SwCalc::IsValidVarName( sName )) - nHandled = 1; + nHandled = true; } } if(!nHandled) diff --git a/sw/source/ui/inc/bookmark.hxx b/sw/source/ui/inc/bookmark.hxx index cc6a19bc4cf1..c93d1fe50edb 100644 --- a/sw/source/ui/inc/bookmark.hxx +++ b/sw/source/ui/inc/bookmark.hxx @@ -35,7 +35,7 @@ class BookmarkCombo : public SwComboBox sal_uInt16 GetNextSelEntryPos(sal_uInt16 nPos) const; sal_uInt16 GetSelEntryPos(sal_uInt16 nPos) const; - virtual long PreNotify(NotifyEvent& rNEvt); + virtual bool PreNotify(NotifyEvent& rNEvt); public: BookmarkCombo(Window* pWin, WinBits nStyle); diff --git a/sw/source/ui/inc/cption.hxx b/sw/source/ui/inc/cption.hxx index ecba8348718d..d1128efeae5d 100644 --- a/sw/source/ui/inc/cption.hxx +++ b/sw/source/ui/inc/cption.hxx @@ -56,7 +56,7 @@ public: : ComboBox( pParent, nStyle ) {} - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); }; diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index 4d19c1a1da6c..9a28ad09050b 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -225,15 +225,15 @@ sal_uInt16 BookmarkCombo::GetSelectEntryPos( sal_uInt16 nSelIndex ) const return COMBOBOX_ENTRY_NOTFOUND; } -long BookmarkCombo::PreNotify( NotifyEvent& rNEvt ) +bool BookmarkCombo::PreNotify( NotifyEvent& rNEvt ) { - long nHandled = 0; + bool nHandled = false; if( EVENT_KEYINPUT == rNEvt.GetType() && rNEvt.GetKeyEvent()->GetCharCode() ) { OUString sKey( rNEvt.GetKeyEvent()->GetCharCode() ); if(-1 != aForbiddenChars.indexOf(sKey)) - nHandled = 1; + nHandled = true; } if(!nHandled) nHandled = SwComboBox::PreNotify( rNEvt ); diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index e8d6c2a4f504..7f6a8df30844 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -543,7 +543,7 @@ private: sal_Bool mbAutoWidth; protected: - long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); public: ImplListBoxFloatingWindow( Window* pParent ); @@ -608,7 +608,7 @@ public: virtual void Resize(); virtual void GetFocus(); virtual void LoseFocus(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); sal_uInt16 GetItemPos() const { return mnItemPos; } void SetItemPos( sal_uInt16 n ) { mnItemPos = n; } diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index d03bb885f1f3..941a6c7e624d 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -347,7 +347,7 @@ public: virtual sal_Bool Close(); virtual void Resize(); - virtual long PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ); void InsertLine( const OUString& rLine ); void Update() { WorkWindow::Update(); maLstBox.Update(); } @@ -501,7 +501,7 @@ void DbgWindow::GetAssertionEntryRange( sal_uInt16 nInbetweenEntry, sal_uInt16& // ----------------------------------------------------------------------- -long DbgWindow::PreNotify( NotifyEvent& rNEvt ) +bool DbgWindow::PreNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == EVENT_COMMAND ) { @@ -544,7 +544,7 @@ long DbgWindow::PreNotify( NotifyEvent& rNEvt ) sAssertion.makeStringAndClear(), GetClipboard()); } } - return 1; // handled + return true; // handled } } return WorkWindow::PreNotify( rNEvt ); diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 81143630df47..4c43db6baae8 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1531,9 +1531,9 @@ void PushButton::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -long PushButton::PreNotify( NotifyEvent& rNEvt ) +bool PushButton::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; const MouseEvent* pMouseEvt = NULL; if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL ) @@ -1594,7 +1594,7 @@ long PushButton::PreNotify( NotifyEvent& rNEvt ) } } - return nDone ? nDone : Button::PreNotify(rNEvt); + return nDone || Button::PreNotify(rNEvt); } // ----------------------------------------------------------------------- @@ -2780,9 +2780,9 @@ void RadioButton::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -long RadioButton::PreNotify( NotifyEvent& rNEvt ) +bool RadioButton::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; const MouseEvent* pMouseEvt = NULL; if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL ) @@ -2804,7 +2804,7 @@ long RadioButton::PreNotify( NotifyEvent& rNEvt ) } } - return nDone ? nDone : Button::PreNotify(rNEvt); + return nDone || Button::PreNotify(rNEvt); } // ----------------------------------------------------------------------- @@ -3793,9 +3793,9 @@ void CheckBox::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -long CheckBox::PreNotify( NotifyEvent& rNEvt ) +bool CheckBox::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; const MouseEvent* pMouseEvt = NULL; if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL ) @@ -3817,7 +3817,7 @@ long CheckBox::PreNotify( NotifyEvent& rNEvt ) } } - return nDone ? nDone : Button::PreNotify(rNEvt); + return nDone || Button::PreNotify(rNEvt); } // ----------------------------------------------------------------------- diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 20148537ae5f..6fb9d4739a8b 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -752,7 +752,7 @@ void ComboBox::DataChanged( const DataChangedEvent& rDCEvt ) // ----------------------------------------------------------------------- -long ComboBox::PreNotify( NotifyEvent& rNEvt ) +bool ComboBox::PreNotify( NotifyEvent& rNEvt ) { return Edit::PreNotify( rNEvt ); diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index f18442d9b544..c0dd2efc1937 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -774,12 +774,12 @@ NumericField::~NumericField() { } -long NumericField::PreNotify( NotifyEvent& rNEvt ) +bool NumericField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplNumericProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) - return 1; + return true; } return SpinField::PreNotify( rNEvt ); @@ -926,12 +926,12 @@ NumericBox::~NumericBox() { } -long NumericBox::PreNotify( NotifyEvent& rNEvt ) +bool NumericBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplNumericProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) - return 1; + return true; } return ComboBox::PreNotify( rNEvt ); @@ -1657,12 +1657,12 @@ sal_Int64 MetricField::GetLast( FieldUnit eOutUnit ) const meUnit, eOutUnit ); } -long MetricField::PreNotify( NotifyEvent& rNEvt ) +bool MetricField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplMetricProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) - return 1; + return true; } return SpinField::PreNotify( rNEvt ); @@ -1758,12 +1758,12 @@ MetricBox::~MetricBox() { } -long MetricBox::PreNotify( NotifyEvent& rNEvt ) +bool MetricBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplMetricProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) - return 1; + return true; } return ComboBox::PreNotify( rNEvt ); @@ -1992,12 +1992,12 @@ CurrencyField::~CurrencyField() { } -long CurrencyField::PreNotify( NotifyEvent& rNEvt ) +bool CurrencyField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplCurrencyProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) - return 1; + return true; } return SpinField::PreNotify( rNEvt ); @@ -2074,12 +2074,12 @@ CurrencyBox::~CurrencyBox() { } -long CurrencyBox::PreNotify( NotifyEvent& rNEvt ) +bool CurrencyBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplCurrencyProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) ) - return 1; + return true; } return ComboBox::PreNotify( rNEvt ); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 01aa8fcdd491..605d42d62055 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -824,14 +824,14 @@ PatternField::~PatternField() { } -long PatternField::PreNotify( NotifyEvent& rNEvt ) +bool PatternField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplPatternProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetEditMask(), GetLiteralMask(), IsStrictFormat(), GetFormatFlags(), ImplIsSameMask(), ImplGetInPattKeyInput() ) ) - return 1; + return true; } return SpinField::PreNotify( rNEvt ); @@ -874,14 +874,14 @@ PatternBox::~PatternBox() { } -long PatternBox::PreNotify( NotifyEvent& rNEvt ) +bool PatternBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplPatternProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetEditMask(), GetLiteralMask(), IsStrictFormat(), GetFormatFlags(), ImplIsSameMask(), ImplGetInPattKeyInput() ) ) - return 1; + return true; } return ComboBox::PreNotify( rNEvt ); @@ -1821,14 +1821,14 @@ DateField::~DateField() { } -long DateField::PreNotify( NotifyEvent& rNEvt ) +bool DateField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && IsStrictFormat() && ( GetExtDateFormat() != XTDATEF_SYSTEM_LONG ) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplDateProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetExtDateFormat( sal_True ), ImplGetLocaleDataWrapper() ) ) - return 1; + return true; } return SpinField::PreNotify( rNEvt ); @@ -1924,14 +1924,14 @@ DateBox::~DateBox() { } -long DateBox::PreNotify( NotifyEvent& rNEvt ) +bool DateBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && IsStrictFormat() && ( GetExtDateFormat() != XTDATEF_SYSTEM_LONG ) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplDateProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetExtDateFormat( sal_True ), ImplGetLocaleDataWrapper() ) ) - return 1; + return true; } return ComboBox::PreNotify( rNEvt ); @@ -2702,12 +2702,12 @@ TimeField::~TimeField() { } -long TimeField::PreNotify( NotifyEvent& rNEvt ) +bool TimeField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplTimeProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsDuration(), GetFormat(), ImplGetLocaleDataWrapper() ) ) - return 1; + return true; } return SpinField::PreNotify( rNEvt ); @@ -2843,12 +2843,12 @@ TimeBox::~TimeBox() { } -long TimeBox::PreNotify( NotifyEvent& rNEvt ) +bool TimeBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) { if ( ImplTimeProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsDuration(), GetFormat(), ImplGetLocaleDataWrapper() ) ) - return 1; + return true; } return ComboBox::PreNotify( rNEvt ); diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx index a9761a0b0b1b..bb44426564b8 100644 --- a/vcl/source/control/ilstbox.cxx +++ b/vcl/source/control/ilstbox.cxx @@ -2786,9 +2786,9 @@ void ImplWin::FillLayoutData() const // ----------------------------------------------------------------------- -long ImplWin::PreNotify( NotifyEvent& rNEvt ) +bool ImplWin::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; const MouseEvent* pMouseEvt = NULL; if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL ) @@ -2805,7 +2805,7 @@ long ImplWin::PreNotify( NotifyEvent& rNEvt ) } } - return nDone ? nDone : Control::PreNotify(rNEvt); + return nDone || Control::PreNotify(rNEvt); } // ----------------------------------------------------------------------- @@ -3104,7 +3104,7 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) : // ----------------------------------------------------------------------- -long ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt ) +bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_LOSEFOCUS ) { diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index bf9f49429aed..a7e735452a45 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -476,12 +476,12 @@ LongCurrencyField::~LongCurrencyField() } -long LongCurrencyField::PreNotify( NotifyEvent& rNEvt ) +bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_KEYINPUT ) { if ( ImplLongCurrencyProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), GetLocaleDataWrapper() ) ) - return 1; + return true; } return SpinField::PreNotify( rNEvt ); } @@ -559,12 +559,12 @@ LongCurrencyBox::~LongCurrencyBox() { } -long LongCurrencyBox::PreNotify( NotifyEvent& rNEvt ) +bool LongCurrencyBox::PreNotify( NotifyEvent& rNEvt ) { if( rNEvt.GetType() == EVENT_KEYINPUT ) { if ( ImplLongCurrencyProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), GetLocaleDataWrapper() ) ) - return 1; + return true; } return ComboBox::PreNotify( rNEvt ); } diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index de38eaa617d2..2af18e2a1996 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -903,9 +903,9 @@ void ListBox::StateChanged( StateChangedType nType ) } -long ListBox::PreNotify( NotifyEvent& rNEvt ) +bool ListBox::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = 0; if ( mpImplLB ) { if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && ( rNEvt.GetWindow() == mpImplWin ) ) @@ -922,7 +922,7 @@ long ListBox::PreNotify( NotifyEvent& rNEvt ) mpBtn->SetPressed( sal_True ); mpFloatWin->StartFloat( sal_False ); ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN ); - nDone = 1; + nDone = true; } else { @@ -936,7 +936,7 @@ long ListBox::PreNotify( NotifyEvent& rNEvt ) aKeyEvt.GetKeyCode().IsMod2() ) { mpFloatWin->EndPopupMode(); - nDone = 1; + nDone = true; } else { @@ -949,7 +949,7 @@ long ListBox::PreNotify( NotifyEvent& rNEvt ) if( IsInDropDown() ) { mpImplLB->ProcessKeyInput( aKeyEvt ); - nDone = 1; + nDone = true; } } break; @@ -980,12 +980,12 @@ long ListBox::PreNotify( NotifyEvent& rNEvt ) } else { - nDone = 0; // Don't consume this event, let the default handling take it (i.e. scroll the context) + nDone = false; // Don't consume this event, let the default handling take it (i.e. scroll the context) } } } - return nDone ? nDone : Control::PreNotify( rNEvt ); + return nDone || Control::PreNotify( rNEvt ); } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 8c9f1609003f..a5a5bebfc1f0 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1303,9 +1303,9 @@ Rectangle* ScrollBar::ImplFindPartRect( const Point& rPt ) return NULL; } -long ScrollBar::PreNotify( NotifyEvent& rNEvt ) +bool ScrollBar::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; const MouseEvent* pMouseEvt = NULL; if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL ) @@ -1343,7 +1343,7 @@ long ScrollBar::PreNotify( NotifyEvent& rNEvt ) } } - return nDone ? nDone : Control::PreNotify(rNEvt); + return nDone || Control::PreNotify(rNEvt); } diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 9b38c13cda20..18ba220c854e 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -485,9 +485,9 @@ Rectangle* SpinButton::ImplFindPartRect( const Point& rPt ) return NULL; } -long SpinButton::PreNotify( NotifyEvent& rNEvt ) +bool SpinButton::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; const MouseEvent* pMouseEvt = NULL; if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL ) @@ -520,7 +520,7 @@ long SpinButton::PreNotify( NotifyEvent& rNEvt ) } } - return nDone ? nDone : Control::PreNotify(rNEvt); + return nDone || Control::PreNotify(rNEvt); } // ----------------------------------------------------------------------- diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index df691a861f4f..fa9bee570f2e 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -897,9 +897,9 @@ Rectangle* SpinField::ImplFindPartRect( const Point& rPt ) return NULL; } -long SpinField::PreNotify( NotifyEvent& rNEvt ) +bool SpinField::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; const MouseEvent* pMouseEvt = NULL; if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL ) @@ -944,7 +944,7 @@ long SpinField::PreNotify( NotifyEvent& rNEvt ) } } - return nDone ? nDone : Edit::PreNotify(rNEvt); + return nDone || Edit::PreNotify(rNEvt); } // ----------------------------------------------------------------------- diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 314cf43d9a35..d42b98b0a797 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1629,9 +1629,9 @@ Rectangle* TabControl::ImplFindPartRect( const Point& rPt ) return nFound == 1 ? &pFoundItem->maRect : NULL; } -long TabControl::PreNotify( NotifyEvent& rNEvt ) +bool TabControl::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; const MouseEvent* pMouseEvt = NULL; if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL ) @@ -1675,7 +1675,7 @@ long TabControl::PreNotify( NotifyEvent& rNEvt ) } } - return nDone ? nDone : Control::PreNotify(rNEvt); + return nDone || Control::PreNotify(rNEvt); } // ----------------------------------------------------------------------- diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index c62f03732c7c..c429160557a3 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -1410,9 +1410,9 @@ bool VclMultiLineEdit::Notify( NotifyEvent& rNEvt ) return nDone || Edit::Notify( rNEvt ); } -long VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) +bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) { - long nDone = 0; + bool nDone = false; #if (OSL_DEBUG_LEVEL > 1) && defined(DBG_UTIL) if( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -1430,7 +1430,7 @@ long VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) const KeyEvent& rKEvent = *rNEvt.GetKeyEvent(); if ( !rKEvent.GetKeyCode().IsShift() && ( rKEvent.GetKeyCode().GetGroup() == KEYGROUP_CURSOR ) ) { - nDone = 1; + nDone = true; TextSelection aSel = pImpVclMEdit->GetTextWindow()->GetTextView()->GetSelection(); if ( aSel.HasRange() ) { @@ -1493,14 +1493,14 @@ long VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) break; default: { - nDone = 0; + nDone = false; } } } } } - return nDone ? nDone : Edit::PreNotify( rNEvt ); + return nDone || Edit::PreNotify( rNEvt ); } // diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 89375271e9c7..4c6d457595e4 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -2585,7 +2585,7 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) // ----------------------------------------------------------------------- -long SplitWindow::PreNotify( NotifyEvent& rNEvt ) +bool SplitWindow::PreNotify( NotifyEvent& rNEvt ) { const MouseEvent* pMouseEvt = NULL; diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 8aa2c8b5c120..31e1313ead7f 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -110,7 +110,7 @@ bool SystemWindow::Notify( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long SystemWindow::PreNotify( NotifyEvent& rNEvt ) +bool SystemWindow::PreNotify( NotifyEvent& rNEvt ) { // capture KeyEvents for taskpane cycling if ( rNEvt.GetType() == EVENT_KEYINPUT ) @@ -121,7 +121,7 @@ long SystemWindow::PreNotify( NotifyEvent& rNEvt ) { // Ctrl-F6 goes directly to the document GrabFocusToDocument(); - return sal_True; + return true; } else { @@ -146,7 +146,7 @@ long SystemWindow::PreNotify( NotifyEvent& rNEvt ) pTList = pSysWin->mpImplData->mpTaskPaneList; } if( pTList && pTList->HandleKeyEvent( *rNEvt.GetKeyEvent() ) ) - return sal_True; + return true; } } return Window::PreNotify( rNEvt ); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 4e91535945d8..3c9b9dea9e85 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -5041,9 +5041,9 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) // ----------------------------------------------------------------------- -long Window::PreNotify( NotifyEvent& rNEvt ) +bool Window::PreNotify( NotifyEvent& rNEvt ) { - long bDone = sal_False; + bool bDone = false; if ( mpWindowImpl->mpParent && !ImplIsOverlapWindow() ) bDone = mpWindowImpl->mpParent->PreNotify( rNEvt ); |