Window::Notify should return bool

Change-Id: I72081b1022582c8b6f95a611e21d9c78f7581efe

18 files changed, 72 insertions, 72 deletions

diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index d01c3260fce6..e8d6c2a4f504 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -423,7 +423,7 @@ protected:
     virtual void        StateChanged( StateChangedType nType );
     virtual void        DataChanged( const DataChangedEvent& rDCEvt );
 
-    long                Notify( NotifyEvent& rNEvt );
+    virtual bool        Notify( NotifyEvent& rNEvt );
 
     void                ImplResizeControls();
     void                ImplCheckScrollBars();
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index b725be4c3fc5..20148537ae5f 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -760,9 +760,9 @@ long ComboBox::PreNotify( NotifyEvent& rNEvt )
 
 // -----------------------------------------------------------------------
 
-long ComboBox::Notify( NotifyEvent& rNEvt )
+bool ComboBox::Notify( NotifyEvent& rNEvt )
 {
-    long nDone = 0;
+    bool nDone = false;
     if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && ( rNEvt.GetWindow() == mpSubEdit )
             && !IsReadOnly() )
     {
@@ -785,12 +785,12 @@ long ComboBox::Notify( NotifyEvent& rNEvt )
                     SetSelection( Selection( 0, SELECTION_MAX ) );
                     mpFloatWin->StartFloat( sal_False );
                     ImplCallEventListeners( VCLEVENT_DROPDOWN_OPEN );
-                    nDone = 1;
+                    nDone = true;
                 }
                 else if( ( nKeyCode == KEY_UP ) && mpFloatWin && mpFloatWin->IsInPopupMode() && aKeyEvt.GetKeyCode().IsMod2() )
                 {
                     mpFloatWin->EndPopupMode();
-                    nDone = 1;
+                    nDone = true;
                 }
                 else
                 {
@@ -804,7 +804,7 @@ long ComboBox::Notify( NotifyEvent& rNEvt )
                 if( ( rNEvt.GetWindow() == mpSubEdit ) && IsInDropDown() )
                 {
                     mpImplLB->ProcessKeyInput( aKeyEvt );
-                    nDone = 1;
+                    nDone = true;
                 }
             }
             break;
@@ -832,7 +832,7 @@ long ComboBox::Notify( NotifyEvent& rNEvt )
         }
         else
         {
-            nDone = 0;  // don't eat this event, let the default handling happen (i.e. scroll the context)
+            nDone = false;  // don't eat this event, let the default handling happen (i.e. scroll the context)
         }
     }
     else if( ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) && ( rNEvt.GetWindow() == mpImplLB->GetMainWindow() ) )
@@ -840,7 +840,7 @@ long ComboBox::Notify( NotifyEvent& rNEvt )
         mpSubEdit->GrabFocus();
     }
 
-    return nDone ? nDone : Edit::Notify( rNEvt );
+    return nDone || Edit::Notify( rNEvt );
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 16841ec1656f..e312c18bb402 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -280,7 +280,7 @@ OUString Control::GetDisplayText() const
 
 // -----------------------------------------------------------------------
 
-long Control::Notify( NotifyEvent& rNEvt )
+bool Control::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
     {
@@ -290,7 +290,7 @@ long Control::Notify( NotifyEvent& rNEvt )
             StateChanged( STATE_CHANGE_CONTROL_FOCUS );
             if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_GETFOCUS, maGetFocusHdl, this ) )
                 // been destroyed within the handler
-                return sal_True;
+                return true;
         }
     }
     else
@@ -304,7 +304,7 @@ long Control::Notify( NotifyEvent& rNEvt )
                 StateChanged( STATE_CHANGE_CONTROL_FOCUS );
                 if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_LOSEFOCUS, maLoseFocusHdl, this ) )
                     // been destroyed within the handler
