Second batch of adding SAL_OVERRIDE to overriding function declarations

...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.

Change-Id: Ie656f9d653fc716f72ac175925272696d509038f

5 files changed, 86 insertions, 86 deletions

diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
index 40f8e071d543..39aba8759f74 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
@@ -34,14 +34,14 @@ namespace dbaui
 
         OTableFieldControl  *m_pFieldControl;
     protected:
-        virtual void Resize();
+        virtual void Resize() SAL_OVERRIDE;
 
     public:
         OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelpBar );
         virtual ~OFieldDescGenWin();
 
-        virtual void GetFocus();
-        virtual void LoseFocus();
+        virtual void GetFocus() SAL_OVERRIDE;
+        virtual void LoseFocus() SAL_OVERRIDE;
         virtual void Init();
 
         void DisplayData( OFieldDescription* pFieldDescr );
@@ -59,14 +59,14 @@ namespace dbaui
         OUString BoolStringUI(const OUString& rPersistentString) const;
 
         // IClipboardTest
-        virtual sal_Bool isCutAllowed();
-        virtual sal_Bool isCopyAllowed();
-        virtual sal_Bool isPasteAllowed();
-        virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); }
+        virtual sal_Bool isCutAllowed() SAL_OVERRIDE;
+        virtual sal_Bool isCopyAllowed() SAL_OVERRIDE;
+        virtual sal_Bool isPasteAllowed() SAL_OVERRIDE;
+        virtual sal_Bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); }
 
-        virtual void copy();
-        virtual void cut();
-        virtual void paste();
+        virtual void copy() SAL_OVERRIDE;
+        virtual void cut() SAL_OVERRIDE;
+        virtual void paste() SAL_OVERRIDE;
 
         inline OTableFieldControl*  getFieldControl() const { return m_pFieldControl; }
     };
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 0b6ca5856a83..b777608ef103 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -87,33 +87,33 @@ namespace dbaui
         ClipboardInvalidator m_aInvalidate;
 
     protected:
-        virtual void Command( const CommandEvent& rEvt );
-        virtual bool SeekRow(long nRow);
+        virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE;
+        virtual bool SeekRow(long nRow) SAL_OVERRIDE;
         virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect,
-                               sal_uInt16 nColumnId ) const;
+                               sal_uInt16 nColumnId ) const SAL_OVERRIDE;
 
-        virtual void CursorMoved();
-        virtual RowStatus GetRowStatus(long nRow) const;
+        virtual void CursorMoved() SAL_OVERRIDE;
+        virtual RowStatus GetRowStatus(long nRow) const SAL_OVERRIDE;
 
-        virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol);
-        virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol);
+        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();
-        virtual bool SaveModified(); // is called before changing a cell (false prevents change)
+        virtual void CellModified() SAL_OVERRIDE;
+        virtual bool SaveModified() SAL_OVERRIDE; // is called before changing a cell (false prevents change)
 
         virtual void Undo();
         virtual void Redo();
-        virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const;
-        virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId);
+        virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const SAL_OVERRIDE;
+        virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE;
 
-        virtual void CopyRows();
-        virtual void InsertRows( long nRow );
-        virtual void DeleteRows();
-        virtual void InsertNewRows( long nRow );
+        virtual void CopyRows() SAL_OVERRIDE;
+        virtual void InsertRows( long nRow ) SAL_OVERRIDE;
+        virtual void DeleteRows() SAL_OVERRIDE;
+        virtual void InsertNewRows( long nRow ) SAL_OVERRIDE;
 
-        virtual sal_Bool IsPrimaryKeyAllowed( long nRow );
-        virtual sal_Bool IsInsertNewAllowed( long nRow );
-        virtual sal_Bool IsDeleteAllowed( long nRow );
+        virtual sal_Bool IsPrimaryKeyAllowed( long nRow ) SAL_OVERRIDE;
+        virtual sal_Bool IsInsertNewAllowed( long nRow ) SAL_OVERRIDE;
+        virtual sal_Bool IsDeleteAllowed( long nRow ) SAL_OVERRIDE;
 
         void ClearModified();
 
