Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code

Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274

16 files changed, 88 insertions, 88 deletions

diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 312750b5c09f..a6324ffd7ceb 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -88,12 +88,12 @@ public:
 
     // IAddTableDialogContext
     virtual css::uno::Reference< css::sdbc::XConnection >
-                    getConnection() const SAL_OVERRIDE;
-    virtual bool    allowViews() const SAL_OVERRIDE;
-    virtual bool    allowQueries() const SAL_OVERRIDE;
-    virtual bool    allowAddition() const SAL_OVERRIDE;
-    virtual void    addTableWindow( const OUString& _rQualifiedTableName, const OUString& _rAliasName ) SAL_OVERRIDE;
-    virtual void    onWindowClosing( const vcl::Window* _pWindow ) SAL_OVERRIDE;
+                    getConnection() const override;
+    virtual bool    allowViews() const override;
+    virtual bool    allowQueries() const override;
+    virtual bool    allowAddition() const override;
+    virtual void    addTableWindow( const OUString& _rQualifiedTableName, const OUString& _rAliasName ) override;
+    virtual void    onWindowClosing( const vcl::Window* _pWindow ) override;
 
 private:
     OJoinTableView* getTableView() const;
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index 9561f1dfd36e..a40ca30dd8bc 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -38,7 +38,7 @@ namespace dbaui
 
     protected:
         // for creation and duplication of lines of own type
-        virtual OConnectionLineDataRef CreateLineDataObj() SAL_OVERRIDE;
+        virtual OConnectionLineDataRef CreateLineDataObj() override;
 
         OQueryTableConnectionData& operator=( const OQueryTableConnectionData& rConnData );
     public:
@@ -48,15 +48,15 @@ namespace dbaui
             const OUString& rConnName=OUString());
         virtual ~OQueryTableConnectionData();
 
-        virtual void CopyFrom(const OTableConnectionData& rSource) SAL_OVERRIDE;
-        virtual OTableConnectionData* NewInstance() const SAL_OVERRIDE;
+        virtual void CopyFrom(const OTableConnectionData& rSource) override;
+        virtual OTableConnectionData* NewInstance() const override;
 
 
         /** Update create a new connection
 
             @return true if successful
         */
-        virtual bool Update() SAL_OVERRIDE;
+        virtual bool Update() override;
 
         OUString GetAliasName(EConnectionSide nWhich) const;
 
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx
index fd30978d2af2..ae895710f8f7 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx
@@ -43,24 +43,24 @@ namespace dbaui
         }
 
         // late Constructor, the base class CREATES Listbox on first call
-        virtual bool         Init() SAL_OVERRIDE;
+        virtual bool         Init() override;
 
         bool                 ExistsField(const OUString& strFieldName, OTableFieldDescRef& rInfo);
         bool                 ExistsAVisitedConn() const;
 
-        virtual OUString     GetName() const SAL_OVERRIDE { return GetWinName(); }
+        virtual OUString     GetName() const override { return GetWinName(); }
 
     protected:
-        virtual void    KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE;
+        virtual void    KeyInput( const KeyEvent& rEvt ) override;
 
-        virtual void    OnEntryDoubleClicked(SvTreeListEntry* pEntry) SAL_OVERRIDE;
+        virtual void    OnEntryDoubleClicked(SvTreeListEntry* pEntry) override;
             // is called from DoubleClickHdl of the ListBox
         /** delete the user data with the equal type as created within createUserData
             @param  _pUserData
                 The user data store in the listbox entries. Created with a call to createUserData.
                 _pUserData may be <NULL/>.
         */
-        virtual void deleteUserData(void*& _pUserData) SAL_OVERRIDE;
+        virtual void deleteUserData(void*& _pUserData) override;
 
         /** creates user information that will be append at the ListBoxentry
             @param  _xColumn
@@ -72,7 +72,7 @@ namespace dbaui
         */
         virtual void* createUserData(const css::uno::Reference<
                                     css::beans::XPropertySet>& _xColumn,
-                                    bool _bPrimaryKey) SAL_OVERRIDE;
+                                    bool _bPrimaryKey) override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOW_HXX
diff --git a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx
index 0c0db3f649b1..e5fac04e8a51 100644
--- a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx
+++ b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx
@@ -31,8 +31,8 @@ namespace dbaui
     public:
         explicit OQueryAddTabConnUndoAction(OQueryTableView* pOwner);
 