-                    return sal_True;
+                    return true;
             }
         }
     }
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index aa8e06b994d5..f18442d9b544 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -785,7 +785,7 @@ long NumericField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-long NumericField::Notify( NotifyEvent& rNEvt )
+bool NumericField::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
@@ -937,7 +937,7 @@ long NumericBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-long NumericBox::Notify( NotifyEvent& rNEvt )
+bool NumericBox::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
@@ -1668,7 +1668,7 @@ long MetricField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-long MetricField::Notify( NotifyEvent& rNEvt )
+bool MetricField::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
@@ -1769,7 +1769,7 @@ long MetricBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-long MetricBox::Notify( NotifyEvent& rNEvt )
+bool MetricBox::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
@@ -2003,7 +2003,7 @@ long CurrencyField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-long CurrencyField::Notify( NotifyEvent& rNEvt )
+bool CurrencyField::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
@@ -2085,7 +2085,7 @@ long CurrencyBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-long CurrencyBox::Notify( NotifyEvent& rNEvt )
+bool CurrencyBox::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 585f81a7f759..01aa8fcdd491 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -837,7 +837,7 @@ long PatternField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-long PatternField::Notify( NotifyEvent& rNEvt )
+bool PatternField::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
@@ -887,7 +887,7 @@ long PatternBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-long PatternBox::Notify( NotifyEvent& rNEvt )
+bool PatternBox::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
@@ -1834,7 +1834,7 @@ long DateField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-long DateField::Notify( NotifyEvent& rNEvt )
+bool DateField::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
@@ -1949,7 +1949,7 @@ void DateBox::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-long DateBox::Notify( NotifyEvent& rNEvt )
+bool DateBox::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
@@ -2713,7 +2713,7 @@ long TimeField::PreNotify( NotifyEvent& rNEvt )
     return SpinField::PreNotify( rNEvt );
 }
 
-long TimeField::Notify( NotifyEvent& rNEvt )
+bool TimeField::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
@@ -2854,7 +2854,7 @@ long TimeBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-long TimeBox::Notify( NotifyEvent& rNEvt )
+bool TimeBox::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_GETFOCUS )
         MarkToBeReformatted( sal_False );
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 972447458935..cfd428242ed8 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2639,9 +2639,9 @@ void ImplListBox::DataChanged( const DataChangedEvent& rDCEvt )
 
 // -----------------------------------------------------------------------
 
-long ImplListBox::Notify( NotifyEvent& rNEvt )
+bool ImplListBox::Notify( NotifyEvent& rNEvt )
 {
-    long nDone = 0;
+    bool nDone = false;
     if ( rNEvt.GetType() == EVENT_COMMAND )
     {
         const CommandEvent& rCEvt = *rNEvt.GetCommandEvent();
@@ -2655,7 +2655,7 @@ long ImplListBox::Notify( NotifyEvent& rNEvt )
         }
     }
 
-    return nDone ? nDone : Window::Notify( rNEvt );
+    return nDone || Window::Notify( rNEvt );
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index e9e8ea2e1b49..bf9f49429aed 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -487,7 +487,7 @@ long LongCurrencyField::PreNotify( NotifyEvent& rNEvt )
 }
 
 