@@ -125,7 +125,7 @@ namespace dbaui
     public:
         OTableEditorCtrl(Window* pParentWin);
         virtual ~OTableEditorCtrl();
-        virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol);
+        virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) SAL_OVERRIDE;
         virtual void UpdateAll();
         SfxUndoManager& GetUndoManager() const;
 
@@ -141,13 +141,13 @@ namespace dbaui
         /// force displaying of the given row
         void DisplayData( long nRow, sal_Bool bGrabFocus = sal_True );
 
-        virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo );
-        virtual void SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rSaveData );
-        virtual ::com::sun::star::uno::Any  GetCellData( long nRow, sal_uInt16 nColId );
-        virtual void SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText );
-        virtual OUString GetControlText( long nRow, sal_uInt16 nColId );
+        virtual void SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) SAL_OVERRIDE;
+        virtual void SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rSaveData ) SAL_OVERRIDE;
+        virtual ::com::sun::star::uno::Any  GetCellData( long nRow, sal_uInt16 nColId ) SAL_OVERRIDE;
+        virtual void SetControlText( long nRow, sal_uInt16 nColId, const OUString& rText ) SAL_OVERRIDE;
+        virtual OUString GetControlText( long nRow, sal_uInt16 nColId ) SAL_OVERRIDE;
 
-        virtual OTableDesignView* GetView() const;
+        virtual OTableDesignView* GetView() const SAL_OVERRIDE;
 
         ::std::vector< ::boost::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; }
 
@@ -155,8 +155,8 @@ namespace dbaui
         void CellModified( long nRow, sal_uInt16 nColId );
         void SetReadOnly( sal_Bool bRead=sal_True );
 
-        virtual void Init();
-        virtual void DeactivateCell(bool bUpdate = true);
+        virtual void Init() SAL_OVERRIDE;
+        virtual void DeactivateCell(bool bUpdate = true) SAL_OVERRIDE;
 
         sal_Bool IsCutAllowed( long nRow = -1 );
         sal_Bool IsCopyAllowed( long nRow = -1 );
@@ -165,17 +165,17 @@ namespace dbaui
         OFieldDescription* GetFieldDescr( long nRow );
 
         // window overloads
-        virtual bool PreNotify( NotifyEvent& rNEvt );
+        virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
         // IClipboardTest
