Window::Notify should return bool

Change-Id: I72081b1022582c8b6f95a611e21d9c78f7581efe

13 files changed, 23 insertions, 23 deletions

diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index d4dada733050..79a98c2c2139 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -735,7 +735,7 @@ namespace svt
     }
 
     //------------------------------------------------------------------------------
-    long EditBrowseBox::Notify(NotifyEvent& rEvt)
+    bool EditBrowseBox::Notify(NotifyEvent& rEvt)
     {
         switch (rEvt.GetType())
         {
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 38fd65f41644..ca9171b35c07 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -2221,7 +2221,7 @@ public:
     PushButton*     EnableNoneBtn( sal_Bool bEnable );
     void            ArrangeButtons();
 
-    long            Notify( NotifyEvent& rNEvt );
+    virtual bool    Notify( NotifyEvent& rNEvt );
 };
 
 // -----------------------------------------------------------------------
@@ -2376,7 +2376,7 @@ void ImplCFieldFloatWin::ArrangeButtons()
 
 // -----------------------------------------------------------------------
 
-long ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt )
+bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index b0279228eecb..c13dd2b86305 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.cxx
@@ -74,7 +74,7 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    long FileURLBox::Notify( NotifyEvent& _rNEvt )
+    bool FileURLBox::Notify( NotifyEvent& _rNEvt )
     {
         switch ( _rNEvt.GetType() )
         {
@@ -84,7 +84,7 @@ namespace svt
                 &&  ( IsInDropDown()                                             )
                 )
             {
-                long nReturn = SvtURLBox::Notify(_rNEvt);
+                bool nReturn = SvtURLBox::Notify(_rNEvt);
                 DisplayURL( m_sPreservedText );
                 return nReturn;
             }
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 551da379cb60..a0742b5d2e27 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -791,7 +791,7 @@ void FormattedField::ReFormat()
     }
 }
 
-long FormattedField::Notify(NotifyEvent& rNEvt)
+bool FormattedField::Notify(NotifyEvent& rNEvt)
 {
     DBG_CHKTHIS(FormattedField, NULL);
 
@@ -809,7 +809,7 @@ long FormattedField::Notify(NotifyEvent& rNEvt)
                 {
                     // the base class would translate this into calls to Up/Down/First/Last,
                     // but we don't want this if we are text-formatted
-                    return 1;
+                    return true;
                 }
         }
     }
@@ -825,7 +825,7 @@ long FormattedField::Notify(NotifyEvent& rNEvt)
                 // same as above : prevent the base class from doing Up/Down-calls
                 // (normally I should put this test into the Up/Down methods itself, shouldn't I ?)
                 // FS - 71553 - 19.01.00
-                return 1;
+                return true;
             }
         }
     }
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 4cbe2a68395e..5ab9dbad8f54 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -1139,7 +1139,7 @@ IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl)
 }
 
 //-------------------------------------------------------------------------
-long SvtURLBox::Notify( NotifyEvent &rEvt )
+bool SvtURLBox::Notify( NotifyEvent &rEvt )
 {
     if ( EVENT_GETFOCUS == rEvt.GetType() )
     {
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index ee62f1b49255..85765000ce4a 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.cxx
@@ -49,14 +49,14 @@ namespace svt
     }
 
     //---------------------------------------------------------------------
-    long OFileURLControl::Notify( NotifyEvent& _rNEvt )
+    bool OFileURLControl::Notify( NotifyEvent& _rNEvt )
     {
         if (GetSubEdit() == _rNEvt.GetWindow())
             if (EVENT_KEYINPUT == _rNEvt.GetType())
                 if (KEY_RETURN == _rNEvt.GetKeyEvent()->GetKeyCode().GetCode())
                     if (IsInDropDown())
                     {
-                        long nReturn = SvtURLBox::Notify(_rNEvt);
+                        bool nReturn = SvtURLBox::Notify(_rNEvt);
 
                         // build a system dependent (thus more user readable) file name
                         OFileNotation aTransformer(m_sPreservedText, OFileNotation::N_URL);
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 90f2e5317837..a493c719e94e 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -311,7 +311,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl)
 
 // -----------------------------------------------------------------------
 
-long PrinterSetupDialog::Notify( NotifyEvent& rNEvt )
+bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt )
 {
     if ( (rNEvt.GetType() == EVENT_GETFOCUS) && IsReallyVisible() )
         ImplStatusHdl( &maStatusTimer );
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 153a29e28566..51bbd19e605c 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -445,7 +445,7 @@ void WizardDialog::StateChanged( StateChangedType nType )
 
 // -----------------------------------------------------------------------
 
-long WizardDialog::Notify( NotifyEvent& rNEvt )
+bool WizardDialog::Notify( NotifyEvent& rNEvt )
 {
     if ( (rNEvt.GetType() == EVENT_KEYINPUT) && mpPrevBtn && mpNextBtn )
     {
@@ -466,7 +466,7 @@ long WizardDialog::Notify( NotifyEvent& rNEvt )
                         mpPrevBtn->SetPressed( sal_False );
                         mpPrevBtn->Click();
                     }
-                    return sal_True;
+                    return true;
                 }
             }
             else
@@ -480,7 +480,7 @@ long WizardDialog::Notify( NotifyEvent& rNEvt )
                         mpNextBtn->SetPressed( sal_False );
                         mpNextBtn->Click();
                     }
