Window::PreNotify should return bool

Change-Id: Ic9903fd887f2c3fab2630ebeb20df39392177c8d

4 files changed, 15 insertions, 15 deletions

diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 5c5c46ed5ff4..84b4844ebd4e 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -318,7 +318,7 @@ private:
     Reference< XFrame > mxFrame;
 
     virtual void    Select();
-    virtual long    PreNotify( NotifyEvent& rNEvt );
+    virtual bool    PreNotify( NotifyEvent& rNEvt );
     virtual bool    Notify( NotifyEvent& rNEvt );
     void            ImplReleaseFocus();
 
@@ -369,7 +369,7 @@ void ImplGrafModeControl::Select()
     }
 }
 
-long ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt )
+bool ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt )
 {
     sal_uInt16 nType = rNEvt.GetType();
 
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 427b635e8379..90beb8e40b8d 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -157,7 +157,7 @@ void SvxLineBox::Select()
 
 // -----------------------------------------------------------------------
 
-long SvxLineBox::PreNotify( NotifyEvent& rNEvt )
+bool SvxLineBox::PreNotify( NotifyEvent& rNEvt )
 {
     sal_uInt16 nType = rNEvt.GetType();
 
@@ -362,7 +362,7 @@ void SvxColorBox::Select()
 
 // -----------------------------------------------------------------------
 
-long SvxColorBox::PreNotify( NotifyEvent& rNEvt )
+bool SvxColorBox::PreNotify( NotifyEvent& rNEvt )
 {
     sal_uInt16 nType = rNEvt.GetType();
 
@@ -564,7 +564,7 @@ void SvxMetricField::RefreshDlgUnit()
 
 // -----------------------------------------------------------------------
 
-long SvxMetricField::PreNotify( NotifyEvent& rNEvt )
+bool SvxMetricField::PreNotify( NotifyEvent& rNEvt )
 {
     sal_uInt16 nType = rNEvt.GetType();
 
@@ -656,7 +656,7 @@ SvxFillTypeBox::~SvxFillTypeBox()
 
 // -----------------------------------------------------------------------
 
-long SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt )
+bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt )
 {
     sal_uInt16 nType = rNEvt.GetType();
 
@@ -749,7 +749,7 @@ SvxFillAttrBox::~SvxFillAttrBox()
 
 // -----------------------------------------------------------------------
 
-long SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt )
+bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt )
 {
     sal_uInt16 nType = rNEvt.GetType();
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 70b6a00d150b..5118449c165d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -134,7 +134,7 @@ public:
     void            SetFamily( SfxStyleFamily eNewFamily );
     inline bool IsVisible() { return bVisible; }
 
-    virtual long    PreNotify( NotifyEvent& rNEvt );
+    virtual bool    PreNotify( NotifyEvent& rNEvt );
     virtual bool    Notify( NotifyEvent& rNEvt );
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
     virtual void    StateChanged( StateChangedType nStateChange );
@@ -219,7 +219,7 @@ public:
                         { FontNameBox::Fill( pList );
                           nFtCount = pList->GetFontNameCount(); }
     virtual void    UserDraw( const UserDrawEvent& rUDEvt );
-    virtual long    PreNotify( NotifyEvent& rNEvt );
+    virtual bool    PreNotify( NotifyEvent& rNEvt );
     virtual bool    Notify( NotifyEvent& rNEvt );
     virtual Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -471,7 +471,7 @@ void SvxStyleBox_Impl::SetFamily( SfxStyleFamily eNewFamily )
 
 // -----------------------------------------------------------------------
 
-long SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
+bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
 {
     sal_uInt16 nType = rNEvt.GetType();
 
@@ -868,7 +868,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
 
 // -----------------------------------------------------------------------
 
-long SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt )
+bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt )
 {
     sal_uInt16 nType = rNEvt.GetType();
 
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 79e78785fb74..b3fdbfbf8c7f 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -180,9 +180,9 @@ void FindTextFieldControl::SetTextToSelected_Impl()
     }
 }
 
-long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
+bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
 {
-    long nRet= ComboBox::PreNotify( rNEvt );
+    bool nRet= ComboBox::PreNotify( rNEvt );
 
     switch ( rNEvt.GetType() )
     {
@@ -195,7 +195,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
 
             if ( KEY_ESCAPE == nCode || (bMod1 && (KEY_F == nCode)) )
             {
-                nRet = 1;
+                nRet = true;
                 GrabFocusToDocument();
 
                 // hide the findbar
@@ -222,7 +222,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
                 ToolBox* pToolBox = (ToolBox*)pWindow;
 
                 impl_executeSearch( m_xContext, m_xFrame, pToolBox, bShift);
-                nRet = 1;
+                nRet = true;
             }
             break;
         }