-long LongCurrencyField::Notify( NotifyEvent& rNEvt )
+bool LongCurrencyField::Notify( NotifyEvent& rNEvt )
 {
     if( rNEvt.GetType() == EVENT_GETFOCUS )
     {
@@ -570,7 +570,7 @@ long LongCurrencyBox::PreNotify( NotifyEvent& rNEvt )
 }
 
 
-long LongCurrencyBox::Notify( NotifyEvent& rNEvt )
+bool LongCurrencyBox::Notify( NotifyEvent& rNEvt )
 {
     if( rNEvt.GetType() == EVENT_GETFOCUS )
     {
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 6f619ccc62cc..df691a861f4f 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -523,9 +523,9 @@ void SpinField::MouseMove( const MouseEvent& rMEvt )
 
 // --------------------------------------------------------------------
 
-long SpinField::Notify( NotifyEvent& rNEvt )
+bool SpinField::Notify( NotifyEvent& rNEvt )
 {
-    long nDone = 0;
+    bool nDone = false;
     if( rNEvt.GetType() == EVENT_KEYINPUT )
     {
         const KeyEvent& rKEvt = *rNEvt.GetKeyEvent();
@@ -539,7 +539,7 @@ long SpinField::Notify( NotifyEvent& rNEvt )
                     if ( !nMod )
                     {
                         Up();
-                        nDone = 1;
+                        nDone = true;
                     }
                 }
                 break;
@@ -548,13 +548,13 @@ long SpinField::Notify( NotifyEvent& rNEvt )
                     if ( !nMod )
                     {
                         Down();
-                        nDone = 1;
+                        nDone = true;
                     }
                     else if ( ( nMod == KEY_MOD2 ) && !mbInDropDown && ( GetStyle() & WB_DROPDOWN ) )
                     {
                         mbInDropDown = ShowDropDown( sal_True );
                         Paint( Rectangle( Point(), GetOutputSizePixel() ) );
-                        nDone = 1;
+                        nDone = true;
                     }
                 }
                 break;
@@ -563,7 +563,7 @@ long SpinField::Notify( NotifyEvent& rNEvt )
                     if ( !nMod )
                     {
                         Last();
-                        nDone = 1;
+                        nDone = true;
                     }
                 }
                 break;
@@ -572,7 +572,7 @@ long SpinField::Notify( NotifyEvent& rNEvt )
                     if ( !nMod )
                     {
                         First();
-                        nDone = 1;
+                        nDone = true;
                     }
                 }
                 break;
@@ -598,15 +598,15 @@ long SpinField::Notify( NotifyEvent& rNEvt )
                         Down();
                     else
                         Up();
-                    nDone = 1;
+                    nDone = true;
                 }
             }
             else
-                nDone = 0;  // don't eat this event, let the default handling happen (i.e. scroll the context)
+                nDone = false;  // don't eat this event, let the default handling happen (i.e. scroll the context)
         }
     }
 
-    return nDone ? nDone : Edit::Notify( rNEvt );
+    return nDone || Edit::Notify( rNEvt );
 }
 
 // --------------------------------------------------------------------
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 474d664534f1..314cf43d9a35 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1027,9 +1027,9 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo
 
 // -----------------------------------------------------------------------
 
-long TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent )
+bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent )
 {
-    long nRet = 0;
+    bool nRet = false;
 
     if ( GetPageCount() > 1 )
     {
@@ -1043,7 +1043,7 @@ long TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent )
                 if ( (nKeyCode == KEY_TAB) || (nKeyCode == KEY_PAGEUP) )
                 {
                     ImplActivateTabPage( sal_False );
-                    nRet = 1;
+                    nRet = true;
                 }
             }
             else
@@ -1051,7 +1051,7 @@ long TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent )
                 if ( (nKeyCode == KEY_TAB) || (nKeyCode == KEY_PAGEDOWN) )
                 {
                     ImplActivateTabPage( sal_True );
-                    nRet = 1;
+                    nRet = true;
                 }
             }
         }
@@ -1680,14 +1680,14 @@ long TabControl::PreNotify( NotifyEvent& rNEvt )
 
 // -----------------------------------------------------------------------
 
-long TabControl::Notify( NotifyEvent& rNEvt )
+bool TabControl::Notify( NotifyEvent& rNEvt )
 {
-    long nRet = 0;
+    bool nRet = false;
 
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
         nRet = ImplHandleKeyEvent( *rNEvt.GetKeyEvent() );
 
-    return nRet ? nRet : Control::Notify( rNEvt );
+    return nRet || Control::Notify( rNEvt );
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index af2d417ce55d..c62f03732c7c 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1400,14 +1400,14 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size&
     pDev->Pop();
 }
 