-        virtual void Undo() SAL_OVERRIDE;
-        virtual void Redo() SAL_OVERRIDE;
+        virtual void Undo() override;
+        virtual void Redo() override;
     };
 
     // OQueryDelTabConnUndoAction - Undo-Klasse fuer Einfuegen einer Connection
@@ -42,8 +42,8 @@ namespace dbaui
     public:
         explicit OQueryDelTabConnUndoAction(OQueryTableView* pOwner);
 
-        virtual void Undo() SAL_OVERRIDE;
-        virtual void Redo() SAL_OVERRIDE;
+        virtual void Undo() override;
+        virtual void Redo() override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYADDTABCONNUNDOACTION_HXX
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index b9a9f4a60463..cbd54cc5d2e6 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
@@ -33,8 +33,8 @@ namespace dbaui
         VclPtr<OSelectionBrowseBox>    pOwner;
         sal_uInt16                  m_nColumnPostion;
 
-        virtual void    Undo() SAL_OVERRIDE = 0;
-        virtual void    Redo() SAL_OVERRIDE = 0;
+        virtual void    Undo() override = 0;
+        virtual void    Redo() override = 0;
 
     public:
         OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, sal_uInt16 nCommentID);
@@ -64,8 +64,8 @@ namespace dbaui
         void SetCellContents(const OUString& str)  { m_strNextCellContents = str; }
         void SetCellIndex(sal_Int32 nIndex)      { m_nCellIndex = nIndex; }
 
-        virtual void Undo() SAL_OVERRIDE;
-        virtual void Redo() SAL_OVERRIDE { Undo(); }
+        virtual void Undo() override;
+        virtual void Redo() override { Undo(); }
     };
 
     // OTabFieldSizedUndoAct - undo class to change the column width
@@ -80,8 +80,8 @@ namespace dbaui
 
         inline void SetOriginalWidth(long nWidth) { m_nNextWidth = nWidth; }
 
-        virtual void Undo() SAL_OVERRIDE;
-        virtual void Redo() SAL_OVERRIDE { Undo(); }
+        virtual void Undo() override;
+        virtual void Redo() override { Undo(); }
     };
 
     // OTabFieldUndoAct - base class for undos in the fieldlist of a query design, which are used to change complete field descriptions
@@ -102,8 +102,8 @@ namespace dbaui
     class OTabFieldDelUndoAct : public OTabFieldUndoAct
     {
     protected:
-        virtual void Undo() SAL_OVERRIDE { pOwner->EnterUndoMode();pOwner->InsertColumn(pDescr, m_nColumnPostion);pOwner->LeaveUndoMode(); }
-        virtual void Redo() SAL_OVERRIDE { pOwner->EnterUndoMode();pOwner->RemoveColumn(pDescr->GetColumnId());pOwner->LeaveUndoMode(); }
+        virtual void Undo() override { pOwner->EnterUndoMode();pOwner->InsertColumn(pDescr, m_nColumnPostion);pOwner->LeaveUndoMode(); }
+        virtual void Redo() override { pOwner->EnterUndoMode();pOwner->RemoveColumn(pDescr->GetColumnId());pOwner->LeaveUndoMode(); }
 
     public:
         explicit OTabFieldDelUndoAct(OSelectionBrowseBox* pSelBrwBox) : OTabFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_TABFIELDDELETE) { }
@@ -115,8 +115,8 @@ namespace dbaui
     class OTabFieldCreateUndoAct : public OTabFieldUndoAct
     {
     protected:
-        virtual void Undo() SAL_OVERRIDE { pOwner->EnterUndoMode();pOwner->RemoveColumn(pDescr->GetColumnId());pOwner->LeaveUndoMode();}
-        virtual void Redo() SAL_OVERRIDE { pOwner->EnterUndoMode();pOwner->InsertColumn(pDescr, m_nColumnPostion);pOwner->LeaveUndoMode();}
+        virtual void Undo() override { pOwner->EnterUndoMode();pOwner->RemoveColumn(pDescr->GetColumnId());pOwner->LeaveUndoMode();}
+        virtual void Redo() override { pOwner->EnterUndoMode();pOwner->InsertColumn(pDescr, m_nColumnPostion);pOwner->LeaveUndoMode();}
 
     public:
         explicit OTabFieldCreateUndoAct(OSelectionBrowseBox* pSelBrwBox) : OTabFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_TABFIELDCREATE) { }