-        virtual sal_Bool isCutAllowed() { return IsCutAllowed(); }
-        virtual sal_Bool isCopyAllowed() { return IsCopyAllowed(); }
-        virtual sal_Bool isPasteAllowed() { return IsPasteAllowed(); }
-        virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); }
-
-        virtual void cut();
-        virtual void copy();
-        virtual void paste();
+        virtual sal_Bool isCutAllowed() SAL_OVERRIDE { return IsCutAllowed(); }
+        virtual sal_Bool isCopyAllowed() SAL_OVERRIDE { return IsCopyAllowed(); }
+        virtual sal_Bool isPasteAllowed() SAL_OVERRIDE { return IsPasteAllowed(); }
+        virtual sal_Bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); }
+
+        virtual void cut() SAL_OVERRIDE;
+        virtual void copy() SAL_OVERRIDE;
+        virtual void paste() SAL_OVERRIDE;
 
     private:
         DECL_LINK( StartIndexing, void* );
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
index 4cceb45dcae7..bf0b501f2691 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
@@ -30,20 +30,20 @@ namespace dbaui
     {
         OTableEditorCtrl*   GetCtrl() const;
     protected:
-        virtual void        ActivateAggregate( EControlType eType );
-        virtual void        DeactivateAggregate( EControlType eType );
+        virtual void        ActivateAggregate( EControlType eType ) SAL_OVERRIDE;
+        virtual void        DeactivateAggregate( EControlType eType ) SAL_OVERRIDE;
         // are to be implemented by the derived classes
-        virtual void        CellModified(long nRow, sal_uInt16 nColId );
-        virtual sal_Bool        IsReadOnly();
-        virtual void        SetModified(sal_Bool bModified);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >    GetFormatter() const;
+        virtual void        CellModified(long nRow, sal_uInt16 nColId ) SAL_OVERRIDE;
+        virtual sal_Bool        IsReadOnly() SAL_OVERRIDE;
+        virtual void        SetModified(sal_Bool bModified) SAL_OVERRIDE;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >    GetFormatter() const SAL_OVERRIDE;
 
-        virtual ::com::sun::star::lang::Locale  GetLocale() const;
+        virtual ::com::sun::star::lang::Locale  GetLocale() const SAL_OVERRIDE;
 
-        virtual TOTypeInfoSP                    getTypeInfo(sal_Int32 _nPos);
-        virtual const OTypeInfoMap*             getTypeInfo() const;
-        virtual sal_Bool                        isAutoIncrementValueEnabled() const;
-        virtual OUString                 getAutoIncrementValue() const;
+        virtual TOTypeInfoSP                    getTypeInfo(sal_Int32 _nPos) SAL_OVERRIDE;
+        virtual const OTypeInfoMap*             getTypeInfo() const SAL_OVERRIDE;
+        virtual sal_Bool                        isAutoIncrementValueEnabled() const SAL_OVERRIDE;
+        virtual OUString                 getAutoIncrementValue() const SAL_OVERRIDE;
 
     public:
         OTableFieldControl( Window* pParent, OTableDesignHelpBar* pHelpBar);
@@ -51,8 +51,8 @@ namespace dbaui
         OUString BoolStringPersistent(const OUString& rUIString) const { return OFieldDescControl::BoolStringPersistent(rUIString); }
         OUString BoolStringUI(const OUString& rPersistentString) const { return OFieldDescControl::BoolStringUI(rPersistentString); }
 
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData();
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection();
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE;
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection() SAL_OVERRIDE;
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEFIELDCONTROL_HXX
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index 8f5eca58ebef..6ab4d6897352 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
@@ -49,8 +49,8 @@ namespace dbaui
         IClipboardTest* getActiveChild() const;
 
     protected:
-        virtual void Resize();
-        virtual void Paint( const Rectangle& rRect );
+        virtual void Resize() SAL_OVERRIDE;
+        virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
 
     public:
         OTableFieldDescWin( Window* pParent);
@@ -63,9 +63,9 @@ namespace dbaui
         void SetReadOnly( sal_Bool bReadOnly );
 
         // window overloads
-        virtual bool PreNotify( NotifyEvent& rNEvt );
-        virtual void GetFocus();
-        virtual void LoseFocus();
+        virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+        virtual void GetFocus() SAL_OVERRIDE;
+        virtual void LoseFocus() SAL_OVERRIDE;
 
         void SetControlText( sal_uInt16 nControlId, const OUString& rText )
                 { m_pGenPage->SetControlText(nControlId,rText); }
@@ -79,14 +79,14 @@ namespace dbaui
         OUString  BoolStringUI(const OUString& rPersistentString) const { return m_pGenPage->BoolStringUI(rPersistentString); }
 
         // IClipboardTest
-        virtual sal_Bool isCutAllowed();
-        virtual sal_Bool isCopyAllowed();
-        virtual sal_Bool isPasteAllowed();
-        virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); }
-
-        virtual void copy();
-        virtual void cut();
-        virtual void paste();
+        virtual sal_Bool isCutAllowed() SAL_OVERRIDE;
+        virtual sal_Bool isCopyAllowed() SAL_OVERRIDE;
+        virtual sal_Bool isPasteAllowed() SAL_OVERRIDE;
+        virtual sal_Bool hasChildPathFocus() SAL_OVERRIDE { return HasChildPathFocus(); }
+
+        virtual void copy() SAL_OVERRIDE;
+        virtual void cut() SAL_OVERRIDE;
+        virtual void paste() SAL_OVERRIDE;
 
         inline OFieldDescGenWin* getGenPage() const { return m_pGenPage; }
         inline OTableDesignHelpBar* getHelpBar() const { return m_pHelpBar; }
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx
index 0d52ee584ac2..38bf92834ba8 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.hxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx
@@ -36,8 +36,8 @@ namespace dbaui
     protected:
         OTableRowView* m_pTabDgnCtrl;
 
