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 /sc/source/ui/view | |
parent | 849482c0ea88c4aa70ec56adfefe7e59b6060950 (diff) |
Window::PreNotify should return bool
Change-Id: Ic9903fd887f2c3fab2630ebeb20df39392177c8d
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
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 ); |