diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 11:54:10 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 11:54:55 +0100 |
commit | 5fb78604c1c3e91beb867c352928af9e1ef57a26 (patch) | |
tree | 7d6a0f7c1bfe2f2803f5f2ffb5741dd3c05c5818 /dbaccess | |
parent | bc5060b32f08b0408fb929faea1f8140a58d3cc5 (diff) |
Split TYPEINFO into plain and TYPEINFO_OVERRIDE
...where the latter contains SAL_OVERRIDE annotations
Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/filter/xml/xmlStyleImport.hxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/dsnItem.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/dlg/optionalboolitem.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/GeneralUndo.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/propertysetitem.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/inc/stringlistitem.hxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/tabledesign/TableUndo.hxx | 16 |
7 files changed, 15 insertions, 15 deletions
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index 078946bce0ea..49cc39a69d1f 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -55,7 +55,7 @@ namespace dbaxml public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableStyleContext( ODBFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -100,7 +100,7 @@ namespace dbaxml public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , const OUString& rLName , diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index e1df6b7a6d72..5ce57a7f8f4a 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -36,7 +36,7 @@ namespace dbaui ::dbaccess::ODsnTypeCollection* m_pCollection; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL); DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index bebe97a6f1b0..3be9826e31d1 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -33,7 +33,7 @@ namespace dbaui ::boost::optional< bool > m_aValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OptionalBoolItem( sal_Int16 nWhich ); OptionalBoolItem( const OptionalBoolItem& _rSource ); diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index f5e4090e495e..960b0d81c5b2 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -35,7 +35,7 @@ namespace dbaui OUString m_strComment; // undo, redo comment public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = OUString(ModuleRes(nCommentID)); } virtual OUString GetComment() const { return m_strComment; } diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index 4c8459b7e2d0..a9eb3ddf6a39 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -34,7 +34,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSet; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OPropertySetItem(sal_Int16 nWhich); OPropertySetItem(sal_Int16 nWhich, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet); diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 229185e7033a..fc4dedf230ad 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -36,7 +36,7 @@ class OStringListItem : public SfxPoolItem ::com::sun::star::uno::Sequence< OUString > m_aList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OStringListItem(sal_Int16 nWhich, const ::com::sun::star::uno::Sequence< OUString >& _rList); OStringListItem(const OStringListItem& _rSource); diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index 5b87bd575237..0d52ee584ac2 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -39,7 +39,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableDesignUndoAct( OTableRowView* pOwner ,sal_uInt16 nCommentID); virtual ~OTableDesignUndoAct(); }; @@ -51,7 +51,7 @@ namespace dbaui OTableEditorCtrl* pTabEdCtrl; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 nCommentID ); virtual ~OTableEditorUndoAct(); }; @@ -67,7 +67,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, sal_uInt16 nColumn ); virtual ~OTableDesignCellUndoAct(); }; @@ -83,7 +83,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, sal_uInt16 nColumn, const TOTypeInfoSP& _pOldType ); virtual ~OTableEditorTypeSelUndoAct(); }; @@ -96,7 +96,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableEditorDelUndoAct( OTableEditorCtrl* pOwner ); virtual ~OTableEditorDelUndoAct(); }; @@ -110,7 +110,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows); @@ -126,7 +126,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableEditorInsNewUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, long nInsertedRows ); virtual ~OTableEditorInsNewUndoAct(); }; @@ -141,7 +141,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OPrimKeyUndoAct( OTableEditorCtrl* pOwner, MultiSelection aDeletedKeys, MultiSelection aInsertedKeys ); virtual ~OPrimKeyUndoAct(); }; |