Window::PreNotify should return bool

Change-Id: Ic9903fd887f2c3fab2630ebeb20df39392177c8d

33 files changed, 53 insertions, 53 deletions

diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index f9dac6a931ab..6083b2ea4657 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -274,7 +274,7 @@ void OApplicationView::resizeDocumentView(Rectangle& _rPlayground)
     _rPlayground.SetSize( Size( 0, 0 ) );
 }
 
-long OApplicationView::PreNotify( NotifyEvent& rNEvt )
+bool OApplicationView::PreNotify( NotifyEvent& rNEvt )
 {
     switch(rNEvt.GetType())
     {
@@ -292,11 +292,11 @@ long OApplicationView::PreNotify( NotifyEvent& rNEvt )
             // give the pane the chance to intercept mnemonic accelerators
             // #i34790#
             if ( getPanel() && getPanel()->interceptKeyInput( *pKeyEvent ) )
-                return 1L;
+                return true;
             // and ditto the detail view
             // #i72799#
             if ( getDetailView() && getDetailView()->interceptKeyInput( *pKeyEvent ) )
-                return 1L;
+                return true;
         }
         break;
     }
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 0e4b48d058a1..70569f5e6e6b 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -111,7 +111,7 @@ namespace dbaui
         void    setTaskExternalMnemonics( MnemonicGenerator& _rMnemonics );
 
         // window overloads
-        virtual long PreNotify( NotifyEvent& rNEvt );
+        virtual bool PreNotify( NotifyEvent& rNEvt );
         virtual void GetFocus();
 
         inline IApplicationController&                  getAppController() const { return m_rAppController; }
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 488142c4f2ef..d7a2d0cce3b8 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -304,9 +304,9 @@ void UnoDataBrowserView::_disposing( const ::com::sun::star::lang::EventObject&
     m_pVclControl = NULL;
 }
 
-long UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
+bool UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
 {
-    long nDone = 0L;
+    bool nDone = false;
     if(rNEvt.GetType() == EVENT_KEYINPUT)
     {
         sal_Bool bGrabAllowed = isGrabVclControlFocusAllowed(this);
@@ -323,11 +323,11 @@ long UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
                 else if ( m_pTreeView && m_pVclControl && m_pVclControl->HasChildPathFocus() )
                     m_pTreeView->GrabFocus();
 
-                nDone = 1L;
+                nDone = true;
             }
         }
     }
-    return nDone ? nDone : ODataView::PreNotify(rNEvt);
+    return nDone || ODataView::PreNotify(rNEvt);
 }
 
 DBG_NAME(BrowserViewStatusDisplay)
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 45340ecb014e..7426382ce785 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -119,7 +119,7 @@ namespace dbaui
         Window::Resize();
         resizeAll( Rectangle( Point( 0, 0), GetSizePixel() ) );
     }
-    long ODataView::PreNotify( NotifyEvent& _rNEvt )
+    bool ODataView::PreNotify( NotifyEvent& _rNEvt )
     {
         bool bHandled = false;
         switch ( _rNEvt.GetType() )
@@ -139,7 +139,7 @@ namespace dbaui
                 bHandled = m_rController.interceptUserInput( _rNEvt );
                 break;
         }
-        return bHandled ? 1L : Window::PreNotify( _rNEvt );
+        return bHandled || Window::PreNotify( _rNEvt );
     }
     void ODataView::StateChanged( StateChangedType nType )
     {
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index c10f70f8f807..26e6587bd19e 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -100,7 +100,7 @@ namespace dbaui
     protected:
         virtual void Resize();
 
-        virtual long PreNotify(NotifyEvent& rNEvt );
+        virtual bool PreNotify(NotifyEvent& rNEvt );
 
         virtual sal_Bool IsTabAllowed(sal_Bool bForward) const;
 
@@ -186,7 +186,7 @@ namespace dbaui
         SetColumnWidth(2, (nOutputWidth / 2));
     }
 
-    long ORelationControl::PreNotify(NotifyEvent& rNEvt)
+    bool ORelationControl::PreNotify(NotifyEvent& rNEvt)
     {
         DBG_CHKTHIS(ORelationControl,NULL);
         if (rNEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() )
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 27f3d7f450e4..5286eaddb3a1 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -148,7 +148,7 @@ void OTableGrantControl::Resize()
     EditBrowseBox::Resize();
 }
 
-long OTableGrantControl::PreNotify(NotifyEvent& rNEvt)
+bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt)
 {
     DBG_CHKTHIS(OTableGrantControl,NULL);
     if (rNEvt.GetType() == EVENT_LOSEFOCUS)
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 351c345e7d38..1936193485c2 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -550,7 +550,7 @@ DBG_NAME(OConnectionHelper)
            }
         return eExists;
     }
