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 /include/svl | |
parent | bc5060b32f08b0408fb929faea1f8140a58d3cc5 (diff) |
Split TYPEINFO into plain and TYPEINFO_OVERRIDE
...where the latter contains SAL_OVERRIDE annotations
Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
Diffstat (limited to 'include/svl')
31 files changed, 46 insertions, 46 deletions
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index 8250197120cc..7cd4e0bd8685 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -35,7 +35,7 @@ protected: sal_uInt16 _GetPosByValue( sal_uInt16 nValue ) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxAllEnumItem(); explicit SfxAllEnumItem( sal_uInt16 nWhich); SfxAllEnumItem( sal_uInt16 nWhich, sal_uInt16 nVal ); diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index 8f697f36265f..31a97d909639 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -36,7 +36,7 @@ protected: SfxPoolItem(rItem) {} public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual bool operator ==(const SfxPoolItem & rItem) const; diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 5a02024224c9..77c3bde33d6d 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -32,7 +32,7 @@ class SVL_DLLPUBLIC CntByteItem: public SfxPoolItem sal_uInt8 m_nValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); CntByteItem(sal_uInt16 which = 0, sal_uInt8 nTheValue = 0): SfxPoolItem(which), m_nValue(nTheValue) { DBG_CTOR(CntByteItem, 0); } @@ -91,7 +91,7 @@ class SVL_DLLPUBLIC CntUInt16Item: public SfxPoolItem sal_uInt16 m_nValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); CntUInt16Item(sal_uInt16 which = 0, sal_uInt16 nTheValue = 0): SfxPoolItem(which), m_nValue(nTheValue) @@ -153,7 +153,7 @@ class SVL_DLLPUBLIC CntInt32Item: public SfxPoolItem sal_Int32 m_nValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); CntInt32Item(sal_uInt16 which = 0, sal_Int32 nTheValue = 0): SfxPoolItem(which), m_nValue(nTheValue) @@ -215,7 +215,7 @@ class SVL_DLLPUBLIC CntUInt32Item: public SfxPoolItem sal_uInt32 m_nValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); CntUInt32Item(sal_uInt16 which = 0, sal_uInt32 nTheValue = 0): SfxPoolItem(which), m_nValue(nTheValue) diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx index 45eff2d50563..f9882b789303 100644 --- a/include/svl/cntwall.hxx +++ b/include/svl/cntwall.hxx @@ -36,7 +36,7 @@ private: sal_uInt16 _nStyle; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); CntWallpaperItem( sal_uInt16 nWhich ); CntWallpaperItem( sal_uInt16 nWhich, SvStream& rStream, sal_uInt16 nVersion ); diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index 1d520cae02a0..fb68140f165e 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -31,7 +31,7 @@ private: OUString _aPresentation; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); CntContentTypeItem(); CntContentTypeItem( sal_uInt16 nWhich, const OUString& rType ); diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 8226d3cde0e0..052381ea9e9a 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -32,7 +32,7 @@ class SVL_DLLPUBLIC CntUnencodedStringItem: public SfxPoolItem OUString m_aValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); CntUnencodedStringItem(sal_uInt16 which = 0): SfxPoolItem(which) { DBG_CTOR(CntUnencodedStringItem, 0); } diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx index 3b4176f78bf4..b27c631eacfc 100644 --- a/include/svl/eitem.hxx +++ b/include/svl/eitem.hxx @@ -44,7 +44,7 @@ protected: SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); sal_uInt16 GetValue() const { return m_nValue; } @@ -67,7 +67,7 @@ class SVL_DLLPUBLIC SfxBoolItem bool m_bValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SfxBoolItem(sal_uInt16 const nWhich = 0, bool const bValue = false) : SfxPoolItem(nWhich) diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index 6f0e7dfd0c33..7494c01f410b 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -32,7 +32,7 @@ class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem sal_uInt16 nVal; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SfxFlagItem( sal_uInt16 nWhich = 0, sal_uInt16 nValue = 0 ); SfxFlagItem( const SfxFlagItem& ); diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx index 11c862669a72..461cee61b8e8 100644 --- a/include/svl/globalnameitem.hxx +++ b/include/svl/globalnameitem.hxx @@ -29,7 +29,7 @@ class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem SvGlobalName m_aName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxGlobalNameItem(); SfxGlobalNameItem( sal_uInt16 nWhich, const SvGlobalName& ); ~SfxGlobalNameItem(); diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index fa02321297e2..13f253299378 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.hxx @@ -23,7 +23,7 @@ private: std::map<OUString, com::sun::star::uno::Any> m_aMap; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxGrabBagItem(); SfxGrabBagItem(sal_uInt16 nWhich, const std::map<OUString, com::sun::star::uno::Any>* pMap = 0); diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx index 39666d7fee9c..3191e4cfe2ea 100644 --- a/include/svl/hint.hxx +++ b/include/svl/hint.hxx @@ -39,7 +39,7 @@ public: bool bIsOwner; \ \ public: \ - TYPEINFO(); \ + TYPEINFO_OVERRIDE(); \ explicit Name( Type* Object, bool bOwnedByHint = false ); \ ~Name(); \ \ diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index a5d1d6beec38..fd351a3ec79c 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -30,7 +30,7 @@ class SVL_DLLPUBLIC SfxIntegerListItem : public SfxPoolItem ::com::sun::star::uno::Sequence < sal_Int32 > m_aList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxIntegerListItem(); SfxIntegerListItem( sal_uInt16 nWhich, const ::std::vector < sal_Int32 >& rList ); diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index dbedde8ac5e2..57d84b8ef1a4 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -28,7 +28,7 @@ class SVL_DLLPUBLIC SfxImageItem : public SfxInt16Item { SfxImageItem_Impl* pImp; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 ); SfxImageItem( const SfxImageItem& ); virtual ~SfxImageItem(); diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index d74988119efa..06b6fdd06aa9 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -27,7 +27,7 @@ class SVL_DLLPUBLIC SfxByteItem: public CntByteItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0): CntByteItem(which, nValue) {} @@ -46,7 +46,7 @@ class SVL_DLLPUBLIC SfxInt16Item: public SfxPoolItem sal_Int16 m_nValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SfxInt16Item(sal_uInt16 which = 0, sal_Int16 nTheValue = 0): SfxPoolItem(which), m_nValue(nTheValue) @@ -104,7 +104,7 @@ inline void SfxInt16Item::SetValue(sal_Int16 nTheValue) class SVL_DLLPUBLIC SfxUInt16Item: public CntUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SfxUInt16Item(sal_uInt16 which = 0, sal_uInt16 nValue = 0): CntUInt16Item(which, nValue) {} @@ -123,7 +123,7 @@ public: class SVL_DLLPUBLIC SfxInt32Item: public CntInt32Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SfxInt32Item(sal_uInt16 which = 0, sal_Int32 nValue = 0): CntInt32Item(which, nValue) {} @@ -143,7 +143,7 @@ public: class SVL_DLLPUBLIC SfxUInt32Item: public CntUInt32Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SfxUInt32Item(sal_uInt16 which = 0, sal_uInt32 nValue = 0): CntUInt32Item(which, nValue) {} diff --git a/include/svl/isethint.hxx b/include/svl/isethint.hxx index c1298aa5130a..edbdd41b76d0 100644 --- a/include/svl/isethint.hxx +++ b/include/svl/isethint.hxx @@ -32,7 +32,7 @@ class SVL_DLLPUBLIC SfxItemSetHint: public SfxHint SfxItemSet* _pItemSet; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxItemSetHint( const SfxItemSet &rItemSet ); virtual ~SfxItemSetHint(); diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index d2c6b2f40249..1d6fa4caa98b 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.hxx @@ -29,7 +29,7 @@ class SVL_DLLPUBLIC SfxLockBytesItem : public SfxPoolItem SvLockBytesRef _xVal; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxLockBytesItem(); SfxLockBytesItem( sal_uInt16 nWhich, SvStream & ); SfxLockBytesItem( const SfxLockBytesItem& ); diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 3ffb875d6223..3cd42c4ccaa4 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -132,7 +132,7 @@ Dieses Item beschreibt eine Makro-Tabelle. class SVL_DLLPUBLIC SvxMacroItem: public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit inline SvxMacroItem ( const sal_uInt16 nId ); diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx index 6fe76e30bc06..73ba594286b2 100644 --- a/include/svl/metitem.hxx +++ b/include/svl/metitem.hxx @@ -29,7 +29,7 @@ DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVL_DLLPUBLIC) class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SfxMetricItem( sal_uInt16 nWhich = 0, sal_uInt32 nValue = 0 ); SfxMetricItem( sal_uInt16 nWhich, SvStream & ); SfxMetricItem( const SfxMetricItem& ); diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 0b89e332456c..03de6889afb0 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -332,7 +332,7 @@ class SVL_DLLPUBLIC SfxVoidItem: public SfxPoolItem { SfxVoidItem & operator=( const SfxVoidItem& ); // not implemented. public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SfxVoidItem( sal_uInt16 nWhich ); SfxVoidItem( sal_uInt16 nWhich, SvStream & ); SfxVoidItem( const SfxVoidItem& ); @@ -360,7 +360,7 @@ class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem SfxSetItem & operator=( const SfxSetItem& ); // not implemented. public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxSetItem( sal_uInt16 nWhich, SfxItemSet *pSet ); SfxSetItem( sal_uInt16 nWhich, const SfxItemSet &rSet ); SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = 0 ); diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index c0ed4a3040cc..30f907cdb3a5 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -34,7 +34,7 @@ class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem Point aVal; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxPointItem(); SfxPointItem( sal_uInt16 nWhich, const Point& rVal ); SfxPointItem( const SfxPointItem& ); diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index 9069cb94cc30..ad4523341c66 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -35,7 +35,7 @@ class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem Rectangle aVal; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxRectangleItem(); SfxRectangleItem( sal_uInt16 nWhich, const Rectangle& rVal ); SfxRectangleItem( const SfxRectangleItem& ); diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index f181593a2a1a..7e4d2137df80 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -33,7 +33,7 @@ private: sal_uInt16 nFrom; sal_uInt16 nTo; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxRangeItem(); SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo ); SfxRangeItem( const SfxRangeItem& rItem ); @@ -61,7 +61,7 @@ private: sal_uInt16* _pRanges; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxUShortRangesItem(); SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream ); SfxUShortRangesItem( const SfxUShortRangesItem& rItem ); diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 9481206fe939..67868d546fb5 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -34,7 +34,7 @@ protected: SfxImpStringList* pImp; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxStringListItem(); SfxStringListItem( sal_uInt16 nWhich, const std::vector<OUString> *pList=NULL ); diff --git a/include/svl/smplhint.hxx b/include/svl/smplhint.hxx index b7f728e2aa0b..5d70dfe14866 100644 --- a/include/svl/smplhint.hxx +++ b/include/svl/smplhint.hxx @@ -62,7 +62,7 @@ class SVL_DLLPUBLIC SfxSimpleHint: public SfxHint private: sal_uLong mnId; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxSimpleHint( sal_uLong nId ) { mnId = nId; } sal_uLong GetId() const { return mnId; } }; @@ -75,7 +75,7 @@ public: Type aObj; \ \ public: \ - TYPEINFO(); \ + TYPEINFO_OVERRIDE(); \ Name( sal_uInt16 nId, const Type& rObject ); \ ~Name(); \ const Type& GetObject() const { return aObj; } \ diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 95cce8153122..0eb0edd139db 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -75,7 +75,7 @@ class SVL_DLLPUBLIC SvxSearchItem : bool bAsianOptions; // use asian options? public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxSearchItem( const sal_uInt16 nId ); SvxSearchItem( const SvxSearchItem& rItem ); diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx index 0712ce3c1ae8..00e4765553ae 100644 --- a/include/svl/stritem.hxx +++ b/include/svl/stritem.hxx @@ -27,7 +27,7 @@ class SVL_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxStringItem() {} diff --git a/include/svl/strmadpt.hxx b/include/svl/strmadpt.hxx index 54f5bcc80d96..9d4797f8aa6f 100644 --- a/include/svl/strmadpt.hxx +++ b/include/svl/strmadpt.hxx @@ -35,7 +35,7 @@ class SVL_DLLPUBLIC SvOutputStreamOpenLockBytes: public SvOpenLockBytes sal_uInt32 m_nPosition; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvOutputStreamOpenLockBytes( const com::sun::star::uno::Reference< diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 72bfaed8da3e..026f0d05bc10 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -285,7 +285,7 @@ class SVL_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase, public SfxListener, public SfxBroadcaster, public svl::StyleSheetUser { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxStyleSheet( const OUString&, const SfxStyleSheetBasePool&, SfxStyleFamily, sal_uInt16 ); SfxStyleSheet( const SfxStyleSheet& ); @@ -338,7 +338,7 @@ class SVL_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint sal_uInt16 nHint; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxStyleSheetPoolHint(sal_uInt16 nArgHint) : nHint(nArgHint){} sal_uInt16 GetHint() const @@ -353,7 +353,7 @@ class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint sal_uInt16 nHint; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxStyleSheetHint( sal_uInt16, SfxStyleSheetBase& ); SfxStyleSheetBase* GetStyleSheet() const @@ -367,7 +367,7 @@ class SVL_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint OUString aName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxStyleSheetHintExtended( sal_uInt16, const OUString& rOld, SfxStyleSheetBase& ); diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index 56965c627a5f..1c50c00ec32d 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -35,7 +35,7 @@ private: Size aVal; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxSizeItem(); SfxSizeItem( sal_uInt16 nWhich, const Size& rVal ); SfxSizeItem( const SfxSizeItem& ); diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 2f86d205e646..95538603a19c 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -163,7 +163,7 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra */ { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxListUndoAction( const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 Id, SfxUndoArray *pFather); @@ -453,7 +453,7 @@ private: void LinkedSfxUndoActionDestructed(const SfxUndoAction& rCandidate); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxLinkUndoAction(::svl::IUndoManager *pManager); ~SfxLinkUndoAction(); diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 02bdb32aed16..60bd4931790e 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -33,7 +33,7 @@ class SVL_DLLPUBLIC SfxVisibilityItem: public SfxPoolItem ::com::sun::star::frame::status::Visibility m_nValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SfxVisibilityItem(sal_uInt16 which = 0, bool bVisible = true): SfxPoolItem(which) |