-long VclMultiLineEdit::Notify( NotifyEvent& rNEvt )
+bool VclMultiLineEdit::Notify( NotifyEvent& rNEvt )
 {
-    long nDone = 0;
+    bool nDone = false;
     if( rNEvt.GetType() == EVENT_COMMAND )
     {
         nDone = pImpVclMEdit->HandleCommand( *rNEvt.GetCommandEvent() );
     }
-    return nDone ? nDone : Edit::Notify( rNEvt );
+    return nDone || Edit::Notify( rNEvt );
 }
 
 long VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1e08a5a1051a..88439c970366 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -594,10 +594,10 @@ IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl)
 
 // -----------------------------------------------------------------------
 
-long Dialog::Notify( NotifyEvent& rNEvt )
+bool Dialog::Notify( NotifyEvent& rNEvt )
 {
     // Zuerst Basisklasse rufen wegen TabSteuerung
-    long nRet = SystemWindow::Notify( rNEvt );
+    bool nRet = SystemWindow::Notify( rNEvt );
     if ( !nRet )
     {
         if ( rNEvt.GetType() == EVENT_KEYINPUT )
@@ -614,7 +614,7 @@ long Dialog::Notify( NotifyEvent& rNEvt )
                 // post this Close asynchronous so we can leave our key handler before
                 // we get destroyed
                 PostUserEvent( LINK( this, Dialog, ImplAsyncCloseHdl ), this );
-                return sal_True;
+                return true;
             }
         }
         else if ( rNEvt.GetType() == EVENT_GETFOCUS )
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 273f6344cdfa..12379f060649 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -596,7 +596,7 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt )
 
 // -----------------------------------------------------------------------
 
-long DockingWindow::Notify( NotifyEvent& rNEvt )
+bool DockingWindow::Notify( NotifyEvent& rNEvt )
 {
     if( GetDockingManager()->IsDockable( this ) )   // new docking interface
         return Window::Notify( rNEvt );
@@ -611,7 +611,7 @@ long DockingWindow::Notify( NotifyEvent& rNEvt )
                 if ( pMEvt->IsMod1() && (pMEvt->GetClicks() == 2) )
                 {
                     SetFloatingMode( !IsFloatingMode() );
-                    return sal_True;
+                    return true;
                 }
                 else if ( pMEvt->GetClicks() == 1 )
                 {
@@ -629,7 +629,7 @@ long DockingWindow::Notify( NotifyEvent& rNEvt )
                         }
                         ImplStartDocking( aPos );
                     }
-                    return sal_True;
+                    return true;
                 }
             }
         }
@@ -640,7 +640,7 @@ long DockingWindow::Notify( NotifyEvent& rNEvt )
                 rKey.IsShift() && rKey.IsMod1() )
             {
                 SetFloatingMode( !IsFloatingMode() );
-                return sal_True;
+                return true;
             }
         }
     }
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 10f1e974b08b..6ff72f93f364 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -552,10 +552,10 @@ IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl)
 
 // -----------------------------------------------------------------------
 
-long FloatingWindow::Notify( NotifyEvent& rNEvt )
+bool FloatingWindow::Notify( NotifyEvent& rNEvt )
 {
     // Zuerst Basisklasse rufen wegen TabSteuerung
-    long nRet = SystemWindow::Notify( rNEvt );
+    bool nRet = SystemWindow::Notify( rNEvt );
     if ( !nRet )
     {
         if ( rNEvt.GetType() == EVENT_KEYINPUT )
@@ -567,7 +567,7 @@ long FloatingWindow::Notify( NotifyEvent& rNEvt )
             if ( (nKeyCode == KEY_ESCAPE) && (GetStyle() & WB_CLOSEABLE) )
             {
                 Close();
-                return sal_True;
+                return true;
             }
         }
     }
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 73a1aaef4878..e3303ded6f53 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1773,9 +1773,9 @@ bool VclScrolledWindow::set_property(const OString &rKey, const OString &rValue)
     return bRet;
 }
 