-        virtual void    Undo();
-        virtual void    Redo();
+        virtual void    Undo() SAL_OVERRIDE;
+        virtual void    Redo() SAL_OVERRIDE;
     public:
         TYPEINFO_OVERRIDE();
         OTableDesignUndoAct( OTableRowView* pOwner ,sal_uInt16 nCommentID);
@@ -64,8 +64,8 @@ namespace dbaui
         ::com::sun::star::uno::Any  m_sOldText;
         ::com::sun::star::uno::Any  m_sNewText;
 
-        virtual void    Undo();
-        virtual void    Redo();
+        virtual void    Undo() SAL_OVERRIDE;
+        virtual void    Redo() SAL_OVERRIDE;
     public:
         TYPEINFO_OVERRIDE();
         OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, sal_uInt16 nColumn );
@@ -80,8 +80,8 @@ namespace dbaui
         TOTypeInfoSP    m_pOldType;
         TOTypeInfoSP    m_pNewType;
 
-        virtual void    Undo();
-        virtual void    Redo();
+        virtual void    Undo() SAL_OVERRIDE;
+        virtual void    Redo() SAL_OVERRIDE;
     public:
         TYPEINFO_OVERRIDE();
         OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, sal_uInt16 nColumn, const TOTypeInfoSP& _pOldType );
@@ -93,8 +93,8 @@ namespace dbaui
     protected:
         ::std::vector< ::boost::shared_ptr<OTableRow> > m_aDeletedRows;
 
-        virtual void    Undo();
-        virtual void    Redo();
+        virtual void    Undo() SAL_OVERRIDE;
+        virtual void    Redo() SAL_OVERRIDE;
     public:
         TYPEINFO_OVERRIDE();
         OTableEditorDelUndoAct( OTableEditorCtrl* pOwner );
@@ -107,8 +107,8 @@ namespace dbaui
         ::std::vector< ::boost::shared_ptr<OTableRow> > m_vInsertedRows;
         long                        m_nInsPos;
 
-        virtual void    Undo();
-        virtual void    Redo();
+        virtual void    Undo() SAL_OVERRIDE;
+        virtual void    Redo() SAL_OVERRIDE;
     public:
         TYPEINFO_OVERRIDE();
         OTableEditorInsUndoAct( OTableEditorCtrl* pOwner,
@@ -123,8 +123,8 @@ namespace dbaui
         long m_nInsPos;
         long m_nInsRows;
 
-        virtual void    Undo();
-        virtual void    Redo();
+        virtual void    Undo() SAL_OVERRIDE;
+        virtual void    Redo() SAL_OVERRIDE;
     public:
         TYPEINFO_OVERRIDE();
         OTableEditorInsNewUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, long nInsertedRows );
@@ -138,8 +138,8 @@ namespace dbaui
                             m_aInsKeys;
         OTableEditorCtrl* m_pEditorCtrl;
 
-        virtual void    Undo();
-        virtual void    Redo();
+        virtual void    Undo() SAL_OVERRIDE;
+        virtual void    Redo() SAL_OVERRIDE;
     public:
         TYPEINFO_OVERRIDE();
         OPrimKeyUndoAct( OTableEditorCtrl* pOwner, MultiSelection aDeletedKeys, MultiSelection aInsertedKeys );