Window::Notify should return bool

Change-Id: I72081b1022582c8b6f95a611e21d9c78f7581efe

11 files changed, 14 insertions, 29 deletions

diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index a47f45aa553e..4964e43396cf 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -593,7 +593,7 @@ void ClientBox::MouseButtonDown( const MouseEvent& rMEvt )
 }
 
 //------------------------------------------------------------------------------
-long ClientBox::Notify( NotifyEvent& rNEvt )
+bool ClientBox::Notify( NotifyEvent& rNEvt )
 {
     if ( !m_bInDelete )
         DeleteRemoved();
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index d4f754f94fdd..9c5ca8f025fd 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -146,7 +146,7 @@ public:
     void    Paint( const Rectangle &rPaintRect );
     void    Resize();
     Size    GetOptimalSize() const;
-    long    Notify( NotifyEvent& rNEvt );
+    bool    Notify( NotifyEvent& rNEvt );
 
     const Size      GetMinOutputSizePixel() const;
     void            SetExtraSize( long nSize ) { m_nExtraHeight = nSize; }
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index b13bf5106906..e7e0c76d2bb9 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -171,7 +171,7 @@ void SdDocPreviewWin::startPreview()
     }
 }
 
-long SdDocPreviewWin::Notify( NotifyEvent& rNEvt )
+bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN )
     {
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index a5cb425f9df5..b3a80b80a5f2 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -782,10 +782,10 @@ NavDocInfo* SdNavigatorWin::GetDocInfo()
 /**
  * PreNotify
  */
-long SdNavigatorWin::Notify(NotifyEvent& rNEvt)
+bool SdNavigatorWin::Notify(NotifyEvent& rNEvt)
 {
     const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
-    long            nOK = sal_False;
+    bool            nOK = false;
 
     if( pKEvt )
     {
@@ -794,7 +794,7 @@ long SdNavigatorWin::Notify(NotifyEvent& rNEvt)
             if( SdPageObjsTLB::IsInDrag() )
             {
                 // during drag'n'drop we just stop the drag but do not close the navigator
-                nOK = sal_True;
+                nOK = true;
             }
             else
             {
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 4aa5fddc49b3..7571f73dcf7a 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -180,7 +180,7 @@ protected:
     virtual void Command(const CommandEvent& rCEvt);
     virtual void RequestHelp( const HelpEvent& rEvt );
     virtual void LoseFocus();
-    virtual long Notify( NotifyEvent& rNEvt );
+    virtual bool Notify( NotifyEvent& rNEvt );
 
     /** Create an accessibility object that makes this window accessible.
 
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index 6e959316e027..7895129830c1 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -67,7 +67,7 @@ public:
     virtual void    Resize();
     void            startPreview();
 
-    virtual long    Notify( NotifyEvent& rNEvt );
+    virtual bool    Notify( NotifyEvent& rNEvt );
 
     void            SetClickHdl( const Link& rLink ) { aClickHdl = rLink; }
     const Link&     GetClickHdl() const { return aClickHdl; }
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 68d6bc95c283..2a9b910e69cd 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -110,7 +110,7 @@ public:
 
 protected:
     virtual void                Resize();
-    virtual long                Notify(NotifyEvent& rNEvt);
+    virtual bool                Notify(NotifyEvent& rNEvt);
 
 
 private:
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 4138c19c7c8b..4d1c54807a29 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -281,19 +281,6 @@ void ShowWindow::Paint(const Rectangle& rRect)
     }
 }
 
-
-long ShowWindow::Notify(NotifyEvent& rNEvt)
-{
-    long nOK = sal_False;
-    if (!nOK)
-        nOK = Window::Notify(rNEvt);
-
-    return nOK;
-}
-
-
-// -----------------------------------------------------------------------------
-
 void ShowWindow::GetFocus()
 {
     // base class
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index 41c0c31506b0..0acf993576cf 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -77,7 +77,6 @@ public:
     virtual void    MouseButtonUp(const MouseEvent& rMEvt);
     virtual void    MouseButtonDown(const MouseEvent& rMEvt);
     virtual void    Paint(const Rectangle& rRect);
-    virtual long    Notify(NotifyEvent& rNEvt);
     //Overload the sd::Window's CreateAccessible to create a different accessible object
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible>
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 88321d71433b..1ec3f117f854 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -60,7 +60,7 @@ public:
     virtual void MouseButtonUp (const MouseEvent& rEvent);
     virtual void MouseButtonDown (const MouseEvent& rEvent);
     virtual void Command (const CommandEvent& rEvent);
-    virtual long Notify (NotifyEvent& rEvent);
+    virtual bool Notify (NotifyEvent& rEvent);
 
 private:
     SlideSorter& mrSlideSorter;
@@ -673,10 +673,9 @@ void ContentWindow::Command(const CommandEvent& rEvent)
 
 
 
-long ContentWindow::Notify (NotifyEvent& rEvent)
+bool ContentWindow::Notify (NotifyEvent&)
 {
-    (void)rEvent;
-    return 0;
+    return false;
 }
 
 
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index a8ddedf67c83..158ae91204bc 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -295,9 +295,9 @@ void Window::Command(const CommandEvent& rCEvt)
 }
 
 
-long Window::Notify( NotifyEvent& rNEvt )
+bool Window::Notify( NotifyEvent& rNEvt )
 {
-    long nResult = sal_False;
+    bool nResult = false;
     if ( mpViewShell )
     {
         nResult = mpViewShell->Notify(rNEvt, this);