-long VclScrolledWindow::Notify(NotifyEvent& rNEvt)
+bool VclScrolledWindow::Notify(NotifyEvent& rNEvt)
 {
-    long nDone = 0;
+    bool nDone = false;
     if ( rNEvt.GetType() == EVENT_COMMAND )
     {
         const CommandEvent& rCEvt = *rNEvt.GetCommandEvent();
@@ -1789,7 +1789,7 @@ long VclScrolledWindow::Notify(NotifyEvent& rNEvt)
         }
     }
 
-    return nDone ? nDone : VclBin::Notify( rNEvt );
+    return nDone || VclBin::Notify( rNEvt );
 }
 
 const Window *VclEventBox::get_child() const
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 13cc48663aa0..f21e3b3083ed 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -733,7 +733,7 @@ void Splitter::KeyInput( const KeyEvent& rKEvt )
 
 // -----------------------------------------------------------------------
 
-long Splitter::Notify( NotifyEvent& rNEvt )
+bool Splitter::Notify( NotifyEvent& rNEvt )
 {
     return Window::Notify( rNEvt );
 }
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index d37abdd4c16b..8aa2c8b5c120 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -89,7 +89,7 @@ SystemWindow::~SystemWindow()
 
 // -----------------------------------------------------------------------
 
-long SystemWindow::Notify( NotifyEvent& rNEvt )
+bool SystemWindow::Notify( NotifyEvent& rNEvt )
 {
     // capture KeyEvents for menu handling
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
@@ -102,7 +102,7 @@ long SystemWindow::Notify( NotifyEvent& rNEvt )
                 pMBar = ((SystemWindow*)pWin)->GetMenuBar();
         }
         if ( pMBar && pMBar->ImplHandleKeyEvent( *rNEvt.GetKeyEvent(), sal_False ) )
-            return sal_True;
+            return true;
     }
 
     return Window::Notify( rNEvt );
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 1b4a2beffead..514d2efbbf0a 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4360,7 +4360,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt )
 
 // -----------------------------------------------------------------------
 
-long ToolBox::Notify( NotifyEvent& rNEvt )
+bool ToolBox::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
@@ -4382,7 +4382,7 @@ long ToolBox::Notify( NotifyEvent& rNEvt )
                 if( bNoTabCycling &&  ! (GetStyle() & WB_FORCETABCYCLE) )
                     return DockingWindow::Notify( rNEvt );
                 else if( ImplChangeHighlightUpDn( aKeyCode.IsShift() ? sal_True : sal_False , bNoTabCycling ) )
-                    return sal_False;
+                    return false;
                 else
                     return DockingWindow::Notify( rNEvt );
             }
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 1bd234bf437e..4e91535945d8 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -5084,9 +5084,9 @@ long Window::PreNotify( NotifyEvent& rNEvt )
 
 // -----------------------------------------------------------------------
 
-long Window::Notify( NotifyEvent& rNEvt )
+bool Window::Notify( NotifyEvent& rNEvt )
 {
-    long nRet = sal_False;
+    bool nRet = false;
 
     // check for docking window
     // but do nothing if window is docked and locked
@@ -5103,13 +5103,13 @@ long Window::Notify( NotifyEvent& rNEvt )
                 {
                     // ctrl double click toggles floating mode
                     pWrapper->SetFloatingMode( !pWrapper->IsFloatingMode() );
-                    return sal_True;
+                    return true;
                 }
                 else if ( pMEvt->GetClicks() == 1 && bHit)
                 {
                     // allow start docking during mouse move
                     pWrapper->ImplEnableStartDocking();
-                    return sal_True;
+                    return true;
                 }
             }
         }
@@ -5133,7 +5133,7 @@ long Window::Notify( NotifyEvent& rNEvt )
                     }
                     pWrapper->ImplStartDocking( aPos );
                 }
-                return sal_True;
+                return true;
             }
         }
         else if( rNEvt.GetType() == EVENT_KEYINPUT )
@@ -5151,7 +5151,7 @@ long Window::Notify( NotifyEvent& rNEvt )
                  */
                 if( pWrapper->IsFloatingMode() )
                     ToTop( TOTOP_GRABFOCUSONLY );
-                return sal_True;
+                return true;
             }
         }
     }