@@ -127,8 +127,8 @@ namespace dbaui
     class OTabFieldMovedUndoAct : public OTabFieldUndoAct
     {
     protected:
-        virtual void Undo() SAL_OVERRIDE;
-        virtual void Redo() SAL_OVERRIDE
+        virtual void Undo() override;
+        virtual void Redo() override
         {
             Undo();
         }
diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
index b8c9f52ad0c1..d8f027a37c65 100644
--- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
@@ -39,8 +39,8 @@ namespace dbaui
     public:
         OJoinMoveTabWinUndoAct(OJoinTableView* pOwner, const Point& ptOriginalPosition, OTableWindow* pTabWin);
 
-        virtual void    Undo() SAL_OVERRIDE { TogglePosition(); }
-        virtual void    Redo() SAL_OVERRIDE { TogglePosition(); }
+        virtual void    Undo() override { TogglePosition(); }
+        virtual void    Redo() override { TogglePosition(); }
     };
 
     inline OJoinMoveTabWinUndoAct::OJoinMoveTabWinUndoAct(OJoinTableView* pOwner, const Point& ptOriginalPosition, OTableWindow* pTabWin)
diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
index f30b54423cb3..7cc039a01343 100644
--- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
@@ -42,8 +42,8 @@ namespace dbaui
         // here returns physical and not logical coordinates
         // (in contrary to QueryMoveTabWinUndoAct)
 
-        virtual void    Undo() SAL_OVERRIDE { ToggleSizePosition(); }
-        virtual void    Redo() SAL_OVERRIDE { ToggleSizePosition(); }
+        virtual void    Undo() override { ToggleSizePosition(); }
+        virtual void    Redo() override { ToggleSizePosition(); }
     };
 
     inline OJoinSizeTabWinUndoAct::OJoinSizeTabWinUndoAct(OJoinTableView* pOwner, const Point& ptOriginalPos, const Size& szOriginalSize, OTableWindow* pTabWin)
diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx
index 6541a4ed5b42..8aa978482c7e 100644
--- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx
@@ -36,8 +36,8 @@ namespace dbaui
         OQueryTabConnUndoAction(OQueryTableView* pOwner, sal_uInt16 nCommentID);
         virtual ~OQueryTabConnUndoAction();
 
-        virtual void Undo() SAL_OVERRIDE = 0;
-        virtual void Redo() SAL_OVERRIDE = 0;
+        virtual void Undo() override = 0;
+        virtual void Redo() override = 0;
 
         void SetConnection(OQueryTableConnection* pConn) { m_pConnection = pConn; }
         // now SetOwnership please
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx
index 83dd52b3f2a5..85b8a39d514c 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx
@@ -32,8 +32,8 @@ namespace dbaui
         explicit OQueryTabWinShowUndoAct(OQueryTableView* pOwner);
         virtual ~OQueryTabWinShowUndoAct();
 
-        virtual void    Undo() SAL_OVERRIDE;
-        virtual void    Redo() SAL_OVERRIDE;
+        virtual void    Undo() override;
+        virtual void    Redo() override;
     };
 
     // OQueryTabWinDelUndoAct - undo class to delete a TabWins
@@ -44,8 +44,8 @@ namespace dbaui
         explicit OQueryTabWinDelUndoAct(OQueryTableView* pOwner);
         virtual ~OQueryTabWinDelUndoAct();
 
-        virtual void    Undo() SAL_OVERRIDE;
-        virtual void    Redo() SAL_OVERRIDE;
+        virtual void    Undo() override;
+        virtual void    Redo() override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABWINSHOWUNDOACT_HXX
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
index aea22ac3dec8..1b67e46af85d 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
@@ -44,8 +44,8 @@ namespace dbaui
 
         void SetOwnership(bool bTakeIt) { m_bOwnerOfObjects = bTakeIt; }
 
-        virtual void Undo() SAL_OVERRIDE = 0;
-        virtual void Redo() SAL_OVERRIDE = 0;
+        virtual void Undo() override = 0;
+        virtual void Redo() override = 0;
 
         // access to the TabWin
         void SetTabWin(OQueryTableWindow* pTW) { m_pTabWin = pTW; }
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index a6240cbe6b71..205cc8615818 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -247,11 +247,11 @@ namespace
     {
         VclPtr<OSelectionBrowseBox> m_pBrowseBox;
     protected:
-        virtual void Select() SAL_OVERRIDE;
+        virtual void Select() override;
     public:
         explicit OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent);
         virtual ~OSelectionBrwBoxHeader() { disposeOnce(); }