-    long OConnectionHelper::PreNotify( NotifyEvent& _rNEvt )
+    bool OConnectionHelper::PreNotify( NotifyEvent& _rNEvt )
     {
         if ( m_pCollection->isFileSystemBased(m_eType) )
         {
@@ -567,7 +567,7 @@ DBG_NAME(OConnectionHelper)
                     if (m_aConnectionURL.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus)
                     {   // a descendant of the URL edit field lost the focus
                         if (!commitURL())
-                            return 1L;  // handled
+                            return true;  // handled
                     }
                     break;
             }
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index 5d6f5e2f74f9..b770d46cb251 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -53,7 +53,7 @@ namespace dbaui
         // setting/retrieving the current connection URL
         // necessary because for some types, the URL must be decoded for display purposes
         ::dbaccess::ODsnTypeCollection* m_pCollection;  /// the DSN type collection instance
-        virtual long    PreNotify( NotifyEvent& _rNEvt );
+        virtual bool    PreNotify( NotifyEvent& _rNEvt );
 
         // <method>OGenericAdministrationPage::fillControls</method>
         virtual void    fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index e8da81c3bbd1..8d3a82f98b54 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -223,7 +223,7 @@ namespace dbaui
 
         /** @note used by AddTabDlg to see if more tables can be added */
         virtual sal_Bool IsAddAllowed();
-        virtual long PreNotify(NotifyEvent& rNEvt);
+        virtual bool PreNotify(NotifyEvent& rNEvt);
 
         // DnD stuff
         virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index e006fe8dea7b..e4341a0229e4 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -97,7 +97,7 @@ namespace dbaui
         virtual void Construct();
         virtual void initialize();
         // window overloads
-        virtual long PreNotify( NotifyEvent& rNEvt );
+        virtual bool PreNotify( NotifyEvent& rNEvt );
         virtual void GetFocus();
 
         sal_Bool isSlotEnabled(sal_Int32 _nSlotId);
diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx
index a9ad6778aa70..5371d3c5a73e 100644
--- a/dbaccess/source/ui/inc/RelationDesignView.hxx
+++ b/dbaccess/source/ui/inc/RelationDesignView.hxx
@@ -41,7 +41,7 @@ namespace dbaui
         virtual void initialize();
 
 
-        virtual long PreNotify( NotifyEvent& rNEvt );
+        virtual bool PreNotify( NotifyEvent& rNEvt );
         virtual void GetFocus();
     };
 }
diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx
index 635842b71521..d192fde38f49 100644
--- a/dbaccess/source/ui/inc/SqlNameEdit.hxx
+++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx
@@ -68,7 +68,7 @@ namespace dbaui
         }
 
         // Window overload
-        //  virtual long PreNotify( NotifyEvent& rNEvt );
+        //  virtual bool PreNotify( NotifyEvent& rNEvt );
         // Edit
         virtual void Modify();
     };
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index a54d2ddf7b6e..f691de93fc5d 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -45,7 +45,7 @@ namespace dbaui
         void SetHelpText( const OUString& rText );
         OUString GetHelpText() const { return m_sHelpText; }
 
-        virtual long PreNotify( NotifyEvent& rNEvt );
+        virtual bool PreNotify( NotifyEvent& rNEvt );
 
         // IClipboardTest
         virtual sal_Bool isCutAllowed();
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index bd98b672e7f8..c3dc7a94a517 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -79,7 +79,7 @@ namespace dbaui
         virtual ~OTableDesignView();
 
         // window overloads
-        virtual long            PreNotify( NotifyEvent& rNEvt );
+        virtual bool            PreNotify( NotifyEvent& rNEvt );
         virtual void            GetFocus();
 
         OTableEditorCtrl*       GetEditorCtrl() const { return m_pWin ? m_pWin->GetEditorCtrl() : NULL; }
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index ccf4a77d4ca3..6e360cbf01df 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -82,7 +82,7 @@ public:
 protected:
     virtual void Resize();
 
-    virtual long PreNotify(NotifyEvent& rNEvt );
+    virtual bool PreNotify(NotifyEvent& rNEvt );
 
     virtual sal_Bool IsTabAllowed(sal_Bool bForward) const;
     virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol );
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index d822cf9df9cd..855d5a604aad 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -176,7 +176,7 @@ namespace dbaui
         // window override
         virtual void                StateChanged( StateChangedType nStateChange );
         virtual void                GetFocus();
-        virtual long                PreNotify( NotifyEvent& rNEvt );
+        virtual bool                PreNotify( NotifyEvent& rNEvt );
         virtual void                Command(const CommandEvent& rEvt);
 
         // Accessibility
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index a4425e33d3cb..8d0cf2fc5c93 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -69,7 +69,7 @@ namespace dbaui
         virtual void NotifyScrolled();
         virtual void NotifyEndScroll();
 
