Window::Notify should return bool

Change-Id: I72081b1022582c8b6f95a611e21d9c78f7581efe

5 files changed, 11 insertions, 11 deletions

diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx
index ff5beb57b6b9..b67303e345c1 100644
--- a/sw/source/ui/cctrl/actctrl.cxx
+++ b/sw/source/ui/cctrl/actctrl.cxx
@@ -28,9 +28,9 @@ void NumEditAction::Action()
 }
 
 
-long NumEditAction::Notify( NotifyEvent& rNEvt )
+bool NumEditAction::Notify( NotifyEvent& rNEvt )
 {
-    long nHandled = 0;
+    long nHandled = false;
 
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
@@ -41,7 +41,7 @@ long NumEditAction::Notify( NotifyEvent& rNEvt )
                 !nModifier)
         {
             Action();
-            nHandled = 1;
+            nHandled = true;
         }
 
     }
diff --git a/sw/source/ui/inc/actctrl.hxx b/sw/source/ui/inc/actctrl.hxx
index d69a29e0631f..8d775917ffde 100644
--- a/sw/source/ui/inc/actctrl.hxx
+++ b/sw/source/ui/inc/actctrl.hxx
@@ -31,7 +31,7 @@ class SW_DLLPUBLIC NumEditAction: public NumericField
 
 protected:
     virtual void Action();
-    virtual long    Notify( NotifyEvent& rNEvt );
+    virtual bool Notify( NotifyEvent& rNEvt );
 public:
     NumEditAction( Window* pParent, const ResId& rResId ) :
                                 NumericField(pParent, rResId) {}
diff --git a/sw/source/ui/inc/swuicnttab.hxx b/sw/source/ui/inc/swuicnttab.hxx
index 3b1a0f25a4db..07a815577406 100644
--- a/sw/source/ui/inc/swuicnttab.hxx
+++ b/sw/source/ui/inc/swuicnttab.hxx
@@ -448,7 +448,7 @@ public:
 
     void                PreTokenButtonRemoved(const SwFormToken& rToken);
     void SetFocus2theAllBtn();
-    virtual long Notify( NotifyEvent& rNEvt );
+    virtual bool Notify( NotifyEvent& rNEvt );
 };
 
 class SwTOXStylesTabPage : public SfxTabPage
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index d5e9a111dae7..e6171eb9fede 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2177,7 +2177,7 @@ void SwTOXEntryTabPage::SetFocus2theAllBtn()
     m_pAllLevelsPB->GrabFocus();
 }
 
-long SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt )
+bool SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 31e0f66f2644..8e660dc829e4 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -623,7 +623,7 @@ public:
 
 protected:
     virtual void    Select();
-    virtual long    Notify( NotifyEvent& rNEvt );
+    virtual bool    Notify( NotifyEvent& rNEvt );
 
     void ReleaseFocus();
 
@@ -680,9 +680,9 @@ void    SwZoomBox_Impl::Select()
     }
 }
 
-long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
+bool SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
 {
-    long nHandled = 0;
+    bool nHandled = true;
 
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
@@ -696,7 +696,7 @@ long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
                 if ( KEY_TAB == nCode )
                     bRelease = false;
                 else
-                    nHandled = 1;
+                    nHandled = true;
                 Select();
                 break;
             }
@@ -714,7 +714,7 @@ long SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
             SetText( GetSavedValue() );
     }
 
-    return nHandled ? nHandled : ComboBox::Notify( rNEvt );
+    return nHandled || ComboBox::Notify( rNEvt );
 }
 
 void SwZoomBox_Impl::ReleaseFocus()