-        virtual void dispose() SAL_OVERRIDE { m_pBrowseBox.clear(); ::svt::EditBrowserHeader::dispose(); }
+        virtual void dispose() override { m_pBrowseBox.clear(); ::svt::EditBrowserHeader::dispose(); }
     };
     OSelectionBrwBoxHeader::OSelectionBrwBoxHeader(OSelectionBrowseBox* pParent)
         : ::svt::EditBrowserHeader(pParent,WB_BUTTONSTYLE|WB_DRAG)
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index fe825dcb4213..64711312a660 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -81,7 +81,7 @@ namespace dbaui
     public:
         explicit OSelectionBrowseBox( vcl::Window* pParent );
                                     virtual ~OSelectionBrowseBox();
-        virtual void                dispose() SAL_OVERRIDE;
+        virtual void                dispose() override;
 
         void                        initialize();
         OTableFieldDescRef          InsertField( const OJoinExchangeData& jxdSource, sal_uInt16 _nColumnPosition = BROWSER_INVALIDID, bool bVis=true, bool bActivate=true );
@@ -131,9 +131,9 @@ namespace dbaui
         void                        paste();
         void                        copy();
 
-        virtual void                GetFocus() SAL_OVERRIDE;
-        virtual void                DeactivateCell(bool bUpdate = true) SAL_OVERRIDE;
-        virtual void                ColumnMoved( sal_uInt16 nColId ) SAL_OVERRIDE { ColumnMoved(nColId,true); }
+        virtual void                GetFocus() override;
+        virtual void                DeactivateCell(bool bUpdate = true) override;
+        virtual void                ColumnMoved( sal_uInt16 nColId ) override { ColumnMoved(nColId,true); }
         void                        ColumnMoved( sal_uInt16 nColId, bool _bCreateUndo);
 
         void                        Fill();
@@ -154,7 +154,7 @@ namespace dbaui
             @return
                 the text out of the cell
         */
-        virtual OUString            GetCellText(long _nRow, sal_uInt16 _nColId) const SAL_OVERRIDE;
+        virtual OUString            GetCellText(long _nRow, sal_uInt16 _nColId) const override;
 
         /** returns the description of the row.
             @param  _nRow
@@ -162,7 +162,7 @@ namespace dbaui
             @return
                 The header text of the specified row.
         */
-        virtual OUString     GetRowDescription( sal_Int32 _nRow ) const SAL_OVERRIDE;
+        virtual OUString     GetRowDescription( sal_Int32 _nRow ) const override;
 
         /** return the name of the specified object.
             @param  eObjType
@@ -172,41 +172,41 @@ namespace dbaui
             @return
                 The name of the specified object.
         */
-        virtual OUString     GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const SAL_OVERRIDE;
+        virtual OUString     GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const override;
 
         // IAccessibleTableProvider
         /** Creates the accessible object of a data table cell.
         @param nRow  The row index of the cell.
         @param nColumnId  The column ID of the cell.
         @return  The XAccessible interface of the specified cell. */
-        virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) SAL_OVERRIDE;
+        virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) override;
 
     protected:
-        virtual bool                SeekRow( long nRow ) SAL_OVERRIDE;
+        virtual bool                SeekRow( long nRow ) override;
 
-        virtual void                PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const SAL_OVERRIDE;
+        virtual void                PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const override;
         virtual void                PaintCell(OutputDevice& rDev, const Rectangle& rRect,
-                                              sal_uInt16 nColumnId ) const SAL_OVERRIDE;
+                                              sal_uInt16 nColumnId ) const override;
 
-        virtual sal_Int8            AcceptDrop( const BrowserAcceptDropEvent& rEvt ) SAL_OVERRIDE;
-        virtual sal_Int8            ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) SAL_OVERRIDE;
-        virtual void                MouseButtonDown( const BrowserMouseEvent& rEvt ) SAL_OVERRIDE;
-        virtual void                MouseButtonUp( const BrowserMouseEvent& rEvt ) SAL_OVERRIDE;
-        virtual void                KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE;
-        virtual void                Command(const CommandEvent& rEvt) SAL_OVERRIDE;
-        virtual void                ArrangeControls(sal_uInt16& nX, sal_uInt16 nY) SAL_OVERRIDE;
+        virtual sal_Int8            AcceptDrop( const BrowserAcceptDropEvent& rEvt ) override;
+        virtual sal_Int8            ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) override;
+        virtual void                MouseButtonDown( const BrowserMouseEvent& rEvt ) override;
+        virtual void                MouseButtonUp( const BrowserMouseEvent& rEvt ) override;
+        virtual void                KeyInput( const KeyEvent& rEvt ) override;
+        virtual void                Command(const CommandEvent& rEvt) override;
+        virtual void                ArrangeControls(sal_uInt16& nX, sal_uInt16 nY) override;
 
