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 | |
| parent | bc5060b32f08b0408fb929faea1f8140a58d3cc5 (diff) | |
Split TYPEINFO into plain and TYPEINFO_OVERRIDE
...where the latter contains SAL_OVERRIDE annotations
Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
Diffstat (limited to 'include')
281 files changed, 380 insertions, 373 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index d64ba0fafc17..07ae639e69eb 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -63,7 +63,7 @@ enum MediaState class AVMEDIA_DLLPUBLIC MediaItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit MediaItem( sal_uInt16 const i_nWhich = 0, sal_uInt32 const nMaskSet = AVMEDIA_SETMASK_NONE ); diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx index 1a2281a33ac9..17f8a23646c2 100644 --- a/include/basic/basmgr.hxx +++ b/include/basic/basmgr.hxx @@ -144,7 +144,7 @@ protected: ~BasicManager(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); BasicManager( SotStorage& rStorage, const OUString& rBaseURL, StarBASIC* pParentFromStdLib = NULL, OUString* pLibPath = NULL, bool bDocMgr = false ); BasicManager( StarBASIC* pStdLib, OUString* pLibPath = NULL, bool bDocMgr = false ); diff --git a/include/basic/sbmeth.hxx b/include/basic/sbmeth.hxx index 9a3fd88c328b..1b2ab4c84736 100644 --- a/include/basic/sbmeth.hxx +++ b/include/basic/sbmeth.hxx @@ -52,7 +52,7 @@ class BASIC_DLLPUBLIC SbMethod : public SbxMethod public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMETHOD,2); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual SbxInfo* GetInfo(); SbxArray* GetStatics(); void ClearStatics(); @@ -76,7 +76,7 @@ class BASIC_DLLPUBLIC SbIfaceMapperMethod : public SbMethod SbMethodRef mxImplMeth; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbIfaceMapperMethod( const OUString& rName, SbMethod* pImplMeth ) : SbMethod( rName, pImplMeth->GetType(), NULL ) , mxImplMeth( pImplMeth ) diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index b0b8ce34bfb0..6d67e8c9e760 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -94,7 +94,7 @@ protected: virtual ~SbModule(); public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICMOD,2); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbModule( const OUString&, sal_Bool bCompat = sal_False ); virtual void SetParent( SbxObject* ); virtual void Clear(); @@ -148,7 +148,7 @@ class BASIC_DLLPUBLIC SbClassModuleObject : public SbModule bool mbInitializeEventDone; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbClassModuleObject( SbModule* pClassModule ); ~SbClassModuleObject(); diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index 23816dcb5d5e..d24c80369861 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -86,7 +86,7 @@ protected: public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASIC,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); StarBASIC( StarBASIC* pParent = NULL, bool bIsDocBasic = false ); diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index ce3c4748f495..949a1d3e9c60 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -93,7 +93,7 @@ class BASIC_DLLPUBLIC SbxHint : public SfxSimpleHint { SbxVariable* pVar; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbxHint( sal_uIntPtr n, SbxVariable* v ) : SfxSimpleHint( n ), pVar( v ) {} SbxVariable* GetVar() const { return pVar; } }; @@ -136,7 +136,7 @@ protected: public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_ARRAY,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbxArray( SbxDataType=SbxVARIANT ); SbxArray( const SbxArray& ); SbxArray& operator=( const SbxArray& ); @@ -183,7 +183,7 @@ protected: virtual ~SbxDimArray(); public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_DIMARRAY,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbxDimArray( SbxDataType=SbxVARIANT ); SbxDimArray( const SbxDimArray& ); SbxDimArray& operator=( const SbxDimArray& ); @@ -227,7 +227,7 @@ protected: public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_COLLECTION,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbxCollection( const OUString& rClassname ); SbxCollection( const SbxCollection& ); SbxCollection& operator=( const SbxCollection& ); @@ -248,7 +248,7 @@ protected: virtual void CollRemove( SbxArray* pPar ); public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_FIXCOLLECTION,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbxStdCollection( const OUString& rClassname, const OUString& rElemClass, sal_Bool=sal_True ); SbxStdCollection( const SbxStdCollection& ); SbxStdCollection& operator=( const SbxStdCollection& ); diff --git a/include/basic/sbxmeth.hxx b/include/basic/sbxmeth.hxx index 6874867c71ee..2c07361ac9d7 100644 --- a/include/basic/sbxmeth.hxx +++ b/include/basic/sbxmeth.hxx @@ -27,7 +27,7 @@ class BASIC_DLLPUBLIC SbxMethod : public SbxVariable { public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbxMethod( const OUString& r, SbxDataType t ); SbxMethod( const SbxMethod& r ); ~SbxMethod(); diff --git a/include/basic/sbxobj.hxx b/include/basic/sbxobj.hxx index 3a02556a2a65..6a06cca53570 100644 --- a/include/basic/sbxobj.hxx +++ b/include/basic/sbxobj.hxx @@ -44,7 +44,7 @@ protected: const SfxHint& rHint, const TypeId& rHintType ); public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_OBJECT,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbxObject( const OUString& rClassname ); SbxObject( const SbxObject& ); SbxObject& operator=( const SbxObject& ); diff --git a/include/basic/sbxprop.hxx b/include/basic/sbxprop.hxx index 19397c532bd5..a58616ed900b 100644 --- a/include/basic/sbxprop.hxx +++ b/include/basic/sbxprop.hxx @@ -27,7 +27,7 @@ class BASIC_DLLPUBLIC SbxProperty : public SbxVariable { public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_PROPERTY,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbxProperty( const OUString& r, SbxDataType t ); SbxProperty( const SbxProperty& r ) : SvRefBase( r ), SbxVariable( r ) {} virtual ~SbxProperty(); diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx index 8d8cde39aaae..04a88eb15265 100644 --- a/include/basic/sbxvar.hxx +++ b/include/basic/sbxvar.hxx @@ -103,7 +103,7 @@ protected: virtual sal_Bool StoreData( SvStream& ) const; public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VALUE,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbxValue(); SbxValue( SbxDataType, void* = NULL ); SbxValue( const SbxValue& ); @@ -304,7 +304,7 @@ protected: virtual sal_Bool StoreData( SvStream& ) const; public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_VARIABLE,2); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbxVariable(); SbxVariable( SbxDataType, void* = NULL ); SbxVariable( const SbxVariable& ); diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index 77ea32ed6c32..d38ed4d13e04 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -48,7 +48,7 @@ class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface friend SvStream& WriteSvxAdjustItem( SvStream&, SvxAdjustItem& ); //$ ostream public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxAdjustItem( const SvxAdjust eAdjst /*= SVX_ADJUST_LEFT*/, const sal_uInt16 nId ); diff --git a/include/editeng/autokernitem.hxx b/include/editeng/autokernitem.hxx index 97c9dbe50e23..591eccd5456a 100644 --- a/include/editeng/autokernitem.hxx +++ b/include/editeng/autokernitem.hxx @@ -34,7 +34,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxAutoKernItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxAutoKernItem( const bool bAutoKern /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/blinkitem.hxx b/include/editeng/blinkitem.hxx index 6b3127b3c48d..d60b119a48ef 100644 --- a/include/editeng/blinkitem.hxx +++ b/include/editeng/blinkitem.hxx @@ -35,7 +35,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxBlinkItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxBlinkItem( const bool bBlink /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/boxitem.hxx b/include/editeng/boxitem.hxx index 4fd98f83ae18..fc09f7d43a43 100644 --- a/include/editeng/boxitem.hxx +++ b/include/editeng/boxitem.hxx @@ -62,7 +62,7 @@ class EDITENG_DLLPUBLIC SvxBoxItem : public SfxPoolItem nRightDist; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxBoxItem( const sal_uInt16 nId ); SvxBoxItem( const SvxBoxItem &rCpy ); @@ -172,7 +172,7 @@ class EDITENG_DLLPUBLIC SvxBoxInfoItem : public SfxPoolItem sal_uInt16 nDefDist; // The default or minimum distance. public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxBoxInfoItem( const sal_uInt16 nId ); SvxBoxInfoItem( const SvxBoxInfoItem &rCpy ); diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 2c20170efc3d..fdae5f70743b 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -62,7 +62,7 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem sal_uInt16 nVersion, sal_uInt16 nWhich ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxBrushItem( sal_uInt16 nWhich ); SvxBrushItem( const Color& rColor, sal_uInt16 nWhich ); diff --git a/include/editeng/bulletitem.hxx b/include/editeng/bulletitem.hxx index ff16adee5181..b58e71bbcad8 100644 --- a/include/editeng/bulletitem.hxx +++ b/include/editeng/bulletitem.hxx @@ -78,7 +78,7 @@ class EDITENG_DLLPUBLIC SvxBulletItem : public SfxPoolItem void SetDefaults_Impl(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxBulletItem( sal_uInt16 nWhich = 0 ); explicit SvxBulletItem( SvStream& rStrm, sal_uInt16 nWhich = 0 ); diff --git a/include/editeng/charhiddenitem.hxx b/include/editeng/charhiddenitem.hxx index c883ed3ddb90..b2271784bd8d 100644 --- a/include/editeng/charhiddenitem.hxx +++ b/include/editeng/charhiddenitem.hxx @@ -32,7 +32,7 @@ class EDITENG_DLLPUBLIC SvxCharHiddenItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxCharHiddenItem( const bool bHidden /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index ba39c23255f0..1014ea0bd87a 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxCharReliefItem( FontRelief eValue /*= RELIEF_NONE*/, const sal_uInt16 nId ); diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx index e0677e0818bf..5d6e2580c30a 100644 --- a/include/editeng/charrotateitem.hxx +++ b/include/editeng/charrotateitem.hxx @@ -37,7 +37,7 @@ class EDITENG_DLLPUBLIC SvxCharRotateItem : public SfxUInt16Item { bool bFitToLine; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxCharRotateItem( sal_uInt16 nValue /*= 0*/, bool bFitIntoLine /*= false*/, diff --git a/include/editeng/charscaleitem.hxx b/include/editeng/charscaleitem.hxx index c3937af6824b..4d5146478be7 100644 --- a/include/editeng/charscaleitem.hxx +++ b/include/editeng/charscaleitem.hxx @@ -35,7 +35,7 @@ class EDITENG_DLLPUBLIC SvxCharScaleWidthItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxCharScaleWidthItem( sal_uInt16 nValue /*= 100*/, const sal_uInt16 nId ); diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx index 654b40d60cf8..8eca973b8fdf 100644 --- a/include/editeng/charsetcoloritem.hxx +++ b/include/editeng/charsetcoloritem.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem { rtl_TextEncoding eFrom; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxCharSetColorItem( const sal_uInt16 nId ); SvxCharSetColorItem( const Color& aColor, const rtl_TextEncoding eFrom, diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index ac43840a666a..01f20e9c694b 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -35,7 +35,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxCaseMapItem( const SvxCaseMap eMap /*= SVX_CASEMAP_NOT_MAPPED*/, const sal_uInt16 nId ); diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index 0755f08740ab..65d2260aae1f 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -40,7 +40,7 @@ private: Color mColor; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxColorItem( const sal_uInt16 nId ); SvxColorItem( const Color& aColor, const sal_uInt16 nId ); diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx index 6a1e9400b499..b61807c6b7d8 100644 --- a/include/editeng/contouritem.hxx +++ b/include/editeng/contouritem.hxx @@ -31,7 +31,7 @@ class EDITENG_DLLPUBLIC SvxContourItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxContourItem( const bool bContoured /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/crossedoutitem.hxx b/include/editeng/crossedoutitem.hxx index badb98b0e4e4..8fd95d4d0828 100644 --- a/include/editeng/crossedoutitem.hxx +++ b/include/editeng/crossedoutitem.hxx @@ -34,7 +34,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxCrossedOutItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxCrossedOutItem( const FontStrikeout eSt /*= STRIKEOUT_NONE*/, const sal_uInt16 nId ); diff --git a/include/editeng/emphasismarkitem.hxx b/include/editeng/emphasismarkitem.hxx index ec84d7ad535c..5caf156d4b29 100644 --- a/include/editeng/emphasismarkitem.hxx +++ b/include/editeng/emphasismarkitem.hxx @@ -35,7 +35,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxEmphasisMarkItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxEmphasisMarkItem( const FontEmphasisMark eVal /*= EMPHASISMARK_NONE*/, const sal_uInt16 nId ); diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index d2a28ca39af0..9b02f95af49a 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -43,7 +43,7 @@ class EDITENG_DLLPUBLIC SvxEscapementItem : public SfxEnumItemInterface short nEsc; sal_uInt8 nProp; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxEscapementItem( const sal_uInt16 nId ); SvxEscapementItem( const SvxEscapement eEscape, diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx index 4a3403a2349e..2a3f400eb453 100644 --- a/include/editeng/fhgtitem.hxx +++ b/include/editeng/fhgtitem.hxx @@ -42,7 +42,7 @@ class EDITENG_DLLPUBLIC SvxFontHeightItem : public SfxPoolItem sal_uInt16 nProp; // default 100% SfxMapUnit ePropUnit; // Percent, Twip, ... public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxFontHeightItem( const sal_uLong nSz /*= 240*/, const sal_uInt16 nPropHeight /*= 100*/, const sal_uInt16 nId ); diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 33db8b5d2aa6..021f95e1434a 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -75,7 +75,7 @@ private: EDITENG_DLLPRIVATE SvxFieldItem( SvxFieldData* pField, const sal_uInt16 nId ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ); SvxFieldItem( const SvxFieldItem& rItem ); diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx index fe71e10b749c..a4ae508c961d 100644 --- a/include/editeng/flstitem.hxx +++ b/include/editeng/flstitem.hxx @@ -42,7 +42,7 @@ private: com::sun::star::uno::Sequence< OUString > aFontNameSeq; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxFontListItem( const FontList* pFontLst, const sal_uInt16 nId ); diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx index d5beb53091e8..37a1fcfb8d22 100644 --- a/include/editeng/fontitem.hxx +++ b/include/editeng/fontitem.hxx @@ -44,7 +44,7 @@ class EDITENG_DLLPUBLIC SvxFontItem : public SfxPoolItem static bool bEnableStoreUnicodeNames; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxFontItem( const sal_uInt16 nId ); SvxFontItem( const FontFamily eFam, const OUString& rFamilyName, diff --git a/include/editeng/forbiddenruleitem.hxx b/include/editeng/forbiddenruleitem.hxx index 47af90fe44bf..85b807073cee 100644 --- a/include/editeng/forbiddenruleitem.hxx +++ b/include/editeng/forbiddenruleitem.hxx @@ -32,7 +32,7 @@ class EDITENG_DLLPUBLIC SvxForbiddenRuleItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxForbiddenRuleItem( bool bOn /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx index 897abd6650af..7dc0df5aee76 100644 --- a/include/editeng/formatbreakitem.hxx +++ b/include/editeng/formatbreakitem.hxx @@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/, const sal_uInt16 nWhich ); diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx index 71174df7dcfa..0d73942d77f9 100644 --- a/include/editeng/frmdiritem.hxx +++ b/include/editeng/frmdiritem.hxx @@ -35,7 +35,7 @@ class EDITENG_DLLPUBLIC SvxFrameDirectionItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxFrameDirectionItem( SvxFrameDirection nValue /*= FRMDIR_HORI_LEFT_TOP*/, sal_uInt16 nWhich ); diff --git a/include/editeng/fwdtitem.hxx b/include/editeng/fwdtitem.hxx index 51f653931031..16691062a364 100644 --- a/include/editeng/fwdtitem.hxx +++ b/include/editeng/fwdtitem.hxx @@ -35,7 +35,7 @@ class SvxFontWidthItem : public SfxPoolItem sal_uInt16 nWidth; // 0 = default sal_uInt16 nProp; // default 100% public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxFontWidthItem( const sal_uInt16 nSz /*= 0*/, const sal_uInt16 nPropWidth /*= 100*/, diff --git a/include/editeng/hngpnctitem.hxx b/include/editeng/hngpnctitem.hxx index ef7831c02719..7acb9aae6b29 100644 --- a/include/editeng/hngpnctitem.hxx +++ b/include/editeng/hngpnctitem.hxx @@ -32,7 +32,7 @@ class EDITENG_DLLPUBLIC SvxHangingPunctuationItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxHangingPunctuationItem( bool bOn /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx index 7d7e04b37f75..b71b869f83f0 100644 --- a/include/editeng/hyphenzoneitem.hxx +++ b/include/editeng/hyphenzoneitem.hxx @@ -43,7 +43,7 @@ class EDITENG_DLLPUBLIC SvxHyphenZoneItem : public SfxPoolItem friend SvStream & WriteSvxHyphenZoneItem( SvStream & aS, SvxHyphenZoneItem & ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxHyphenZoneItem( const bool bHyph /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 15271a7a355d..9da2bb48d8dd 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -28,7 +28,7 @@ class EDITENG_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxHorJustifyItem( const sal_uInt16 nId ); @@ -61,7 +61,7 @@ public: class EDITENG_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxVerJustifyItem( const sal_uInt16 nId ); diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx index 85eb197c46c2..a2b28691a2b7 100644 --- a/include/editeng/keepitem.hxx +++ b/include/editeng/keepitem.hxx @@ -33,7 +33,7 @@ class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); inline SvxFmtKeepItem( const bool bKeep /*= false*/, const sal_uInt16 _nWhich ); diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx index 1f1d51e5fc81..af940c53a4cc 100644 --- a/include/editeng/kernitem.hxx +++ b/include/editeng/kernitem.hxx @@ -37,7 +37,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxKerningItem : public SfxInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxKerningItem( const short nKern /*= 0*/, const sal_uInt16 nId ); diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx index 5a73673877fd..e44a9a5d25af 100644 --- a/include/editeng/langitem.hxx +++ b/include/editeng/langitem.hxx @@ -35,7 +35,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxLanguageItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxLanguageItem( const LanguageType eLang /*= LANGUAGE_GERMAN*/, const sal_uInt16 nId ); diff --git a/include/editeng/lcolitem.hxx b/include/editeng/lcolitem.hxx index 94c4b393bb06..f92f183a36e4 100644 --- a/include/editeng/lcolitem.hxx +++ b/include/editeng/lcolitem.hxx @@ -30,7 +30,7 @@ class EDITENG_DLLPUBLIC SvxLineColorItem : public SvxColorItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxLineColorItem( const sal_uInt16 nId ); SvxLineColorItem( const SvxLineColorItem& rCopy ); diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx index e85b9127bd87..b2cf40d2bdd0 100644 --- a/include/editeng/lineitem.hxx +++ b/include/editeng/lineitem.hxx @@ -39,7 +39,7 @@ namespace editeng { class EDITENG_DLLPUBLIC SvxLineItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxLineItem( const sal_uInt16 nId ); SvxLineItem( const SvxLineItem& rCpy ); diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx index e5874d5f800a..f5871a009e60 100644 --- a/include/editeng/lrspitem.hxx +++ b/include/editeng/lrspitem.hxx @@ -64,7 +64,7 @@ class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxLRSpaceItem( const sal_uInt16 nId ); SvxLRSpaceItem( const long nLeft, const long nRight, diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index 54ff961040c0..2e6fa0acdf6e 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -43,7 +43,7 @@ class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface SvxInterLineSpace eInterLineSpace; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // The writer relies on a default height of 200! Actually, I would // initialize all values to 0, but who can ignore the consequences in diff --git a/include/editeng/nhypitem.hxx b/include/editeng/nhypitem.hxx index 02034387c5ae..6c02b7b72b2c 100644 --- a/include/editeng/nhypitem.hxx +++ b/include/editeng/nhypitem.hxx @@ -26,7 +26,7 @@ class EDITENG_DLLPUBLIC SvxNoHyphenItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxNoHyphenItem( const bool bHyphen /*= true*/, const sal_uInt16 nId ); diff --git a/include/editeng/nlbkitem.hxx b/include/editeng/nlbkitem.hxx index 4373a12778d0..0dfc61db4ccd 100644 --- a/include/editeng/nlbkitem.hxx +++ b/include/editeng/nlbkitem.hxx @@ -26,7 +26,7 @@ class EDITENG_DLLPUBLIC SvxNoLinebreakItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxNoLinebreakItem( const bool bBreak /*= true*/, const sal_uInt16 nId ); diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx index b1aa1459d52c..37c6f7698a9a 100644 --- a/include/editeng/opaqitem.hxx +++ b/include/editeng/opaqitem.hxx @@ -35,7 +35,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxOpaqueItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxOpaqueItem( const sal_uInt16 nId , const bool bOpa = true ); inline SvxOpaqueItem &operator=( const SvxOpaqueItem &rCpy ); diff --git a/include/editeng/optitems.hxx b/include/editeng/optitems.hxx index 55102d1184c3..6f7cb9f8b437 100644 --- a/include/editeng/optitems.hxx +++ b/include/editeng/optitems.hxx @@ -35,7 +35,7 @@ namespace linguistic2{ class EDITENG_DLLPUBLIC SfxSpellCheckItem: public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxSpellCheckItem( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xChecker, @@ -68,7 +68,7 @@ class EDITENG_DLLPUBLIC SfxHyphenRegionItem: public SfxPoolItem sal_uInt8 nMinTrail; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxHyphenRegionItem( const sal_uInt16 nId ); SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ); diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx index f0f10d48cdb9..d19788061937 100644 --- a/include/editeng/orphitem.hxx +++ b/include/editeng/orphitem.hxx @@ -35,7 +35,7 @@ class EDITENG_DLLPUBLIC SvxOrphansItem: public SfxByteItem { friend SvStream & WriteSvxOrphansItem( SvStream & aS, SvxOrphansItem & ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxOrphansItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); diff --git a/include/editeng/paravertalignitem.hxx b/include/editeng/paravertalignitem.hxx index d864b90a5d25..a84213a59260 100644 --- a/include/editeng/paravertalignitem.hxx +++ b/include/editeng/paravertalignitem.hxx @@ -35,7 +35,7 @@ class EDITENG_DLLPUBLIC SvxParaVertAlignItem : public SfxUInt16Item { public: enum { AUTOMATIC, BASELINE, TOP, CENTER, BOTTOM }; - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxParaVertAlignItem( sal_uInt16 nValue /*= 0*/, const sal_uInt16 nId ); diff --git a/include/editeng/pbinitem.hxx b/include/editeng/pbinitem.hxx index a5ebef0094d2..d3c14ea84afb 100644 --- a/include/editeng/pbinitem.hxx +++ b/include/editeng/pbinitem.hxx @@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxPaperBinItem : public SfxByteItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit inline SvxPaperBinItem( const sal_uInt16 nId , const sal_uInt8 nTray = PAPERBIN_PRINTER_SETTINGS ); diff --git a/include/editeng/pgrditem.hxx b/include/editeng/pgrditem.hxx index 5e8e322bc26f..e5ca9a53c7c2 100644 --- a/include/editeng/pgrditem.hxx +++ b/include/editeng/pgrditem.hxx @@ -33,7 +33,7 @@ class EDITENG_DLLPUBLIC SvxParaGridItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxParaGridItem( const bool bSnapToGrid /*= true*/, const sal_uInt16 nId ); diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx index c55513a80a10..16abd6db1604 100644 --- a/include/editeng/pmdlitem.hxx +++ b/include/editeng/pmdlitem.hxx @@ -35,7 +35,7 @@ private: bool bAuto; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit inline SvxPageModelItem( sal_uInt16 nWh ); inline SvxPageModelItem( const OUString& rModel, bool bA /*= false*/, diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx index 8b2636685feb..45d3b20257e9 100644 --- a/include/editeng/postitem.hxx +++ b/include/editeng/postitem.hxx @@ -35,7 +35,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxPostureItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxPostureItem( const FontItalic ePost /*= ITALIC_NONE*/, const sal_uInt16 nId ); diff --git a/include/editeng/prntitem.hxx b/include/editeng/prntitem.hxx index 83e1596c7b4b..25e66dc9e82a 100644 --- a/include/editeng/prntitem.hxx +++ b/include/editeng/prntitem.hxx @@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxPrintItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxPrintItem( const sal_uInt16 nId , const bool bPrt = true ); inline SvxPrintItem &operator=( const SvxPrintItem &rCpy ); diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx index 12de52d4b10d..079b77aa4626 100644 --- a/include/editeng/protitem.hxx +++ b/include/editeng/protitem.hxx @@ -39,7 +39,7 @@ class EDITENG_DLLPUBLIC SvxProtectItem : public SfxPoolItem bool bPos :1; // Position protected public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit inline SvxProtectItem( const sal_uInt16 nId ); inline SvxProtectItem &operator=( const SvxProtectItem &rCpy ); diff --git a/include/editeng/prszitem.hxx b/include/editeng/prszitem.hxx index 0810ccf386bd..6594b1a4b0a9 100644 --- a/include/editeng/prszitem.hxx +++ b/include/editeng/prszitem.hxx @@ -32,7 +32,7 @@ class EDITENG_DLLPUBLIC SvxPropSizeItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxPropSizeItem( const sal_uInt16 nPercent /*= 100*/, const sal_uInt16 nID ); diff --git a/include/editeng/rsiditem.hxx b/include/editeng/rsiditem.hxx index 4049df3ffcdc..da658aee445b 100644 --- a/include/editeng/rsiditem.hxx +++ b/include/editeng/rsiditem.hxx @@ -19,7 +19,7 @@ class EDITENG_DLLPUBLIC SvxRsidItem : public SfxUInt32Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxRsidItem( sal_uInt32 nRsid, sal_uInt16 nId ) : SfxUInt32Item( nId, nRsid ) {} SvxRsidItem( SvStream& rIn, sal_uInt16 nId ) : SfxUInt32Item( nId, rIn ) {} diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx index 73b770f8422f..7233c98e6b81 100644 --- a/include/editeng/scriptspaceitem.hxx +++ b/include/editeng/scriptspaceitem.hxx @@ -33,7 +33,7 @@ class EDITENG_DLLPUBLIC SvxScriptSpaceItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxScriptSpaceItem( bool bOn /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/scripttypeitem.hxx b/include/editeng/scripttypeitem.hxx index 1de26f6a0750..8afb993012d8 100644 --- a/include/editeng/scripttypeitem.hxx +++ b/include/editeng/scripttypeitem.hxx @@ -38,7 +38,7 @@ short GetI18NScriptType( sal_uInt16 nItemType ); class EDITENG_DLLPUBLIC SvxScriptTypeItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxScriptTypeItem( sal_uInt16 nType = SCRIPTTYPE_LATIN ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -48,7 +48,7 @@ public: class EDITENG_DLLPUBLIC SvxScriptSetItem : public SfxSetItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool ); diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx index 2415997f58be..91b52642d305 100644 --- a/include/editeng/shaditem.hxx +++ b/include/editeng/shaditem.hxx @@ -43,7 +43,7 @@ class EDITENG_DLLPUBLIC SvxShadowItem : public SfxEnumItemInterface sal_uInt16 nWidth; SvxShadowLocation eLocation; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxShadowItem( const sal_uInt16 nId , const Color *pColor = 0, const sal_uInt16 nWidth = 100 /*5pt*/, diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx index 011a35f4bc3c..81c404349a2f 100644 --- a/include/editeng/shdditem.hxx +++ b/include/editeng/shdditem.hxx @@ -34,7 +34,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxShadowedItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxShadowedItem( const bool bShadowed /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/sizeitem.hxx b/include/editeng/sizeitem.hxx index f3095b0e2964..4963f0537842 100644 --- a/include/editeng/sizeitem.hxx +++ b/include/editeng/sizeitem.hxx @@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxSizeItem : public SfxPoolItem Size aSize; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxSizeItem( const sal_uInt16 nId ); SvxSizeItem( const sal_uInt16 nId, const Size& rSize); diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx index 0c3c2281f91c..3e147b56e504 100644 --- a/include/editeng/spltitem.hxx +++ b/include/editeng/spltitem.hxx @@ -34,7 +34,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ~SvxFmtSplitItem(); inline SvxFmtSplitItem( const bool bSplit /*= true*/, diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx index c0a71362dc2a..ba5081f54539 100644 --- a/include/editeng/tstpitem.hxx +++ b/include/editeng/tstpitem.hxx @@ -105,7 +105,7 @@ class EDITENG_DLLPUBLIC SvxTabStopItem : public SfxPoolItem SvxTabStopArr maTabStops; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxTabStopItem( sal_uInt16 nWhich ); SvxTabStopItem( const sal_uInt16 nTabs, diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx index a2e01ac69688..73f9e2d0f796 100644 --- a/include/editeng/twolinesitem.hxx +++ b/include/editeng/twolinesitem.hxx @@ -30,7 +30,7 @@ class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem sal_Unicode cStartBracket, cEndBracket; bool bOn; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxTwoLinesItem( bool bOn /*= true*/, sal_Unicode nStartBracket /*= 0*/, sal_Unicode nEndBracket /*= 0*/, diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx index 19367483f746..d7de5d5285bc 100644 --- a/include/editeng/udlnitem.hxx +++ b/include/editeng/udlnitem.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvxTextLineItem : public SfxEnumItem { Color mColor; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxTextLineItem( const FontUnderline eSt, const sal_uInt16 nId ); @@ -87,7 +87,7 @@ public: class EDITENG_DLLPUBLIC SvxUnderlineItem : public SvxTextLineItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxUnderlineItem( const FontUnderline eSt, const sal_uInt16 nId ); @@ -104,7 +104,7 @@ public: class EDITENG_DLLPUBLIC SvxOverlineItem : public SvxTextLineItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxOverlineItem( const FontUnderline eSt, const sal_uInt16 nId ); diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx index ed33eda6d818..fb5fff8c0d65 100644 --- a/include/editeng/ulspitem.hxx +++ b/include/editeng/ulspitem.hxx @@ -39,7 +39,7 @@ class EDITENG_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem bool bContext; // Contextual spacing? sal_uInt16 nPropUpper, nPropLower; // relative or absolute (=100%) public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxULSpaceItem( const sal_uInt16 nId ); SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow, diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx index 58d78aae4b33..9b360200c889 100644 --- a/include/editeng/unoedhlp.hxx +++ b/include/editeng/unoedhlp.hxx @@ -45,7 +45,7 @@ private: sal_Int32 mnEnd; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxEditSourceHint( sal_uLong nId ); SvxEditSourceHint( sal_uLong nId, sal_uLong nValue, sal_Int32 nStart=0, sal_Int32 nEnd=0 ); @@ -56,7 +56,7 @@ public: class SvxEditSourceHintEndPara :public SvxEditSourceHint { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxEditSourceHintEndPara( sal_uInt32 nId ) :SvxEditSourceHint(nId) {} SvxEditSourceHintEndPara( sal_uInt32 nId, sal_uInt32 nValue, sal_uInt32 nStart=0, sal_uInt32 nEnd=0 ) diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx index f8946508f1b5..105d3577e7fa 100644 --- a/include/editeng/wghtitem.hxx +++ b/include/editeng/wghtitem.hxx @@ -35,7 +35,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxWeightItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxWeightItem( const FontWeight eWght /*= WEIGHT_NORMAL*/, const sal_uInt16 nId ); diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx index ec1c42f06349..e6aa013abfea 100644 --- a/include/editeng/widwitem.hxx +++ b/include/editeng/widwitem.hxx @@ -35,7 +35,7 @@ class EDITENG_DLLPUBLIC SvxWidowsItem: public SfxByteItem { friend SvStream & WriteSvxWidowsItem( SvStream & aS, SvxWidowsItem & ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxWidowsItem( const sal_uInt8 nL /*= 0*/, const sal_uInt16 nId ); diff --git a/include/editeng/writingmodeitem.hxx b/include/editeng/writingmodeitem.hxx index 78c3f8e6852d..f87ffdea4cff 100644 --- a/include/editeng/writingmodeitem.hxx +++ b/include/editeng/writingmodeitem.hxx @@ -28,7 +28,7 @@ class EDITENG_DLLPUBLIC SvxWritingModeItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxWritingModeItem( ::com::sun::star::text::WritingMode eValue /*= com::sun::star::text::WritingMode_LR_TB*/, sal_uInt16 nWhich /*= SDRATTR_TEXTDIRECTION*/ ); diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx index d64f2d6f070c..78acf3f7c2ca 100644 --- a/include/editeng/wrlmitem.hxx +++ b/include/editeng/wrlmitem.hxx @@ -35,7 +35,7 @@ class SvXMLUnitConverter; class EDITENG_DLLPUBLIC SvxWordLineModeItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxWordLineModeItem( const bool bWordLineMode /*= false*/, const sal_uInt16 nId ); diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx index 029bc5e78164..4329a476259d 100644 --- a/include/editeng/xmlcnitm.hxx +++ b/include/editeng/xmlcnitm.hxx @@ -34,7 +34,7 @@ class EDITENG_DLLPUBLIC SvXMLAttrContainerItem: public SfxPoolItem SvXMLAttrContainerData *pImpl; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvXMLAttrContainerItem( sal_uInt16 nWhich = 0 ); SvXMLAttrContainerItem( const SvXMLAttrContainerItem& ); diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 122cb0da4dc1..57cbf016b7e4 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -137,7 +137,7 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell void Deinitialize(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXAPP) SfxApplication(); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 86e466a4146b..19e91785e031 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -86,7 +86,7 @@ private: ::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty > m_aCmisProperties; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxDocumentInfoItem(); SfxDocumentInfoItem( const OUString &rFileName, const ::com::sun::star::uno::Reference< diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index 2bebdddc6d01..be335ebf95b7 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -42,7 +42,7 @@ class SFX2_DLLPUBLIC SfxEventHint : public SfxHint sal_uInt16 nEventId; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj = 0 ) : pObjShell(pObj), aEventName(aName), @@ -66,7 +66,7 @@ class SFX2_DLLPUBLIC SfxViewEventHint : public SfxEventHint ::com::sun::star::uno::Reference< css::frame::XController2 > xViewController; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxViewEventHint( sal_uInt16 nId, const OUString& aName, SfxObjectShell *pObj, const css::uno::Reference< css::frame::XController >& xController ) : SfxEventHint( nId, aName, pObj ) @@ -91,7 +91,7 @@ class SfxNamedHint : public SfxHint OUString _aArgs; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxNamedHint( const OUString& rName, const OUString& rArgs, @@ -119,7 +119,7 @@ class SfxPrintingHint : public SfxViewEventHint sal_Int32 mnPrintableState; com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aOpts; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxPrintingHint( sal_Int32 nEvent, diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index eacefeb1b46f..3f96dedf95c8 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -74,7 +74,7 @@ class SFX2_DLLPUBLIC SfxEventNamesItem : public SfxPoolItem SfxEventNamesList aEventsList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {} diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 7678e0bfdceb..0bf2a8763397 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -233,7 +233,7 @@ class SFX2_DLLPUBLIC SfxFrameItem: public SfxPoolItem SAL_DLLPRIVATE void SetFramePtr_Impl( SfxFrame* /*pFrameP*/ ) { pFrame = wFrame; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxFrameItem( sal_uInt16 nWhich, SfxViewFrame *p ); SfxFrameItem( SfxFrame *p=0 ); @@ -256,7 +256,7 @@ class SFX2_DLLPUBLIC SfxUsrAnyItem : public SfxPoolItem { ::com::sun::star::uno::Any aValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxUsrAnyItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Any& rAny ); ::com::sun::star::uno::Any GetValue() const { return aValue; } @@ -272,7 +272,7 @@ class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem m_xFrame; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxUnoFrameItem(); SfxUnoFrameItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame ); const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index ffa57edcf7ef..7c17b1cad4b8 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -223,7 +223,7 @@ class SfxFrameDescriptorItem : public SfxPoolItem { SfxFrameProperties aProperties; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxFrameDescriptorItem ( const sal_uInt16 nId = SID_FRAMEDESCRIPTOR ) : SfxPoolItem( nId ) diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index 85b855bed684..3b443b570666 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -35,7 +35,7 @@ class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem OUString aCommentText; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxMacroInfoItem( sal_uInt16 nWhich, const BasicManager* pMgr, const OUString &rLibName, diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 52ccefb7f968..48ab868b0f23 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -66,7 +66,7 @@ private: SAL_DLLPRIVATE void Construct_Impl(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXMODULE) SfxModule( ResMgr* pMgrP, bool bDummy, diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index f19caa357790..862e29fe4abd 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -32,7 +32,7 @@ class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem SfxShell* _pSh; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=0 ); virtual bool operator==( const SfxPoolItem& ) const; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index a80abe39cb41..b912b969711c 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -203,7 +203,7 @@ protected: void AddToRecentlyUsedList(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXDOCSH) static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); @@ -740,7 +740,7 @@ class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem SfxObjectShell* pObjSh; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxObjectShellItem() : SfxPoolItem( 0 ), pObjSh( 0 ) diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index b34cda6b58ea..526e6385dd12 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -166,7 +166,7 @@ protected: SAL_DLLPRIVATE void SetShellObj_Impl( SfxShellObject* pObj ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~SfxShell(); virtual SfxInterface* GetInterface() const; diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 15853c9573e2..595769ef450d 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -50,7 +50,7 @@ struct TabDlg_Impl; class SFX2_DLLPUBLIC SfxTabDialogItem: public SfxSetItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=NULL); virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const; diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx index b8e664ce31ed..262f34824630 100644 --- a/include/sfx2/tplpitem.hxx +++ b/include/sfx2/tplpitem.hxx @@ -30,7 +30,7 @@ class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem { OUString aStyle; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxTemplateItem(); SfxTemplateItem( sal_uInt16 nWhich, const OUString &rStyle, diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 63a1cc8c71b4..43cac0dcf437 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -90,7 +90,7 @@ protected: public: SfxViewFrame( SfxFrame& rFrame, SfxObjectShell *pDoc = NULL ); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWFRM) static void SetViewFrame( SfxViewFrame* ); @@ -293,7 +293,7 @@ class SFX2_DLLPUBLIC SfxViewFrameItem: public SfxPoolItem SfxViewFrame* pFrame; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxViewFrameItem( SfxViewFrame *pViewFrame ): SfxPoolItem( 0 ), pFrame( pViewFrame) @@ -316,7 +316,7 @@ class SfxVerbListItem : public SfxPoolItem com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > aVerbs; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxVerbListItem( sal_uInt16 nWhichId = SID_OBJECT ) : SfxPoolItem( nWhichId ) {} diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index a6bbf56e14bb..6fd665ab2907 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -162,7 +162,7 @@ public: static SfxViewShell* Get( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController>& i_rController ); // Initialize Constructors/Destructors - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWSH) SfxViewShell( SfxViewFrame *pFrame, sal_uInt16 nFlags = 0 ); diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index 1cfdc3db0f69..da0d1343e516 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -42,7 +42,7 @@ class SFX2_DLLPUBLIC SvxZoomItem: public SfxUInt16Item SvxZoomType eType; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxZoomItem( SvxZoomType eZoomType = SVX_ZOOM_PERCENT, sal_uInt16 nVal = 0, sal_uInt16 nWhich = SID_ATTR_ZOOM ); diff --git a/include/sot/filelist.hxx b/include/sot/filelist.hxx index 220b5121adf2..56290770235e 100644 --- a/include/sot/filelist.hxx +++ b/include/sot/filelist.hxx @@ -43,7 +43,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FileList() {}; ~FileList(); diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx index a4033f5dd965..70066e21708f 100644 --- a/include/sot/stg.hxx +++ b/include/sot/stg.hxx @@ -75,7 +75,7 @@ public: class BaseStorageStream : public StorageBase { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual sal_uLong Read( void * pData, sal_uLong nSize ) = 0; virtual sal_uLong Write( const void* pData, sal_uLong nSize ) = 0; virtual sal_uLong Seek( sal_uLong nPos ) = 0; @@ -92,7 +92,7 @@ public: class BaseStorage : public StorageBase { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual const OUString& GetName() const = 0; virtual bool IsRoot() const = 0; virtual void SetClassId( const ClsId& ) = 0; @@ -156,7 +156,7 @@ class StorageStream : public BaseStorageStream, public OLEStorageBase protected: ~StorageStream(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); StorageStream( StgIo*, StgDirEntry*, StreamMode ); virtual sal_uLong Read( void * pData, sal_uLong nSize ); virtual sal_uLong Write( const void* pData, sal_uLong nSize ); @@ -185,7 +185,7 @@ class SOT_DLLPUBLIC Storage : public BaseStorage, public OLEStorageBase protected: ~Storage(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); Storage( const OUString &, StreamMode = STREAM_STD_READWRITE, bool bDirect = true ); Storage( SvStream& rStrm, bool bDirect = true ); Storage( UCBStorageStream& rStrm, bool bDirect = true ); @@ -249,7 +249,7 @@ friend class UCBStorage; protected: ~UCBStorageStream(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); UCBStorageStream( const OUString& rName, StreamMode nMode, bool bDirect, const OString* pKey, bool bRepair, ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XProgressHandler > xProgress ); UCBStorageStream( UCBStorageStream_Impl* ); @@ -308,7 +308,7 @@ public: UCBStorage( UCBStorage_Impl* ); UCBStorage( SvStream& rStrm, bool bDirect = true ); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual const OUString& GetName() const; virtual bool IsRoot() const; virtual void SetClassId( const ClsId& ); 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) diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 7f53e86bdb79..978eb2a4ce02 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -238,7 +238,7 @@ namespace svt bool m_bOwnImplementation; // did we create m_pEditImplementation? public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); EditCellController( Edit* _pEdit ); EditCellController( IEditImplementation* _pImplementation ); ~EditCellController( ); @@ -261,7 +261,7 @@ namespace svt class SVT_DLLPUBLIC SpinCellController : public CellController { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SpinCellController(SpinField* pSpinField); SpinField& GetSpinWindow() const {return (SpinField &)GetWindow();} @@ -313,7 +313,7 @@ namespace svt class SVT_DLLPUBLIC CheckBoxCellController : public CellController { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); CheckBoxCellController(CheckBoxControl* pWin):CellController(pWin){} CheckBox& GetCheckBox() const; @@ -346,7 +346,7 @@ namespace svt class SVT_DLLPUBLIC ComboBoxCellController : public CellController { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ComboBoxCellController(ComboBoxControl* pParent); ComboBoxControl& GetComboBox() const {return (ComboBoxControl &)GetWindow();} @@ -379,7 +379,7 @@ namespace svt class SVT_DLLPUBLIC ListBoxCellController : public CellController { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ListBoxCellController(ListBoxControl* pParent); ListBoxControl& GetListBox() const {return (ListBoxControl &)GetWindow();} @@ -398,7 +398,7 @@ namespace svt class SVT_DLLPUBLIC FormattedFieldCellController : public EditCellController { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FormattedFieldCellController( FormattedField* _pFormatted ); virtual void CommitModifications(); diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 8617d3ac1fab..09fdbfdfa7ad 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -310,7 +310,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); GraphicObject( const GraphicManager* pMgr = NULL ); GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr = NULL ); diff --git a/include/svtools/xwindowitem.hxx b/include/svtools/xwindowitem.hxx index 14399d0e45bb..f99ce60e0ce4 100644 --- a/include/svtools/xwindowitem.hxx +++ b/include/svtools/xwindowitem.hxx @@ -39,7 +39,7 @@ class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem XWindowItem & operator = ( const XWindowItem & ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XWindowItem(); XWindowItem( const XWindowItem &rItem ); ~XWindowItem(); diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index 2f1746281b61..a6ce3dd2cc48 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -33,7 +33,7 @@ private: com::sun::star::geometry::AffineMatrix2D maMatrix; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); AffineMatrixItem(const com::sun::star::geometry::AffineMatrix2D* pMatrix = 0); AffineMatrixItem(SvStream& rIn); AffineMatrixItem(const AffineMatrixItem&); diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx index 6ba81ac464b6..e5f8ea066003 100644 --- a/include/svx/SmartTagItem.hxx +++ b/include/svx/SmartTagItem.hxx @@ -51,7 +51,7 @@ class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem const OUString maRangeText; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxSmartTagItem( const sal_uInt16 nId, const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence, diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 67daf974b475..b2aab411008c 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -32,7 +32,7 @@ class SvStream; class SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxOrientationItem( const SvxCellOrientation eOrientation /*= SVX_ORIENTATION_STANDARD*/, @@ -78,7 +78,7 @@ class SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem sal_Int16 nRightMargin; sal_Int16 nBottomMargin; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxMarginItem( const sal_uInt16 nId ); SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/, sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/, diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index f1d193d5dc3d..2f15a0436756 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -167,7 +167,7 @@ enum SvxChartRegress class SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxChartStyleItem(SvxChartStyle eStyle /*= CHSTYLE_2D_LINE*/, sal_uInt16 nId ); SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId ); @@ -185,7 +185,7 @@ public: class SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxChartRegressItem(SvxChartRegress eRegress /*= CHREGRESS_LINEAR*/, sal_uInt16 nId ); SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId ); @@ -204,7 +204,7 @@ public: class SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId ); @@ -221,7 +221,7 @@ public: class SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/, sal_uInt16 nId ); SvxChartTextOrderItem(SvStream& rIn, @@ -243,7 +243,7 @@ public: class SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId ); @@ -260,7 +260,7 @@ public: class SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxChartKindErrorItem(SvxChartKindError /*eOrient = CHERROR_NONE*/, sal_uInt16 nId ); SvxChartKindErrorItem(SvStream& rIn, @@ -281,7 +281,7 @@ public: class SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/, sal_uInt16 nId ); SvxChartIndicateItem(SvStream& rIn, @@ -304,7 +304,7 @@ class SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem double fVal; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId ); SvxDoubleItem(const SvxDoubleItem& rItem); diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index 3407b5e83290..5e0cd6a9689d 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -34,7 +34,7 @@ protected: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxClipboardFmtItem( sal_uInt16 nId = 0 ); SvxClipboardFmtItem( const SvxClipboardFmtItem& ); virtual ~SvxClipboardFmtItem(); diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx index 53507026f72b..9f07b6325bc2 100644 --- a/include/svx/cube3d.hxx +++ b/include/svx/cube3d.hxx @@ -57,7 +57,7 @@ protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize); E3dCubeObj(); diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index 1de3e4609446..2601174fb418 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SvxColorListItem: public SfxPoolItem XColorListRef pColorList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxColorListItem(); SvxColorListItem( XColorListRef pTable, sal_uInt16 nWhich ); @@ -64,7 +64,7 @@ class SVX_DLLPUBLIC SvxGradientListItem: public SfxPoolItem XGradientListRef pGradientList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxGradientListItem(); SvxGradientListItem( XGradientListRef pList, sal_uInt16 nWhich ); @@ -94,7 +94,7 @@ class SVX_DLLPUBLIC SvxHatchListItem: public SfxPoolItem XHatchListRef pHatchList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxHatchListItem(); SvxHatchListItem( XHatchListRef pList, sal_uInt16 nWhich ); @@ -125,7 +125,7 @@ class SVX_DLLPUBLIC SvxBitmapListItem: public SfxPoolItem XBitmapListRef pBitmapList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxBitmapListItem(); SvxBitmapListItem( XBitmapListRef pBL, sal_uInt16 nWhich ); @@ -156,7 +156,7 @@ class SVX_DLLPUBLIC SvxDashListItem: public SfxPoolItem XDashListRef pDashList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxDashListItem(); SvxDashListItem( XDashListRef pList, sal_uInt16 nWhich ); @@ -184,7 +184,7 @@ class SVX_DLLPUBLIC SvxLineEndListItem: public SfxPoolItem XLineEndListRef pLineEndList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxLineEndListItem(); SvxLineEndListItem( XLineEndListRef pList, sal_uInt16 nWhich ); diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index fae604d3ef36..ee258515cda7 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem basegfx::B3DVector aVal; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxB3DVectorItem(); SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal ); SvxB3DVectorItem( const SvxB3DVectorItem& ); diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx index 27e50dd49d3f..96ebbd0cb9ee 100644 --- a/include/svx/e3dundo.hxx +++ b/include/svx/e3dundo.hxx @@ -36,7 +36,7 @@ class E3dUndoAction : public SdrUndoAction E3dObject *pMy3DObj; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dUndoAction (SdrModel *pModel, E3dObject *p3DObj) : SdrUndoAction (*pModel), @@ -60,7 +60,7 @@ class E3dRotateUndoAction : public E3dUndoAction basegfx::B3DHomMatrix aMyNewRotation; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dRotateUndoAction (SdrModel *pModel, E3dObject *p3DObj, const basegfx::B3DHomMatrix &aOldRotation, @@ -93,7 +93,7 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction const SfxItemSet aOldSet; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dAttributesUndoAction( SdrModel &rModel, E3dObject* pInObject, const SfxItemSet& rNewSet, diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx index 5bea27dce930..10aa7d50d263 100644 --- a/include/svx/extrud3d.hxx +++ b/include/svx/extrud3d.hxx @@ -44,7 +44,7 @@ protected: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPP, double fDepth); E3dExtrudeObj(); diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx index 2f31c4ec4362..47800a22c16c 100644 --- a/include/svx/extrusionbar.hxx +++ b/include/svx/extrusionbar.hxx @@ -38,7 +38,7 @@ SVX_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyEx class SVX_DLLPUBLIC ExtrusionBar : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SVX_INTERFACE_EXTRUSION_BAR) ExtrusionBar(SfxViewShell* pViewShell ); diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx index a441ff2d726f..b74fdcb11ba4 100644 --- a/include/svx/fmmodel.hxx +++ b/include/svx/fmmodel.hxx @@ -46,7 +46,7 @@ private: SVX_DLLPRIVATE void operator=(const FmFormModel& rSrcModel); // never implemented public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL ); FmFormModel(const OUString& rPath, SfxItemPool* pPool=NULL, diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 2d36c1576c09..1ba4bf0d4ce4 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -45,7 +45,7 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage OUString m_sPageName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFormPage(FmFormModel& rModel, bool bMasterPage=false); FmFormPage(const FmFormPage& rPage); diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index ababcc43444c..92306858b64f 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -60,7 +60,7 @@ class SVX_DLLPUBLIC FmDesignModeChangedHint : public SfxHint bool m_bDesignMode; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmDesignModeChangedHint( bool bDesMode ); virtual ~FmDesignModeChangedHint(); @@ -101,7 +101,7 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell public: SFX_DECL_INTERFACE(SVX_INTERFACE_FORM_SH) - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFormShell(SfxViewShell* pParent, FmFormView* pView = NULL); virtual ~FmFormShell(); diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 02103ca1bf1c..884b88211bd7 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -61,7 +61,7 @@ class SVX_DLLPUBLIC FmFormView : public E3dView void Init(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFormView(FmFormModel* pModel, OutputDevice* pOut = 0L); virtual ~FmFormView(); diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx index ec5f0f3c2081..9efd7dc76dab 100644 --- a/include/svx/fontworkbar.hxx +++ b/include/svx/fontworkbar.hxx @@ -38,7 +38,7 @@ bool SVX_DLLPUBLIC checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nChe class SVX_DLLPUBLIC FontworkBar : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SVX_INTERFACE_FONTWORK_BAR) FontworkBar(SfxViewShell* pViewShell ); diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index 9509c8759aee..e6a586f0163f 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -47,7 +47,7 @@ class SVX_DLLPUBLIC SvxGalleryItem : public SfxPoolItem com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > m_xGraphic; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxGalleryItem(); SvxGalleryItem( const SvxGalleryItem& ); diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index fa86b2787141..deea8b6d9c93 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index 11e6c4a032bb..e5c55f1029f0 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -50,7 +50,7 @@ class SVX_DLLPUBLIC SvxHyperlinkItem : public SfxPoolItem sal_uInt16 nMacroEvents; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxHyperlinkItem( sal_uInt16 _nWhich = SID_HYPERLINK_GETLINK ): SfxPoolItem(_nWhich), pMacroTable(NULL) { eType = HLINK_DEFAULT; nMacroEvents=0; }; diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx index 1c3dbbddeb2a..9aad4789ad87 100644 --- a/include/svx/lathe3d.hxx +++ b/include/svx/lathe3d.hxx @@ -46,7 +46,7 @@ private: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon rPoly2D); E3dLatheObj(); diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index 8154f0063ed1..820f466d1988 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -34,7 +34,7 @@ This item is used as a transport medium for a number formatter class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxNumberInfoItem( const sal_uInt16 nId ); SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 1a59ea45fad4..049f632dce4c 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -79,7 +79,7 @@ public: class E3dObjList : public SdrObjList { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dObjList(SdrModel* pNewModel = 0, SdrPage* pNewPage = 0, E3dObjList* pNewUpList = 0); SVX_DLLPUBLIC E3dObjList(const E3dObjList& rSrcList); SVX_DLLPUBLIC virtual ~E3dObjList(); @@ -136,7 +136,7 @@ protected: E3dObject(bool bIsFromChart); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual void RecalcSnapRect(); virtual void SetRectsDirty(bool bNotMyself = false); @@ -239,7 +239,7 @@ protected: basegfx::B2DPolyPolygon TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate); public : - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dCompoundObject(); E3dCompoundObject(E3dDefaultAttributes& rDefault); diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index ac479ae65dc1..adbbbbd8005f 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -68,7 +68,7 @@ private: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxPageItem( const sal_uInt16 nId ); SvxPageItem( const SvxPageItem& rItem ); diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx index 7769a1703a08..06a174067625 100644 --- a/include/svx/polygn3d.hxx +++ b/include/svx/polygn3d.hxx @@ -43,7 +43,7 @@ public: void SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D); void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D); - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dPolygonObj( E3dDefaultAttributes& rDefault, diff --git a/include/svx/polysc3d.hxx b/include/svx/polysc3d.hxx index cb661ff1ecd2..c7f76371fae0 100644 --- a/include/svx/polysc3d.hxx +++ b/include/svx/polysc3d.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC E3dPolyScene : public E3dScene { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dPolyScene(); E3dPolyScene(E3dDefaultAttributes& rDefault); diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index 1bf651be5a8e..ac4c8c1e5eb5 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -33,7 +33,7 @@ The author shorthand symbol of a note class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxPostItAuthorItem( sal_uInt16 nWhich ); @@ -64,7 +64,7 @@ The date of a note class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxPostItDateItem( sal_uInt16 nWhich ); @@ -95,7 +95,7 @@ The text of a note class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxPostItTextItem( sal_uInt16 nWhich ); diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index f81adb3e918d..276542747c8c 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -37,7 +37,7 @@ enum SvxRotateMode class SVX_DLLPUBLIC SvxRotateModeItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, sal_uInt16 nWhich=0); SvxRotateModeItem( const SvxRotateModeItem& rItem ); diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 0891c1003160..6e5d0b5fd022 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -47,7 +47,7 @@ private: SVX_DLLPRIVATE const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &); // n.i. public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId); SvxLongLRSpaceItem(const SvxLongLRSpaceItem &); SvxLongLRSpaceItem(); @@ -81,7 +81,7 @@ private: SVX_DLLPRIVATE const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &); // n.i. public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId); SvxLongULSpaceItem(const SvxLongULSpaceItem &); SvxLongULSpaceItem(); @@ -113,7 +113,7 @@ protected: private: SVX_DLLPRIVATE const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &); // n.i. public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxPagePosSizeItem(const Point &rPos, long lWidth, long lHeight); SvxPagePosSizeItem(const SvxPagePosSizeItem &); SvxPagePosSizeItem(); @@ -174,7 +174,7 @@ protected: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // right edge of the surrounding frame // nLeft, nRight each the distance to the surrounding frame SvxColumnItem(sal_uInt16 nAct = 0); @@ -233,7 +233,7 @@ private: SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i. public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxObjectItem(long nStartX, long nEndX, long nStartY, long nEndY, bool bLimits = false); diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index c81839f93172..23856f27cba7 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -88,7 +88,7 @@ protected: void ImpCleanup3DDepthMapper(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dScene(); E3dScene(E3dDefaultAttributes& rDefault); virtual ~E3dScene(); diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index f6c354da6786..c3eb49a0baa4 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrAngleItem(): SfxInt32Item() {} SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle=0): SfxInt32Item(nId,nAngle) {} SdrAngleItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index 88f606b59ce4..778fb09f0fa0 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -43,7 +43,7 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem public : - TYPEINFO(); + TYPEINFO_OVERRIDE(); SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem(); SdrCustomShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion ); SVX_DLLPUBLIC ~SdrCustomShapeAdjustmentItem(); diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index b30470980191..6fddcc05364c 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -71,7 +71,7 @@ private: public : - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrCustomShapeGeometryItem(); SdrCustomShapeGeometryItem( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& ); diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx index 7d313ff91d51..aba6846b789d 100644 --- a/include/svx/sdgcoitm.hxx +++ b/include/svx/sdgcoitm.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrGrafRedItem( short nRedPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFRED, nRedPercent ) {} SdrGrafRedItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFRED, rIn ) {} @@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrGrafGreenItem( short nGreenPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, nGreenPercent ) {} SdrGrafGreenItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, rIn ) {} @@ -66,7 +66,7 @@ class SVX_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrGrafBlueItem( short nBluePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, nBluePercent ) {} SdrGrafBlueItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, rIn ) {} diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index 9fad5fd89a01..bc0364ecc12b 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SdrGrafCropItem : public SvxGrfCrop { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrGrafCropItem( sal_Int32 nLeftCrop = 0, sal_Int32 nTopCrop = 0, sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0, diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index 4930937c96cc..3e0d24644794 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrGrafGamma100Item : public SfxUInt32Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrGrafGamma100Item( sal_uIntPtr nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {} SdrGrafGamma100Item( SvStream& rIn ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, rIn ) {} diff --git a/include/svx/sdginitm.hxx b/include/svx/sdginitm.hxx index 8a087530708e..a22b78126a77 100644 --- a/include/svx/sdginitm.hxx +++ b/include/svx/sdginitm.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrGrafInvertItem : public SdrOnOffItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrGrafInvertItem( bool bInvert = false ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {} SdrGrafInvertItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_GRAFINVERT, rIn ) {} diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx index 32d0064595ed..aa073498129f 100644 --- a/include/svx/sdgluitm.hxx +++ b/include/svx/sdgluitm.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrGrafLuminanceItem : public SdrSignedPercentItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrGrafLuminanceItem( short nLuminancePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, nLuminancePercent ) {} SdrGrafLuminanceItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, rIn ) {} @@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SdrGrafContrastItem : public SdrSignedPercentItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrGrafContrastItem( short nContrastPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, nContrastPercent ) {} SdrGrafContrastItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, rIn ) {} diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 8936ee629e62..1bdb3d505a1b 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC SdrGrafModeItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (sal_uInt16)eMode ) {} SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {} diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx index 076bb2af8c36..88372f8544ff 100644 --- a/include/svx/sdgtritm.hxx +++ b/include/svx/sdgtritm.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {} SdrGrafTransparenceItem( SvStream& rIn ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, rIn ) {} diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 3e85dc790a35..0a956f56980d 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrMetricItem(): SfxInt32Item() {} SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal=0): SfxInt32Item(nId,nVal) {} SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index d9999f46d17a..6245237df99e 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrOnOffItem(): SfxBoolItem() {} SdrOnOffItem(sal_uInt16 nId, bool bOn=false): SfxBoolItem(nId,bOn) {} SdrOnOffItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index 65890a53a42c..3e0dd6564493 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrPercentItem(): SfxUInt16Item() {} SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal=0): SfxUInt16Item(nId,nVal) {} SdrPercentItem(sal_uInt16 nId, SvStream& rIn): SfxUInt16Item(nId,rIn) {} @@ -49,7 +49,7 @@ public: class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrSignedPercentItem(): SfxInt16Item() {} SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {} SdrSignedPercentItem( sal_uInt16 nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {} diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index edd93e7c3ff4..68808c3421a1 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -25,7 +25,7 @@ class SVX_DLLPUBLIC SdrTextAniAmountItem: public SfxInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {} SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 54ded50680f9..95ab7c39c498 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -34,7 +34,7 @@ enum SdrTextAniDirection {SDRTEXTANI_LEFT, class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(sal_uInt16)eDir) {} SdrTextAniDirectionItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index b6fd1c680672..7ce752357e11 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -35,7 +35,7 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(sal_uInt16)eAdj) {} SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich,(sal_uInt16)eAdj) {} SdrTextVertAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_VERTADJUST,rIn) {} @@ -63,7 +63,7 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(sal_uInt16)eAdj) {} SdrTextHorzAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 3d1e6c11ccd9..c93eed5bf6d5 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -77,7 +77,7 @@ enum SdrTextAniKind {SDRTEXTANI_NONE, class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(sal_uInt16)eKind) {} SdrTextAniKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index 27979aab4ae7..6a45325a5872 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -25,7 +25,7 @@ class SVX_DLLPUBLIC SdrTextAniDelayItem: public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {} SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 2fa0a8163dd6..7ef6c13fc962 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -25,7 +25,7 @@ class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrTextFixedCellHeightItem( bool bUseFixedCellHeight = false ); SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion ); diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index 5defc601c6c0..6d763b8513d9 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -44,7 +44,7 @@ enum SdrFitToSizeType { class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(sal_uInt16)eFit) {} SdrTextFitToSizeTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index cb1142ee10fd..d8620d365559 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -30,7 +30,7 @@ //-------------------------------------------------- ---------- class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrYesNoItem(): SfxBoolItem() {} SdrYesNoItem(sal_uInt16 nId, bool bOn=false): SfxBoolItem(nId,bOn) {} SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx index 06c6147de76d..e3ae1724d57a 100644 --- a/include/svx/sphere3d.hxx +++ b/include/svx/sphere3d.hxx @@ -39,7 +39,7 @@ protected: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& rCenter, const basegfx::B3DVector& r3DSize); // FG: This constructor is only called from MakeObject from the 3d-Objectfactory diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index fc45d3f1a6ca..c97a53644f82 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -236,7 +236,7 @@ protected: virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrDragMove(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const; @@ -259,7 +259,7 @@ protected: Fraction aYFact; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrDragResize(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const; @@ -288,7 +288,7 @@ protected: virtual void createSdrDragEntries(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrDragObjOwn(SdrDragView& rNewView); virtual ~SdrDragObjOwn(); diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 524c86c37b9c..049e2f099f3f 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -124,7 +124,7 @@ public: SdrHintKind meHint; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SdrHint(SdrHintKind eNewHint); explicit SdrHint(const SdrObject& rNewObj); @@ -279,7 +279,7 @@ private: public: bool IsPasteResize() const { return bPasteResize; } void SetPasteResize(bool bOn) { bPasteResize=bOn; } - TYPEINFO(); + TYPEINFO_OVERRIDE(); // Steckt man hier seinen eigenen Pool rein, so wird die Klasse auch // Aktionen an ihm vornehmen (Put(),Remove()). Bei Zerstoerung von // SdrModel wird dieser Pool ver delete geloescht! diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 00b4afebf714..ffd44d7476c8 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -150,7 +150,7 @@ public: double GetObjectRotation() const; double GetExtraTextRotation( const bool bPreRotation = false ) const; - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrObjCustomShape(); virtual ~SdrObjCustomShape(); diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index d01f57d73d47..d3a39cdca14e 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -63,7 +63,7 @@ protected: virtual ~SdrAttrObj(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // Detects if bFilledObj && Fill != FillNone bool HasFill() const; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index ddd6dcca28c5..ccdf58abb683 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -448,7 +448,7 @@ protected: virtual ~SdrObject(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrObject(); // frees the SdrObject pointed to by the argument diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 9db626919cf1..30bd9a085aeb 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -75,7 +75,7 @@ private: SVX_DLLPRIVATE void ImpRecalcTail(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrCaptionObj(); SdrCaptionObj(const Rectangle& rRect, const Point& rTail); virtual ~SdrCaptionObj(); diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index 3286d55037dd..99879ca71dd9 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -69,7 +69,7 @@ protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrCircObj(SdrObjKind eNewKind); // Circ, CArc, Sect or CCut SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect); diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 3c9bead8aba1..49b29410d07e 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -213,7 +213,7 @@ protected: void ImpSetEdgeInfoToAttr(); // Werte vom aEdgeInfo in den Pool kopieren public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrEdgeObj(); virtual ~SdrEdgeObj(); diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 5fe8dfdc3ee6..4ca3a238e166 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -104,7 +104,7 @@ private: void onGraphicChanged(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrGrafObj(); SdrGrafObj(const Graphic& rGrf); diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 6717a79dd18c..5851b6280688 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -47,7 +47,7 @@ protected: bool bRefPoint; // Ist ein RefPoint gesetzt? public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrObjGroup(); virtual ~SdrObjGroup(); diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index d177663fae0f..27d083789724 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -85,7 +85,7 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrMeasureObj(); SdrMeasureObj(const Point& rPt1, const Point& rPt2); virtual ~SdrMeasureObj(); diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 2e1d55103c10..2fef2413a16f 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -38,7 +38,7 @@ class SVX_DLLPUBLIC SdrMediaObj : public SdrRectObj public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrMediaObj(); SdrMediaObj( const Rectangle& rRect ); diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index c6fbf3210be4..6a12228c551c 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -81,7 +81,7 @@ protected: public: OUString GetStyleString(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrOle2Obj(bool bFrame_ = false); SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect, bool bFrame_ = false); diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 59f959c28cf2..5712feccc6f7 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -42,7 +42,7 @@ protected: virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrPageObj(SdrPage* pNewPage = 0L); SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage = 0L); ~SdrPageObj(); diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index 3ff166553e10..dc57bc8121b1 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -72,7 +72,7 @@ public: double GetBrightness() { return mdBrightness; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrPathObj(SdrObjKind eNewKind); SdrPathObj(SdrObjKind eNewKind, const basegfx::B2DPolyPolygon& rPathPoly, double dBrightness = 1.0); virtual ~SdrPathObj(); diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index f2510afbb9e3..fc6bbb5265bd 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -64,7 +64,7 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // Der Eckenradius-Parameter fliegt irgendwann raus. Der Eckenradius // ist dann (spaeter) ueber SfxItems einzustellen (SetAttributes()). // Konstruktion eines Rechteck-Zeichenobjekts diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index 8a1f46ad710a..aaa9573ae735 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -109,7 +109,7 @@ public: SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows); virtual ~SdrTableObj(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); // table stuff diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 8e184c3aec8d..84393da7da29 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -104,7 +104,7 @@ class ImpSdrObjTextLinkUserData : public SdrObjUserData rtl_TextEncoding eCharSet; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ImpSdrObjTextLinkUserData(SdrTextObj* pObj1); virtual ~ImpSdrObjTextLinkUserData(); @@ -312,7 +312,7 @@ protected: virtual ~SdrTextObj(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // #101684# bool IsInEditMode() const { return mbInEditMode; } diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 4d366cf64f41..3037fe0f02f2 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -64,7 +64,7 @@ private: const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SdrUnoObj(const OUString& rModelName, bool bOwnsModel = true); SdrUnoObj(const OUString& rModelName, diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 1fe569246f92..7b299e4132e9 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -52,7 +52,7 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrVirtObj(SdrObject& rNewObj); virtual ~SdrVirtObj(); virtual SdrObject& ReferencedObj(); diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index a573365b071d..8214f40eb92b 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -483,7 +483,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrPage(SdrModel& rNewModel, bool bMasterPage=false); // Copy-Ctor und Zuweisungeoperator sind nicht getestet! SdrPage(const SdrPage& rSrcPage); diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 751120655708..49b34766ef02 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxViewHint : public SfxHint { public: enum HintType { SVX_HINT_VIEWCHANGED }; - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SvxViewHint (HintType eType); HintType GetHintType (void) const; @@ -284,7 +284,7 @@ protected: virtual ~SdrPaintView(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual void ClearPageView(); SdrModel* GetModel() const { return pMod; } diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 55aaebe17d8c..7f65f337a882 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -56,7 +56,7 @@ protected: {} public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~SdrUndoAction(); virtual bool CanRepeat(SfxRepeatTarget& rView) const; diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index bfe5bc8bfc0c..f8d563e83850 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -165,7 +165,7 @@ protected: SvtAccessibilityOptions maAccessibilityOptions; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit SdrView(SdrModel* pModel1, OutputDevice* pOut = 0L); virtual ~SdrView(); diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx index 1c0690ff5059..015c339e813c 100644 --- a/include/svx/svxgrahicitem.hxx +++ b/include/svx/svxgrahicitem.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem Graphic aGraphic; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxGraphicItem(); SvxGraphicItem( sal_uInt16 nWhich ,const Graphic& rGraphic); SvxGraphicItem( const SvxGraphicItem& ); diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index 3dc637ff8537..888743b05537 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -32,7 +32,7 @@ enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBEST class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< sal_uInt16 >(eDir)) {} SdrCaptionEscDirItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONESCDIR,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sxcikitm.hxx b/include/svx/sxcikitm.hxx index 0643e298acbc..8c6761fbf11f 100644 --- a/include/svx/sxcikitm.hxx +++ b/include/svx/sxcikitm.hxx @@ -29,7 +29,7 @@ enum SdrCircKind {SDRCIRC_FULL, class SdrCircKindItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrCircKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CIRCKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index c7ead86ea3db..28195cc7fed0 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -30,7 +30,7 @@ enum SdrCaptionType {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4}; class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< sal_uInt16 >(eStyle)) {} SdrCaptionTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONTYPE,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index 30ce02a68666..d0f3ac901b68 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -34,7 +34,7 @@ enum SdrEdgeKind {SDREDGE_ORTHOLINES, class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< sal_uInt16 >(eStyle)) {} SdrEdgeKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_EDGEKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sxmkitm.hxx b/include/svx/sxmkitm.hxx index afc0f24abcd2..f00757859998 100644 --- a/include/svx/sxmkitm.hxx +++ b/include/svx/sxmkitm.hxx @@ -29,7 +29,7 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. class SdrMeasureKindItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrMeasureKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index 824278ae70eb..cf3fe879422d 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -31,7 +31,7 @@ enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BR class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} SdrMeasureTextHPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; @@ -51,7 +51,7 @@ public: class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} SdrMeasureTextVPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 313ce96b1192..4b55f207b72a 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -28,7 +28,7 @@ // (ausgehend von der MapUnit des Models). Diese Einheit wird dann ggf. auch angezeigt. class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {} SdrMeasureUnitItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREUNIT,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx index 2906c8d46a7b..30c2070617f5 100644 --- a/include/svx/sxsiitm.hxx +++ b/include/svx/sxsiitm.hxx @@ -23,7 +23,7 @@ class SdrScaleItem: public SdrFractionItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {} SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index 8c444b804c4d..74f793269335 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -77,7 +77,7 @@ protected: void BreakSingle3DObj(E3dObject* pObj); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dView(SdrModel* pModel, OutputDevice* pOut = 0L); virtual ~E3dView(); diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index cd6b5bfffd16..7688f14fff20 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item bool mbBookMode; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, sal_uInt16 nWhich = SID_ATTR_VIEWLAYOUT ); SvxViewLayoutItem( const SvxViewLayoutItem& ); diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 4c612cda1ca2..060a15e313dd 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -42,7 +42,7 @@ private: GraphicObject maGraphicObject; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBitmapItem() : NameOrIndex(XATTR_FILLBITMAP, -1 ) {} XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject); XFillBitmapItem(SfxItemPool* pPool, const GraphicObject& rGraphicObject); diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index 0ba0ea7a0410..3eb317105089 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC XColorItem : public NameOrIndex Color aColor; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XColorItem() {} XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor); diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index a4d3336f56f7..731aab194033 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFillStyleItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillStyleItem(XFillStyle = XFILL_SOLID); XFillStyleItem(XFillStyle, sal_uInt16 nWhich); XFillStyleItem(SvStream& rIn); diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx index 77e024cd9dd6..6f1cc1eb52c8 100644 --- a/include/svx/xflasit.hxx +++ b/include/svx/xflasit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFillAttrSetItem : public SfxSetItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillAttrSetItem(SfxItemSet* pItemSet ); XFillAttrSetItem(SfxItemPool* pItemPool); XFillAttrSetItem(const XFillAttrSetItem& rAttr); diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index 0ed1bfb6a0bf..b5119d9aee71 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBackgroundItem( bool bFill = false ); SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn ); diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index c3ff9c51a08d..6938a5bdae06 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -27,7 +27,7 @@ class SVX_DLLPUBLIC XFillBmpPosItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBmpPosItem( RECT_POINT eRP = RP_MM ); SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn ); diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index 11b4a15048b1..ec1008f9e6b8 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBmpSizeLogItem( bool bLog = true ); SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn ); diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index 2729a26ad9e9..a8103fbf8a58 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpSizeXItem : public SfxMetricItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBmpSizeXItem( long nSizeX = 0 ); SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn ); @@ -47,7 +47,7 @@ public: class SVX_DLLPUBLIC XFillBmpSizeYItem : public SfxMetricItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBmpSizeYItem( long nSizeY = 0 ); SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn ); diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index a60458e73cb4..038b72fcdc0b 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpTileItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBmpTileItem( bool bTile = true ); XFillBmpTileItem( SvStream& rIn ); diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index 3818ec220951..aac255d363cb 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetXItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn ); @@ -42,7 +42,7 @@ public: class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn ); diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index e2cea6a3b4a4..b59f6748d787 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpStretchItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBmpStretchItem( bool bStretch = true ); XFillBmpStretchItem( SvStream& rIn ); diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index cb5d69b3b9f3..66914214c36e 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetXItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn ); @@ -42,7 +42,7 @@ public: class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn ); diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 34784616108b..113b0e7a0cdf 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFillColorItem : public XColorItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillColorItem() {} XFillColorItem(sal_Int32 nIndex, const Color& rTheColor); XFillColorItem(const OUString& rName, const Color& rTheColor); diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index a5d74affe0ab..eff4ff50faaa 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -34,7 +34,7 @@ private: bool bEnabled; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillFloatTransparenceItem(); XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, bool bEnable = true ); diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 110ce064f5a6..65615be9fd56 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex XGradient aGradient; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {} XFillGradientItem(sal_uInt16 nWhich_) : NameOrIndex(nWhich_, -1) {} XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient); diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index bcf6d659b9bb..388948f33443 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex XHatch aHatch; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {} XFillHatchItem(const OUString& rName, const XHatch& rTheHatch); XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch); diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index 04fbfd32925a..4a20fee332ed 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFillTransparenceItem: public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFillTransparenceItem(sal_uInt16 nFillTransparence = 0); XFillTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx index 6241a42d3ed8..e2eba0b49322 100644 --- a/include/svx/xftadit.hxx +++ b/include/svx/xftadit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFormTextAdjustItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextAdjustItem(XFormTextAdjust = XFT_CENTER); XFormTextAdjustItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xftdiit.hxx b/include/svx/xftdiit.hxx index 2457c07c4db4..f9abcba7ba1b 100644 --- a/include/svx/xftdiit.hxx +++ b/include/svx/xftdiit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFormTextDistanceItem : public SfxMetricItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextDistanceItem(long nDist = 0); XFormTextDistanceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx index 9f0f6d330eeb..9be4439c2d66 100644 --- a/include/svx/xftmrit.hxx +++ b/include/svx/xftmrit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFormTextMirrorItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextMirrorItem(bool bMirror = false); XFormTextMirrorItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx index 18c94d649874..f284aed27dcc 100644 --- a/include/svx/xftouit.hxx +++ b/include/svx/xftouit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFormTextOutlineItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextOutlineItem(bool bOutline = false); XFormTextOutlineItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx index 9ee5062d1268..e858a4a1ea97 100644 --- a/include/svx/xftshcit.hxx +++ b/include/svx/xftshcit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFormTextShadowColorItem : public XColorItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextShadowColorItem() {} XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor); XFormTextShadowColorItem(SvStream& rIn); diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx index cf77ae203386..0676d7ce1be0 100644 --- a/include/svx/xftshit.hxx +++ b/include/svx/xftshit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFormTextShadowItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE); XFormTextShadowItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xftshtit.hxx b/include/svx/xftshtit.hxx index ce29ab294aa7..0f6f08705d21 100644 --- a/include/svx/xftshtit.hxx +++ b/include/svx/xftshtit.hxx @@ -31,7 +31,7 @@ class XFormTextShadowTranspItem: public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0); XFormTextShadowTranspItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; diff --git a/include/svx/xftshxy.hxx b/include/svx/xftshxy.hxx index c934a77e961a..809ba3da0c60 100644 --- a/include/svx/xftshxy.hxx +++ b/include/svx/xftshxy.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFormTextShadowXValItem : public SfxMetricItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextShadowXValItem(long nVal = 0); XFormTextShadowXValItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; @@ -48,7 +48,7 @@ public: class SVX_DLLPUBLIC XFormTextShadowYValItem : public SfxMetricItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextShadowYValItem(long nVal = 0); XFormTextShadowYValItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xftstit.hxx b/include/svx/xftstit.hxx index 28b03bb6afcc..ba695f26402f 100644 --- a/include/svx/xftstit.hxx +++ b/include/svx/xftstit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFormTextStartItem : public SfxMetricItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextStartItem(long nStart = 0); XFormTextStartItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index d38741a1669d..065e1f7d8478 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XGradientStepCountItem: public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XGradientStepCountItem( sal_uInt16 nStepCount = 0 ); XGradientStepCountItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 2a83d5d90f56..1d5dae5fa5da 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -43,7 +43,7 @@ protected: void Detach() { nPalIndex = -1; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); NameOrIndex() { nPalIndex = -1; } NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex); NameOrIndex(sal_uInt16 nWhich, diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index d202d7f1a10d..d8a5182f4fc9 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC XLineStyleItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineStyleItem(XLineStyle = XLINE_SOLID); XLineStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 5feb31837809..722487c411eb 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineJointItem( com::sun::star::drawing::LineJoint eLineJoint = com::sun::star::drawing::LineJoint_ROUND ); XLineJointItem( SvStream& rIn ); diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx index 58a88e84b367..6a32cf5df32d 100644 --- a/include/svx/xlnasit.hxx +++ b/include/svx/xlnasit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XLineAttrSetItem : public SfxSetItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineAttrSetItem(SfxItemSet* pItemSet ); XLineAttrSetItem(SfxItemPool* pItemPool); XLineAttrSetItem(const XLineAttrSetItem& rAttr); diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index 335cd5d8307b..9308b3020e2e 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XLineCapItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineCapItem(com::sun::star::drawing::LineCap eLineCap = com::sun::star::drawing::LineCap_BUTT); XLineCapItem(SvStream& rIn); diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index d6bafc4c9b2f..e7b9780dc466 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineColorItem : public XColorItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineColorItem() {} XLineColorItem(sal_Int32 nIndex, const Color& rTheColor); XLineColorItem(const OUString& rName, const Color& rTheColor); diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index f8b7a01a0547..237f822e71b0 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex XDash aDash; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {} XLineDashItem(const OUString& rName, const XDash& rTheDash); XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash); diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index 8212865078bc..818cbc571bb5 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineEndCenterItem(bool bEndCenter = false); XLineEndCenterItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index 5c53f801c5d9..f1071080c1a5 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XLineEndItem : public NameOrIndex basegfx::B2DPolyPolygon maPolyPolygon; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineEndItem(sal_Int32 nIndex = -1); XLineEndItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon); XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon); diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index fd272c14ff4d..e5da6e361bfd 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XLineEndWidthItem : public SfxMetricItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT); XLineEndWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index ea9ea4b09a8d..5b04e2deecfb 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineStartCenterItem(bool bStartCenter = false); XLineStartCenterItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index 66275c61faf7..e20d818f17dc 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XLineStartItem : public NameOrIndex basegfx::B2DPolyPolygon maPolyPolygon; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineStartItem(sal_Int32 nIndex = -1); XLineStartItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon); XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon); diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index 0db83c5c4559..2dbefda771cc 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC XLineStartWidthItem : public SfxMetricItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT); XLineStartWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index ac6a1efc0bcf..f924e8d18b0c 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XLineTransparenceItem: public SfxUInt16Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineTransparenceItem(sal_uInt16 nLineTransparence = 0); XLineTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index d819adaee8a0..fd9045a2e232 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineWidthItem : public SfxMetricItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XLineWidthItem(long nWidth = 0); XLineWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 7cd55a33fac2..eb9a91be64b5 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SVX_DLLPRIVATE XSecondaryFillColorItem() {} XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor); SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn); diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx index 80b75e52cf30..fec64739b4a0 100644 --- a/include/svx/xtextit0.hxx +++ b/include/svx/xtextit0.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFormTextStyleItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextStyleItem(XFormTextStyle = XFT_NONE); XFormTextStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; @@ -54,7 +54,7 @@ public: class SVX_DLLPUBLIC XFormTextHideFormItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XFormTextHideFormItem(bool bHide = false); XFormTextHideFormItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index 6aa2ca8afb17..edae1bfe9100 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item sal_uInt16 mnMaxZoom; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER ); SvxZoomSliderItem( const SvxZoomSliderItem& ); diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx index 3b0ec00d798c..89155398e59e 100644 --- a/include/tools/errinf.hxx +++ b/include/tools/errinf.hxx @@ -57,7 +57,7 @@ private: EDcr_Impl* pImpl; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DynamicErrorInfo(sal_uIntPtr lUserId, sal_uInt16 nMask); virtual ~DynamicErrorInfo(); @@ -72,7 +72,7 @@ private: OUString aString; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); StringErrorInfo( sal_uIntPtr lUserId, const OUString& aStringP, @@ -87,7 +87,7 @@ private: OUString aArg2; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); TwoStringErrorInfo(sal_uIntPtr nUserID, const OUString & rTheArg1, const OUString & rTheArg2, sal_uInt16 nFlags = 0): @@ -102,7 +102,7 @@ public: class TOOLS_DLLPUBLIC MessageInfo : public DynamicErrorInfo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); MessageInfo(sal_uIntPtr UserId, sal_uInt16 nFlags = 0) : DynamicErrorInfo(UserId, nFlags) {} diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx index 660fb3145132..14d14493e95c 100644 --- a/include/tools/pstm.hxx +++ b/include/tools/pstm.hxx @@ -54,7 +54,7 @@ public: SV_DECL_IMPL_REF(SvRttiBase) #define SV_DECL_PERSIST( Class, CLASS_ID ) \ - TYPEINFO(); \ + TYPEINFO_OVERRIDE(); \ static sal_Int32 StaticClassId() { return CLASS_ID; } \ static void * CreateInstance( SvPersistBase ** ppBase ); \ friend SvPersistStream& operator >> ( SvPersistStream & rStm, \ diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx index 3e2676baa7c8..83bd5671d40c 100644 --- a/include/tools/rtti.hxx +++ b/include/tools/rtti.hxx @@ -32,6 +32,13 @@ typedef void* (*TypeId)(); virtual TypeId Type() const; \ virtual bool IsA( TypeId aSameOrSuperType ) const +#define TYPEINFO_OVERRIDE() \ + static void* CreateType(); \ + static TypeId StaticType(); \ + static bool IsOf( TypeId aSameOrSuperType ); \ + virtual TypeId Type() const SAL_OVERRIDE; \ + virtual bool IsA( TypeId aSameOrSuperType ) const SAL_OVERRIDE + #define TYPEINFO_VISIBILITY(visibility) \ visibility static void* CreateType(); \ visibility static TypeId StaticType(); \ diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index e7760fdbe4a1..3eb2fd4ea279 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -148,7 +148,7 @@ SV_DECL_IMPL_REF(SvLockBytes); class TOOLS_DLLPUBLIC SvOpenLockBytes: public SvLockBytes { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvOpenLockBytes() : SvLockBytes(0, false) {} SvOpenLockBytes(SvStream * pStream, bool bOwner): @@ -174,7 +174,7 @@ class SvAsyncLockBytes: public SvOpenLockBytes bool m_bTerminated; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvAsyncLockBytes(SvStream * pStream, bool bOwner): SvOpenLockBytes(pStream, bOwner), m_nSize(0), m_bTerminated(false) {} diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx index 1639f5b99278..34b9ebc66db9 100644 --- a/include/vcl/graph.hxx +++ b/include/vcl/graph.hxx @@ -90,7 +90,7 @@ public: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); Graphic(); Graphic( const Graphic& rGraphic ); diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx index 2ebdfdd4b59c..cee186cd11ea 100644 --- a/include/vcl/pdfextoutdevdata.hxx +++ b/include/vcl/pdfextoutdevdata.hxx @@ -96,7 +96,7 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData public : - TYPEINFO(); + TYPEINFO_OVERRIDE(); PDFExtOutDevData( const OutputDevice& rOutDev ); virtual ~PDFExtOutDevData(); diff --git a/include/vcl/textdata.hxx b/include/vcl/textdata.hxx index 3b3fc530328e..1f475878a01e 100644 --- a/include/vcl/textdata.hxx +++ b/include/vcl/textdata.hxx @@ -129,7 +129,7 @@ private: sal_uLong mnValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); TextHint( sal_uLong nId ); TextHint( sal_uLong nId, sal_uLong nValue ); diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index cd5df4d0e930..473b8e4f4f71 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -223,7 +223,7 @@ private: public: VclWindowEvent( Window* pWin, sal_uLong n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } virtual ~VclWindowEvent() {} - TYPEINFO(); + TYPEINFO_OVERRIDE(); Window* GetWindow() const { return pWindow; } void* GetData() const { return pData; } @@ -238,7 +238,7 @@ private: public: VclMenuEvent( Menu* pM, sal_uLong n, sal_uInt16 nPos ) : VclSimpleEvent(n) { pMenu = pM; mnPos = nPos; } virtual ~VclMenuEvent() {} - TYPEINFO(); + TYPEINFO_OVERRIDE(); Menu* GetMenu() const { return pMenu; } sal_uInt16 GetItemPos() const { return mnPos; } diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx index 041bfa0e91b6..27a67ee33995 100644 --- a/include/xmloff/XMLBase64ImportContext.hxx +++ b/include/xmloff/XMLBase64ImportContext.hxx @@ -35,7 +35,7 @@ class XMLOFF_DLLPUBLIC XMLBase64ImportContext : public SvXMLImportContext OUString sBase64CharsLeft; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLBase64ImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx index c147d4d79251..c4993583c9d1 100644 --- a/include/xmloff/XMLCharContext.hxx +++ b/include/xmloff/XMLCharContext.hxx @@ -33,7 +33,7 @@ protected: sal_Unicode m_c; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLCharContext( SvXMLImport& rImport, diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx index fc988c26da0a..6c50f23277f8 100644 --- a/include/xmloff/XMLEventsImportContext.hxx +++ b/include/xmloff/XMLEventsImportContext.hxx @@ -64,7 +64,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLEventsImportContext( SvXMLImport& rImport, diff --git a/include/xmloff/XMLFontStylesContext.hxx b/include/xmloff/XMLFontStylesContext.hxx index 08382d218163..b8730ddfcd70 100644 --- a/include/xmloff/XMLFontStylesContext.hxx +++ b/include/xmloff/XMLFontStylesContext.hxx @@ -53,7 +53,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFontStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx index 8382607d873e..d39d9ea51e79 100644 --- a/include/xmloff/XMLGraphicsDefaultStyle.hxx +++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx @@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace container class XMLOFF_DLLPUBLIC XMLGraphicsDefaultStyle : public XMLPropStyleContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx index cedd322ef6c1..6b86280ce638 100644 --- a/include/xmloff/XMLShapeStyleContext.hxx +++ b/include/xmloff/XMLShapeStyleContext.hxx @@ -42,7 +42,7 @@ protected: const OUString& rLocalName, const OUString& rValue ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLShapeStyleContext( SvXMLImport& rImport, diff --git a/include/xmloff/XMLTextMasterPageContext.hxx b/include/xmloff/XMLTextMasterPageContext.hxx index 26fb62896b1e..f0620ceceaf2 100644 --- a/include/xmloff/XMLTextMasterPageContext.hxx +++ b/include/xmloff/XMLTextMasterPageContext.hxx @@ -59,7 +59,7 @@ protected: ::com::sun::star::style::XStyle > GetStyle() { return xStyle; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLTextMasterStylesContext.hxx b/include/xmloff/XMLTextMasterStylesContext.hxx index 526fb1de5806..2034628f4a45 100644 --- a/include/xmloff/XMLTextMasterStylesContext.hxx +++ b/include/xmloff/XMLTextMasterStylesContext.hxx @@ -40,7 +40,7 @@ protected: virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLTextShapeStyleContext.hxx b/include/xmloff/XMLTextShapeStyleContext.hxx index d95675dcb425..22fc3cad331c 100644 --- a/include/xmloff/XMLTextShapeStyleContext.hxx +++ b/include/xmloff/XMLTextShapeStyleContext.hxx @@ -39,7 +39,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextShapeStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/XMLTextTableContext.hxx b/include/xmloff/XMLTextTableContext.hxx index 16171be2e386..d5576e92af96 100644 --- a/include/xmloff/XMLTextTableContext.hxx +++ b/include/xmloff/XMLTextTableContext.hxx @@ -37,7 +37,7 @@ class XMLOFF_DLLPUBLIC XMLTextTableContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextTableContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx index b5a99a0031a9..e727003987b8 100644 --- a/include/xmloff/prstylei.hxx +++ b/include/xmloff/prstylei.hxx @@ -60,7 +60,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLPropStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx index 1f616ec8fe0d..15efd3702e19 100644 --- a/include/xmloff/shapeimport.hxx +++ b/include/xmloff/shapeimport.hxx @@ -256,7 +256,7 @@ public: SvXMLShapeContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLName, sal_Bool bTemporaryShape ) : SvXMLImportContext( rImp, nPrfx, rLName ), mbTemporaryShape(bTemporaryShape) {} - TYPEINFO(); + TYPEINFO_OVERRIDE(); const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& getShape() const { return mxShape; } diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx index 7fea288089bf..336f5f915a3b 100644 --- a/include/xmloff/txtstyli.hxx +++ b/include/xmloff/txtstyli.hxx @@ -63,7 +63,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx index 5371b8cc14b3..fae4482c785f 100644 --- a/include/xmloff/xmlnumi.hxx +++ b/include/xmloff/xmlnumi.hxx @@ -53,7 +53,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxXMLListStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx index ab43cefc250e..78e82522bc36 100644 --- a/include/xmloff/xmlstyle.hxx +++ b/include/xmloff/xmlstyle.hxx @@ -90,7 +90,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvXMLStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -213,7 +213,7 @@ protected: virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvXMLStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, |