-        virtual long PreNotify(NotifyEvent& rNEvt);
+        virtual bool PreNotify(NotifyEvent& rNEvt);
 
         virtual void dragFinished( );
 
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index d4aaf989988b..b7f66d0df886 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -67,7 +67,7 @@ namespace dbaui
                                                 sal_uInt16 _nPos,
                                                 sal_Bool _bSet=sal_False);
     protected:
-        virtual long            PreNotify( NotifyEvent& rNEvt );
+        virtual bool            PreNotify( NotifyEvent& rNEvt );
     public:
         OWizTypeSelectList( Window* pParent, WinBits nStyle = WB_BORDER ) : MultiListBox(pParent,nStyle) {};
         OWizTypeSelectList( Window* pParent, const ResId& rResId ) : MultiListBox(pParent,rResId) {};
diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx
index b0f54cb41942..801dca595c12 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -81,7 +81,7 @@ namespace dbaui
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >     getContainer() { return m_xMe; }
 
     protected:
-        virtual long PreNotify( NotifyEvent& rNEvt );
+        virtual bool PreNotify( NotifyEvent& rNEvt );
         virtual void GetFocus();
         virtual void resizeDocumentView(Rectangle& rRect);
         virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource );
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index 45f5feeed90c..fdc57d450922 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -53,7 +53,7 @@ namespace dbaui
 
         virtual void Construct();
 
-        virtual long        PreNotify( NotifyEvent& rNEvt );
+        virtual bool        PreNotify( NotifyEvent& rNEvt );
 
         // show the beamer
         void    showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame);
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index af4fca058e72..b1c3c970f645 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -387,16 +387,16 @@ void OWizTypeSelectList::setPrimaryKey(OFieldDescription* _pFieldDescr,sal_uInt1
     SetEntryData(_nPos,_pFieldDescr);
 }
 
-long OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
+bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
 {
-    long nDone = 0;
+    bool nDone = false;
     switch( rEvt.GetType() )
     {
         case EVENT_MOUSEBUTTONDOWN:
         {
             const MouseEvent* pMEvt = rEvt.GetMouseEvent();
             if(pMEvt->IsRight() && !pMEvt->GetModifier())
-                nDone = 1;
+                nDone = true;
         }
             break;
         case EVENT_COMMAND:
@@ -436,11 +436,11 @@ long OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
                 }
                 break;
             }
-            nDone = 1;
+            nDone = true;
         }
         break;
     }
-    return nDone ? nDone : MultiListBox::PreNotify(rEvt);
+    return nDone || MultiListBox::PreNotify(rEvt);
 }
 
 void OWizTypeSelect::fillColumnList(sal_uInt32 nRows)
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 0d412d3b092e..0d804f53e01c 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1269,7 +1269,7 @@ OTableConnection* OJoinTableView::GetTabConn(const OTableWindow* pLhs,const OTab
     return pConn;
 }
 
-long OJoinTableView::PreNotify(NotifyEvent& rNEvt)
+bool OJoinTableView::PreNotify(NotifyEvent& rNEvt)
 {
     sal_Bool bHandled = sal_False;
     switch (rNEvt.GetType())
@@ -1460,7 +1460,7 @@ long OJoinTableView::PreNotify(NotifyEvent& rNEvt)
 
     if (!bHandled)
         return Window::PreNotify(rNEvt);
-    return 1L;
+    return true;
 }
 
 void OJoinTableView::GrabTabWinFocus()
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index fad78e1b76d1..80d6b1f3bd21 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2778,7 +2778,7 @@ void OQueryDesignView::fillValidFields(const OUString& sAliasName, ComboBox* pFi
     }
 }
 
-long OQueryDesignView::PreNotify(NotifyEvent& rNEvt)
+bool OQueryDesignView::PreNotify(NotifyEvent& rNEvt)
 {
     switch (rNEvt.GetType())
     {
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 6b734e8b6ee7..beedbae5e4c0 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -607,7 +607,7 @@ void OTableWindow::Command(const CommandEvent& rEvt)
     }
 }
 
-long OTableWindow::PreNotify(NotifyEvent& rNEvt)
+bool OTableWindow::PreNotify(NotifyEvent& rNEvt)
 {
     sal_Bool bHandled = sal_False;
     switch (rNEvt.GetType())
@@ -737,7 +737,7 @@ long OTableWindow::PreNotify(NotifyEvent& rNEvt)
     }
     if (!bHandled)
         return Window::PreNotify(rNEvt);
-    return 1L;
+    return true;
 }
 
 OUString OTableWindow::getTitle() const
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index 9c587855124c..746947dbcaa9 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -130,7 +130,7 @@ void OTableWindowListBox::NotifyEndScroll()
     m_bReallyScrolled = sal_False;
 }
 