-                    return sal_True;
+                    return true;
                 }
             }
         }
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index b9551ece5c88..4a603a8143ef 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -627,7 +627,7 @@ long SvResizeWindow::PreNotify( NotifyEvent& rEvt )
     return Window::PreNotify(rEvt);
 }
 
-long SvResizeWindow::Notify( NotifyEvent& rEvt )
+bool SvResizeWindow::Notify( NotifyEvent& rEvt )
 {
     if ( rEvt.GetType() == EVENT_LOSEFOCUS && m_bActive )
     {
diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx
index a2703b0dea68..79425625cb67 100644
--- a/svtools/source/hatchwindow/ipwin.hxx
+++ b/svtools/source/hatchwindow/ipwin.hxx
@@ -91,7 +91,7 @@ public:
     virtual void    KeyInput( const KeyEvent & rEvt );
     virtual void    Resize();
     virtual void    Paint( const Rectangle & );
-    virtual long    Notify( NotifyEvent& rNEvt );
+    virtual bool    Notify( NotifyEvent& rNEvt );
     virtual long    PreNotify( NotifyEvent& rNEvt );
 
     void    QueryObjAreaPixel( Rectangle & );
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index 65703e5d45c5..9970338ddfc2 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -209,9 +209,9 @@ namespace svt { namespace table
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    long TableDataWindow::Notify(NotifyEvent& rNEvt )
+    bool TableDataWindow::Notify(NotifyEvent& rNEvt )
     {
-        long nDone = 0;
+        bool nDone = false;
         if ( rNEvt.GetType() == EVENT_COMMAND )
         {
             const CommandEvent& rCEvt = *rNEvt.GetCommandEvent();
@@ -224,7 +224,7 @@ namespace svt { namespace table
                 }
             }
         }
-        return nDone ? nDone : Window::Notify( rNEvt );
+        return nDone || Window::Notify( rNEvt );
     }
 //......................................................................................................................
 } } // namespace svt::table
diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx
index 4a7a771f02c3..594831db4ede 100644
--- a/svtools/source/table/tabledatawindow.hxx
+++ b/svtools/source/table/tabledatawindow.hxx
@@ -58,7 +58,7 @@ namespace svt { namespace table
         virtual void        MouseMove( const MouseEvent& rMEvt);
         virtual void        MouseButtonDown( const MouseEvent& rMEvt);
         virtual void        MouseButtonUp( const MouseEvent& rMEvt);
-        virtual long        Notify(NotifyEvent& rNEvt);
+        virtual bool        Notify(NotifyEvent& rNEvt);
         virtual void        SetControlBackground(const Color& rColor);
         virtual void        SetControlBackground();
         virtual void        RequestHelp( const HelpEvent& rHEvt );
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index 92cbc8743e60..2653de04bc45 100644
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -456,7 +456,7 @@ namespace svt
     }
 
     //--------------------------------------------------------------------
-    long ToolPanelDeck::Notify( NotifyEvent& i_rNotifyEvent )
+    bool ToolPanelDeck::Notify( NotifyEvent& i_rNotifyEvent )
     {
         bool bHandled = false;
         if ( i_rNotifyEvent.GetType() == EVENT_KEYINPUT )
@@ -496,7 +496,7 @@ namespace svt
         }
 
         if ( bHandled )
-            return 1;
+            return true;
 
         return Control::Notify( i_rNotifyEvent );
     }