Window::PreNotify should return bool

Change-Id: Ic9903fd887f2c3fab2630ebeb20df39392177c8d

9 files changed, 18 insertions, 18 deletions

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 );