-long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
+bool OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
 {
     sal_Bool bHandled = sal_False;
     switch (rNEvt.GetType())
@@ -159,7 +159,7 @@ long OTableWindowListBox::PreNotify(NotifyEvent& rNEvt)
 
     if (!bHandled)
         return SvTreeListBox::PreNotify(rNEvt);
-    return 1L;
+    return true;
 }
 
 IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ )
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 8cc0b6e8470a..79abb14feef1 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -156,7 +156,7 @@ namespace dbaui
             Resize();
         }
     }
-    long OQueryContainerWindow::PreNotify( NotifyEvent& rNEvt )
+    bool OQueryContainerWindow::PreNotify( NotifyEvent& rNEvt )
     {
         sal_Bool bHandled = sal_False;
         switch (rNEvt.GetType())
@@ -170,7 +170,7 @@ namespace dbaui
                     rController.InvalidateFeature(SID_PASTE);
                 }
         }
-        return bHandled ? 1L : ODataView::PreNotify(rNEvt);
+        return bHandled || ODataView::PreNotify(rNEvt);
     }
     void OQueryContainerWindow::showPreview(const Reference<XFrame>& _xFrame)
     {
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 9f72313c1a98..b97fe50eb370 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -71,15 +71,15 @@ void ORelationDesignView::initialize()
     OJoinDesignView::initialize();
 }
 
-long ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
+bool ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
 {
-    long nDone = 0L;
+    bool nDone = false;
     if(rNEvt.GetType() == EVENT_GETFOCUS)
     {
         if(!m_pTableView->HasChildPathFocus())
         {
             m_pTableView->GrabTabWinFocus();
-            nDone = 1L;
+            nDone = true;
         }
     }
     if(!nDone)
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 820ba0f279d0..664d4c9dc92e 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1745,7 +1745,7 @@ void OTableEditorCtrl::DeactivateCell(sal_Bool bUpdate)
         pDescrWin->SetReadOnly(bReadOnly || !SetDataPtr(nRow) || GetActRow()->IsReadOnly());
 }
 
-long OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt )
+bool OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt )
 {
     if (rNEvt.GetType() == EVENT_GETFOCUS)
     {
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 34d696645593..02c4c1d66518 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -165,7 +165,7 @@ namespace dbaui
         OFieldDescription* GetFieldDescr( long nRow );
 
         // window overloads
-        virtual long PreNotify( NotifyEvent& rNEvt );
+        virtual bool PreNotify( NotifyEvent& rNEvt );
 
         // IClipboardTest
         virtual sal_Bool isCutAllowed() { return IsCutAllowed(); }
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index ebc9f39139e4..e2681b021ba3 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -66,7 +66,7 @@ void OTableDesignHelpBar::Resize()
 
 }
 
-long OTableDesignHelpBar::PreNotify( NotifyEvent& rNEvt )
+bool OTableDesignHelpBar::PreNotify( NotifyEvent& rNEvt )
 {
     if (rNEvt.GetType() == EVENT_LOSEFOCUS)
         SetHelpText(OUString());
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 29c8c5554b67..c459c7615035 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -229,7 +229,7 @@ void OTableDesignView::resizeDocumentView(Rectangle& _rPlayground)
     _rPlayground.SetSize( Size( 0, 0 ) );
 }
 
-long OTableDesignView::PreNotify( NotifyEvent& rNEvt )
+bool OTableDesignView::PreNotify( NotifyEvent& rNEvt )
 {
     sal_Bool bHandled = sal_False;
     switch(rNEvt.GetType())
@@ -244,7 +244,7 @@ long OTableDesignView::PreNotify( NotifyEvent& rNEvt )
             break;
     }
 
-    return bHandled ? 1L : ODataView::PreNotify(rNEvt);
+    return bHandled || ODataView::PreNotify(rNEvt);
 }
 
 IClipboardTest* OTableDesignView::getActiveChild() const
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index e3b9bfb245ef..fd6633619786 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -276,7 +276,7 @@ void OTableFieldDescWin::LoseFocus()
         getGenPage()->LoseFocus();
 }
 
-long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
+bool OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
 {
     sal_Bool bHandled = sal_False;
     switch(rNEvt.GetType())
@@ -289,7 +289,7 @@ long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt )
             break;
     }
 
-    return bHandled ? 1L : TabPage::PreNotify(rNEvt);
+    return bHandled || TabPage::PreNotify(rNEvt);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index 94223eab9e10..8f5eca58ebef 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -63,7 +63,7 @@ namespace dbaui
         void SetReadOnly( sal_Bool bReadOnly );
 
         // window overloads
-        virtual long PreNotify( NotifyEvent& rNEvt );
+        virtual bool PreNotify( NotifyEvent& rNEvt );
         virtual void GetFocus();
         virtual void LoseFocus();