-        virtual ::svt::CellController*  GetController(long nRow, sal_uInt16 nCol) SAL_OVERRIDE;
-        virtual void                InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) SAL_OVERRIDE;
-        virtual void                CellModified() SAL_OVERRIDE;
-        virtual bool                SaveModified() SAL_OVERRIDE;
-        virtual void                Init() SAL_OVERRIDE;
-        virtual void                ColumnResized( sal_uInt16 nColId ) SAL_OVERRIDE;
+        virtual ::svt::CellController*  GetController(long nRow, sal_uInt16 nCol) override;
+        virtual void                InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) override;
+        virtual void                CellModified() override;
+        virtual bool                SaveModified() override;
+        virtual void                Init() override;
+        virtual void                ColumnResized( sal_uInt16 nColId ) override;
 
-        virtual sal_uInt32          GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE;
+        virtual sal_uInt32          GetTotalCellWidth(long nRow, sal_uInt16 nColId) override;
 
         // if you want to have an own header ...
-        virtual VclPtr<BrowserHeader> imp_CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE;
+        virtual VclPtr<BrowserHeader> imp_CreateHeaderBar(BrowseBox* pParent) override;
 
         void                        stopTimer();
         void                        startTimer();
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index decbd5d64587..505f2e91a42f 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -35,7 +35,7 @@ class LimitBoxImpl: public LimitBox
     public:
         LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl );
 
-        virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+        virtual bool Notify( NotifyEvent& rNEvt ) override;
 
     private:
         LimitBoxController* m_pControl;
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
index 1866a423fcd5..5a2ad947c08a 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
@@ -36,25 +36,25 @@ class LimitBoxController: public svt::ToolboxController,
         virtual ~LimitBoxController();
 
         /// XInterface
-        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual void SAL_CALL acquire() throw () SAL_OVERRIDE;
-        virtual void SAL_CALL release() throw () SAL_OVERRIDE;
+        virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL acquire() throw () override;
+        virtual void SAL_CALL release() throw () override;
 
         /// XServiceInfo
         DECLARE_SERVICE_INFO_STATIC();
 
         /// XComponent
-        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
 
         /// XStatusListener
-        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+        virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
 
         /// XToolbarController
-        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+        virtual void SAL_CALL execute( sal_Int16 KeyModifier ) throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL click() throw (css::uno::RuntimeException, std::exception) override;
+        virtual void SAL_CALL doubleClick() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createPopupWindow() throw (css::uno::RuntimeException, std::exception) override;
+        virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override;
 
         void dispatchCommand( const css::uno::Sequence< css::beans::PropertyValue >& rArgs );
         using svt::ToolboxController::dispatchCommand;
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 7cca1a54d88b..42b7de87c5f4 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -100,11 +100,11 @@ namespace dbaui
 
     class OViewController : public OQueryController
     {
-        virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) SAL_OVERRIDE
+        virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override
         {
             return getImplementationName_Static();
         }
-        virtual Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE
+        virtual Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override
         {
             return getSupportedServiceNames_Static();
         }
diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx
index b69b7b9e0e3a..9b804323e7f8 100644
--- a/dbaccess/source/ui/querydesign/querydlg.hxx
+++ b/dbaccess/source/ui/querydesign/querydlg.hxx
@@ -69,18 +69,18 @@ namespace dbaui
                     const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
                     bool _bAllowTableSelect);
         virtual ~DlgQryJoin();
-        virtual void dispose() SAL_OVERRIDE;
+        virtual void dispose() override;
         EJoinType GetJoinType() const { return eJoinType; };
 
         /** setValid set the valid inside, can be used for OK buttons
             @param  _bValid true when the using control allows an update
         */
-        virtual void setValid(bool _bValid) SAL_OVERRIDE;
+        virtual void setValid(bool _bValid) override;
 
         /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists
             @param  _pConnectionData    the connection which exists between the new tables
         */
-        virtual void notifyConnectionChange() SAL_OVERRIDE;
+        virtual void notifyConnectionChange() override;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDLG_HXX