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 | |
| parent | bc5060b32f08b0408fb929faea1f8140a58d3cc5 (diff) | |
Split TYPEINFO into plain and TYPEINFO_OVERRIDE
...where the latter contains SAL_OVERRIDE annotations
Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
669 files changed, 1153 insertions, 1146 deletions
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx index 0606e7ff2ed0..d70296a25192 100644 --- a/basctl/source/basicide/basdoc.hxx +++ b/basctl/source/basicide/basdoc.hxx @@ -48,7 +48,7 @@ protected: bool bTemplate = false ) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); using SotObject::GetInterface; SFX_DECL_OBJECTFACTORY(); diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index d7495b894c91..3201d2c6f799 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -335,7 +335,7 @@ protected: virtual void DoScroll( ScrollBar* pCurScrollBar ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ModulWindow( ModulWindowLayout* pParent, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, OUString& aModule ); diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index 01e1b3c18749..f66bda4f68c9 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -77,7 +77,7 @@ protected: void InitSettings(bool bFont, bool bForeground, bool bBackground); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DialogWindow (DialogWindowLayout* pParent, ScriptDocument const& rDocument, const OUString& aLibName, const OUString& aName, com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> const& xDialogModel); DialogWindow( DialogWindow* pCurView ); // never implemented ~DialogWindow(); diff --git a/basctl/source/inc/basidesh.hxx b/basctl/source/inc/basidesh.hxx index 6a75f159d2dd..0084f33d4ad4 100644 --- a/basctl/source/inc/basidesh.hxx +++ b/basctl/source/inc/basidesh.hxx @@ -148,7 +148,7 @@ private: virtual void onDocumentModeChanged( const ScriptDocument& _rDocument ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE( SVX_INTERFACE_BASIDE_VIEWSH ) SFX_DECL_VIEWFACTORY(Shell); diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 6d1d4a679f10..3975cb9ebbc7 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -69,7 +69,7 @@ private: DlgEdObj* pDlgEdObj; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DlgEdHint (Kind); DlgEdHint (Kind, DlgEdObj* pObj); virtual ~DlgEdHint(); diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx index c7d737558fe6..2aa31ba51187 100644 --- a/basctl/source/inc/dlgedmod.hxx +++ b/basctl/source/inc/dlgedmod.hxx @@ -38,7 +38,7 @@ private: void operator=(const DlgEdModel& rSrcModel); // not implemented public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DlgEdModel(); virtual ~DlgEdModel(); diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index dedd56699810..6208b7dfe704 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -86,7 +86,7 @@ protected: sal_Int32& nXOut, sal_Int32& nYOut, sal_Int32& nWidthOut, sal_Int32& nHeightOut ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~DlgEdObj(); virtual void SetPage(SdrPage* pNewPage); @@ -157,7 +157,7 @@ protected: virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~DlgEdForm(); diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx index 370b4127a398..4083616720d7 100644 --- a/basctl/source/inc/dlgedpage.hxx +++ b/basctl/source/inc/dlgedpage.hxx @@ -38,7 +38,7 @@ private: DlgEdForm* pDlgEdForm; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DlgEdPage( DlgEdModel& rModel, bool bMasterPage = false ); virtual ~DlgEdPage(); diff --git a/basctl/source/inc/dlgedview.hxx b/basctl/source/inc/dlgedview.hxx index 59a727c4c086..1e14329df655 100644 --- a/basctl/source/inc/dlgedview.hxx +++ b/basctl/source/inc/dlgedview.hxx @@ -38,7 +38,7 @@ private: DlgEditor& rDlgEditor; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DlgEdView (SdrModel& rModel, OutputDevice& rOut, DlgEditor& rEditor); virtual ~DlgEdView(); diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx index c3c02cc2b64e..66c358196d77 100644 --- a/basctl/source/inc/sbxitem.hxx +++ b/basctl/source/inc/sbxitem.hxx @@ -44,7 +44,7 @@ class SbxItem : public SfxPoolItem ItemType m_eType; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, ItemType); SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, const OUString& aMethodName, ItemType eType); diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx index e7416cca279d..a47763c19295 100644 --- a/basic/inc/sbobjmod.hxx +++ b/basic/inc/sbobjmod.hxx @@ -37,7 +37,7 @@ protected: virtual ~SbObjModule(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbObjModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVbaCompatible ); virtual SbxVariable* Find( const OUString& rName, SbxClassType t ); @@ -63,7 +63,7 @@ class BASIC_DLLPUBLIC SbUserFormModule : public SbObjModule //protected: virtual void InitObject(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbUserFormModule( const OUString& rName, const com::sun::star::script::ModuleInfo& mInfo, bool bIsVBACompat ); virtual ~SbUserFormModule(); virtual SbxVariable* Find( const OUString& rName, SbxClassType t ); diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx index c65fe261725b..678de56f472b 100644 --- a/basic/inc/sbprop.hxx +++ b/basic/inc/sbprop.hxx @@ -37,7 +37,7 @@ class BASIC_DLLPUBLIC SbProperty : public SbxProperty virtual ~SbProperty(); public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_BASICPROP,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbModule* GetModule() { return pMod; } }; @@ -54,7 +54,7 @@ public: : SbxProperty( r, t ) // , pMod( p ) , mbSet( false ) {} - TYPEINFO(); + TYPEINFO_OVERRIDE(); bool isSet( void ) { return mbSet; } diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx index ad45eaa76eab..62a40560ec69 100644 --- a/basic/inc/sbstdobj.hxx +++ b/basic/inc/sbstdobj.hxx @@ -49,7 +49,7 @@ protected: void PropHeight( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbStdPicture(); virtual SbxVariable* Find( const OUString&, SbxClassType ); @@ -81,7 +81,7 @@ protected: void PropName( SbxVariable* pVar, SbxArray* pPar, sal_Bool bWrite ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbStdFont(); virtual SbxVariable* Find( const OUString&, SbxClassType ); @@ -117,7 +117,7 @@ protected: void MethSetText( SbxVariable* pVar, SbxArray* pPar_, sal_Bool bWrite ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbStdClipboard(); virtual SbxVariable* Find( const OUString&, SbxClassType ); diff --git a/basic/source/inc/sbjsmeth.hxx b/basic/source/inc/sbjsmeth.hxx index 7031e6a1cd0d..8f790fa37b2e 100644 --- a/basic/source/inc/sbjsmeth.hxx +++ b/basic/source/inc/sbjsmeth.hxx @@ -34,7 +34,7 @@ public: virtual ~SbJScriptMethod(); SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMETH,2); - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; SV_DECL_IMPL_REF(SbJScriptMethod) diff --git a/basic/source/inc/sbjsmod.hxx b/basic/source/inc/sbjsmod.hxx index 9af385fa301b..fa6a9c7b4b50 100644 --- a/basic/source/inc/sbjsmod.hxx +++ b/basic/source/inc/sbjsmod.hxx @@ -32,7 +32,7 @@ class SbJScriptModule : public SbModule virtual sal_Bool StoreData( SvStream& ) const; public: SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_JSCRIPTMOD,1); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbJScriptModule( const OUString& ); // hand through }; diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx index e7c20b8b452b..0566e3964f68 100644 --- a/basic/source/inc/sbunoobj.hxx +++ b/basic/source/inc/sbunoobj.hxx @@ -80,7 +80,7 @@ class SbUnoStructRefObject: public SbxObject OUString Impl_DumpProperties(); OUString getDbgObjectName(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); StructRefInfo getStructMember( const OUString& rMember ); StructRefInfo getStructInfo() { return maMemberInfo; } SbUnoStructRefObject( const OUString& aName_, const StructRefInfo& rMemberInfo ); @@ -119,7 +119,7 @@ class SbUnoObject: public SbxObject public: static bool getDefaultPropName( SbUnoObject* pUnoObj, OUString& sDfltProp ); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbUnoObject( const OUString& aName_, const ::com::sun::star::uno::Any& aUnoObj_ ); ~SbUnoObject(); @@ -166,7 +166,7 @@ class SbUnoMethod : public SbxMethod bool mbDirectInvocation; // Method should be used with XDirectInvocation interface public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbUnoMethod( const OUString& aName_, SbxDataType eSbxType, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlMethod > xUnoMethod_, bool bInvocation, @@ -200,7 +200,7 @@ class SbUnoProperty : public SbxProperty SbUnoProperty& operator = ( const SbUnoProperty&); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbUnoProperty( const OUString& aName_, SbxDataType eSbxType, SbxDataType eRealSbxType, const ::com::sun::star::beans::Property& aUnoProp_, sal_Int32 nId_, bool bInvocation, bool bUnoStruct ); @@ -224,7 +224,7 @@ class SbUnoClass : public SbxObject const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass > m_xClass; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbUnoClass( const OUString& aName_ ) : SbxObject( aName_ ) {} @@ -255,7 +255,7 @@ class SbUnoService : public SbxObject bool m_bNeedsInit; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbUnoService( const OUString& aName_, const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceTypeDescription2 >& xServiceTypeDesc ) : SbxObject( aName_ ) @@ -284,7 +284,7 @@ class SbUnoServiceCtor : public SbxMethod SbUnoServiceCtor* pNext; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbUnoServiceCtor( const OUString& aName_, ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XServiceConstructorDescription > xServiceCtorDesc ); virtual ~SbUnoServiceCtor(); @@ -301,7 +301,7 @@ class SbUnoSingleton : public SbxObject const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription > m_xSingletonTypeDesc; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SbUnoSingleton( const OUString& aName_, const ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XSingletonTypeDescription >& xSingletonTypeDesc ); @@ -326,7 +326,7 @@ public: const ::com::sun::star::uno::Any& getValue( void ) { return mVal; } - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; @@ -337,7 +337,7 @@ class AutomationNamedArgsSbxArray : public SbxArray { ::com::sun::star::uno::Sequence< OUString > maNameSeq; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); AutomationNamedArgsSbxArray( sal_Int32 nSeqSize ) : maNameSeq( nSeqSize ) {} @@ -385,7 +385,7 @@ class BasicCollection : public SbxObject void CollRemove( SbxArray* pPar_ ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); BasicCollection( const OUString& rClassname ); virtual SbxVariable* Find( const OUString&, SbxClassType ); virtual void Clear(); diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx index 09ead4d6573f..57850cc19aa5 100644 --- a/connectivity/source/inc/dbase/DCode.hxx +++ b/connectivity/source/inc/dbase/DCode.hxx @@ -52,7 +52,7 @@ namespace connectivity virtual sal_Bool isIndexed() const; virtual file::OEvaluateSet* preProcess(file::OBoolOperator* pOp, file::OOperand* pRight = 0); - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; } } diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index e1dd02fb4a50..38ce3f28558b 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -79,7 +79,7 @@ namespace connectivity virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0); inline sal_Bool isValid() const; - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; class OOO_DLLPUBLIC_FILE OOperandRow : public OOperand @@ -95,7 +95,7 @@ namespace connectivity virtual void setValue(const ORowSetValue& _rVal); void bindValue(const OValueRefRow& _pRow); // Bind to the value that the operand represents - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; // Attributes from a result row @@ -110,7 +110,7 @@ namespace connectivity virtual sal_Bool isIndexed() const; virtual OEvaluateSet* preProcess(OBoolOperator* pOp, OOperand* pRight = 0); - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; // Parameter for a predicate @@ -118,7 +118,7 @@ namespace connectivity { public: OOperandParam(connectivity::OSQLParseNode* pNode, sal_Int32 _nPos); - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; // Value operands @@ -139,7 +139,7 @@ namespace connectivity virtual const ORowSetValue& getValue() const; virtual void setValue(const ORowSetValue& _rVal); - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; @@ -149,7 +149,7 @@ namespace connectivity public: OOperandConst(const connectivity::OSQLParseNode& rColumnRef, const OUString& aStrValue); - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; @@ -164,7 +164,7 @@ namespace connectivity public: OOperandResult(const ORowSetValue& _rVar) :OOperandValue(_rVar, _rVar.getTypeKind()) {} - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; @@ -195,7 +195,7 @@ namespace connectivity { public: OStopOperand(){} - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; // Operators @@ -205,7 +205,7 @@ namespace connectivity virtual void Exec(OCodeStack&) = 0; virtual sal_uInt16 getRequestedOperands() const; // Count of requested operands // Defaults to 2 - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; @@ -213,7 +213,7 @@ namespace connectivity class OOO_DLLPUBLIC_FILE OBoolOperator : public OOperator { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual void Exec(OCodeStack&); virtual sal_Bool operate(const OOperand*, const OOperand*) const; }; @@ -221,7 +221,7 @@ namespace connectivity class OOp_NOT : public OBoolOperator { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); protected: virtual void Exec(OCodeStack&); @@ -232,7 +232,7 @@ namespace connectivity class OOp_AND : public OBoolOperator { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); protected: virtual sal_Bool operate(const OOperand*, const OOperand*) const; @@ -241,7 +241,7 @@ namespace connectivity class OOp_OR : public OBoolOperator { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); protected: virtual sal_Bool operate(const OOperand*, const OOperand*) const; }; @@ -249,7 +249,7 @@ namespace connectivity class OOO_DLLPUBLIC_FILE OOp_ISNULL : public OBoolOperator { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); public: virtual void Exec(OCodeStack&); virtual sal_uInt16 getRequestedOperands() const; @@ -259,14 +259,14 @@ namespace connectivity class OOO_DLLPUBLIC_FILE OOp_ISNOTNULL : public OOp_ISNULL { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual sal_Bool operate(const OOperand*, const OOperand* = NULL) const; }; class OOO_DLLPUBLIC_FILE OOp_LIKE : public OBoolOperator { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); protected: const sal_Unicode cEscape; @@ -279,7 +279,7 @@ namespace connectivity class OOp_NOTLIKE : public OOp_LIKE { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); public: OOp_NOTLIKE(const sal_Unicode cEsc = L'\0'):OOp_LIKE(cEsc){}; @@ -291,7 +291,7 @@ namespace connectivity sal_Int32 aPredicateType; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OOp_COMPARE(sal_Int32 aPType) :aPredicateType(aPType) {} @@ -305,7 +305,7 @@ namespace connectivity public: virtual void Exec(OCodeStack&); - TYPEINFO(); + TYPEINFO_OVERRIDE(); protected: virtual double operate(const double& fLeft,const double& fRight) const = 0; @@ -346,7 +346,7 @@ namespace connectivity public: virtual void Exec(OCodeStack&); - TYPEINFO(); + TYPEINFO_OVERRIDE(); protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const = 0; @@ -357,7 +357,7 @@ namespace connectivity public: virtual void Exec(OCodeStack&); - TYPEINFO(); + TYPEINFO_OVERRIDE(); protected: virtual ORowSetValue operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const = 0; @@ -370,7 +370,7 @@ namespace connectivity virtual sal_uInt16 getRequestedOperands() const; virtual ORowSetValue operate(const ORowSetValue& lhs) const = 0; - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; } diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx index 2cfd5f3b1da9..be7ee6442f54 100644 --- a/cui/source/options/cfgchart.hxx +++ b/cui/source/options/cfgchart.hxx @@ -93,7 +93,7 @@ public: class SvxChartColorTableItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxChartColorTableItem( sal_uInt16 nWhich, const SvxChartColorTable& ); SvxChartColorTableItem( const SvxChartColorTableItem& ); diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx index d3f6c5158809..f9e8a4e55fa5 100644 --- a/cui/source/options/connpoolsettings.hxx +++ b/cui/source/options/connpoolsettings.hxx @@ -83,7 +83,7 @@ namespace offapp DriverPoolingSettings m_aSettings; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings ); diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index 444aabfdb86a..c3fb36806cd0 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -72,7 +72,7 @@ namespace svx DatabaseRegistrations m_aRegistrations; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations ); diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index 078946bce0ea..49cc39a69d1f 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -55,7 +55,7 @@ namespace dbaxml public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableStyleContext( ODBFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -100,7 +100,7 @@ namespace dbaxml public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx , const OUString& rLName , diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index e1df6b7a6d72..5ce57a7f8f4a 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -36,7 +36,7 @@ namespace dbaui ::dbaccess::ODsnTypeCollection* m_pCollection; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL); DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource); diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index bebe97a6f1b0..3be9826e31d1 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -33,7 +33,7 @@ namespace dbaui ::boost::optional< bool > m_aValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OptionalBoolItem( sal_Int16 nWhich ); OptionalBoolItem( const OptionalBoolItem& _rSource ); diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index f5e4090e495e..960b0d81c5b2 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -35,7 +35,7 @@ namespace dbaui OUString m_strComment; // undo, redo comment public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OCommentUndoAction(sal_uInt16 nCommentID) { m_strComment = OUString(ModuleRes(nCommentID)); } virtual OUString GetComment() const { return m_strComment; } diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index 4c8459b7e2d0..a9eb3ddf6a39 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -34,7 +34,7 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSet; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OPropertySetItem(sal_Int16 nWhich); OPropertySetItem(sal_Int16 nWhich, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet); diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 229185e7033a..fc4dedf230ad 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -36,7 +36,7 @@ class OStringListItem : public SfxPoolItem ::com::sun::star::uno::Sequence< OUString > m_aList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OStringListItem(sal_Int16 nWhich, const ::com::sun::star::uno::Sequence< OUString >& _rList); OStringListItem(const OStringListItem& _rSource); diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index 5b87bd575237..0d52ee584ac2 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -39,7 +39,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableDesignUndoAct( OTableRowView* pOwner ,sal_uInt16 nCommentID); virtual ~OTableDesignUndoAct(); }; @@ -51,7 +51,7 @@ namespace dbaui OTableEditorCtrl* pTabEdCtrl; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableEditorUndoAct( OTableEditorCtrl* pOwner,sal_uInt16 nCommentID ); virtual ~OTableEditorUndoAct(); }; @@ -67,7 +67,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableDesignCellUndoAct( OTableRowView* pOwner, long nRowID, sal_uInt16 nColumn ); virtual ~OTableDesignCellUndoAct(); }; @@ -83,7 +83,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableEditorTypeSelUndoAct( OTableEditorCtrl* pOwner, long nRowID, sal_uInt16 nColumn, const TOTypeInfoSP& _pOldType ); virtual ~OTableEditorTypeSelUndoAct(); }; @@ -96,7 +96,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableEditorDelUndoAct( OTableEditorCtrl* pOwner ); virtual ~OTableEditorDelUndoAct(); }; @@ -110,7 +110,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, const ::std::vector< ::boost::shared_ptr<OTableRow> >& _vInsertedRows); @@ -126,7 +126,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OTableEditorInsNewUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, long nInsertedRows ); virtual ~OTableEditorInsNewUndoAct(); }; @@ -141,7 +141,7 @@ namespace dbaui virtual void Undo(); virtual void Redo(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OPrimKeyUndoAct( OTableEditorCtrl* pOwner, MultiSelection aDeletedKeys, MultiSelection aInsertedKeys ); virtual ~OPrimKeyUndoAct(); }; 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, diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 66a229a3081f..01b773622257 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -53,7 +53,7 @@ private: void operator=(const OReportModel& rSrcModel); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OReportModel(::reportdesign::OReportDefinition* _pReportDefinition); virtual ~OReportModel(); diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index 48cf539ffc08..c6f39e7fa1f1 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -57,7 +57,7 @@ typedef ::std::multimap< sal_Int16, OUString, ::std::less< sal_Int16 > > IndexTo DlgEdHint(DlgEdHint&); void operator =(DlgEdHint&); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DlgEdHint( DlgEdHintKind eHint ); virtual ~DlgEdHint(); @@ -158,7 +158,7 @@ protected: void SetObjectItemHelper(const SfxPoolItem& rItem); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~OCustomShape(); @@ -205,7 +205,7 @@ protected: virtual SdrPage* GetImplPage() const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~OOle2Obj(); @@ -253,7 +253,7 @@ protected: virtual SdrPage* GetImplPage() const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual sal_Int32 GetStep() const; virtual void _propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw(::com::sun::star::uno::RuntimeException); diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index 2d7ec6e6f064..dd4d99e1cffb 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -50,7 +50,7 @@ class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OReportPage( OReportModel& rModel ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 3b92fec6d0fa..b40733debb5d 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -157,7 +157,7 @@ namespace rptui ::dbaui::IController* m_pController; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OCommentUndoAction( SdrModel& rMod ,sal_uInt16 nCommentID); virtual ~OCommentUndoAction(); diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index 00868d55124d..896d248262cd 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -61,7 +61,7 @@ namespace rptxml public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OControlStyleContext( ORptFilter& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -128,7 +128,7 @@ namespace rptxml public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OReportStylesContext( ORptFilter& rImport, sal_uInt16 nPrfx , const OUString& rLName , diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 75426d59c95f..6804d8aa087e 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -84,7 +84,7 @@ class RptMLMasterStylesContext_Impl : public XMLTextMasterStylesContext void operator =(const RptMLMasterStylesContext_Impl&); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); RptMLMasterStylesContext_Impl( ORptFilter& rImport, sal_uInt16 nPrfx, diff --git a/reportdesign/source/ui/inc/RptUndo.hxx b/reportdesign/source/ui/inc/RptUndo.hxx index b4d47c7fcc37..8612b2a24b76 100644 --- a/reportdesign/source/ui/inc/RptUndo.hxx +++ b/reportdesign/source/ui/inc/RptUndo.hxx @@ -51,7 +51,7 @@ namespace rptui void collectControls(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot ,Action _eAction @@ -75,7 +75,7 @@ namespace rptui OReportSectionUndo(const OReportSectionUndo&); void operator =(const OReportSectionUndo&); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); //OReportSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection OReportSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot @@ -102,7 +102,7 @@ namespace rptui OGroupSectionUndo(const OGroupSectionUndo&); void operator =(const OGroupSectionUndo&); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); //OGroupSectionUndo( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection OGroupSectionUndo( OReportModel& rMod ,sal_uInt16 _nSlot @@ -128,7 +128,7 @@ namespace rptui void implReInsert( ); void implReRemove( ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OGroupUndo(OReportModel& rMod ,sal_uInt16 nCommentID ,Action _eAction diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx index 5c6a3b101835..77c3c0638873 100644 --- a/reportdesign/source/ui/inc/SectionView.hxx +++ b/reportdesign/source/ui/inc/SectionView.hxx @@ -41,7 +41,7 @@ private: OSectionView(const OSectionView&); void operator =(const OSectionView&); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, OReportWindow* pEditor ); virtual ~OSectionView(); diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index 86301c85c590..2a32681d8453 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -44,7 +44,7 @@ private: bool FindExtRange( ScRange& rRange, ScDocument* pSrcDoc, const OUString& rAreaName ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScAreaLink( SfxObjectShell* pShell, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, const OUString& rArea, const ScRange& rDest, sal_uLong nRefresh ); diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 30230c0da358..ac9c2006f4dc 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -50,7 +50,7 @@ class SC_DLLPUBLIC ScMergeAttr: public SfxPoolItem SCsCOL nColMerge; SCsROW nRowMerge; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScMergeAttr(); ScMergeAttr( SCsCOL nCol, SCsROW nRow = 0); ScMergeAttr( const ScMergeAttr& ); @@ -101,7 +101,7 @@ class SC_DLLPUBLIC ScProtectionAttr: public SfxPoolItem bool bHideCell; ///< hide cell bool bHidePrint; ///< don't print cell public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScProtectionAttr(); ScProtectionAttr( bool bProtect, bool bHFormula = false, @@ -152,7 +152,7 @@ public: class ScRangeItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); inline ScRangeItem( const sal_uInt16 nWhich ); inline ScRangeItem( const sal_uInt16 nWhich, @@ -209,7 +209,7 @@ inline ScRangeItem& ScRangeItem::operator=( const ScRangeItem &rCpy ) class ScTableListItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); inline ScTableListItem( const sal_uInt16 nWhich ); ScTableListItem( const ScTableListItem& rCpy ); @@ -248,7 +248,7 @@ class SC_DLLPUBLIC ScPageHFItem : public SfxPoolItem EditTextObject* pRightArea; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScPageHFItem( sal_uInt16 nWhich ); ScPageHFItem( const ScPageHFItem& rItem ); ~ScPageHFItem(); @@ -279,7 +279,7 @@ public: class SC_DLLPUBLIC ScViewObjectModeItem: public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScViewObjectModeItem( sal_uInt16 nWhich ); ScViewObjectModeItem( sal_uInt16 nWhich, ScVObjMode eMode ); @@ -302,7 +302,7 @@ public: class ScDoubleItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScDoubleItem( sal_uInt16 nWhich, double nVal=0 ); ScDoubleItem( const ScDoubleItem& rItem ); ~ScDoubleItem(); @@ -330,7 +330,7 @@ const sal_uInt8 SC_MID_PAGE_SCALETO_HEIGHT = 2; class SC_DLLPUBLIC ScPageScaleToItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); /** Default c'tor sets the width and height to 0. */ explicit ScPageScaleToItem(); @@ -369,7 +369,7 @@ private: class ScCondFormatItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit ScCondFormatItem(); explicit ScCondFormatItem(const std::vector<sal_uInt32>& nIndex); diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx index b328becc244a..e988f694f517 100644 --- a/sc/inc/brdcst.hxx +++ b/sc/inc/brdcst.hxx @@ -32,7 +32,7 @@ class ScHint : public SfxSimpleHint ScAddress aAddress; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScHint( sal_uLong n, const ScAddress& a ); const ScAddress& GetAddress() const { return aAddress; } ScAddress& GetAddress() { return aAddress; } @@ -44,7 +44,7 @@ class ScAreaChangedHint : public SfxHint private: ScRange aNewRange; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScAreaChangedHint(const ScRange& rRange) : aNewRange(rRange) {} const ScRange& GetRange() const { return aNewRange; } }; diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 6c52db9f950d..5e1902a3a22e 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -45,7 +45,7 @@ public: class SC_DLLPUBLIC ScTpDefaultsItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScTpDefaultsItem( sal_uInt16 nWhich, const ScDefaultsOptions& rOpt ); ScTpDefaultsItem( const ScTpDefaultsItem& rItem ); diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index 0406de07ea8c..87f45595564b 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -145,7 +145,7 @@ inline bool ScDocOptions::operator!=( const ScDocOptions& rOpt ) const class SC_DLLPUBLIC ScTpCalcItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScTpCalcItem( sal_uInt16 nWhich, const ScDocOptions& rOpt ); ScTpCalcItem( const ScTpCalcItem& rItem ); diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index 456fc8897f77..d127bf7e3f93 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -40,7 +40,7 @@ class ScTabDeletedHint : public SfxHint private: SCTAB nTab; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScTabDeletedHint( SCTAB nTabNo = SCTAB_MAX ); virtual ~ScTabDeletedHint(); @@ -52,7 +52,7 @@ class ScTabSizeChangedHint : public SfxHint private: SCTAB nTab; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScTabSizeChangedHint( SCTAB nTabNo = SCTAB_MAX ); virtual ~ScTabSizeChangedHint(); diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index cd9597c73f39..e0af1b663c89 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -81,7 +81,7 @@ public: class SC_DLLPUBLIC ScTpFormulaItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScTpFormulaItem( sal_uInt16 nWhich, const ScFormulaOptions& rOpt ); ScTpFormulaItem( const ScTpFormulaItem& rItem ); diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx index 79e6d4455dec..5829a410d428 100644 --- a/sc/inc/hints.hxx +++ b/sc/inc/hints.hxx @@ -33,7 +33,7 @@ class ScPaintHint : public SfxHint ScPaintHint(); // disabled public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint = PAINT_ALL ); ~ScPaintHint(); @@ -59,7 +59,7 @@ class ScUpdateRefHint : public SfxHint SCsTAB nDz; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUpdateRefHint( UpdateRefMode eMode, const ScRange& rR, SCsCOL nX, SCsROW nY, SCsTAB nZ ); @@ -79,7 +79,7 @@ class ScPointerChangedHint : public SfxHint sal_uInt16 nFlags; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ~ScPointerChangedHint(); @@ -105,7 +105,7 @@ class ScLinkRefreshedHint : public SfxHint //! also use source data for area links? public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScLinkRefreshedHint(); ~ScLinkRefreshedHint(); @@ -132,7 +132,7 @@ class ScAutoStyleHint : public SfxHint sal_uLong nTimeout; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScAutoStyleHint( const ScRange& rR, const OUString& rSt1, sal_uLong nT, const OUString& rSt2 ); ~ScAutoStyleHint(); @@ -148,7 +148,7 @@ class ScDBRangeRefreshedHint : public SfxHint ScImportParam aParam; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScDBRangeRefreshedHint( const ScImportParam& rP ); ~ScDBRangeRefreshedHint(); @@ -160,7 +160,7 @@ class ScDataPilotModifiedHint : public SfxHint OUString maName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScDataPilotModifiedHint( const OUString& rName ); ~ScDataPilotModifiedHint(); diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index af15c42ff84a..ad27a9e229eb 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -55,7 +55,7 @@ public: class SC_DLLPUBLIC ScTpPrintItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScTpPrintItem( sal_uInt16 nWhich, const ScPrintOptions& rOpt ); ScTpPrintItem( const ScTpPrintItem& rItem ); diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx index 20fba2695c30..87a855ddda84 100644 --- a/sc/inc/stlsheet.hxx +++ b/sc/inc/stlsheet.hxx @@ -43,7 +43,7 @@ private: mutable ScStyleSheet::Usage eUsage; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScStyleSheet( const ScStyleSheet& rStyle ); diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index 71ff0acb3f79..4d0b3f5ed49c 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -42,7 +42,7 @@ private: bool bDoPaint:1; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScTableLink( ScDocShell* pDocSh, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, sal_uLong nRefresh ); ScTableLink( SfxObjectShell* pShell, const OUString& rFile, diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx index bd5d5f41c98f..dab538fc5f93 100644 --- a/sc/inc/unoreflist.hxx +++ b/sc/inc/unoreflist.hxx @@ -63,7 +63,7 @@ class ScUnoRefUndoHint : public SfxHint ScUnoRefEntry aEntry; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUnoRefUndoHint( const ScUnoRefEntry& rRefEntry ); ~ScUnoRefUndoHint(); diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 7ebb3b624dac..e6b6c6dc3f4a 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -115,7 +115,7 @@ private: class SC_DLLPUBLIC ScTpViewItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScTpViewItem( sal_uInt16 nWhich, const ScViewOptions& rOpt ); ScTpViewItem( const ScTpViewItem& rItem ); ~ScTpViewItem(); diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx index 46072a47ce53..ea11846f5c22 100644 --- a/sc/source/core/inc/ddelink.hxx +++ b/sc/source/core/inc/ddelink.hxx @@ -47,7 +47,7 @@ static bool bIsInUpdate; ScMatrixRef pResult; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScDdeLink( ScDocument* pD, const OUString& rA, const OUString& rT, const OUString& rI, diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index 21637726bb77..efe7801e9f13 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -54,7 +54,7 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext bool bContainsCenter; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -83,7 +83,7 @@ private: ::com::sun::star::text::XTextCursor > xOldTextCursor; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLHeaderFooterRegionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index bf452db576fb..17e63f20aa46 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -89,7 +89,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTableStyleContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -200,7 +200,7 @@ protected: virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScXMLMasterStylesContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -225,7 +225,7 @@ class ScMasterPageContext : public XMLTextMasterPageContext void ClearContent(const OUString& rContent); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScMasterPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx index 5ece67334d1b..14483facb32a 100644 --- a/sc/source/ui/inc/AccessibilityHints.hxx +++ b/sc/source/ui/inc/AccessibilityHints.hxx @@ -39,7 +39,7 @@ class ScAccWinFocusLostHint : public SfxHint ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xOldAccessible; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScAccWinFocusLostHint( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld ); ~ScAccWinFocusLostHint(); @@ -53,7 +53,7 @@ class ScAccWinFocusGotHint : public SfxHint ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xNewAccessible; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScAccWinFocusGotHint( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew ); ~ScAccWinFocusGotHint(); @@ -66,7 +66,7 @@ class ScAccGridWinFocusLostHint : public ScAccWinFocusLostHint { ScSplitPos eOldGridWin; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScAccGridWinFocusLostHint( ScSplitPos eOldGridWin, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xOld ); ~ScAccGridWinFocusLostHint(); @@ -78,7 +78,7 @@ class ScAccGridWinFocusGotHint : public ScAccWinFocusGotHint { ScSplitPos eNewGridWin; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScAccGridWinFocusGotHint( ScSplitPos eNewGridWin, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xNew ); ~ScAccGridWinFocusGotHint(); diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx index a24c937dfe30..edb82bb00737 100644 --- a/sc/source/ui/inc/auditsh.hxx +++ b/sc/source/ui/inc/auditsh.hxx @@ -34,7 +34,7 @@ private: sal_uInt16 nFunction; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_AUDITING_SHELL) ScAuditingShell(ScViewData* pData); diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index 7b5fbaedc397..bcfbed18f174 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -68,7 +68,7 @@ private: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_CELL_SHELL) ScCellShell(ScViewData* pData); diff --git a/sc/source/ui/inc/chartsh.hxx b/sc/source/ui/inc/chartsh.hxx index 9a3719af1a96..947e616fb330 100644 --- a/sc/source/ui/inc/chartsh.hxx +++ b/sc/source/ui/inc/chartsh.hxx @@ -32,7 +32,7 @@ class ScChartShell: public ScDrawShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_CHART_SHELL) ScChartShell(ScViewData* pData); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 8fd82092b8ff..88f2ffaec494 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -171,7 +171,7 @@ protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_DOC_SHELL) SFX_DECL_OBJECTFACTORY(); diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 7e5ede5fce22..fba5dc0377b9 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -48,7 +48,7 @@ protected: ScViewData* GetViewData() { return pViewData; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_DRAW_SHELL) ScDrawShell(ScViewData* pData); diff --git a/sc/source/ui/inc/drformsh.hxx b/sc/source/ui/inc/drformsh.hxx index ba72981621b3..599906d3e3d4 100644 --- a/sc/source/ui/inc/drformsh.hxx +++ b/sc/source/ui/inc/drformsh.hxx @@ -34,7 +34,7 @@ class ScDrawFormShell: public ScDrawShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_FORM_SHELL) ScDrawFormShell(ScViewData* pData); diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index 2fbc1a05e61a..b7c7d272b74f 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -41,7 +41,7 @@ class ScDrawTextObjectBar : public SfxShell DECL_LINK( ClipboardChanged, TransferableDataHelper* ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_DRAW_TEXT_SHELL) ScDrawTextObjectBar(ScViewData* pData); diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx index 69cf69e82488..f0b3384230d5 100644 --- a/sc/source/ui/inc/editsh.hxx +++ b/sc/source/ui/inc/editsh.hxx @@ -49,7 +49,7 @@ private: DECL_LINK( ClipboardChanged, TransferableDataHelper* ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_EDIT_SHELL) ScEditShell(EditView* pView, ScViewData* pData); diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx index 975e2ad63597..13b004fdfb15 100644 --- a/sc/source/ui/inc/formatsh.hxx +++ b/sc/source/ui/inc/formatsh.hxx @@ -38,7 +38,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_FORMAT_SHELL) ScFormatShell(ScViewData* pData); diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx index 31d2d35bcffe..a00b24e80fcb 100644 --- a/sc/source/ui/inc/graphsh.hxx +++ b/sc/source/ui/inc/graphsh.hxx @@ -33,7 +33,7 @@ class ScGraphicShell: public ScDrawShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_GRAPHIC_SHELL) ScGraphicShell(ScViewData* pData); diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx index e389b600c997..eb329256403b 100644 --- a/sc/source/ui/inc/mediash.hxx +++ b/sc/source/ui/inc/mediash.hxx @@ -33,7 +33,7 @@ class ScMediaShell: public ScDrawShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_MEDIA_SHELL) ScMediaShell(ScViewData* pData); diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx index 2de3f6882549..f82e5621dd59 100644 --- a/sc/source/ui/inc/oleobjsh.hxx +++ b/sc/source/ui/inc/oleobjsh.hxx @@ -33,7 +33,7 @@ class ScOleObjectShell: public ScDrawShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_OLEOBJECT_SHELL) ScOleObjectShell(ScViewData* pData); diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx index 1b04614861bb..bccfe08e25cf 100644 --- a/sc/source/ui/inc/pgbrksh.hxx +++ b/sc/source/ui/inc/pgbrksh.hxx @@ -30,7 +30,7 @@ class ScTabViewShell; class ScPageBreakShell : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_PAGEBREAK_SHELL) ScPageBreakShell( ScTabViewShell* pView ); diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx index 059b356e0dd9..4662611db293 100644 --- a/sc/source/ui/inc/pivotsh.hxx +++ b/sc/source/ui/inc/pivotsh.hxx @@ -31,7 +31,7 @@ class ScDPObject; class ScPivotShell : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SCID_PIVOT_SHELL) ScPivotShell( ScTabViewShell* pView ); diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx index 54ec1c683ea1..7d128d07fd99 100644 --- a/sc/source/ui/inc/target.hxx +++ b/sc/source/ui/inc/target.hxx @@ -30,7 +30,7 @@ private: ScTabViewShell* pViewShell; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScTabViewTarget( ScTabViewShell* pShell ) : pViewShell( pShell ) {} virtual ~ScTabViewTarget(); diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 19a045cd787d..3573df0ce437 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -54,7 +54,7 @@ class ScInputStatusItem : public SfxPoolItem const std::vector<editeng::MisspellRanges>* mpMisspellRanges; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScInputStatusItem( sal_uInt16 nWhich, const ScAddress& rCurPos, @@ -104,7 +104,7 @@ class ScTablesHint : public SfxHint SCTAB nTab2; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScTablesHint(sal_uInt16 nNewId, SCTAB nTable1, SCTAB nTable2=0); ~ScTablesHint(); @@ -119,7 +119,7 @@ class ScEditViewHint : public SfxHint ScAddress aCursorPos; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScEditViewHint( ScEditEngineDefaulter* pEngine, const ScAddress& rCurPos ); ~ScEditViewHint(); @@ -138,7 +138,7 @@ class ScIndexHint : public SfxHint sal_uInt16 nIndex; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScIndexHint(sal_uInt16 nNewId, sal_uInt16 nIdx); ~ScIndexHint(); @@ -152,7 +152,7 @@ public: class SC_DLLPUBLIC ScSortItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScSortItem( sal_uInt16 nWhich, ScViewData* ptrViewData, const ScSortParam* pSortData ); @@ -179,7 +179,7 @@ private: class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScQueryItem( sal_uInt16 nWhich, ScViewData* ptrViewData, const ScQueryParam* pQueryData ); @@ -210,7 +210,7 @@ private: class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScSubTotalItem( sal_uInt16 nWhich, ScViewData* ptrViewData, const ScSubTotalParam* pSubTotalData ); @@ -237,7 +237,7 @@ private: class SC_DLLPUBLIC ScUserListItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUserListItem( sal_uInt16 nWhich ); ScUserListItem( const ScUserListItem& rItem ); ~ScUserListItem(); @@ -258,7 +258,7 @@ private: class ScConsolidateItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScConsolidateItem( sal_uInt16 nWhich, const ScConsolidateParam* pParam ); ScConsolidateItem( const ScConsolidateItem& rItem ); @@ -279,7 +279,7 @@ private: class ScPivotItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScPivotItem( sal_uInt16 nWhich, const ScDPSaveData* pData, const ScRange* pRange, bool bNew ); ScPivotItem( const ScPivotItem& rItem ); @@ -304,7 +304,7 @@ private: class ScSolveItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScSolveItem( sal_uInt16 nWhich, const ScSolveParam* pParam ); ScSolveItem( const ScSolveItem& rItem ); @@ -325,7 +325,7 @@ private: class ScTabOpItem : public SfxPoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScTabOpItem( sal_uInt16 nWhich, const ScTabOpParam* pParam ); ScTabOpItem( const ScTabOpItem& rItem ); diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index b04784928643..8999631e06e7 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -38,7 +38,7 @@ class ScSimpleUndo: public SfxUndoAction ScSimpleUndo(const ScSimpleUndo&); // disabled public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScSimpleUndo( ScDocShell* pDocSh ); virtual ~ScSimpleUndo(); @@ -70,7 +70,7 @@ enum ScBlockUndoMode { SC_UNDO_SIMPLE, SC_UNDO_MANUALHEIGHT, SC_UNDO_AUTOHEIGHT class ScBlockUndo: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScBlockUndo( ScDocShell* pDocSh, const ScRange& rRange, ScBlockUndoMode eBlockMode ); virtual ~ScBlockUndo(); @@ -92,7 +92,7 @@ protected: class ScMultiBlockUndo: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScMultiBlockUndo(ScDocShell* pDocSh, const ScRangeList& rRanges, ScBlockUndoMode eBlockMode); virtual ~ScMultiBlockUndo(); @@ -123,7 +123,7 @@ protected: SdrUndoAction* mpDrawUndo; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal, SdrUndoAction* pDrawUndo = 0 ); virtual ~ScDBFuncUndo(); @@ -142,7 +142,7 @@ enum ScMoveUndoMode { SC_UNDO_REFFIRST, SC_UNDO_REFLAST }; class ScMoveUndo: public ScSimpleUndo // mit Referenzen { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScMoveUndo( ScDocShell* pDocSh, ScDocument* pRefDoc, ScRefUndoData* pRefData, ScMoveUndoMode eRefMode ); @@ -170,7 +170,7 @@ class ScUndoWrapper: public SfxUndoAction // for manual merging of act SfxUndoAction* pWrappedUndo; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoWrapper( SfxUndoAction* pUndo ); virtual ~ScUndoWrapper(); diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 520e2f974696..59b81b87ab95 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -46,7 +46,7 @@ class ScEditDataArray; class ScUndoInsertCells: public ScMoveUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoInsertCells( ScDocShell* pNewDocShell, const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios, InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData, @@ -80,7 +80,7 @@ private: class ScUndoDeleteCells: public ScMoveUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoDeleteCells( ScDocShell* pNewDocShell, const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios, DelCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData ); @@ -110,7 +110,7 @@ private: class ScUndoDeleteMulti: public ScMoveUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoDeleteMulti( ScDocShell* pNewDocShell, bool bNewRows, bool bNeedsRefresh, SCTAB nNewTab, @@ -142,7 +142,7 @@ private: class ScUndoCut: public ScBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoCut( ScDocShell* pNewDocShell, ScRange aRange, // adjusted for merged cells ScAddress aOldEnd, // end position without adjustment @@ -189,7 +189,7 @@ struct ScUndoPasteOptions class ScUndoPaste: public ScMultiBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoPaste(ScDocShell* pNewDocShell, const ScRangeList& rRanges, const ScMarkData& rMark, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, @@ -226,7 +226,7 @@ private: class ScUndoDragDrop: public ScMoveUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoDragDrop( ScDocShell* pNewDocShell, const ScRange& rRange, ScAddress aNewDestPos, bool bNewCut, ScDocument* pUndoDocument, ScRefUndoData* pRefData, @@ -261,7 +261,7 @@ private: class ScUndoDeleteContents: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoDeleteContents( ScDocShell* pNewDocShell, const ScMarkData& rMark, const ScRange& rRange, @@ -294,7 +294,7 @@ private: class ScUndoFillTable: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoFillTable( ScDocShell* pNewDocShell, const ScMarkData& rMark, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, @@ -331,7 +331,7 @@ private: class ScUndoSelectionAttr: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoSelectionAttr( ScDocShell* pNewDocShell, const ScMarkData& rMark, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, @@ -368,7 +368,7 @@ private: class ScUndoWidthOrHeight: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoWidthOrHeight( ScDocShell* pNewDocShell, const ScMarkData& rMark, SCCOLROW nNewStart, SCTAB nNewStartTab, @@ -406,7 +406,7 @@ private: class ScUndoAutoFill: public ScBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoAutoFill( ScDocShell* pNewDocShell, const ScRange& rRange, const ScRange& rSourceArea, ScDocument* pNewUndoDoc, const ScMarkData& rMark, @@ -442,7 +442,7 @@ private: class ScUndoMerge: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo); virtual ~ScUndoMerge(); @@ -467,7 +467,7 @@ private: class ScUndoAutoFormat: public ScBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoAutoFormat( ScDocShell* pNewDocShell, const ScRange& rRange, ScDocument* pNewUndoDoc, const ScMarkData& rMark, @@ -492,7 +492,7 @@ private: class ScUndoReplace: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark, SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, @@ -523,7 +523,7 @@ private: class ScUndoTabOp: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoTabOp( ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, @@ -556,7 +556,7 @@ private: class ScUndoConversion : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoConversion( ScDocShell* pNewDocShell, const ScMarkData& rMark, SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocument* pNewUndoDoc, @@ -588,7 +588,7 @@ private: class ScUndoRefConversion: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoRefConversion( ScDocShell* pNewDocShell, const ScRange& aMarkRange, const ScMarkData& rMark, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, bool bNewMulti, sal_uInt16 nNewFlag); @@ -618,7 +618,7 @@ private: class ScUndoListNames: public ScBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoListNames( ScDocShell* pNewDocShell, const ScRange& rRange, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc ); @@ -642,7 +642,7 @@ private: class ScUndoUseScenario: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoUseScenario( ScDocShell* pNewDocShell, const ScMarkData& rMark, const ScArea& rDestArea, ScDocument* pNewUndoDoc, @@ -667,7 +667,7 @@ private: class ScUndoSelectionStyle: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoSelectionStyle( ScDocShell* pNewDocShell, const ScMarkData& rMark, const ScRange& rRange, @@ -696,7 +696,7 @@ private: class ScUndoRefreshLink: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoRefreshLink( ScDocShell* pNewDocShell, ScDocument* pNewUndoDoc ); virtual ~ScUndoRefreshLink(); @@ -717,7 +717,7 @@ private: class ScUndoEnterMatrix: public ScBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoEnterMatrix( ScDocShell* pNewDocShell, const ScRange& rArea, ScDocument* pNewUndoDoc, @@ -744,7 +744,7 @@ private: class ScUndoInsertAreaLink : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoInsertAreaLink( ScDocShell* pShell, const OUString& rDocName, const OUString& rFltName, const OUString& rOptions, @@ -772,7 +772,7 @@ private: class ScUndoRemoveAreaLink : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoRemoveAreaLink( ScDocShell* pShell, const OUString& rDocName, const OUString& rFltName, const OUString& rOptions, @@ -800,7 +800,7 @@ private: class ScUndoUpdateAreaLink : public ScSimpleUndo //! also change BlockUndo? { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoUpdateAreaLink( ScDocShell* pShell, const OUString& rOldD, const OUString& rOldF, const OUString& rOldO, @@ -845,7 +845,7 @@ private: class ScUndoIndent: public ScBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark, ScDocument* pNewUndoDoc, bool bIncrement ); virtual ~ScUndoIndent(); @@ -867,7 +867,7 @@ private: class ScUndoTransliterate: public ScBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark, ScDocument* pNewUndoDoc, sal_Int32 nType ); virtual ~ScUndoTransliterate(); @@ -889,7 +889,7 @@ private: class ScUndoClearItems: public ScBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoClearItems( ScDocShell* pNewDocShell, const ScMarkData& rMark, ScDocument* pNewUndoDoc, const sal_uInt16* pW ); virtual ~ScUndoClearItems(); @@ -911,7 +911,7 @@ private: class ScUndoRemoveBreaks: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoRemoveBreaks( ScDocShell* pNewDocShell, SCTAB nNewTab, ScDocument* pNewUndoDoc ); virtual ~ScUndoRemoveBreaks(); @@ -932,7 +932,7 @@ private: class ScUndoRemoveMerge: public ScBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoRemoveMerge( ScDocShell* pNewDocShell, const ScCellMergeOption& rOption, ScDocument* pNewUndoDoc ); @@ -956,7 +956,7 @@ private: class ScUndoBorder: public ScBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoBorder( ScDocShell* pNewDocShell, const ScRangeList& rRangeList, ScDocument* pNewUndoDoc, diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 199eae3fd021..c9297b2f0259 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -46,7 +46,7 @@ class CellValues; class ScUndoCursorAttr: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoCursorAttr( ScDocShell* pNewDocShell, SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, const ScPatternAttr* pOldPat, const ScPatternAttr* pNewPat, @@ -83,7 +83,7 @@ private: class ScUndoEnterData: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); struct Value { @@ -126,7 +126,7 @@ private: class ScUndoEnterValue: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos, const ScCellValue& rUndoCell, double nVal ); @@ -152,7 +152,7 @@ private: class ScUndoSetCell : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoSetCell( ScDocShell* pDocSh, const ScAddress& rPos, const ScCellValue& rOldVal, const ScCellValue& rNewVal ); virtual ~ScUndoSetCell(); @@ -177,7 +177,7 @@ private: class ScUndoPageBreak: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoPageBreak( ScDocShell* pNewDocShell, SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, bool bNewColumn, bool bNewInsert ); @@ -203,7 +203,7 @@ private: class ScUndoPrintZoom: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoPrintZoom( ScDocShell* pNewDocShell, SCTAB nT, sal_uInt16 nOS, sal_uInt16 nOP, sal_uInt16 nNS, sal_uInt16 nNP ); virtual ~ScUndoPrintZoom(); @@ -228,7 +228,7 @@ private: class ScUndoThesaurus: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoThesaurus( ScDocShell* pNewDocShell, SCCOL nNewCol, SCROW nNewRow, SCTAB nNewTab, const ScCellValue& rOldText, const ScCellValue& rNewText ); @@ -260,7 +260,7 @@ private: class ScUndoReplaceNote : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); /** Constructs an undo action for inserting or removing a cell note. */ ScUndoReplaceNote( @@ -304,7 +304,7 @@ private: class ScUndoShowHideNote : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoShowHideNote( ScDocShell& rDocShell, const ScAddress& rPos, bool bShow ); virtual ~ScUndoShowHideNote(); @@ -325,7 +325,7 @@ private: class ScUndoDetective: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoDetective( ScDocShell* pNewDocShell, SdrUndoAction* pDraw, const ScDetOpData* pOperation, ScDetOpList* pUndoList = NULL ); @@ -350,7 +350,7 @@ private: class ScUndoRangeNames: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); //use nTab = -1 for global range names ScUndoRangeNames( ScDocShell* pNewDocShell, ScRangeName* pOld, ScRangeName* pNew , SCTAB nTab = -1); diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 20c6ba836b0e..9d00e52fb534 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -45,7 +45,7 @@ class ScMarkData; class ScUndoDoOutline: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoDoOutline( ScDocShell* pNewDocShell, SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, ScDocument* pNewUndoDoc, bool bNewColumns, @@ -74,7 +74,7 @@ private: class ScUndoMakeOutline: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoMakeOutline( ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, @@ -101,7 +101,7 @@ private: class ScUndoOutlineLevel: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoOutlineLevel( ScDocShell* pNewDocShell, SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, @@ -129,7 +129,7 @@ private: class ScUndoOutlineBlock: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoOutlineBlock( ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, @@ -156,7 +156,7 @@ private: class ScUndoRemoveAllOutlines: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoRemoveAllOutlines( ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, @@ -181,7 +181,7 @@ private: class ScUndoAutoOutline: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoAutoOutline( ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, @@ -206,7 +206,7 @@ private: class ScUndoSubTotals: public ScDBFuncUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScSubTotalParam& rNewParam, SCROW nNewEndY, ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, @@ -236,7 +236,7 @@ private: class ScUndoSort: public ScDBFuncUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoSort( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScSortParam& rParam, ScDocument* pNewUndoDoc, @@ -263,7 +263,7 @@ private: class ScUndoQuery: public ScDBFuncUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQueryParam& rParam, ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB, const ScRange* pOld, @@ -300,7 +300,7 @@ private: void DoChange( bool bUndo ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoAutoFilter( ScDocShell* pNewDocShell, const ScRange& rRange, const OUString& rName, bool bSet ); virtual ~ScUndoAutoFilter(); @@ -317,7 +317,7 @@ public: class ScUndoDBData: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoDBData( ScDocShell* pNewDocShell, ScDBCollection* pNewUndoColl, ScDBCollection* pNewRedoColl ); virtual ~ScUndoDBData(); @@ -338,7 +338,7 @@ private: class ScUndoImportData: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoImportData( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScImportParam& rParam, SCCOL nNewEndX, SCROW nNewEndY, SCCOL nNewFormula, @@ -370,7 +370,7 @@ private: class ScUndoRepeatDB: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab, SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, SCROW nResultEndRow, SCCOL nCurX, SCROW nCurY, @@ -404,7 +404,7 @@ private: class ScUndoDataPilot: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoDataPilot( ScDocShell* pNewDocShell, ScDocument* pOldDoc, ScDocument* pNewDoc, const ScDPObject* pOldObj, const ScDPObject* pNewObj, @@ -430,7 +430,7 @@ private: class ScUndoConsolidate: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoConsolidate( ScDocShell* pNewDocShell, const ScArea& rArea, const ScConsolidateParam& rPar, ScDocument* pNewUndoDoc, bool bReference, @@ -459,7 +459,7 @@ private: class ScUndoChartData: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoChartData( ScDocShell* pNewDocShell, const OUString& rName, const ScRange& rNew, bool bColHdr, bool bRowHdr, bool bAdd ); @@ -492,7 +492,7 @@ private: class ScUndoDataForm: public ScBlockUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoDataForm( ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx index 4a1fab00c867..0630a0ac3597 100644 --- a/sc/source/ui/inc/undodraw.hxx +++ b/sc/source/ui/inc/undodraw.hxx @@ -32,7 +32,7 @@ class ScUndoDraw: public SfxUndoAction void UpdateSubShell(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoDraw( SfxUndoAction* pUndo, ScDocShell* pDocSh ); virtual ~ScUndoDraw(); diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 34d00c043a51..86756c2b599f 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -60,7 +60,7 @@ private: const ScStyleSaveData& rData ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoModifyStyle( ScDocShell* pDocSh, SfxStyleFamily eFam, const ScStyleSaveData& rOld, @@ -78,7 +78,7 @@ public: class ScUndoApplyPageStyle: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoApplyPageStyle( ScDocShell* pDocSh, const OUString& rNewStyle ); virtual ~ScUndoApplyPageStyle(); diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index e24f0d94e66a..5a465c642d8d 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -47,7 +47,7 @@ class ScMarkData; class ScUndoInsertTab : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoInsertTab( ScDocShell* pNewDocShell, SCTAB nTabNum, @@ -75,7 +75,7 @@ private: class ScUndoInsertTables : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoInsertTables( ScDocShell* pNewDocShell, SCTAB nTabNum, @@ -104,7 +104,7 @@ private: class ScUndoDeleteTab: public ScMoveUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoDeleteTab( ScDocShell* pNewDocShell, const std::vector<SCTAB> &theTabs, //SCTAB nNewTab, @@ -131,7 +131,7 @@ private: class ScUndoRenameTab: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoRenameTab( ScDocShell* pNewDocShell, SCTAB nT, @@ -158,7 +158,7 @@ private: class ScUndoMoveTab: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoMoveTab( ScDocShell* pNewDocShell, ::std::vector<SCTAB>* pOldTabs, @@ -188,7 +188,7 @@ private: class ScUndoCopyTab: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoCopyTab( ScDocShell* pNewDocShell, ::std::vector<SCTAB>* pOldTabs, @@ -216,7 +216,7 @@ private: class ScUndoTabColor: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoTabColor( ScDocShell* pNewDocShell, SCTAB nT, @@ -243,7 +243,7 @@ private: class ScUndoMakeScenario: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoMakeScenario( ScDocShell* pNewDocShell, SCTAB nSrc, SCTAB nDest, @@ -274,7 +274,7 @@ private: class ScUndoImportTab : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoImportTab( ScDocShell* pShell, SCTAB nNewTab, SCTAB nNewCount ); @@ -300,7 +300,7 @@ private: class ScUndoRemoveLink : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoRemoveLink( // Call before delete! ScDocShell* pShell, const OUString& rDoc ); @@ -330,7 +330,7 @@ private: class ScUndoShowHideTab : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoShowHideTab( ScDocShell* pShell, const std::vector<SCTAB>& newUndoTabs, @@ -411,7 +411,7 @@ private: class ScUndoPrintRange : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoPrintRange( ScDocShell* pShell, SCTAB nNewTab, ScPrintRangeSaver* pOld, ScPrintRangeSaver* pNew ); virtual ~ScUndoPrintRange(); @@ -435,7 +435,7 @@ private: class ScUndoScenarioFlags: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoScenarioFlags( ScDocShell* pNewDocShell, SCTAB nT, const OUString& rON, const OUString& rNN, @@ -468,7 +468,7 @@ private: class ScUndoRenameObject: public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoRenameObject( ScDocShell* pNewDocShell, const OUString& rPN, const OUString& rON, const OUString& rNN ); @@ -494,7 +494,7 @@ private: class ScUndoLayoutRTL : public ScSimpleUndo { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, bool bNewRTL ); virtual ~ScUndoLayoutRTL(); diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index 191574cf6d7e..a9db2d1ec6e9 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -208,7 +208,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdDrawDocument(DocumentType eType, SfxObjectShell* pDocSh); ~SdDrawDocument(); diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 004827c0db64..3ccc8e925e9f 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -91,7 +91,7 @@ public: class DiaEffectItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DiaEffectItem( ::com::sun::star::presentation::FadeEffect eFade = com::sun::star::presentation::FadeEffect_NONE ); DiaEffectItem( SvStream& rIn ); @@ -106,7 +106,7 @@ public: class DiaSpeedItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DiaSpeedItem( FadeSpeed = FADE_SPEED_MEDIUM ); DiaSpeedItem( SvStream& rIn ); @@ -121,7 +121,7 @@ public: class DiaAutoItem : public SfxEnumItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DiaAutoItem( PresChange = PRESCHANGE_MANUAL ); DiaAutoItem( SvStream& rIn ); @@ -135,7 +135,7 @@ public: class DiaTimeItem : public SfxUInt32Item { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DiaTimeItem( sal_uInt32 nValue = 0L ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 477093cf8250..ca93858750b3 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -74,7 +74,7 @@ class SdModule : public SfxModule, public SfxListener { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SD_IF_SDAPP) DECL_LINK( CalcFieldValueHdl, EditFieldInfo* ); diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index f10aef2752b1..1c895723d43e 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -154,7 +154,7 @@ protected: double mfTransitionDuration; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdPage(SdDrawDocument& rNewDoc, sal_Bool bMasterPage=sal_False); SdPage(const SdPage& rSrcPage); diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx index 50fae9bd4212..02c874eb158f 100644 --- a/sd/inc/sdundo.hxx +++ b/sd/inc/sdundo.hxx @@ -28,7 +28,7 @@ class SdDrawDocument; class SD_DLLPUBLIC SdUndoAction : public SfxUndoAction { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdUndoAction(SdDrawDocument* pSdDrawDocument) : mpDoc(pSdDrawDocument) {} virtual ~SdUndoAction() {} diff --git a/sd/source/ui/inc/BezierObjectBar.hxx b/sd/source/ui/inc/BezierObjectBar.hxx index 7188f69d4c6d..11036a21f28a 100644 --- a/sd/source/ui/inc/BezierObjectBar.hxx +++ b/sd/source/ui/inc/BezierObjectBar.hxx @@ -33,7 +33,7 @@ class BezierObjectBar : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SD_IF_SDDRAWBEZIEROBJECTBAR) BezierObjectBar (ViewShell* pSdViewShell, View* pSdView); diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index c8b22c8240ec..1dee67d7a967 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -49,7 +49,7 @@ class ViewShell; class SD_DLLPUBLIC DrawDocShell : public SfxObjectShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SD_IF_SDDRAWDOCSHELL) SFX_DECL_OBJECTFACTORY(); diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 73414906a7ff..5e566773afb1 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -65,7 +65,7 @@ class DrawViewShell public: static const int SLOTARRAY_COUNT = 24; - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SD_IF_SDDRAWVIEWSHELL) diff --git a/sd/source/ui/inc/GraphicDocShell.hxx b/sd/source/ui/inc/GraphicDocShell.hxx index 7c1a32e7e018..fc3c8602e51c 100644 --- a/sd/source/ui/inc/GraphicDocShell.hxx +++ b/sd/source/ui/inc/GraphicDocShell.hxx @@ -36,7 +36,7 @@ class GraphicDocShell : public DrawDocShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SD_IF_SDGRAPHICDOCSHELL) SFX_DECL_OBJECTFACTORY(); diff --git a/sd/source/ui/inc/GraphicObjectBar.hxx b/sd/source/ui/inc/GraphicObjectBar.hxx index a7e8b6303095..3f28c15c3e80 100644 --- a/sd/source/ui/inc/GraphicObjectBar.hxx +++ b/sd/source/ui/inc/GraphicObjectBar.hxx @@ -34,7 +34,7 @@ class GraphicObjectBar : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE( SD_IF_SDDRAWGRAFOBJECTBAR ) GraphicObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); diff --git a/sd/source/ui/inc/GraphicViewShell.hxx b/sd/source/ui/inc/GraphicViewShell.hxx index d1c4b7bddd89..59663647da2c 100644 --- a/sd/source/ui/inc/GraphicViewShell.hxx +++ b/sd/source/ui/inc/GraphicViewShell.hxx @@ -39,7 +39,7 @@ class GraphicViewShell : public DrawViewShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_VIEWFACTORY(GraphicViewShell); SFX_DECL_INTERFACE(SD_IF_SDGRAPHICVIEWSHELL) diff --git a/sd/source/ui/inc/GraphicViewShellBase.hxx b/sd/source/ui/inc/GraphicViewShellBase.hxx index db8e778dedf5..37d4ed0c58ec 100644 --- a/sd/source/ui/inc/GraphicViewShellBase.hxx +++ b/sd/source/ui/inc/GraphicViewShellBase.hxx @@ -32,7 +32,7 @@ class GraphicViewShellBase : public ViewShellBase { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_VIEWFACTORY(GraphicViewShellBase); /** This constructor is used by the view factory of the SFX diff --git a/sd/source/ui/inc/ImpressViewShellBase.hxx b/sd/source/ui/inc/ImpressViewShellBase.hxx index c094d7bf6ba2..0da157499116 100644 --- a/sd/source/ui/inc/ImpressViewShellBase.hxx +++ b/sd/source/ui/inc/ImpressViewShellBase.hxx @@ -32,7 +32,7 @@ class ImpressViewShellBase : public ViewShellBase { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_VIEWFACTORY(ImpressViewShellBase); /** This constructor is used by the view factory of the SFX diff --git a/sd/source/ui/inc/MediaObjectBar.hxx b/sd/source/ui/inc/MediaObjectBar.hxx index 676d3f1785f7..863deb6f1cc1 100644 --- a/sd/source/ui/inc/MediaObjectBar.hxx +++ b/sd/source/ui/inc/MediaObjectBar.hxx @@ -34,7 +34,7 @@ class MediaObjectBar : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE( SD_IF_SDDRAWMEDIAOBJECTBAR ) MediaObjectBar (ViewShell* pSdViewShell, ::sd::View* pSdView); diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index bc813795121d..ee71f9899226 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -69,7 +69,7 @@ public: void ConnectToApplication (void); void DisconnectFromApplication (void); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrTextObj* GetTitleTextObject(SdrPage* pPage); SdrTextObj* GetOutlineTextObject(SdrPage* pPage); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index deb9307a89cb..5611360bf1ef 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -36,7 +36,7 @@ class OutlineViewShell : public ViewShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_VIEWFACTORY(OutlineViewShell); SFX_DECL_INTERFACE(SD_IF_SDOUTLINEVIEWSHELL) diff --git a/sd/source/ui/inc/OutlineViewShellBase.hxx b/sd/source/ui/inc/OutlineViewShellBase.hxx index c02d8ad388c5..6dafd4d23394 100644 --- a/sd/source/ui/inc/OutlineViewShellBase.hxx +++ b/sd/source/ui/inc/OutlineViewShellBase.hxx @@ -32,7 +32,7 @@ class OutlineViewShellBase : public ImpressViewShellBase { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_VIEWFACTORY(OutlineViewShellBase); /** This constructor is used by the view factory of the SFX diff --git a/sd/source/ui/inc/PaneShells.hxx b/sd/source/ui/inc/PaneShells.hxx index 00c81a5ee738..0dd1c55bcb4e 100644 --- a/sd/source/ui/inc/PaneShells.hxx +++ b/sd/source/ui/inc/PaneShells.hxx @@ -35,7 +35,7 @@ class LeftImpressPaneShell : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SD_IF_SDLEFTIMPRESSPANESHELL) LeftImpressPaneShell (void); @@ -52,7 +52,7 @@ class LeftDrawPaneShell : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SD_IF_SDLEFTDRAWPANESHELL) LeftDrawPaneShell (void); @@ -68,7 +68,7 @@ public: class ToolPanelPaneShell : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE( SD_IF_SDTOOLPANELPANESHELL ) ToolPanelPaneShell(); diff --git a/sd/source/ui/inc/PresentationViewShell.hxx b/sd/source/ui/inc/PresentationViewShell.hxx index f23f501716a0..887dbf30e5cb 100644 --- a/sd/source/ui/inc/PresentationViewShell.hxx +++ b/sd/source/ui/inc/PresentationViewShell.hxx @@ -30,7 +30,7 @@ namespace sd { class PresentationViewShell : public DrawViewShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_VIEWFACTORY(PresViewShell); SFX_DECL_INTERFACE( SD_IF_SDPRESVIEWSHELL ) diff --git a/sd/source/ui/inc/PresentationViewShellBase.hxx b/sd/source/ui/inc/PresentationViewShellBase.hxx index 832e311f8948..0e74b4dade52 100644 --- a/sd/source/ui/inc/PresentationViewShellBase.hxx +++ b/sd/source/ui/inc/PresentationViewShellBase.hxx @@ -32,7 +32,7 @@ class PresentationViewShellBase : public ViewShellBase { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_VIEWFACTORY(PresentationViewShellBase); /** This constructor is used by the view factory of the SFX diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 6e212a243075..630ced0a6659 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -42,7 +42,7 @@ class SlideSorterViewShell friend class controller::SlotManager; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SD_IF_SDSLIDESORTERVIEWSHELL) static ::boost::shared_ptr<SlideSorterViewShell> Create( diff --git a/sd/source/ui/inc/SlideSorterViewShellBase.hxx b/sd/source/ui/inc/SlideSorterViewShellBase.hxx index 3e7f9c71854c..24b2173942c4 100644 --- a/sd/source/ui/inc/SlideSorterViewShellBase.hxx +++ b/sd/source/ui/inc/SlideSorterViewShellBase.hxx @@ -32,7 +32,7 @@ class SlideSorterViewShellBase : public ImpressViewShellBase { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_VIEWFACTORY(SlideSorterViewShellBase); /** This constructor is used by the view factory of the SFX diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx index 6208cd8737a5..6d760dc195d9 100644 --- a/sd/source/ui/inc/TextObjectBar.hxx +++ b/sd/source/ui/inc/TextObjectBar.hxx @@ -36,7 +36,7 @@ class TextObjectBar : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SD_IF_SDDRAWTEXTOBJECTBAR) TextObjectBar ( diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index c270616eacce..ea916dcb0696 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -67,7 +67,7 @@ struct SdViewRedrawRec class View : public FmFormView { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); View ( SdDrawDocument& rDrawDoc, diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 759bed49a220..16b823b537e1 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -112,7 +112,7 @@ public: = DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT; - TYPEINFO(); + TYPEINFO_OVERRIDE(); ViewShell ( SfxViewFrame *pFrame, diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 231e5dadc89a..995b8d9fad87 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -62,7 +62,7 @@ class ViewShellBase : public SfxViewShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_VIEWFACTORY(ViewShellBase); SFX_DECL_INTERFACE(SD_IF_SDVIEWSHELLBASE) diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index 303f00f90e0d..6a10b4d30afd 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -45,7 +45,7 @@ public: HINT_COMPLEX_MODEL_CHANGE_END }; - TYPEINFO(); + TYPEINFO_OVERRIDE(); ViewShellHint (HintId nHintId); diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 06a41a69acf0..18e5854527e7 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -34,7 +34,7 @@ class DrawViewShell; class DrawView : public ::sd::View { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DrawView ( DrawDocShell* pDocSh, diff --git a/sd/source/ui/inc/fuarea.hxx b/sd/source/ui/inc/fuarea.hxx index f58c32498760..ad0cd278c21c 100644 --- a/sd/source/ui/inc/fuarea.hxx +++ b/sd/source/ui/inc/fuarea.hxx @@ -27,7 +27,7 @@ namespace sd { class FuArea : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fubullet.hxx b/sd/source/ui/inc/fubullet.hxx index 221d62b5a3b2..1dd91c70dd59 100644 --- a/sd/source/ui/inc/fubullet.hxx +++ b/sd/source/ui/inc/fubullet.hxx @@ -32,7 +32,7 @@ class ViewShell; class FuBullet : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuchar.hxx b/sd/source/ui/inc/fuchar.hxx index 87b9b248f897..20ffd3d9d202 100644 --- a/sd/source/ui/inc/fuchar.hxx +++ b/sd/source/ui/inc/fuchar.hxx @@ -28,7 +28,7 @@ class FuChar : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx index 61e70fbf7a81..9c0236e914ec 100644 --- a/sd/source/ui/inc/fucon3d.hxx +++ b/sd/source/ui/inc/fucon3d.hxx @@ -33,7 +33,7 @@ class FuConstruct3dObject : public FuConstruct { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx index 6408c087880f..8ac7bb453b9c 100644 --- a/sd/source/ui/inc/fuconarc.hxx +++ b/sd/source/ui/inc/fuconarc.hxx @@ -29,7 +29,7 @@ class FuConstructArc : public FuConstruct { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx index 7ea3968a4d9b..0b65ff874bb6 100644 --- a/sd/source/ui/inc/fuconbez.hxx +++ b/sd/source/ui/inc/fuconbez.hxx @@ -34,7 +34,7 @@ class FuConstructBezierPolygon : public FuConstruct { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx index bbb7f9b097b0..c29cec57b251 100644 --- a/sd/source/ui/inc/fuconcs.hxx +++ b/sd/source/ui/inc/fuconcs.hxx @@ -32,7 +32,7 @@ class FuConstructCustomShape : public FuConstruct { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuconnct.hxx b/sd/source/ui/inc/fuconnct.hxx index 14ebd54062ab..5eac44fd27c4 100644 --- a/sd/source/ui/inc/fuconnct.hxx +++ b/sd/source/ui/inc/fuconnct.hxx @@ -28,7 +28,7 @@ class FuConnectionDlg : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx index 3e0d96374fbb..1d553336f7d2 100644 --- a/sd/source/ui/inc/fuconrec.hxx +++ b/sd/source/ui/inc/fuconrec.hxx @@ -36,7 +36,7 @@ class FuConstructRectangle : public FuConstruct { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 42164eea8065..88794cbd21ca 100644 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -32,7 +32,7 @@ class FuConstruct : public FuDraw { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index e972ef187f4e..49c0e56212d8 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -32,7 +32,7 @@ class FuConstructUnoControl : public FuConstruct { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fucopy.hxx b/sd/source/ui/inc/fucopy.hxx index 8abb5fdcd462..46388a11574b 100644 --- a/sd/source/ui/inc/fucopy.hxx +++ b/sd/source/ui/inc/fucopy.hxx @@ -28,7 +28,7 @@ class FuCopy : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fucushow.hxx b/sd/source/ui/inc/fucushow.hxx index 6e4189dc26ef..33b3b71b5da9 100644 --- a/sd/source/ui/inc/fucushow.hxx +++ b/sd/source/ui/inc/fucushow.hxx @@ -28,7 +28,7 @@ class FuCustomShowDlg : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fudraw.hxx b/sd/source/ui/inc/fudraw.hxx index 9e42c8242173..1a3e6af03a39 100644 --- a/sd/source/ui/inc/fudraw.hxx +++ b/sd/source/ui/inc/fudraw.hxx @@ -35,7 +35,7 @@ class FuDraw : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual sal_Bool KeyInput(const KeyEvent& rKEvt); virtual sal_Bool MouseMove(const MouseEvent& rMEvt); diff --git a/sd/source/ui/inc/fudspord.hxx b/sd/source/ui/inc/fudspord.hxx index 76876d1a3dd6..c194b9501a7b 100644 --- a/sd/source/ui/inc/fudspord.hxx +++ b/sd/source/ui/inc/fudspord.hxx @@ -33,7 +33,7 @@ class FuDisplayOrder : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx index 5eddb0bfba44..666804e49d64 100644 --- a/sd/source/ui/inc/fuediglu.hxx +++ b/sd/source/ui/inc/fuediglu.hxx @@ -28,7 +28,7 @@ class FuEditGluePoints : public FuDraw { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq, bool bPermanent ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuexpand.hxx b/sd/source/ui/inc/fuexpand.hxx index aa565ea426d3..9eb997d8e791 100644 --- a/sd/source/ui/inc/fuexpand.hxx +++ b/sd/source/ui/inc/fuexpand.hxx @@ -28,7 +28,7 @@ class FuExpandPage : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 1f5668d84bce..99a3e47e4cbd 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -33,7 +33,7 @@ class DrawViewShell; class FuFormatPaintBrush : public FuText { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuhhconv.hxx b/sd/source/ui/inc/fuhhconv.hxx index 2faaefe4081a..6606f11f9e65 100644 --- a/sd/source/ui/inc/fuhhconv.hxx +++ b/sd/source/ui/inc/fuhhconv.hxx @@ -30,7 +30,7 @@ class Outliner; class FuHangulHanjaConversion : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuinsert.hxx b/sd/source/ui/inc/fuinsert.hxx index 200abc1107ea..2f6ca859397e 100644 --- a/sd/source/ui/inc/fuinsert.hxx +++ b/sd/source/ui/inc/fuinsert.hxx @@ -28,7 +28,7 @@ class FuInsertGraphic : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); @@ -50,7 +50,7 @@ class FuInsertClipboard : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); @@ -71,7 +71,7 @@ class FuInsertOLE : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); @@ -91,7 +91,7 @@ class FuInsertAVMedia : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuinsfil.hxx b/sd/source/ui/inc/fuinsfil.hxx index ea4caca71c98..4cb8a4bd8efa 100644 --- a/sd/source/ui/inc/fuinsfil.hxx +++ b/sd/source/ui/inc/fuinsfil.hxx @@ -32,7 +32,7 @@ class FuInsertFile : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuline.hxx b/sd/source/ui/inc/fuline.hxx index cc195d5f01f8..5ef287cf3a52 100644 --- a/sd/source/ui/inc/fuline.hxx +++ b/sd/source/ui/inc/fuline.hxx @@ -28,7 +28,7 @@ class FuLine : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/inc/fulinend.hxx b/sd/source/ui/inc/fulinend.hxx index 5e16a2d376b2..c70de5d33664 100644 --- a/sd/source/ui/inc/fulinend.hxx +++ b/sd/source/ui/inc/fulinend.hxx @@ -28,7 +28,7 @@ class FuLineEnd : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/inc/fulink.hxx b/sd/source/ui/inc/fulink.hxx index 496704278f3b..ba787be323ce 100644 --- a/sd/source/ui/inc/fulink.hxx +++ b/sd/source/ui/inc/fulink.hxx @@ -28,7 +28,7 @@ class FuLink : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fumeasur.hxx b/sd/source/ui/inc/fumeasur.hxx index 5ba670e41b8b..19f3c95fb7c2 100644 --- a/sd/source/ui/inc/fumeasur.hxx +++ b/sd/source/ui/inc/fumeasur.hxx @@ -28,7 +28,7 @@ class FuMeasureDlg : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx index 1e4a812c7322..ca18eb2363b5 100644 --- a/sd/source/ui/inc/fumorph.hxx +++ b/sd/source/ui/inc/fumorph.hxx @@ -37,7 +37,7 @@ class FuMorph : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuoaprms.hxx b/sd/source/ui/inc/fuoaprms.hxx index 870dc4b1a6d9..0f103156e50c 100644 --- a/sd/source/ui/inc/fuoaprms.hxx +++ b/sd/source/ui/inc/fuoaprms.hxx @@ -28,7 +28,7 @@ class FuObjectAnimationParameters : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuolbull.hxx b/sd/source/ui/inc/fuolbull.hxx index 253fec0718fc..8a607cfcfe34 100644 --- a/sd/source/ui/inc/fuolbull.hxx +++ b/sd/source/ui/inc/fuolbull.hxx @@ -40,7 +40,7 @@ class FuOutlineBullet : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuoltext.hxx b/sd/source/ui/inc/fuoltext.hxx index 7aea47b56ce1..5e5602128665 100644 --- a/sd/source/ui/inc/fuoltext.hxx +++ b/sd/source/ui/inc/fuoltext.hxx @@ -38,7 +38,7 @@ class FuOutlineText : public FuOutline { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuoutl.hxx b/sd/source/ui/inc/fuoutl.hxx index 04eba0366d8f..87c937402241 100644 --- a/sd/source/ui/inc/fuoutl.hxx +++ b/sd/source/ui/inc/fuoutl.hxx @@ -41,7 +41,7 @@ class FuOutline : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual sal_Bool Command(const CommandEvent& rCEvt); diff --git a/sd/source/ui/inc/fupage.hxx b/sd/source/ui/inc/fupage.hxx index b4db714ff09c..13753cfb0a39 100644 --- a/sd/source/ui/inc/fupage.hxx +++ b/sd/source/ui/inc/fupage.hxx @@ -33,7 +33,7 @@ class FuPage : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuparagr.hxx b/sd/source/ui/inc/fuparagr.hxx index b59769d43613..3341f249f47b 100644 --- a/sd/source/ui/inc/fuparagr.hxx +++ b/sd/source/ui/inc/fuparagr.hxx @@ -28,7 +28,7 @@ class FuParagraph : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx index 205e6865deac..ec080c35531c 100644 --- a/sd/source/ui/inc/fuprlout.hxx +++ b/sd/source/ui/inc/fuprlout.hxx @@ -35,7 +35,7 @@ class FuPresentationLayout : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuprobjs.hxx b/sd/source/ui/inc/fuprobjs.hxx index a288a5dccd07..f1b988169843 100644 --- a/sd/source/ui/inc/fuprobjs.hxx +++ b/sd/source/ui/inc/fuprobjs.hxx @@ -36,7 +36,7 @@ class FuPresentationObjects : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuscale.hxx b/sd/source/ui/inc/fuscale.hxx index c1606948d041..c130589977fc 100644 --- a/sd/source/ui/inc/fuscale.hxx +++ b/sd/source/ui/inc/fuscale.hxx @@ -28,7 +28,7 @@ class FuScale : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fusearch.hxx b/sd/source/ui/inc/fusearch.hxx index 7974aeae1085..4540189c8ac1 100644 --- a/sd/source/ui/inc/fusearch.hxx +++ b/sd/source/ui/inc/fusearch.hxx @@ -32,7 +32,7 @@ class FuSearch : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index 8334fc8341cc..d9536102621c 100644 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -34,7 +34,7 @@ class FuSelection : public FuDraw { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fusldlg.hxx b/sd/source/ui/inc/fusldlg.hxx index 9305c9a27736..3ec8cb1fcac6 100644 --- a/sd/source/ui/inc/fusldlg.hxx +++ b/sd/source/ui/inc/fusldlg.hxx @@ -28,7 +28,7 @@ class FuSlideShowDlg : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fusnapln.hxx b/sd/source/ui/inc/fusnapln.hxx index 0dff5fe90f14..3c1188f1f10c 100644 --- a/sd/source/ui/inc/fusnapln.hxx +++ b/sd/source/ui/inc/fusnapln.hxx @@ -28,7 +28,7 @@ class FuSnapLine : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/inc/fusumry.hxx b/sd/source/ui/inc/fusumry.hxx index 196327d1f427..3f39ca9cd32c 100644 --- a/sd/source/ui/inc/fusumry.hxx +++ b/sd/source/ui/inc/fusumry.hxx @@ -28,7 +28,7 @@ class FuSummaryPage : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/futempl.hxx b/sd/source/ui/inc/futempl.hxx index edd97e57501f..630919dbf9e4 100644 --- a/sd/source/ui/inc/futempl.hxx +++ b/sd/source/ui/inc/futempl.hxx @@ -28,7 +28,7 @@ class FuTemplate : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index 820a4994bc83..3ec8412d4e3f 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -38,7 +38,7 @@ class FuText : public FuConstruct { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/futhes.hxx b/sd/source/ui/inc/futhes.hxx index 799a1bcc4511..ea28787601d5 100644 --- a/sd/source/ui/inc/futhes.hxx +++ b/sd/source/ui/inc/futhes.hxx @@ -28,7 +28,7 @@ class FuThesaurus : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/futransf.hxx b/sd/source/ui/inc/futransf.hxx index 4064bf3a2ef9..3118255ceda9 100644 --- a/sd/source/ui/inc/futransf.hxx +++ b/sd/source/ui/inc/futransf.hxx @@ -29,7 +29,7 @@ class FuTransform : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/futxtatt.hxx b/sd/source/ui/inc/futxtatt.hxx index 7057f568b622..a6cf67566e0b 100644 --- a/sd/source/ui/inc/futxtatt.hxx +++ b/sd/source/ui/inc/futxtatt.hxx @@ -28,7 +28,7 @@ class FuTextAttrDlg : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuvect.hxx b/sd/source/ui/inc/fuvect.hxx index 12028b74f9ca..93ca46c9cf79 100644 --- a/sd/source/ui/inc/fuvect.hxx +++ b/sd/source/ui/inc/fuvect.hxx @@ -28,7 +28,7 @@ class FuVectorize : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); virtual void DoExecute( SfxRequest& rReq ); diff --git a/sd/source/ui/inc/fuzoom.hxx b/sd/source/ui/inc/fuzoom.hxx index 802fa520c3bc..487c22a25fcf 100644 --- a/sd/source/ui/inc/fuzoom.hxx +++ b/sd/source/ui/inc/fuzoom.hxx @@ -31,7 +31,7 @@ class FuZoom : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq ); diff --git a/sd/source/ui/inc/sdundogr.hxx b/sd/source/ui/inc/sdundogr.hxx index c8a9ce018a3a..d5d11926596d 100644 --- a/sd/source/ui/inc/sdundogr.hxx +++ b/sd/source/ui/inc/sdundogr.hxx @@ -28,7 +28,7 @@ class SD_DLLPUBLIC SdUndoGroup : public SdUndoAction { std::vector<SdUndoAction*> aCtn; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdUndoGroup(SdDrawDocument* pSdDrawDocument) : SdUndoAction(pSdDrawDocument), aCtn() {} diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 2f2487e6a11e..71128fd8c645 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -55,7 +55,7 @@ class ToolPanelViewShell : public ViewShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SD_IF_SDTOOLPANELSHELL) ToolPanelViewShell ( diff --git a/sd/source/ui/inc/unchss.hxx b/sd/source/ui/inc/unchss.hxx index d4d5c260083d..257eceaa2a73 100644 --- a/sd/source/ui/inc/unchss.hxx +++ b/sd/source/ui/inc/unchss.hxx @@ -35,7 +35,7 @@ class StyleSheetUndoAction : public SdUndoAction OUString aComment; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); StyleSheetUndoAction(SdDrawDocument* pTheDoc, SfxStyleSheet* pTheStyleSheet, const SfxItemSet* pTheNewItemSet); diff --git a/sd/source/ui/inc/undoback.hxx b/sd/source/ui/inc/undoback.hxx index 65b8471cd10f..e30bacb3ac01 100644 --- a/sd/source/ui/inc/undoback.hxx +++ b/sd/source/ui/inc/undoback.hxx @@ -39,7 +39,7 @@ private: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdBackgroundObjUndoAction( SdDrawDocument& rDoc, diff --git a/sd/source/ui/inc/undoheaderfooter.hxx b/sd/source/ui/inc/undoheaderfooter.hxx index 65eb645282e5..b4b9cb5ecce7 100644 --- a/sd/source/ui/inc/undoheaderfooter.hxx +++ b/sd/source/ui/inc/undoheaderfooter.hxx @@ -36,7 +36,7 @@ class SD_DLLPUBLIC SdHeaderFooterUndoAction : public SdUndoAction const sd::HeaderFooterSettings maNewSettings; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdHeaderFooterUndoAction( SdDrawDocument* pDoc, SdPage* pPage, const sd::HeaderFooterSettings& rNewSettings ); virtual ~SdHeaderFooterUndoAction(); diff --git a/sd/source/ui/inc/undolayer.hxx b/sd/source/ui/inc/undolayer.hxx index 6ce918eb36aa..fda35cc5f3df 100644 --- a/sd/source/ui/inc/undolayer.hxx +++ b/sd/source/ui/inc/undolayer.hxx @@ -31,7 +31,7 @@ class SdLayerModifyUndoAction : public SdUndoAction { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdLayerModifyUndoAction( SdDrawDocument* _pDoc, SdrLayer* pLayer, const OUString& rOldLayerName, const OUString& rOldLayerTitle, const OUString& rOldLayerDesc, bool bOldIsVisible, bool bOldIsLocked, bool bOldIsPrintable, const OUString& rNewLayerName, const OUString& rNewLayerTitle, const OUString& rNewLayerDesc, bool bNewIsVisible, bool bNewIsLocked, bool bNewIsPrintable ); diff --git a/sd/source/ui/inc/undopage.hxx b/sd/source/ui/inc/undopage.hxx index 391ebc6fbe8f..3a8faab7cbb3 100644 --- a/sd/source/ui/inc/undopage.hxx +++ b/sd/source/ui/inc/undopage.hxx @@ -54,7 +54,7 @@ class SdPageFormatUndoAction : public SdUndoAction sal_Bool mbNewFullSize; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdPageFormatUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, const Size& rOldSz, @@ -117,7 +117,7 @@ class SdPageLRUndoAction : public SdUndoAction sal_Int32 mnNewRight; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdPageLRUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, sal_Int32 nOldLft, sal_Int32 nOldRgt, sal_Int32 nNewLft, sal_Int32 nNewRgt ) : @@ -146,7 +146,7 @@ class SdPageULUndoAction : public SdUndoAction sal_Int32 mnNewLower; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdPageULUndoAction( SdDrawDocument* pDoc, SdPage* pThePage, sal_Int32 nOldUpr, sal_Int32 nOldLwr, sal_Int32 nNewUpr, sal_Int32 nNewLwr ) : diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index fd74d186b8d5..7b0257353f95 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -41,7 +41,7 @@ class ModifyPageUndoAction : public SdUndoAction OUString maComment; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ModifyPageUndoAction( SdDrawDocument* pTheDoc, SdPage* pThePage, diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 678641dc9e8a..05548711c4eb 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -80,7 +80,7 @@ class SdAnimationPrmsUndoAction : public SdUndoAction sal_Bool bInfoCreated; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdAnimationPrmsUndoAction(SdDrawDocument* pTheDoc, SdrObject* pObj, sal_Bool bCreated): SdUndoAction (pTheDoc), diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index 3ff3a90ee08c..b5a69d3a5383 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -37,7 +37,7 @@ class SdPresentationLayoutUndoAction : public SdUndoAction OUString aComment; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdPresentationLayoutUndoAction(SdDrawDocument* pTheDoc, const OUString& aTheOldLayoutName, const OUString& aTheNewLayoutName, diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index e09f7d18602c..f2acc963614e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -42,7 +42,7 @@ class SelectionFunction private ::boost::noncopyable { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); static rtl::Reference<FuPoor> Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index 207525a31d80..b9000fb95893 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx @@ -35,7 +35,7 @@ class SlideFunction : public FuPoor { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual sal_Bool MouseMove (const MouseEvent& rMEvt); virtual sal_Bool MouseButtonUp (const MouseEvent& rMEvt); diff --git a/sd/source/ui/table/tableobjectbar.hxx b/sd/source/ui/table/tableobjectbar.hxx index 60301669a653..4bbdf99b267d 100644 --- a/sd/source/ui/table/tableobjectbar.hxx +++ b/sd/source/ui/table/tableobjectbar.hxx @@ -36,7 +36,7 @@ namespace sd { namespace ui { namespace table { class TableObjectBar : public SfxShell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE( SD_IF_SDDRAWTABLEOBJECTBAR ) TableObjectBar( ::sd::ViewShell* pSdViewShell, ::sd::View* pSdView); diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index b582a7f91642..a0ac9a8e17bf 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -29,7 +29,7 @@ private: OUString aLanguage; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxScriptOrganizerItem(); SfxScriptOrganizerItem( const SfxScriptOrganizerItem& ); virtual ~SfxScriptOrganizerItem(); diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 14caad6a3c47..fc263f586df8 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -273,7 +273,7 @@ protected: SfxObjectShell * SaveSelection(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window*, bool ); virtual ~SfxCommonTemplateDialog_Impl(); @@ -363,7 +363,7 @@ protected: public: friend class SfxTemplateDialog; - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxTemplateDialog_Impl( SfxBindings*, SfxTemplateDialog* pDlgWindow ); SfxTemplateDialog_Impl( SfxBindings*, SfxTemplatePanelControl* pDlgWindow ); diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx index 0730ad5f9e97..7b12750357fd 100644 --- a/sot/source/base/object.cxx +++ b/sot/source/base/object.cxx @@ -24,7 +24,7 @@ class SotObjectFactory : public SotFactory { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SotObjectFactory( const SvGlobalName & rName, const OUString & rClassName, CreateInstanceType pCreateFuncP ) diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 9b408647cff7..2f5c915c7e2a 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; class SotStorageStreamFactory : public SotFactory { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SotStorageStreamFactory( const SvGlobalName & rName, const OUString & rClassName, CreateInstanceType pCreateFuncP ) @@ -294,7 +294,7 @@ bool SotStorageStream::SetProperty( const OUString& rName, const ::com::sun::sta class SotStorageFactory : public SotFactory { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SotStorageFactory( const SvGlobalName & rName, const OUString & rClassName, CreateInstanceType pCreateFuncP ) diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index dcfa197319b6..1fa846711276 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -159,7 +159,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener void readFormulaOoxml( oox::formulaimport::XmlStream& stream ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START+1) using SotObject::GetInterface; SFX_DECL_OBJECTFACTORY(); diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index c60a6868d696..c2e4ee9e044f 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -100,7 +100,7 @@ class SmModule : public SfxModule, utl::ConfigurationListener void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SFX_INTERFACE_SMA_START + 0) SmModule(SfxObjectFactory* pObjFact); diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 8adadd82bb88..a26cd239356e 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -275,7 +275,7 @@ protected: virtual void SetZoomFactor( const Fraction &rX, const Fraction &rY ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SmViewShell(SfxViewFrame *pFrame, SfxViewShell *pOldSh); ~SmViewShell(); diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index a31189540b94..0b2b6ef95a8b 100644 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -72,7 +72,7 @@ protected: bool mbMovedAtAll; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dDragMethod( SdrDragView &rView, const SdrMarkList& rMark, @@ -103,7 +103,7 @@ class E3dDragRotate : public E3dDragMethod basegfx::B3DPoint maGlobalCenter; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dDragRotate( SdrDragView &rView, const SdrMarkList& rMark, @@ -127,7 +127,7 @@ class E3dDragMove : public E3dDragMethod Point maScaleFixPos; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); E3dDragMove( SdrDragView &rView, const SdrMarkList& rMark, diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index b930613fec6f..ff77ca9af5ee 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -232,7 +232,7 @@ class FmFilterHint : public SfxHint FmFilterData* m_pData; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFilterHint(FmFilterData* pData):m_pData(pData){} FmFilterData* GetData() const { return m_pData; } }; @@ -244,7 +244,7 @@ class FmFilterInsertedHint : public FmFilterHint sal_uLong m_nPos; // Position relative to the parent of the data public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFilterInsertedHint(FmFilterData* pData, sal_uLong nRelPos) :FmFilterHint(pData) ,m_nPos(nRelPos){} @@ -257,7 +257,7 @@ TYPEINIT1( FmFilterInsertedHint, FmFilterHint ); class FmFilterRemovedHint : public FmFilterHint { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFilterRemovedHint(FmFilterData* pData) :FmFilterHint(pData){} @@ -268,7 +268,7 @@ TYPEINIT1( FmFilterRemovedHint, FmFilterHint ); class FmFilterTextChangedHint : public FmFilterHint { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFilterTextChangedHint(FmFilterData* pData) :FmFilterHint(pData){} @@ -279,7 +279,7 @@ TYPEINIT1( FmFilterTextChangedHint, FmFilterHint ); class FilterClearingHint : public SfxHint { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FilterClearingHint(){} }; TYPEINIT1( FilterClearingHint, SfxHint ); @@ -288,7 +288,7 @@ TYPEINIT1( FilterClearingHint, SfxHint ); class FmFilterCurrentChangedHint : public SfxHint { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFilterCurrentChangedHint(){} }; TYPEINIT1( FmFilterCurrentChangedHint, SfxHint ); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index c5a813cad1c8..82189af99706 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -83,7 +83,7 @@ protected: ::std::vector< FmFilterData* > m_aChildren; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmParentData(FmParentData* pParent, const OUString& rText) : FmFilterData(pParent, rText) {} @@ -100,7 +100,7 @@ class FmFormItem : public FmParentData ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFilterController > m_xFilterController; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFormItem( FmParentData* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & _xController, @@ -124,7 +124,7 @@ public: class FmFilterItems : public FmParentData { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFilterItems() : FmParentData(NULL, OUString()) {} FmFilterItems(FmFormItem* pParent, const OUString& rText ) : FmParentData(pParent, rText) {} @@ -139,7 +139,7 @@ class FmFilterItem : public FmFilterData const sal_Int32 m_nComponentIndex; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFilterItem( FmFilterItems* pParent, const OUString& aFieldName, @@ -166,7 +166,7 @@ class FmFilterModel : public FmParentData FmFilterItems* m_pCurrentItems; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFilterModel(); virtual ~FmFilterModel(); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index e305515bc0ae..f84554977544 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -67,7 +67,7 @@ class FmNavInsertedHint : public SfxHint sal_uInt32 nPos; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmNavInsertedHint( FmEntryData* pInsertedEntryData, sal_uInt32 nRelPos ); virtual ~FmNavInsertedHint(); @@ -81,7 +81,7 @@ class FmNavModelReplacedHint : public SfxHint FmEntryData* pEntryData; // die Daten des Eintrages, der ein neues Model bekommen hat public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmNavModelReplacedHint( FmEntryData* pAffectedEntryData ); virtual ~FmNavModelReplacedHint(); @@ -94,7 +94,7 @@ class FmNavRemovedHint : public SfxHint FmEntryData* pEntryData; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmNavRemovedHint( FmEntryData* pInsertedEntryData ); virtual ~FmNavRemovedHint(); @@ -108,7 +108,7 @@ class FmNavNameChangedHint : public SfxHint OUString aNewName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName ); virtual ~FmNavNameChangedHint(); @@ -120,7 +120,7 @@ public: class FmNavClearedHint : public SfxHint { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmNavClearedHint(); virtual ~FmNavClearedHint(); }; @@ -130,7 +130,7 @@ class FmNavViewMarksChanged : public SfxHint { FmFormView* pView; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmNavViewMarksChanged(FmFormView* pWhichView) { pView = pWhichView; } virtual ~FmNavViewMarksChanged() {} @@ -225,7 +225,7 @@ class FmNavRequestSelectHint : public SfxHint FmEntryDataArray m_arredToSelect; sal_Bool m_bMixedSelection; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmNavRequestSelectHint() { } virtual ~FmNavRequestSelectHint() {} @@ -243,7 +243,7 @@ class FmFormData : public FmEntryData ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmFormData( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, @@ -277,7 +277,7 @@ class FmControlData : public FmEntryData Image GetImage(const ImageList& ilNavigatorImages) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmControlData( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& _rxComponent, diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index 72a9e3156d3c..021ec4d1a58c 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx @@ -29,7 +29,7 @@ class FmInterfaceItem : public SfxPoolItem ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xInterface; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmInterfaceItem( const sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxInterface ) :SfxPoolItem( nId ) diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 8f6a755c2f16..35bd0ec01318 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -48,7 +48,7 @@ public: SVX_DLLPUBLIC FmFormObj(const OUString& rModelName); SVX_DLLPUBLIC FmFormObj(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& GetOriginalParent() const { return m_xParent; } diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 66f9facdfc5a..f92da990f01b 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -371,7 +371,7 @@ inline void DbCellControl::unlockValueProperty() class DbLimitedLengthField : public DbCellControl { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); protected: DbLimitedLengthField( DbGridColumn& _rColumn ); @@ -400,7 +400,7 @@ protected: ~DbTextField( ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbTextField(DbGridColumn& _rColumn); ::svt::IEditImplementation* GetEditImplementation() { return m_pEdit; } @@ -431,7 +431,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbFormattedField(DbGridColumn& _rColumn); virtual ~DbFormattedField(); @@ -454,7 +454,7 @@ protected: class DbCheckBox : public DbCellControl { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbCheckBox(DbGridColumn& _rColumn); virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); @@ -477,7 +477,7 @@ class DbComboBox : public DbCellControl sal_Int16 m_nKeyType; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbComboBox(DbGridColumn& _rColumn); virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); @@ -505,7 +505,7 @@ class DbListBox :public DbCellControl ::com::sun::star::uno::Sequence< OUString > m_aValueList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbListBox(DbGridColumn& _rColumn); virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); @@ -530,7 +530,7 @@ protected: class DbPatternField : public DbCellControl { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbPatternField( DbGridColumn& _rColumn, const css::uno::Reference<css::uno::XComponentContext>& _rContext ); virtual void Init( Window& rParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xCursor ); virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); @@ -562,7 +562,7 @@ private: sal_Int16 m_nStandardAlign; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); protected: DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign = com::sun::star::awt::TextAlign::RIGHT ); @@ -583,7 +583,7 @@ protected: class DbDateField : public DbSpinField { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbDateField(DbGridColumn& _rColumn); virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); @@ -608,7 +608,7 @@ protected: class DbTimeField : public DbSpinField { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbTimeField(DbGridColumn& _rColumn); virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); @@ -635,7 +635,7 @@ class DbCurrencyField : public DbSpinField sal_Int16 m_nScale; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbCurrencyField(DbGridColumn& _rColumn); virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); @@ -662,7 +662,7 @@ protected: class DbNumericField : public DbSpinField { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbNumericField(DbGridColumn& _rColumn); virtual OUString GetFormatText(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter, Color** ppColor = NULL); virtual void UpdateFromField(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxField, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xFormatter); @@ -697,7 +697,7 @@ class DbFilterField sal_Bool m_bBound : 1; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); DbFilterField(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, DbGridColumn& _rColumn); virtual ~DbFilterField(); @@ -836,7 +836,7 @@ private: class FmXDataCell : public FmXGridCell { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmXDataCell( DbGridColumn* pColumn, DbCellControl& _rControl ) :FmXGridCell( pColumn, &_rControl ) { @@ -875,7 +875,7 @@ protected: sal_Bool m_bFastPaint; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl ); virtual void PaintFieldToCell(OutputDevice& rDev, @@ -1101,7 +1101,7 @@ class FmXFilterCell :public FmXGridCell protected: virtual ~FmXFilterCell(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); FmXFilterCell(DbGridColumn* pColumn = NULL, DbCellControl* pControl = NULL); diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index b2282bd28ee5..d77268ecd25f 100644 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx @@ -40,7 +40,7 @@ protected: virtual void createSdrDragEntries(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrDragMovHdl(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const; @@ -64,7 +64,7 @@ private: bool bRight; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrDragRotate(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const; @@ -93,7 +93,7 @@ private: bool bSlant; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrDragShear(SdrDragView& rNewView,bool bSlant1); virtual void TakeSdrDragComment(OUString& rStr) const; @@ -120,7 +120,7 @@ private: bool ImpCheckSide(const Point& rPnt) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrDragMirror(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const; @@ -146,7 +146,7 @@ private: bool bIsGradient : 1; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrDragGradient(SdrDragView& rNewView, bool bGrad = true); bool IsGradient() const { return bIsGradient; } @@ -198,7 +198,7 @@ protected: virtual void createSdrDragEntries(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrDragCrook(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const; @@ -232,7 +232,7 @@ protected: virtual void createSdrDragEntries(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrDragDistort(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const; @@ -253,7 +253,7 @@ public: class SdrDragCrop : public SdrDragObjOwn { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdrDragCrop(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const; diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 83b96f6bae12..942b6812adda 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -121,7 +121,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject virtual const SwRect GetObjBoundRect() const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwAnchoredDrawObject(); virtual ~SwAnchoredDrawObject(); diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 10bc398e237e..446f58c046a3 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -56,7 +56,7 @@ public: SwCondCollItem(sal_uInt16 nWhich = FN_COND_COLL); ~SwCondCollItem(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual bool operator==( const SfxPoolItem& ) const; diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx index 6eb9e809d086..50f239b5f174 100644 --- a/sw/inc/charfmt.hxx +++ b/sw/inc/charfmt.hxx @@ -36,7 +36,7 @@ class SW_DLLPUBLIC SwCharFmt : public SwFmt {} public: - TYPEINFO(); // already in base class Client + TYPEINFO_OVERRIDE(); // already in base class Client }; namespace CharFmt diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 7c6cb99bc224..d2fa00d8e41c 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -304,7 +304,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwCrsrShell( SwDoc& rDoc, Window *pWin, const SwViewOption *pOpt = 0 ); // disguised copy constructor SwCrsrShell( SwCrsrShell& rShell, Window *pWin ); diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 84cea92113bb..f78267c4e218 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -106,7 +106,7 @@ protected: void SetInDTOR(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// For reader. Only the connection is created. SwContact( SwFrmFmt *pToRegisterIn ); @@ -199,7 +199,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// Creates DrawObject and registers it with the Model. SwFlyDrawContact( SwFlyFrmFmt* pToRegisterIn, SdrModel* pMod ); @@ -247,7 +247,7 @@ class SwDrawVirtObj : public SdrVirtObj virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwDrawVirtObj( SdrObject& _rNewObj, SwDrawContact& _rDrawContact ); @@ -396,7 +396,7 @@ class SwDrawContact : public SwContact virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwDrawContact( SwFrmFmt *pToRegisterIn, SdrObject *pObj ); virtual ~SwDrawContact(); diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 2da71e665cce..72257e277a2f 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -149,7 +149,7 @@ public: /// but we implement this ourselves. SFX_DECL_INTERFACE(SW_DOCSHELL) SFX_DECL_OBJECTFACTORY() - TYPEINFO(); + TYPEINFO_OVERRIDE(); static SfxInterface *_GetInterface() { return GetStaticInterface(); } diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index ae3c29102753..c296565b3a90 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -51,7 +51,7 @@ private: SwFmtCharFmt & operator= (const SwFmtCharFmt &); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const; diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 94a9f208fb34..3723f31092d2 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -212,7 +212,7 @@ public: using SwEditShell::Insert; - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwFEShell( SwDoc& rDoc, Window *pWin, const SwViewOption *pOpt = 0 ); SwFEShell( SwEditShell& rShell, Window *pWin ); virtual ~SwFEShell(); diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index 9858727e45e8..1009ba155e18 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -42,7 +42,7 @@ private: SwFmtAutoFmt & operator= (const SwFmtAutoFmt &); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const; diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 665138608996..e5e000f45cdd 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -90,7 +90,7 @@ protected: public: - TYPEINFO(); ///< Already in base class Client. + TYPEINFO_OVERRIDE(); ///< Already in base class Client. inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext); SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; } @@ -163,7 +163,7 @@ protected: {} public: - TYPEINFO(); ///< Already in base class Client. + TYPEINFO_OVERRIDE(); ///< Already in base class Client. }; // FEATURE::CONDCOLL @@ -194,7 +194,7 @@ class SW_DLLPUBLIC SwCollCondition : public SwClient } aSubCondition; public: - TYPEINFO(); ///< Already in base class Client. + TYPEINFO_OVERRIDE(); ///< Already in base class Client. SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond, sal_uLong nSubCond = 0 ); @@ -241,7 +241,7 @@ protected: {} public: - TYPEINFO(); ///< Already in base class Client. + TYPEINFO_OVERRIDE(); ///< Already in base class Client. virtual ~SwConditionTxtFmtColl(); diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 42865e685291..5c87e31c58a2 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -55,7 +55,7 @@ protected: virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// Single argument constructors shall be explicit. explicit SwFmtFld( const SwField &rFld ); @@ -131,7 +131,7 @@ public: , pView(pV) {} - TYPEINFO(); + TYPEINFO_OVERRIDE(); const SwFmtFld* GetField() const { return pFld; } sal_Int16 Which() const { return nWhich; } const SwView* GetView() const { return pView; } diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx index afce213f5294..2ab47e9e221a 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -32,7 +32,7 @@ public: SwFmtFollowTextFlow( sal_Bool bFlag = sal_False ) : SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {} - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index bf0be326afe5..ec9b932fdf4d 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -42,7 +42,7 @@ public: ~SwFmtHeader(); SwFmtHeader& operator=( const SwFmtHeader &rCpy ); - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const; @@ -75,7 +75,7 @@ public: ~SwFmtFooter(); SwFmtFooter& operator=( const SwFmtFooter &rCpy ); - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const; diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index e0fbca252568..dbdd0850c173 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -48,7 +48,7 @@ public: SwFmtINetFmt(); ///< For TypeInfo. virtual ~SwFmtINetFmt(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const; diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 9e9375893713..9d64c83de253 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -35,7 +35,7 @@ public: SwFmtLineNumber(); ~SwFmtLineNumber(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const; diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 69925328fab6..c4b2dd63d97e 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -36,7 +36,7 @@ class SW_DLLPUBLIC SwFmtVertOrient: public SfxPoolItem sal_Int16 eOrient; sal_Int16 eRelation; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwFmtVertOrient( SwTwips nY = 0, sal_Int16 eVert = com::sun::star::text::VertOrientation::NONE, sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA ); inline SwFmtVertOrient &operator=( const SwFmtVertOrient &rCpy ); @@ -71,7 +71,7 @@ class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem sal_Int16 eRelation; sal_Bool bPosToggle : 1; ///< Flip position on even pages. public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwFmtHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE, sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, sal_Bool bPos = sal_False ); inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy ); diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 6e88c7115352..be74b34f9006 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -55,7 +55,7 @@ public: SwFmtPageDesc &operator=( const SwFmtPageDesc &rCpy ); ~SwFmtPageDesc(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const; diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index e4d7b2607230..9a46e85287bc 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -30,7 +30,7 @@ private: sal_Int16 mnWrapInfluenceOnPosition; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // #i35017# - constant name has changed SwFmtWrapInfluenceOnObjPos( diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 7b5c1ed427fe..4829caf678ac 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -65,7 +65,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ); public: - TYPEINFO(); ///< Already in base class Client. + TYPEINFO_OVERRIDE(); ///< Already in base class Client. virtual ~SwFmt(); SwFmt &operator=(const SwFmt&); diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index cd6e91419330..a2d2771cc44c 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -61,7 +61,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ); public: - TYPEINFO(); ///< Already in base class Client. + TYPEINFO_OVERRIDE(); ///< Already in base class Client. /// Destroys all Frms in aDepend (Frms are identified via PTR_CAST). virtual void DelFrms(); @@ -160,7 +160,7 @@ protected: {} public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ~SwFlyFrmFmt(); /// Creates the views. @@ -257,7 +257,7 @@ protected: {} public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); ~SwDrawFrmFmt(); /** DrawObjects are removed from the arrays at the layout. diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx index 7832e2444a48..b76f891e0737 100644 --- a/sw/inc/globdoc.hxx +++ b/sw/inc/globdoc.hxx @@ -27,7 +27,7 @@ class SwGlobalDocShell : public SwDocShell public: SFX_DECL_OBJECTFACTORY(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwGlobalDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED); ~SwGlobalDocShell(); diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index 45b194345708..0223baac2bf6 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -90,7 +90,7 @@ public: class SW_DLLPUBLIC SwCropGrf : public SvxGrfCrop { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwCropGrf(); SwCropGrf( sal_Int32 nLeft, sal_Int32 nRight, sal_Int32 nTop, sal_Int32 nBottom ); @@ -204,7 +204,7 @@ class SW_DLLPUBLIC SwGammaGrf : public SfxPoolItem { double nValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwGammaGrf() : SfxPoolItem( RES_GRFATR_GAMMA ), nValue( 1.0 ) {} diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index d04041d7ed07..897e6d7e9f2a 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -724,7 +724,7 @@ public: bool IsHidden() const; - TYPEINFO(); // fuer rtti + TYPEINFO_OVERRIDE(); // fuer rtti /// override SwIndexReg virtual void Update( diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 033a28f9402a..52d80a3e47de 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -377,7 +377,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); public: - TYPEINFO(); /// Already contained in base class Client. + TYPEINFO_OVERRIDE(); /// Already contained in base class Client. /** MakeFrm will be called for a certain layout pSib is another SwFrm of the same layout (e.g. the SwRootFrm itself, a sibling, the parent) */ diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index c7c5c004784d..76dde6eae120 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -47,7 +47,7 @@ class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient sal_uInt8 nChars; ///< Character count. sal_Bool bWholeWord; ///< First word with initials. public: - TYPEINFO(); ///< Already in base class SwClient. + TYPEINFO_OVERRIDE(); ///< Already in base class SwClient. SwFmtDrop(); virtual ~SwFmtDrop(); @@ -101,7 +101,7 @@ public: class SwRegisterItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); inline SwRegisterItem( const sal_Bool bRegister = sal_False ); @@ -131,7 +131,7 @@ inline SwRegisterItem& SwRegisterItem::operator=( class SW_DLLPUBLIC SwNumRuleItem : public SfxStringItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwNumRuleItem() : SfxStringItem( RES_PARATR_NUMRULE, OUString() ) {} @@ -161,7 +161,7 @@ public: class SwParaConnectBorderItem : public SfxBoolItem { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); inline SwParaConnectBorderItem( const sal_Bool bConnect = sal_True ); diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 09df1f9e2768..8c0aa430f501 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -370,7 +370,7 @@ public: , pView(pV) {} - TYPEINFO(); + TYPEINFO_OVERRIDE(); const SwRangeRedline* GetRedline() const { return pRedline; } sal_Int16 Which() const { return nWhich; } const SwView* GetView() const { return pView; } diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 40eba2acbd60..2d958baeb0df 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -163,7 +163,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); public: - TYPEINFO(); // rtti + TYPEINFO_OVERRIDE(); // rtti SwSection(SectionType const eType, OUString const& rName, SwSectionFmt & rFormat); @@ -299,7 +299,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); public: - TYPEINFO(); // Already contained in base class client. + TYPEINFO_OVERRIDE(); // Already contained in base class client. ~SwSectionFmt(); // Deletes all Frms in aDepend (Frms are recognized via PTR_CAST). diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx index 7c28933097da..cf8d7d969cad 100644 --- a/sw/inc/swacorr.hxx +++ b/sw/inc/swacorr.hxx @@ -40,7 +40,7 @@ protected: const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwAutoCorrect( const SvxAutoCorrect& rACorr ); virtual ~SwAutoCorrect(); diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index 85566d538011..a55d151114a1 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -47,7 +47,7 @@ protected: {} public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwBaseLink( sal_uInt16 nMode, sal_uInt16 nFormat, SwCntntNode* pNode = 0 ) : ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ), diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index 680a281d5166..2e8b61ad842c 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -27,7 +27,7 @@ class SwDDETable : public SwTable { SwDepend aDepend; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // Ctor moves all lines/boxes from SwTable to it. // After that SwTable is empty and has to be deleted. diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 5c02ce61b4ee..08d57d718853 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -121,7 +121,7 @@ public: // public Data - used for internal Clipboard / Drag & Drop / XSelection SwTransferable *pDragDrop, *pXSelection; - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SW_INTERFACE_MODULE) // This Ctor only for SW-Dll. diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 47c5991cfc80..4968bd7b2f4c 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -134,7 +134,7 @@ public: SEARCH_COL // column selection }; - TYPEINFO(); + TYPEINFO_OVERRIDE(); // single argument ctors shall be explicit. explicit SwTable( SwTableFmt* ); @@ -344,7 +344,7 @@ class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt. SwTableBox *pUpper; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwTableLine() : pUpper(0) {} @@ -398,7 +398,7 @@ class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrmFmt. SwTableBoxFmt* CheckBoxFmt( SwTableBoxFmt* ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwTableBox() : pSttNd(0), pUpper(0), pImpl(0) {} diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index 49412b72de0d..ec696082ab0c 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -38,7 +38,7 @@ protected: {} public: - TYPEINFO(); // Already in base class Content. + TYPEINFO_OVERRIDE(); // Already in base class Content. DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt) }; @@ -58,7 +58,7 @@ protected: {} public: - TYPEINFO(); // Already in base class Content. + TYPEINFO_OVERRIDE(); // Already in base class Content. DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFmt) }; @@ -81,7 +81,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ); public: - TYPEINFO(); // Already in base class Content. + TYPEINFO_OVERRIDE(); // Already in base class Content. DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFmt) }; diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index f6c578fa390c..43122d2cce04 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -80,7 +80,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); public: - TYPEINFO(); // rtti + TYPEINFO_OVERRIDE(); // rtti // single argument ctors shall be explicit. explicit SwTOXMark( const SwTOXType* pTyp ); diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index 5846411107f2..1f80016d9141 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -90,7 +90,7 @@ protected: public: SwTxtRuby( SwFmtRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); virtual ~SwTxtRuby(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual bool GetInfo( SfxPoolItem& rInfo ) const; diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index 85f6cc4377be..174cb1fba814 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -40,7 +40,7 @@ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); public: SwTxtINetFmt( SwFmtINetFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); virtual ~SwTxtINetFmt(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual bool GetInfo( SfxPoolItem& rInfo ) const; diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 927374c9ca70..631f72ccc3e3 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -223,7 +223,7 @@ protected: public: SwXShape(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xShape); - TYPEINFO(); + TYPEINFO_OVERRIDE(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception); diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index b6e4790df9b0..cc63fd73959b 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -90,7 +90,7 @@ public: //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); - TYPEINFO(); + TYPEINFO_OVERRIDE(); //XNamed virtual OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); @@ -334,7 +334,7 @@ class SwXOLEListener : public cppu::WeakImplHelper1 public: SwXOLEListener(SwFmt& rOLEFmt, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE); ~SwXOLEListener(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); // ::com::sun::star::lang::XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException, std::exception); diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index ad40bbc3fcf9..4f605be8f6b6 100644 --- a/sw/inc/unoredline.hxx +++ b/sw/inc/unoredline.hxx @@ -75,7 +75,7 @@ public: SwXRedline(SwRangeRedline& rRedline, SwDoc& rDoc); ~SwXRedline(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( ) throw(){OWeakObject::acquire();} diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index da77f9e6e769..c5ad1a24540b 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -206,7 +206,7 @@ public: ~SwXStyle(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 25579dbf8011..86a5254bd65d 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -99,7 +99,7 @@ public: SwXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, size_t nPos = NOTFOUND); SwXCell(SwFrmFmt* pTblFmt, const SwStartNode& rStartNode); // XML import interface - TYPEINFO(); + TYPEINFO_OVERRIDE(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -174,7 +174,7 @@ protected: public: SwXTextTableRow(SwFrmFmt* pFmt, SwTableLine* pLine); - TYPEINFO(); + TYPEINFO_OVERRIDE(); //XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -329,7 +329,7 @@ public: //XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); - TYPEINFO(); + TYPEINFO_OVERRIDE(); //XTextTable virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception); @@ -460,7 +460,7 @@ public: SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt, SwRangeDescriptor& rDesc); ~SwXCellRange(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -555,7 +555,7 @@ protected: public: SwXTableRows(SwFrmFmt& rFrmFmt); - TYPEINFO(); + TYPEINFO_OVERRIDE(); //XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); @@ -596,7 +596,7 @@ protected: public: SwXTableColumns(SwFrmFmt& rFrmFmt); - TYPEINFO(); + TYPEINFO_OVERRIDE(); //XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx index 32f833a69539..d9d170422f90 100644 --- a/sw/inc/wdocsh.hxx +++ b/sw/inc/wdocsh.hxx @@ -33,7 +33,7 @@ public: // But implement yourself. SFX_DECL_INTERFACE(SW_WEBDOCSHELL) SFX_DECL_OBJECTFACTORY(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwWebDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED); ~SwWebDocShell(); diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index be61756ea5ca..a045636ed738 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -65,7 +65,7 @@ protected: public: virtual ~SwCntntFrm(); - TYPEINFO(); // already in base class + TYPEINFO_OVERRIDE(); // already in base class virtual void Cut(); virtual void Paste( SwFrm* pParent, SwFrm* pSibling = 0 ); diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx index 1f84e50b414b..451c9a936878 100644 --- a/sw/source/core/inc/dflyobj.hxx +++ b/sw/source/core/inc/dflyobj.hxx @@ -44,7 +44,7 @@ protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwFlyDrawObj(); ~SwFlyDrawObj(); @@ -76,7 +76,7 @@ public: basegfx::B2DRange getOuterBound() const; basegfx::B2DRange getInnerBound() const; - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly); ~SwVirtFlyDrawObj(); diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx index 65cea1f1b7c3..bae445ada61d 100644 --- a/sw/source/core/inc/doctxm.hxx +++ b/sw/source/core/inc/doctxm.hxx @@ -84,7 +84,7 @@ public: void Update( const SfxItemSet* pAttr = 0, const bool _bNewTOX = false ); void UpdatePageNum(); // insert page numbering - TYPEINFO(); // for rtti + TYPEINFO_OVERRIDE(); // for rtti SwTOXSortTabBases* GetTOXSortTabBases() { return &aSortArr; } diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index a666a9da1df3..3ba5bf4b503f 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -155,7 +155,7 @@ protected: public: // #i26791# - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~SwFlyFrm(); // get client information diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx index b5964fe5c32d..28e007a148d8 100644 --- a/sw/source/core/inc/flyfrms.hxx +++ b/sw/source/core/inc/flyfrms.hxx @@ -64,7 +64,7 @@ protected: public: // #i28701# - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~SwFlyFreeFrm(); @@ -123,7 +123,7 @@ class SwFlyLayFrm : public SwFlyFreeFrm { public: // #i28701# - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwFlyLayFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); SwFlyLayFrm( SwFlyLayFrm& ); @@ -150,7 +150,7 @@ protected: public: // #i28701# - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwFlyAtCntFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); @@ -185,7 +185,7 @@ protected: public: // #i28701# - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwFlyInCntFrm( SwFlyFrmFmt*, SwFrm*, SwFrm *pAnchor ); diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 73b32f8d7747..514f64e2698e 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -438,7 +438,7 @@ public: return uno::Sequence< style::TabStop >(); } - TYPEINFO(); // already in base class + TYPEINFO_OVERRIDE(); // already in base class sal_uInt16 GetType() const { return 0x1 << mnType; } diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx index c162bf1dcdee..a840d03619f6 100644 --- a/sw/source/core/inc/layfrm.hxx +++ b/sw/source/core/inc/layfrm.hxx @@ -63,7 +63,7 @@ protected: public: // --> #i28701# - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect& ) const; void RefreshLaySubsidiary( const SwPageFrm*, const SwRect& ) const; diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index e5a856efb5cd..5b99ffd8bdbc 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -354,7 +354,7 @@ public: SwTwips HangingMargin() const; // RTTI - TYPEINFO(); + TYPEINFO_OVERRIDE(); DECL_FIXEDMEMPOOL_NEWDEL(SwTxtFrm) // Locking diff --git a/sw/source/core/uibase/inc/annotsh.hxx b/sw/source/core/uibase/inc/annotsh.hxx index 7592d441b29a..314188cc8c2f 100644 --- a/sw/source/core/uibase/inc/annotsh.hxx +++ b/sw/source/core/uibase/inc/annotsh.hxx @@ -32,7 +32,7 @@ class SwAnnotationShell: public SfxShell public: SFX_DECL_INTERFACE(SW_ANNOTATIONSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwAnnotationShell(SwView&); virtual ~SwAnnotationShell(); diff --git a/sw/source/core/uibase/inc/basesh.hxx b/sw/source/core/uibase/inc/basesh.hxx index 9875221d4c72..f7317977425a 100644 --- a/sw/source/core/uibase/inc/basesh.hxx +++ b/sw/source/core/uibase/inc/basesh.hxx @@ -69,7 +69,7 @@ public: virtual ~SwBaseShell(); SFX_DECL_INTERFACE(SW_BASESHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); void ExecDelete(SfxRequest &); diff --git a/sw/source/core/uibase/inc/beziersh.hxx b/sw/source/core/uibase/inc/beziersh.hxx index c957d083d1f8..458ba453d2af 100644 --- a/sw/source/core/uibase/inc/beziersh.hxx +++ b/sw/source/core/uibase/inc/beziersh.hxx @@ -25,7 +25,7 @@ class SwBezierShell: public SwBaseShell { public: SFX_DECL_INTERFACE(SW_BEZIERSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwBezierShell(SwView &rView); diff --git a/sw/source/core/uibase/inc/cfgitems.hxx b/sw/source/core/uibase/inc/cfgitems.hxx index fbcafa3c228c..bcd36c4594e8 100644 --- a/sw/source/core/uibase/inc/cfgitems.hxx +++ b/sw/source/core/uibase/inc/cfgitems.hxx @@ -61,7 +61,7 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem Color aIndexBackgrndCol; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwDocDisplayItem( sal_uInt16 nWhich = FN_PARAM_DOCDISP ); SwDocDisplayItem( const SwDocDisplayItem& rSwDocDisplayItem ); @@ -99,7 +99,7 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem friend class SwContentOptPage; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwElemItem( sal_uInt16 nWhich = FN_PARAM_ELEM ); SwElemItem(const SwElemItem& rElemItem); SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich); @@ -122,7 +122,7 @@ class SW_DLLPUBLIC SwAddPrinterItem : public SfxPoolItem, public SwPrintData using SwPrintData::operator ==; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwAddPrinterItem( sal_uInt16 nWhich = FN_PARAM_ADDPRINTER ); SwAddPrinterItem( sal_uInt16 nWhich, const SwPrintData& rPrtData ); SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem); @@ -166,7 +166,7 @@ class SW_DLLPUBLIC SwShadowCursorItem : public SfxPoolItem sal_uInt8 eMode; sal_Bool bOn; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwShadowCursorItem( sal_uInt16 nWhich = FN_PARAM_SHADOWCURSOR ); SwShadowCursorItem( const SwShadowCursorItem& rElemItem ); SwShadowCursorItem( const SwViewOption& rVOpt, sal_uInt16 nWhich ); diff --git a/sw/source/core/uibase/inc/drawsh.hxx b/sw/source/core/uibase/inc/drawsh.hxx index 545faf748d7d..88888c50e85d 100644 --- a/sw/source/core/uibase/inc/drawsh.hxx +++ b/sw/source/core/uibase/inc/drawsh.hxx @@ -27,7 +27,7 @@ class SwDrawShell: public SwDrawBaseShell { public: SFX_DECL_INTERFACE(SW_DRAWSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwDrawShell(SwView &rView); diff --git a/sw/source/core/uibase/inc/drformsh.hxx b/sw/source/core/uibase/inc/drformsh.hxx index 8f58bae51b96..9468a82a8c39 100644 --- a/sw/source/core/uibase/inc/drformsh.hxx +++ b/sw/source/core/uibase/inc/drformsh.hxx @@ -27,7 +27,7 @@ class SwDrawFormShell: public SwDrawBaseShell { public: SFX_DECL_INTERFACE(SW_DRAWFORMSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwDrawFormShell(SwView &rView); virtual ~SwDrawFormShell(); diff --git a/sw/source/core/uibase/inc/drwbassh.hxx b/sw/source/core/uibase/inc/drwbassh.hxx index 7bb62ad9076c..b5ed0a22bc8f 100644 --- a/sw/source/core/uibase/inc/drwbassh.hxx +++ b/sw/source/core/uibase/inc/drwbassh.hxx @@ -39,7 +39,7 @@ public: virtual ~SwDrawBaseShell(); SFX_DECL_INTERFACE(SW_DRAWBASESHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); void Execute(SfxRequest &); void GetState(SfxItemSet &); diff --git a/sw/source/core/uibase/inc/drwtxtsh.hxx b/sw/source/core/uibase/inc/drwtxtsh.hxx index 9fbe1b20eee5..cd7b4befef17 100644 --- a/sw/source/core/uibase/inc/drwtxtsh.hxx +++ b/sw/source/core/uibase/inc/drwtxtsh.hxx @@ -39,7 +39,7 @@ class SwDrawTextShell: public SfxShell sal_Bool IsTextEdit(); public: SFX_DECL_INTERFACE(SW_DRWTXTSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwView &GetView() { return rView; } SwWrtShell &GetShell(); diff --git a/sw/source/core/uibase/inc/envimg.hxx b/sw/source/core/uibase/inc/envimg.hxx index 9c766e11acea..fa3a0e393e79 100644 --- a/sw/source/core/uibase/inc/envimg.hxx +++ b/sw/source/core/uibase/inc/envimg.hxx @@ -59,7 +59,7 @@ public: SwEnvItem(); SwEnvItem(const SwEnvItem& rItem); - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwEnvItem& operator =(const SwEnvItem& rItem); diff --git a/sw/source/core/uibase/inc/glshell.hxx b/sw/source/core/uibase/inc/glshell.hxx index 13f84e159cbb..a23e80096d47 100644 --- a/sw/source/core/uibase/inc/glshell.hxx +++ b/sw/source/core/uibase/inc/glshell.hxx @@ -33,7 +33,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SW_GLOSDOCSHELL) SwGlosDocShell( sal_Bool bNewShow = sal_True); @@ -63,7 +63,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SW_WEBGLOSDOCSHELL) SwWebGlosDocShell(); diff --git a/sw/source/core/uibase/inc/listsh.hxx b/sw/source/core/uibase/inc/listsh.hxx index d37d9ed62b6e..ee6a57cb5ea6 100644 --- a/sw/source/core/uibase/inc/listsh.hxx +++ b/sw/source/core/uibase/inc/listsh.hxx @@ -25,7 +25,7 @@ class SwListShell: public SwBaseShell { public: SFX_DECL_INTERFACE(SW_LISTSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwListShell(SwView &rView); diff --git a/sw/source/core/uibase/inc/pview.hxx b/sw/source/core/uibase/inc/pview.hxx index d1569bca2406..ac70a08e7aed 100644 --- a/sw/source/core/uibase/inc/pview.hxx +++ b/sw/source/core/uibase/inc/pview.hxx @@ -218,7 +218,7 @@ protected: public: SFX_DECL_VIEWFACTORY(SwPagePreview); SFX_DECL_INTERFACE(SW_PAGEPREVIEW) - TYPEINFO(); + TYPEINFO_OVERRIDE(); inline Window* GetFrameWindow() const { return &(GetViewFrame())->GetWindow(); } inline SwViewShell* GetViewShell() const { return pViewWin->GetViewShell(); } diff --git a/sw/source/core/uibase/inc/srcview.hxx b/sw/source/core/uibase/inc/srcview.hxx index fee601092a4a..3a6d054e91ca 100644 --- a/sw/source/core/uibase/inc/srcview.hxx +++ b/sw/source/core/uibase/inc/srcview.hxx @@ -53,7 +53,7 @@ public: SFX_DECL_VIEWFACTORY(SwSrcView); SFX_DECL_INTERFACE(SW_SRC_VIEWSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwSrcView(SfxViewFrame* pFrame, SfxViewShell*); diff --git a/sw/source/core/uibase/inc/swwrtshitem.hxx b/sw/source/core/uibase/inc/swwrtshitem.hxx index ba498ea7c41f..36c3b52e8c95 100644 --- a/sw/source/core/uibase/inc/swwrtshitem.hxx +++ b/sw/source/core/uibase/inc/swwrtshitem.hxx @@ -28,7 +28,7 @@ class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem SwWrtShell* pWrtSh; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwWrtShellItem(); SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh); SwWrtShellItem( const SwWrtShellItem& ); diff --git a/sw/source/core/uibase/inc/tabsh.hxx b/sw/source/core/uibase/inc/tabsh.hxx index 8e37947b7cf5..9928fcb356a1 100644 --- a/sw/source/core/uibase/inc/tabsh.hxx +++ b/sw/source/core/uibase/inc/tabsh.hxx @@ -34,7 +34,7 @@ class SwTableShell: public SwBaseShell { public: SFX_DECL_INTERFACE(SW_TABSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); void Execute(SfxRequest &); void GetState(SfxItemSet &); diff --git a/sw/source/core/uibase/inc/textsh.hxx b/sw/source/core/uibase/inc/textsh.hxx index 98ea806d133e..9bb47271e3a4 100644 --- a/sw/source/core/uibase/inc/textsh.hxx +++ b/sw/source/core/uibase/inc/textsh.hxx @@ -39,7 +39,7 @@ class SwTextShell: public SwBaseShell public: SFX_DECL_INTERFACE(SW_TEXTSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog * ); DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog * ); diff --git a/sw/source/core/uibase/inc/view.hxx b/sw/source/core/uibase/inc/view.hxx index d3572f7ad76d..b5ee5317b55b 100644 --- a/sw/source/core/uibase/inc/view.hxx +++ b/sw/source/core/uibase/inc/view.hxx @@ -397,7 +397,7 @@ public: SFX_DECL_VIEWFACTORY(SwView); SFX_DECL_INTERFACE(SW_VIEWSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); SfxDispatcher &GetDispatcher(); diff --git a/sw/source/core/uibase/inc/wformsh.hxx b/sw/source/core/uibase/inc/wformsh.hxx index aac9f9f69c94..697c67aa5b13 100644 --- a/sw/source/core/uibase/inc/wformsh.hxx +++ b/sw/source/core/uibase/inc/wformsh.hxx @@ -28,7 +28,7 @@ public: virtual ~SwWebDrawFormShell(); SFX_DECL_INTERFACE(SW_WEBDRAWFORMSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; #endif diff --git a/sw/source/core/uibase/inc/wfrmsh.hxx b/sw/source/core/uibase/inc/wfrmsh.hxx index 68f7edcab86b..390acd29c841 100644 --- a/sw/source/core/uibase/inc/wfrmsh.hxx +++ b/sw/source/core/uibase/inc/wfrmsh.hxx @@ -27,7 +27,7 @@ class SwWebFrameShell: public SwFrameShell public: SFX_DECL_INTERFACE(SW_WEBFRAMESHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwWebFrameShell(SwView &rView); virtual ~SwWebFrameShell(); diff --git a/sw/source/core/uibase/inc/wgrfsh.hxx b/sw/source/core/uibase/inc/wgrfsh.hxx index 45682ac74554..4a6a045c0dd0 100644 --- a/sw/source/core/uibase/inc/wgrfsh.hxx +++ b/sw/source/core/uibase/inc/wgrfsh.hxx @@ -28,7 +28,7 @@ public: virtual ~SwWebGrfShell(); SFX_DECL_INTERFACE(SW_WEBGRFSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); }; #endif diff --git a/sw/source/core/uibase/inc/wlistsh.hxx b/sw/source/core/uibase/inc/wlistsh.hxx index 3df943966885..ad7bf69fd7c6 100644 --- a/sw/source/core/uibase/inc/wlistsh.hxx +++ b/sw/source/core/uibase/inc/wlistsh.hxx @@ -25,7 +25,7 @@ class SwWebListShell: public SwListShell { public: SFX_DECL_INTERFACE(SW_WEBLISTSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~SwWebListShell(); SwWebListShell(SwView &rView); diff --git a/sw/source/core/uibase/inc/wtabsh.hxx b/sw/source/core/uibase/inc/wtabsh.hxx index 64f25bcb4ed4..bc367e20a38c 100644 --- a/sw/source/core/uibase/inc/wtabsh.hxx +++ b/sw/source/core/uibase/inc/wtabsh.hxx @@ -25,7 +25,7 @@ class SwWebTableShell: public SwTableShell { public: SFX_DECL_INTERFACE(SW_WEBTABSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual ~SwWebTableShell(); SwWebTableShell(SwView &rView); diff --git a/sw/source/core/uibase/inc/wtextsh.hxx b/sw/source/core/uibase/inc/wtextsh.hxx index 3a236f7ce307..713aa5e540fd 100644 --- a/sw/source/core/uibase/inc/wtextsh.hxx +++ b/sw/source/core/uibase/inc/wtextsh.hxx @@ -27,7 +27,7 @@ class SwWebTextShell: public SwTextShell public: SFX_DECL_INTERFACE(SW_WEBTEXTSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwWebTextShell(SwView &rView); virtual ~SwWebTextShell(); diff --git a/sw/source/core/uibase/inc/wview.hxx b/sw/source/core/uibase/inc/wview.hxx index 873f7a720648..c6a4d09315cc 100644 --- a/sw/source/core/uibase/inc/wview.hxx +++ b/sw/source/core/uibase/inc/wview.hxx @@ -30,7 +30,7 @@ public: SFX_DECL_VIEWFACTORY(SwWebView); SFX_DECL_INTERFACE(SW_WEBVIEWSHELL) - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwWebView(SfxViewFrame* pFrame, SfxViewShell*); ~SwWebView(); diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx index 943315f6bb72..8264496fdd11 100644 --- a/sw/source/filter/xml/xmlbrshi.hxx +++ b/sw/source/filter/xml/xmlbrshi.hxx @@ -44,7 +44,7 @@ private: const SvXMLUnitConverter& rUnitConv ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwXMLBrushItemImportContext( SvXMLImport& rImport, diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index 8d2386ee93ca..98a2f5501b86 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -203,7 +203,7 @@ public: const uno::Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~SwXMLConditionContext_Impl(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); bool IsValid() const { return 0 != nCondition; } @@ -268,7 +268,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwXMLTextStyleContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -448,7 +448,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwXMLItemSetStyleContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, @@ -737,7 +737,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwXMLStylesContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, @@ -928,7 +928,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwXMLMasterStylesContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 45156033a804..2f3d39ecd43a 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -118,7 +118,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~SwXMLBodyContext_Impl(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -165,7 +165,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~SwXMLDocContext_Impl(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -255,7 +255,7 @@ public: const Reference< document::XDocumentProperties >& xDocProps); virtual ~SwXMLOfficeDocContext_Impl(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, @@ -319,7 +319,7 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList ); virtual ~SwXMLDocStylesContext_Impl(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual void EndElement(); }; diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 826c1f69626b..c72031d7a01f 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1074,7 +1074,7 @@ class SwXMLDDETableContext_Impl : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwXMLDDETableContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName); diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx index cc5c36e4072e..28d6725056b4 100644 --- a/sw/source/filter/xml/xmltbli.hxx +++ b/sw/source/filter/xml/xmltbli.hxx @@ -132,7 +132,7 @@ class SwXMLTableContext : public XMLTextTableContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/vcl/source/edit/textund2.hxx b/vcl/source/edit/textund2.hxx index 89151854f777..f8382db56904 100644 --- a/vcl/source/edit/textund2.hxx +++ b/vcl/source/edit/textund2.hxx @@ -31,7 +31,7 @@ private: TextNode* mpNode; // points at the valid not-destroyed object public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, sal_uLong nPara ); ~TextUndoDelPara(); @@ -49,7 +49,7 @@ private: sal_uInt16 mnSepPos; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); TextUndoConnectParas( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nSepPos ); ~TextUndoConnectParas(); @@ -67,7 +67,7 @@ private: sal_uInt16 mnSepPos; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); TextUndoSplitPara( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nSepPos ); ~TextUndoSplitPara(); @@ -85,7 +85,7 @@ private: OUString maText; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); TextUndoInsertChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ); virtual void Undo(); @@ -104,7 +104,7 @@ private: OUString maText; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); TextUndoRemoveChars( TextEngine* pTextEngine, const TextPaM& rTextPaM, const OUString& rStr ); virtual void Undo(); @@ -120,7 +120,7 @@ private: TextSelection maSelection; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); TextUndoSetAttribs( TextEngine* pTextEngine, const TextSelection& rESel ); ~TextUndoSetAttribs(); diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx index 2ff08a2efa8d..c1385686163b 100644 --- a/vcl/source/edit/textundo.hxx +++ b/vcl/source/edit/textundo.hxx @@ -64,7 +64,7 @@ protected: TEParaPortions* GetTEParaPortions() const { return mpTextEngine->mpTEParaPortions; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); TextUndo( TextEngine* pTextEngine ); virtual ~TextUndo(); diff --git a/xmloff/inc/PageMasterImportContext.hxx b/xmloff/inc/PageMasterImportContext.hxx index 752e12c8baba..bafdbb9a9f97 100644 --- a/xmloff/inc/PageMasterImportContext.hxx +++ b/xmloff/inc/PageMasterImportContext.hxx @@ -34,7 +34,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); PageStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx index b4c7b732eb4f..f92d4ee678be 100644 --- a/xmloff/inc/XMLBackgroundImageContext.hxx +++ b/xmloff/inc/XMLBackgroundImageContext.hxx @@ -46,7 +46,7 @@ private: ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLBackgroundImageContext( SvXMLImport& rImport, diff --git a/xmloff/inc/XMLChartStyleContext.hxx b/xmloff/inc/XMLChartStyleContext.hxx index ca66f896cedb..23114a709ed7 100644 --- a/xmloff/inc/XMLChartStyleContext.hxx +++ b/xmloff/inc/XMLChartStyleContext.hxx @@ -35,7 +35,7 @@ protected: const OUString& rValue ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLChartStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx index 49cdb131d248..edefaef7ffdf 100644 --- a/xmloff/inc/XMLElementPropertyContext.hxx +++ b/xmloff/inc/XMLElementPropertyContext.hxx @@ -39,7 +39,7 @@ protected: void SetInsert( sal_Bool bIns ) { bInsert = bIns; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLElementPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx index f32ee8ae83c0..52bd62f09508 100644 --- a/xmloff/inc/XMLEmbeddedObjectImportContext.hxx +++ b/xmloff/inc/XMLEmbeddedObjectImportContext.hxx @@ -38,7 +38,7 @@ class XMLEmbeddedObjectImportContext : public SvXMLImportContext OUString sCLSID; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); const OUString& GetFilterServiceName() const { return sFilterService; } // #100592# diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx index 1ae5bfdf9419..84022a1ecd9f 100644 --- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx +++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx @@ -65,7 +65,7 @@ class XMLFootnoteConfigurationImportContext : public SvXMLStyleContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFootnoteConfigurationImportContext( SvXMLImport& rImport, diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx index d97b33560efe..4294331a75f4 100644 --- a/xmloff/inc/XMLImageMapContext.hxx +++ b/xmloff/inc/XMLImageMapContext.hxx @@ -45,7 +45,7 @@ class XMLImageMapContext : public SvXMLImportContext ::com::sun::star::beans::XPropertySet> xPropertySet; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImageMapContext( SvXMLImport& rImport, diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx index aff9c7d5cf9a..068fe0115650 100644 --- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx +++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx @@ -66,7 +66,7 @@ class XMLIndexBibliographyConfigurationContext : public SvXMLStyleContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexBibliographyConfigurationContext( SvXMLImport& rImport, diff --git a/xmloff/inc/XMLLineNumberingImportContext.hxx b/xmloff/inc/XMLLineNumberingImportContext.hxx index ccf26488f565..eef1219bb61c 100644 --- a/xmloff/inc/XMLLineNumberingImportContext.hxx +++ b/xmloff/inc/XMLLineNumberingImportContext.hxx @@ -77,7 +77,7 @@ class XMLLineNumberingImportContext : public SvXMLStyleContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLLineNumberingImportContext( SvXMLImport& rImport, diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx index cf4c69996d2f..17bccd5f52e5 100644 --- a/xmloff/inc/XMLNumberStylesImport.hxx +++ b/xmloff/inc/XMLNumberStylesImport.hxx @@ -46,7 +46,7 @@ protected: void add( OUString& rNumberStyle, sal_Bool bLong, sal_Bool bTextual, sal_Bool bDecimal02, OUString& rText ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx index 01035b094be7..08ba7c2333d1 100644 --- a/xmloff/inc/XMLReplacementImageContext.hxx +++ b/xmloff/inc/XMLReplacementImageContext.hxx @@ -40,7 +40,7 @@ class XMLReplacementImageContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLReplacementImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/inc/XMLShapePropertySetContext.hxx b/xmloff/inc/XMLShapePropertySetContext.hxx index b66bec224c58..66b8823398dc 100644 --- a/xmloff/inc/XMLShapePropertySetContext.hxx +++ b/xmloff/inc/XMLShapePropertySetContext.hxx @@ -29,7 +29,7 @@ class XMLShapePropertySetContext : public SvXMLPropertySetContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLShapePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/inc/XMLStringBufferImportContext.hxx b/xmloff/inc/XMLStringBufferImportContext.hxx index 378b4986c874..eded4ea65c70 100644 --- a/xmloff/inc/XMLStringBufferImportContext.hxx +++ b/xmloff/inc/XMLStringBufferImportContext.hxx @@ -36,7 +36,7 @@ class XMLStringBufferImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLStringBufferImportContext( SvXMLImport& rImport, diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx index 7f91a6e49ec6..ba4f6be5f33f 100644 --- a/xmloff/inc/XMLTextColumnsContext.hxx +++ b/xmloff/inc/XMLTextColumnsContext.hxx @@ -48,7 +48,7 @@ class XMLTextColumnsContext :public XMLElementPropertyContext sal_Int32 nAutomaticDistance; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextColumnsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/inc/XMLTextHeaderFooterContext.hxx b/xmloff/inc/XMLTextHeaderFooterContext.hxx index 35184002ffb0..421e4ba3c077 100644 --- a/xmloff/inc/XMLTextHeaderFooterContext.hxx +++ b/xmloff/inc/XMLTextHeaderFooterContext.hxx @@ -46,7 +46,7 @@ class XMLTextHeaderFooterContext: public SvXMLImportContext sal_Bool bFirst : 1; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx index 08a78cf96126..8b7f38b780b2 100644 --- a/xmloff/inc/animationimport.hxx +++ b/xmloff/inc/animationimport.hxx @@ -38,7 +38,7 @@ class AnimationNodeContext : public SvXMLImportContext void init_node( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); AnimationNodeContext( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xParentNode, diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx index 529a048dda2d..68fe07ff4b99 100644 --- a/xmloff/inc/animimp.hxx +++ b/xmloff/inc/animimp.hxx @@ -32,7 +32,7 @@ class XMLAnimationsContext : public SvXMLImportContext AnimImpImpl* mpImpl; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 74b127b8d4cf..91ca606eab76 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -125,7 +125,7 @@ protected: sal_Bool bValid; /// whether this field is valid ? public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -202,7 +202,7 @@ protected: sal_uInt16 nElementToken; /// token for this elment field public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLSenderFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -237,7 +237,7 @@ class XMLAuthorFieldImportContext : public XMLSenderFieldImportContext const OUString sPropertyContent; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAuthorFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -271,7 +271,7 @@ class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext sal_Int16 nPlaceholderType; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLPlaceholderFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -312,7 +312,7 @@ protected: sal_Bool bIsDefaultLanguage; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTimeFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -335,7 +335,7 @@ public: class XMLDateFieldImportContext : public XMLTimeFieldImportContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDateFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -361,7 +361,7 @@ class XMLPageContinuationImportContext : public XMLTextFieldImportContext sal_Bool sStringOK; /// continuation string encountered? public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLPageContinuationImportContext( SvXMLImport& rImport, /// XML Import @@ -394,7 +394,7 @@ class XMLPageNumberImportContext : public XMLTextFieldImportContext sal_Bool sNumberFormatOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLPageNumberImportContext( SvXMLImport& rImport, /// XML Import @@ -448,7 +448,7 @@ protected: bool bUseDisplay ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, @@ -471,7 +471,7 @@ public: class XMLDatabaseNameImportContext : public XMLDatabaseFieldImportContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDatabaseNameImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -500,7 +500,7 @@ protected: const OUString& sLocalName); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDatabaseNextImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -525,7 +525,7 @@ class XMLDatabaseSelectImportContext : public XMLDatabaseNextImportContext sal_Bool bNumberOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDatabaseSelectImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -553,7 +553,7 @@ class XMLDatabaseNumberImportContext : public XMLDatabaseFieldImportContext sal_Bool bValueOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDatabaseNumberImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -584,7 +584,7 @@ protected: sal_Bool bHasContent; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLSimpleDocInfoImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -621,7 +621,7 @@ class XMLDateTimeDocInfoImportContext : public XMLSimpleDocInfoImportContext sal_Bool bIsDefaultLanguage; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDateTimeDocInfoImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -646,7 +646,7 @@ class XMLRevisionDocInfoImportContext : public XMLSimpleDocInfoImportContext const OUString sPropertyRevision; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLRevisionDocInfoImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -673,7 +673,7 @@ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext sal_Bool bIsDefaultLanguage; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLUserDocInfoImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -700,7 +700,7 @@ class XMLHiddenParagraphImportContext : public XMLTextFieldImportContext sal_Bool bIsHidden; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLHiddenParagraphImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -737,7 +737,7 @@ class XMLConditionalTextImportContext : public XMLTextFieldImportContext sal_Bool bCurrentValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLConditionalTextImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -770,7 +770,7 @@ class XMLHiddenTextImportContext : public XMLTextFieldImportContext sal_Bool bIsHidden; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLHiddenTextImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -799,7 +799,7 @@ class XMLFileNameImportContext : public XMLTextFieldImportContext sal_Bool bFixed; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFileNameImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -825,7 +825,7 @@ class XMLTemplateNameImportContext : public XMLTextFieldImportContext sal_Int16 nFormat; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTemplateNameImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -853,7 +853,7 @@ class XMLChapterImportContext : public XMLTextFieldImportContext sal_Int8 nLevel; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLChapterImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -882,7 +882,7 @@ class XMLCountFieldImportContext : public XMLTextFieldImportContext sal_Bool bNumberFormatOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLCountFieldImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -914,7 +914,7 @@ class XMLPageVarGetFieldImportContext : public XMLTextFieldImportContext sal_Bool bNumberFormatOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLPageVarGetFieldImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -942,7 +942,7 @@ class XMLPageVarSetFieldImportContext : public XMLTextFieldImportContext sal_Bool bActive; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLPageVarSetFieldImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -976,7 +976,7 @@ class XMLMacroFieldImportContext : public XMLTextFieldImportContext sal_Bool bDescriptionOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLMacroFieldImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1018,7 +1018,7 @@ class XMLReferenceFieldImportContext : public XMLTextFieldImportContext sal_Bool bTypeOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLReferenceFieldImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1048,7 +1048,7 @@ class XMLDdeFieldDeclsImportContext : public SvXMLImportContext SvXMLTokenMap aTokenMap; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDdeFieldDeclsImportContext(SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -1073,7 +1073,7 @@ class XMLDdeFieldDeclImportContext : public SvXMLImportContext const SvXMLTokenMap& rTokenMap; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDdeFieldDeclImportContext(SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -1093,7 +1093,7 @@ class XMLDdeFieldImportContext : public XMLTextFieldImportContext OUString sPropertyContent; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDdeFieldImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1119,7 +1119,7 @@ class XMLSheetNameImportContext : public XMLTextFieldImportContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLSheetNameImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1149,7 +1149,7 @@ class XMLUrlFieldImportContext : public XMLTextFieldImportContext sal_Bool bFrameOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLUrlFieldImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1175,7 +1175,7 @@ class XMLBibliographyFieldImportContext : public XMLTextFieldImportContext ::std::vector< ::com::sun::star::beans::PropertyValue> aValues; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLBibliographyFieldImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1223,7 +1223,7 @@ class XMLAnnotationImportContext : public XMLTextFieldImportContext sal_uInt16 m_nToken; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAnnotationImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1262,7 +1262,7 @@ class XMLScriptImportContext : public XMLTextFieldImportContext sal_Bool bScriptTypeOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLScriptImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1286,7 +1286,7 @@ class XMLMeasureFieldImportContext : public XMLTextFieldImportContext sal_Int16 mnKind; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLMeasureFieldImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1323,7 +1323,7 @@ class XMLDropDownFieldImportContext : public XMLTextFieldImportContext const OUString sPropertyToolTip; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDropDownFieldImportContext(SvXMLImport& rImport, XMLTextImportHelper& rHlp, @@ -1350,7 +1350,7 @@ protected: class XMLHeaderFieldImportContext : public XMLTextFieldImportContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLHeaderFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -1372,7 +1372,7 @@ public: class XMLFooterFieldImportContext : public XMLTextFieldImportContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFooterFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -1394,7 +1394,7 @@ public: class XMLDateTimeFieldImportContext : public XMLTextFieldImportContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDateTimeFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -1420,7 +1420,7 @@ class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext const OUString sPropertyValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLCustomPropertyFieldImportContext (SvXMLImport& rImport, XMLTextImportHelper& rHlp, diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx index 2c2dadcd5784..27b6605cc155 100644 --- a/xmloff/inc/txtvfldi.hxx +++ b/xmloff/inc/txtvfldi.hxx @@ -171,7 +171,7 @@ private: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLVarFieldImportContext( // for XMLTextFieldImportContext: @@ -221,7 +221,7 @@ class XMLVariableGetFieldImportContext : public XMLVarFieldImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLVariableGetFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -246,7 +246,7 @@ class XMLExpressionFieldImportContext : public XMLVarFieldImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLExpressionFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -267,7 +267,7 @@ class XMLTextInputFieldImportContext : public XMLVarFieldImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextInputFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -296,7 +296,7 @@ class XMLSetVarFieldImportContext : public XMLVarFieldImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLSetVarFieldImportContext( // for XMLTextFieldImportContext: @@ -341,7 +341,7 @@ class XMLVariableSetFieldImportContext : public XMLSetVarFieldImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLVariableSetFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -366,7 +366,7 @@ class XMLVariableInputFieldImportContext : public XMLSetVarFieldImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLVariableInputFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -390,7 +390,7 @@ class XMLUserFieldImportContext : public XMLSetVarFieldImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLUserFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -405,7 +405,7 @@ class XMLUserFieldInputImportContext : public XMLVarFieldImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLUserFieldInputImportContext( SvXMLImport& rImport, /// XML Import @@ -435,7 +435,7 @@ class XMLSequenceFieldImportContext : public XMLSetVarFieldImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLSequenceFieldImportContext( SvXMLImport& rImport, /// XML Import @@ -471,7 +471,7 @@ class XMLVariableDeclsImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLVariableDeclsImportContext( SvXMLImport& rImport, /// XML Import @@ -506,7 +506,7 @@ class XMLVariableDeclImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLVariableDeclImportContext( SvXMLImport& rImport, /// XML Import @@ -544,7 +544,7 @@ class XMLTableFormulaImportContext : public XMLTextFieldImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTableFormulaImportContext( SvXMLImport& rImport, /// XML Import @@ -585,7 +585,7 @@ class XMLDatabaseDisplayImportContext : public XMLDatabaseFieldImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDatabaseDisplayImportContext( SvXMLImport& rImport, /// XML Import diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx index 66bc1689ca54..65ae7359ed59 100644 --- a/xmloff/inc/xmltabi.hxx +++ b/xmloff/inc/xmltabi.hxx @@ -32,7 +32,7 @@ private: SvxXMLTabStopArray_Impl* mpTabStops; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxXMLTabStopImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/chart/XMLChartPropertyContext.hxx b/xmloff/source/chart/XMLChartPropertyContext.hxx index 28a9657063bf..da978ae3630f 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.hxx +++ b/xmloff/source/chart/XMLChartPropertyContext.hxx @@ -24,7 +24,7 @@ class XMLChartPropertyContext : public SvXMLPropertySetContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLChartPropertyContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.hxx b/xmloff/source/chart/XMLLabelSeparatorContext.hxx index 0f5a24059f13..18b336bc132c 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.hxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.hxx @@ -24,7 +24,7 @@ class XMLLabelSeparatorContext : public XMLElementPropertyContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLLabelSeparatorContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/chart/XMLSymbolImageContext.hxx b/xmloff/source/chart/XMLSymbolImageContext.hxx index 5b47e64215cf..34a6b2676c65 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.hxx +++ b/xmloff/source/chart/XMLSymbolImageContext.hxx @@ -28,7 +28,7 @@ namespace com { namespace sun { namespace star { class XMLSymbolImageContext : public XMLElementPropertyContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLSymbolImageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx index 8c090464fe01..d65bef05c9f2 100644 --- a/xmloff/source/chart/contexts.hxx +++ b/xmloff/source/chart/contexts.hxx @@ -49,7 +49,7 @@ public: const OUString& rLName ); virtual ~SchXMLDocContext(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual SvXMLImportContext* CreateChildContext( sal_uInt16 nPrefix, diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index 23a9257a14cd..c15a389b0023 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -70,7 +70,7 @@ class XMLEmbeddedObjectImportContext_Impl : public SvXMLImportContext ::com::sun::star::xml::sax::XDocumentHandler > xHandler; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLEmbeddedObjectImportContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index ea6f80aa6eab..1d71c2de9ffe 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -125,7 +125,7 @@ protected: sal_Bool bValid; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImageMapObjectContext( SvXMLImport& rImport, @@ -319,7 +319,7 @@ class XMLImageMapRectangleContext : public XMLImageMapObjectContext sal_Bool bHeightOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImageMapRectangleContext( SvXMLImport& rImport, @@ -429,7 +429,7 @@ class XMLImageMapPolygonContext : public XMLImageMapObjectContext sal_Bool bPointsOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImageMapPolygonContext( SvXMLImport& rImport, @@ -527,7 +527,7 @@ class XMLImageMapCircleContext : public XMLImageMapObjectContext sal_Bool bRadiusOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImageMapCircleContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 7553458b9fb6..8022ebef8d4e 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -489,7 +489,7 @@ private: boost::shared_ptr< SvXMLImportContext > mpSlaveContext; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 925e437fd823..61ceec7af45e 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -379,7 +379,7 @@ public: OUString maPathShapeId; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAnimationsEffectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -399,7 +399,7 @@ class XMLAnimationsSoundContext : public SvXMLImportContext XMLAnimationsEffectContext* mpParent; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent ); virtual ~XMLAnimationsSoundContext(); diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx index 15e1b56cb557..c3403db8ca13 100644 --- a/xmloff/source/draw/descriptionimp.hxx +++ b/xmloff/source/draw/descriptionimp.hxx @@ -31,7 +31,7 @@ private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; OUString msText; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index f7158ff9c5c8..46cbb387d51e 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -75,7 +75,7 @@ private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, const Reference< XShape >& rxShape ); virtual ~SdXMLEventContext(); @@ -103,7 +103,7 @@ class XMLEventSoundContext : public SvXMLImportContext SdXMLEventContext* mpParent; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLEventSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent ); virtual ~XMLEventSoundContext(); diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx index 55b45c7949e1..509fde887da1 100644 --- a/xmloff/source/draw/eventimp.hxx +++ b/xmloff/source/draw/eventimp.hxx @@ -31,7 +31,7 @@ private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx index ac40d09de3a8..4cee65efaafb 100644 --- a/xmloff/source/draw/layerimp.hxx +++ b/xmloff/source/draw/layerimp.hxx @@ -31,7 +31,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLayerManager; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 7ced7b0d1d0e..cb52bdc5741c 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -103,7 +103,7 @@ public: const uno::Reference<xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLDocContext_Impl(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index 3ebd8d706626..6a07181227af 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -41,7 +41,7 @@ protected: sal_Bool mbSetTransform; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DObjectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -65,7 +65,7 @@ class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext sal_Bool mbMaxEdgeUsed; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -88,7 +88,7 @@ class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext sal_Bool mbSizeUsed; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -109,7 +109,7 @@ class SdXML3DPolygonBasedShapeContext : public SdXML3DObjectContext OUString maViewBox; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -127,7 +127,7 @@ public: class SdXML3DLatheObjectShapeContext : public SdXML3DPolygonBasedShapeContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -145,7 +145,7 @@ public: class SdXML3DExtrudeObjectShapeContext : public SdXML3DPolygonBasedShapeContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index 3ac8354157fe..35b7ea5a0c3c 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -43,7 +43,7 @@ protected: { mxChildren = rNew; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DSceneShapeContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx index 26b6c143053c..822f25dad06e 100644 --- a/xmloff/source/draw/ximpcustomshape.hxx +++ b/xmloff/source/draw/ximpcustomshape.hxx @@ -51,7 +51,7 @@ class XMLEnhancedCustomShapeContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, sal_uInt16 nPrefix, const OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ); diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index 2df42a2b072c..2df524613ab5 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -39,7 +39,7 @@ protected: { mxShapes = rNew; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx index 015ae148db19..e51e71259eea 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -39,7 +39,7 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext OUString msHyperlink; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx index c93768d878bb..e850c4945aab 100644 --- a/xmloff/source/draw/ximppage.hxx +++ b/xmloff/source/draw/ximppage.hxx @@ -64,7 +64,7 @@ protected: void SetNavigationOrder(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 6ddb83b12b79..2f267ac661e1 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -99,7 +99,7 @@ protected: sal_Bool isPresentationShape() const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -130,7 +130,7 @@ class SdXMLRectShapeContext : public SdXMLShapeContext sal_Int32 mnRadius; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -154,7 +154,7 @@ class SdXMLLineShapeContext : public SdXMLShapeContext sal_Int32 mnY2; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -181,7 +181,7 @@ class SdXMLEllipseShapeContext : public SdXMLShapeContext sal_Int32 mnStartAngle; sal_Int32 mnEndAngle; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -204,7 +204,7 @@ class SdXMLPolygonShapeContext : public SdXMLShapeContext sal_Bool mbClosed; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -225,7 +225,7 @@ class SdXMLPathShapeContext : public SdXMLShapeContext OUString maViewBox; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -246,7 +246,7 @@ class SdXMLTextBoxShapeContext : public SdXMLShapeContext sal_Int32 mnRadius; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -268,7 +268,7 @@ private: OUString maFormId; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -304,7 +304,7 @@ private: com::sun::star::uno::Any maPath; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -327,7 +327,7 @@ private: ::com::sun::star::awt::Point maEnd; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -349,7 +349,7 @@ class SdXMLPageShapeContext : public SdXMLShapeContext private: sal_Int32 mnPageNumber; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -372,7 +372,7 @@ private: sal_Int32 mnRadius; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -395,7 +395,7 @@ private: ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -420,7 +420,7 @@ class SdXMLChartShapeContext : public SdXMLShapeContext SvXMLImportContext* mpChartContext; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -448,7 +448,7 @@ private: ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -481,7 +481,7 @@ private: com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -512,7 +512,7 @@ private: com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -540,7 +540,7 @@ private: OUString maHref; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -571,7 +571,7 @@ protected: virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -601,7 +601,7 @@ protected : public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, @@ -624,7 +624,7 @@ public: class SdXMLTableShapeContext : public SdXMLShapeContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx index ffff1c9dc87c..a795b2ea5509 100644 --- a/xmloff/source/draw/ximpshow.hxx +++ b/xmloff/source/draw/ximpshow.hxx @@ -32,7 +32,7 @@ class SdXMLShowsContext : public SvXMLImportContext ShowsImpImpl* mpImpl; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 34447403db3f..102664c3aa4b 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -54,7 +54,7 @@ class SdXMLDrawingPagePropertySetContext : public SvXMLPropertySetContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLDrawingPagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -131,7 +131,7 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext( class SdXMLDrawingPageStyleContext : public XMLPropStyleContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLDrawingPageStyleContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index a338be79bbb5..cc01c1cab9ea 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -46,7 +46,7 @@ class SdXMLPageMasterStyleContext: public SvXMLStyleContext SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPageMasterStyleContext( SdXMLImport& rImport, @@ -75,7 +75,7 @@ class SdXMLPageMasterContext: public SvXMLStyleContext SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPageMasterContext( SdXMLImport& rImport, @@ -102,7 +102,7 @@ class SdXMLMasterPageContext: public SdXMLGenericPageContext OUString msStyleName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLMasterPageContext( SdXMLImport& rImport, @@ -166,7 +166,7 @@ class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPresentationPageLayoutContext( SdXMLImport& rImport, @@ -218,7 +218,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLStylesContext( SdXMLImport& rImport, @@ -247,7 +247,7 @@ class SdXMLMasterStylesContext : public SvXMLImportContext SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLMasterStylesContext( SdXMLImport& rImport, diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index e1874022d391..65934f74da39 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -36,7 +36,7 @@ namespace xmloff ,public OStackedLogging { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); OFormsRootImport( SvXMLImport& _rImport, sal_uInt16 _nPrfx, const OUString& _rLocalName); virtual ~OFormsRootImport(); diff --git a/xmloff/source/style/FillStyleContext.hxx b/xmloff/source/style/FillStyleContext.hxx index a009078ec989..6acfcd9f612e 100644 --- a/xmloff/source/style/FillStyleContext.hxx +++ b/xmloff/source/style/FillStyleContext.hxx @@ -33,7 +33,7 @@ private: OUString maStrName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); @@ -53,7 +53,7 @@ private: OUString maStrName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLHatchStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); @@ -74,7 +74,7 @@ private: ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLBitmapStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); @@ -99,7 +99,7 @@ private: OUString maStrName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTransGradientStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); @@ -119,7 +119,7 @@ private: OUString maStrName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLMarkerStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); @@ -139,7 +139,7 @@ private: OUString maStrName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDashStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList ); diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx b/xmloff/source/style/XMLFontStylesContext_impl.hxx index 3bcbdde0b086..2259d21947dd 100644 --- a/xmloff/source/style/XMLFontStylesContext_impl.hxx +++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx @@ -40,7 +40,7 @@ class XMLFontStyleContextFontFace : public SvXMLStyleContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFontStyleContextFontFace( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -73,7 +73,7 @@ class XMLFontStyleContextFontFaceSrc : public SvXMLImportContext const XMLFontStyleContextFontFace& font; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFontStyleContextFontFaceSrc( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -94,7 +94,7 @@ class XMLFontStyleContextFontFaceUri : public SvXMLStyleContext void handleEmbeddedFont( const OUString& url, bool eot ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFontStyleContextFontFaceUri( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -117,7 +117,7 @@ class XMLFontStyleContextFontFaceFormat : public SvXMLStyleContext { XMLFontStyleContextFontFaceUri& uri; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFontStyleContextFontFaceFormat( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx index 03d6cce38e7e..8f223244b388 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.hxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.hxx @@ -48,7 +48,7 @@ class XMLFootnoteSeparatorImport : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFootnoteSeparatorImport( SvXMLImport& rImport, diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index a5d49d82f35b..abb1f27b31c3 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -61,7 +61,7 @@ private: style::TabStop aTabStop; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SvxXMLTabStopContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/text/XMLAutoMarkFileContext.hxx b/xmloff/source/text/XMLAutoMarkFileContext.hxx index 33e3bc9b40a7..9f5a8380f050 100644 --- a/xmloff/source/text/XMLAutoMarkFileContext.hxx +++ b/xmloff/source/text/XMLAutoMarkFileContext.hxx @@ -36,7 +36,7 @@ class XMLAutoMarkFileContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAutoMarkFileContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx index 8b9440d63320..dcb63f223f02 100644 --- a/xmloff/source/text/XMLAutoTextContainerEventImport.hxx +++ b/xmloff/source/text/XMLAutoTextContainerEventImport.hxx @@ -42,7 +42,7 @@ class XMLAutoTextContainerEventImport : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAutoTextContainerEventImport( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLChangeElementImportContext.hxx b/xmloff/source/text/XMLChangeElementImportContext.hxx index 8bccea1f69ed..876381055b66 100644 --- a/xmloff/source/text/XMLChangeElementImportContext.hxx +++ b/xmloff/source/text/XMLChangeElementImportContext.hxx @@ -59,7 +59,7 @@ class XMLChangeElementImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLChangeElementImportContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLChangeImportContext.hxx b/xmloff/source/text/XMLChangeImportContext.hxx index fff4eb276dae..7228ed38686e 100644 --- a/xmloff/source/text/XMLChangeImportContext.hxx +++ b/xmloff/source/text/XMLChangeImportContext.hxx @@ -45,7 +45,7 @@ class XMLChangeImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); /** * import a change mark diff --git a/xmloff/source/text/XMLChangeInfoContext.hxx b/xmloff/source/text/XMLChangeInfoContext.hxx index a9902dc987a1..3f87ad9f1319 100644 --- a/xmloff/source/text/XMLChangeInfoContext.hxx +++ b/xmloff/source/text/XMLChangeInfoContext.hxx @@ -51,7 +51,7 @@ class XMLChangeInfoContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLChangeInfoContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLChangedRegionImportContext.hxx b/xmloff/source/text/XMLChangedRegionImportContext.hxx index a6c0883fc193..fc312f4c6633 100644 --- a/xmloff/source/text/XMLChangedRegionImportContext.hxx +++ b/xmloff/source/text/XMLChangedRegionImportContext.hxx @@ -55,7 +55,7 @@ class XMLChangedRegionImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLChangedRegionImportContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx index 706a2079bd99..207ffc3987b6 100644 --- a/xmloff/source/text/XMLFootnoteBodyImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteBodyImportContext.hxx @@ -37,7 +37,7 @@ class XMLFootnoteBodyImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFootnoteBodyImportContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx index a83f65957edd..bd120598f9f7 100644 --- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx +++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx @@ -62,7 +62,7 @@ class XMLFootnoteConfigHelper : public SvXMLImportContext bool bIsBegin; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFootnoteConfigHelper( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLFootnoteImportContext.hxx b/xmloff/source/text/XMLFootnoteImportContext.hxx index dcc0269c1638..556ccfaa7cf3 100644 --- a/xmloff/source/text/XMLFootnoteImportContext.hxx +++ b/xmloff/source/text/XMLFootnoteImportContext.hxx @@ -56,7 +56,7 @@ class XMLFootnoteImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFootnoteImportContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx index c39c464a440a..6ada329b8324 100644 --- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx +++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx @@ -66,7 +66,7 @@ class XMLIndexAlphabeticalSourceContext : public XMLIndexSourceBaseContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexAlphabeticalSourceContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx index ba8e47dab8b9..027cac96e04a 100644 --- a/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographyEntryContext.hxx @@ -45,7 +45,7 @@ class XMLIndexBibliographyEntryContext : public XMLIndexSimpleEntryContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexBibliographyEntryContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx index bc90b275997a..3e62d41d0635 100644 --- a/xmloff/source/text/XMLIndexBibliographySourceContext.hxx +++ b/xmloff/source/text/XMLIndexBibliographySourceContext.hxx @@ -38,7 +38,7 @@ class XMLIndexBibliographySourceContext : public XMLIndexSourceBaseContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexBibliographySourceContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexBodyContext.hxx b/xmloff/source/text/XMLIndexBodyContext.hxx index dfda1c0352e8..3d72ec04f8f4 100644 --- a/xmloff/source/text/XMLIndexBodyContext.hxx +++ b/xmloff/source/text/XMLIndexBodyContext.hxx @@ -41,7 +41,7 @@ class XMLIndexBodyContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexBodyContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx index d6bdb2cae7f9..f89db81231f2 100644 --- a/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx +++ b/xmloff/source/text/XMLIndexChapterInfoEntryContext.hxx @@ -45,7 +45,7 @@ class XMLIndexChapterInfoEntryContext : public XMLIndexSimpleEntryContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexChapterInfoEntryContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx index 056de02a4ac8..d1a3b2ff9326 100644 --- a/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx +++ b/xmloff/source/text/XMLIndexIllustrationSourceContext.hxx @@ -40,7 +40,7 @@ class XMLIndexIllustrationSourceContext : public XMLIndexTableSourceContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexIllustrationSourceContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.hxx b/xmloff/source/text/XMLIndexObjectSourceContext.hxx index 790364e9a05b..2378f6dfef3b 100644 --- a/xmloff/source/text/XMLIndexObjectSourceContext.hxx +++ b/xmloff/source/text/XMLIndexObjectSourceContext.hxx @@ -49,7 +49,7 @@ class XMLIndexObjectSourceContext : public XMLIndexSourceBaseContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexObjectSourceContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx index 589899b6e1b2..824626f96735 100644 --- a/xmloff/source/text/XMLIndexSimpleEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSimpleEntryContext.hxx @@ -53,7 +53,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexSimpleEntryContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.hxx b/xmloff/source/text/XMLIndexSourceBaseContext.hxx index c4c0fb545d92..43650e09bfdc 100644 --- a/xmloff/source/text/XMLIndexSourceBaseContext.hxx +++ b/xmloff/source/text/XMLIndexSourceBaseContext.hxx @@ -91,7 +91,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexSourceBaseContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.hxx b/xmloff/source/text/XMLIndexSpanEntryContext.hxx index b286511baecc..87152e32cfcf 100644 --- a/xmloff/source/text/XMLIndexSpanEntryContext.hxx +++ b/xmloff/source/text/XMLIndexSpanEntryContext.hxx @@ -39,7 +39,7 @@ class XMLIndexSpanEntryContext : public XMLIndexSimpleEntryContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexSpanEntryContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexTOCContext.hxx b/xmloff/source/text/XMLIndexTOCContext.hxx index 2aec12be2bca..c49b986235cd 100644 --- a/xmloff/source/text/XMLIndexTOCContext.hxx +++ b/xmloff/source/text/XMLIndexTOCContext.hxx @@ -70,7 +70,7 @@ class XMLIndexTOCContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexTOCContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.hxx b/xmloff/source/text/XMLIndexTOCSourceContext.hxx index f519df0db1cb..235dc5221ce1 100644 --- a/xmloff/source/text/XMLIndexTOCSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTOCSourceContext.hxx @@ -48,7 +48,7 @@ class XMLIndexTOCSourceContext : public XMLIndexSourceBaseContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexTOCSourceContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexTOCStylesContext.hxx b/xmloff/source/text/XMLIndexTOCStylesContext.hxx index 4ca00074de26..c57cc729827d 100644 --- a/xmloff/source/text/XMLIndexTOCStylesContext.hxx +++ b/xmloff/source/text/XMLIndexTOCStylesContext.hxx @@ -56,7 +56,7 @@ class XMLIndexTOCStylesContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexTOCStylesContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx index ce0ad27c1db4..1414fcfaa4b0 100644 --- a/xmloff/source/text/XMLIndexTabStopEntryContext.hxx +++ b/xmloff/source/text/XMLIndexTabStopEntryContext.hxx @@ -46,7 +46,7 @@ class XMLIndexTabStopEntryContext : public XMLIndexSimpleEntryContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexTabStopEntryContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexTableSourceContext.hxx b/xmloff/source/text/XMLIndexTableSourceContext.hxx index a663d15e9b35..d758fc8fe680 100644 --- a/xmloff/source/text/XMLIndexTableSourceContext.hxx +++ b/xmloff/source/text/XMLIndexTableSourceContext.hxx @@ -48,7 +48,7 @@ class XMLIndexTableSourceContext : public XMLIndexSourceBaseContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexTableSourceContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexTemplateContext.hxx b/xmloff/source/text/XMLIndexTemplateContext.hxx index be067639e36c..16935eb11f0c 100644 --- a/xmloff/source/text/XMLIndexTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTemplateContext.hxx @@ -112,7 +112,7 @@ public: const OUString sParaStyleLevel; - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexTemplateContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx index 9410393a26bc..19d1b6a05807 100644 --- a/xmloff/source/text/XMLIndexTitleTemplateContext.hxx +++ b/xmloff/source/text/XMLIndexTitleTemplateContext.hxx @@ -54,7 +54,7 @@ class XMLIndexTitleTemplateContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexTitleTemplateContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLIndexUserSourceContext.hxx b/xmloff/source/text/XMLIndexUserSourceContext.hxx index 97f54f340835..8f3476335997 100644 --- a/xmloff/source/text/XMLIndexUserSourceContext.hxx +++ b/xmloff/source/text/XMLIndexUserSourceContext.hxx @@ -55,7 +55,7 @@ class XMLIndexUserSourceContext : public XMLIndexSourceBaseContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexUserSourceContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx index c0644e60b838..1f28bf5778ec 100644 --- a/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx +++ b/xmloff/source/text/XMLLineNumberingSeparatorImportContext.hxx @@ -40,7 +40,7 @@ class XMLLineNumberingSeparatorImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLLineNumberingSeparatorImportContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx index c374a1c53946..80f8ba963238 100644 --- a/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx +++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.hxx @@ -47,7 +47,7 @@ class XMLSectionFootnoteConfigImport : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLSectionFootnoteConfigImport( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLSectionImportContext.hxx b/xmloff/source/text/XMLSectionImportContext.hxx index 5b71436d27bd..b7375c16a833 100644 --- a/xmloff/source/text/XMLSectionImportContext.hxx +++ b/xmloff/source/text/XMLSectionImportContext.hxx @@ -77,7 +77,7 @@ class XMLSectionImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLSectionImportContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx index a823faa1658d..8b082cfd14a6 100644 --- a/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.hxx @@ -40,7 +40,7 @@ class XMLSectionSourceDDEImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLSectionSourceDDEImportContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx b/xmloff/source/text/XMLSectionSourceImportContext.hxx index 7e86a4de63b9..2f6fcb671211 100644 --- a/xmloff/source/text/XMLSectionSourceImportContext.hxx +++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx @@ -35,7 +35,7 @@ class XMLSectionSourceImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLSectionSourceImportContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 3eec7381703b..aecbbc53827b 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -97,7 +97,7 @@ class XMLTextColumnContext_Impl: public SvXMLImportContext text::TextColumn aColumn; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextColumnContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -179,7 +179,7 @@ class XMLTextColumnSepContext_Impl: public SvXMLImportContext VerticalAlignment eVertAlign; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextColumnSepContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx index 9b36879583e9..e3aaaff4dd72 100644 --- a/xmloff/source/text/XMLTextFrameContext.cxx +++ b/xmloff/source/text/XMLTextFrameContext.cxx @@ -115,7 +115,7 @@ class XMLTextFrameTitleOrDescContext_Impl : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextFrameTitleOrDescContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -151,7 +151,7 @@ class XMLTextFrameParam_Impl : public SvXMLImportContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextFrameParam_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -209,7 +209,7 @@ class XMLTextFrameContourContext_Impl : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextFrameContourContext_Impl( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -430,7 +430,7 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); sal_Bool CreateIfNotThere(); const OUString& GetHRef() const { return sHRef; } diff --git a/xmloff/source/text/XMLTextFrameContext.hxx b/xmloff/source/text/XMLTextFrameContext.hxx index 5d614ed8a246..816e079a4457 100644 --- a/xmloff/source/text/XMLTextFrameContext.hxx +++ b/xmloff/source/text/XMLTextFrameContext.hxx @@ -64,7 +64,7 @@ protected: public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextFrameContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx index 19f4bd8a49fb..501e8a5f61e3 100644 --- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx +++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx @@ -40,7 +40,7 @@ class XMLTextFrameHyperlinkContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextFrameHyperlinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/XMLTextListBlockContext.hxx b/xmloff/source/text/XMLTextListBlockContext.hxx index 4172c107a318..cc4196d455cd 100644 --- a/xmloff/source/text/XMLTextListBlockContext.hxx +++ b/xmloff/source/text/XMLTextListBlockContext.hxx @@ -49,7 +49,7 @@ class XMLTextListBlockContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // add optional parameter <bRestartNumberingAtSubList> XMLTextListBlockContext( diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx index 661c30625209..53c2ea13f9d8 100644 --- a/xmloff/source/text/XMLTextListItemContext.hxx +++ b/xmloff/source/text/XMLTextListItemContext.hxx @@ -38,7 +38,7 @@ class XMLTextListItemContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextListItemContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLTextMarkImportContext.hxx b/xmloff/source/text/XMLTextMarkImportContext.hxx index d7ae57e12868..460f670b8ec0 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.hxx +++ b/xmloff/source/text/XMLTextMarkImportContext.hxx @@ -75,7 +75,7 @@ class XMLTextMarkImportContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextMarkImportContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/XMLTrackedChangesImportContext.hxx b/xmloff/source/text/XMLTrackedChangesImportContext.hxx index 711d718b46a3..45b3b9a54eeb 100644 --- a/xmloff/source/text/XMLTrackedChangesImportContext.hxx +++ b/xmloff/source/text/XMLTrackedChangesImportContext.hxx @@ -37,7 +37,7 @@ class XMLTrackedChangesImportContext : public SvXMLImportContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTrackedChangesImportContext( SvXMLImport& rImport, diff --git a/xmloff/source/text/txtdropi.hxx b/xmloff/source/text/txtdropi.hxx index 024840e84381..fc6551024d63 100644 --- a/xmloff/source/text/txtdropi.hxx +++ b/xmloff/source/text/txtdropi.hxx @@ -35,7 +35,7 @@ private: ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTextDropCapImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index eb09a5745245..e5067cec49cb 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -156,7 +156,7 @@ void XMLCharContext::InsertString(const OUString& _sString) class XMLStartReferenceContext_Impl : public SvXMLImportContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // Do everything in constructor. Well ... XMLStartReferenceContext_Impl ( @@ -227,7 +227,7 @@ sal_Bool XMLStartReferenceContext_Impl::FindName( class XMLEndReferenceContext_Impl : public SvXMLImportContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // Do everything in constructor. Well ... XMLEndReferenceContext_Impl( @@ -284,7 +284,7 @@ class XMLImpSpanContext_Impl : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImpSpanContext_Impl( SvXMLImport& rImport, @@ -322,7 +322,7 @@ class XMLImpHyperlinkContext_Impl : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImpHyperlinkContext_Impl( SvXMLImport& rImport, @@ -455,7 +455,7 @@ class XMLImpRubyBaseContext_Impl : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImpRubyBaseContext_Impl( SvXMLImport& rImport, @@ -524,7 +524,7 @@ class XMLImpRubyContext_Impl : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImpRubyContext_Impl( SvXMLImport& rImport, @@ -550,7 +550,7 @@ class XMLImpRubyTextContext_Impl : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImpRubyTextContext_Impl( SvXMLImport& rImport, @@ -692,7 +692,7 @@ protected: OUString m_XmlId; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLMetaImportContextBase( SvXMLImport& i_rImport, @@ -811,7 +811,7 @@ class XMLMetaImportContext : public XMLMetaImportContextBase OUString m_sDatatype; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLMetaImportContext( SvXMLImport& i_rImport, @@ -905,7 +905,7 @@ class XMLMetaFieldImportContext : public XMLMetaImportContextBase OUString m_DataStyleName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLMetaFieldImportContext( SvXMLImport& i_rImport, @@ -1011,7 +1011,7 @@ class XMLIndexMarkImportContext_Impl : public SvXMLImportContext OUString sID; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLIndexMarkImportContext_Impl( SvXMLImport& rImport, @@ -1284,7 +1284,7 @@ class XMLTOCMarkImportContext_Impl : public XMLIndexMarkImportContext_Impl const OUString sLevel; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTOCMarkImportContext_Impl( SvXMLImport& rImport, @@ -1349,7 +1349,7 @@ class XMLUserIndexMarkImportContext_Impl : public XMLIndexMarkImportContext_Impl const OUString sLevel; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLUserIndexMarkImportContext_Impl( SvXMLImport& rImport, @@ -1426,7 +1426,7 @@ class XMLAlphaIndexMarkImportContext_Impl : public XMLIndexMarkImportContext_Imp const OUString sMainEntry; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAlphaIndexMarkImportContext_Impl( SvXMLImport& rImport, diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx index 2f0629a8e6a0..df9c79db4f84 100644 --- a/xmloff/source/text/txtparai.hxx +++ b/xmloff/source/text/txtparai.hxx @@ -57,7 +57,7 @@ class XMLParaContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLParaContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -93,7 +93,7 @@ class XMLNumberedParaContext : public SvXMLImportContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLNumberedParaContext( SvXMLImport& i_rImport, sal_uInt16 i_nPrefix, diff --git a/xmloff/source/transform/ChartOASISTContext.hxx b/xmloff/source/transform/ChartOASISTContext.hxx index 8a3b5e722403..385a12ba56cc 100644 --- a/xmloff/source/transform/ChartOASISTContext.hxx +++ b/xmloff/source/transform/ChartOASISTContext.hxx @@ -25,7 +25,7 @@ class XMLChartOASISTransformerContext : public XMLTransformerContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLChartOASISTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); diff --git a/xmloff/source/transform/ChartOOoTContext.hxx b/xmloff/source/transform/ChartOOoTContext.hxx index 32624a919b5f..464e4a784ed6 100644 --- a/xmloff/source/transform/ChartOOoTContext.hxx +++ b/xmloff/source/transform/ChartOOoTContext.hxx @@ -25,7 +25,7 @@ class XMLChartOOoTransformerContext : public XMLTransformerContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLChartOOoTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx index 2e4212975de0..8570eccf80ef 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.cxx @@ -34,7 +34,7 @@ using ::com::sun::star::uno::Reference; class XMLAxisOASISContext : public XMLPersElemContentTContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAxisOASISContext( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx index da69b1904376..79d8c8860517 100644 --- a/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOASISTContext.hxx @@ -26,7 +26,7 @@ class XMLChartPlotAreaOASISTContext : public XMLProcAttrTransformerContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit XMLChartPlotAreaOASISTContext( XMLTransformerBase & rTransformer, const OUString & rQName ); diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx index 9cae48db933d..a8cace1805ce 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.cxx @@ -34,7 +34,7 @@ using ::com::sun::star::uno::Reference; class XMLAxisOOoContext : public XMLPersElemContentTContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAxisOOoContext( XMLTransformerBase& rTransformer, const OUString& rQName ); diff --git a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx index c0a9dc7ae849..21be555dcc1a 100644 --- a/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx +++ b/xmloff/source/transform/ChartPlotAreaOOoTContext.hxx @@ -32,7 +32,7 @@ class XMLAxisContextVector : class XMLChartPlotAreaOOoTContext : public XMLProcAttrTransformerContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); explicit XMLChartPlotAreaOOoTContext( XMLTransformerBase & rTransformer, const OUString & rQName ); diff --git a/xmloff/source/transform/ControlOASISTContext.hxx b/xmloff/source/transform/ControlOASISTContext.hxx index 4d86cd785a18..4af9d225f0b1 100644 --- a/xmloff/source/transform/ControlOASISTContext.hxx +++ b/xmloff/source/transform/ControlOASISTContext.hxx @@ -28,7 +28,7 @@ class XMLControlOASISTransformerContext : public XMLTransformerContext sal_Bool m_bCreateControl; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLControlOASISTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/ControlOOoTContext.hxx b/xmloff/source/transform/ControlOOoTContext.hxx index 196b2f9aa014..2cd024e85649 100644 --- a/xmloff/source/transform/ControlOOoTContext.hxx +++ b/xmloff/source/transform/ControlOOoTContext.hxx @@ -30,7 +30,7 @@ class XMLControlOOoTransformerContext : public XMLTransformerContext OUString m_aElemQName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLControlOOoTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); diff --git a/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx index 6b777a2df81e..4f12919efac5 100644 --- a/xmloff/source/transform/CreateElemTContext.hxx +++ b/xmloff/source/transform/CreateElemTContext.hxx @@ -32,7 +32,7 @@ protected: sal_uInt16 GetActionMap() const { return m_nActionMap; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLCreateElemTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/DeepTContext.hxx b/xmloff/source/transform/DeepTContext.hxx index 7cf5e8d132b1..3fa76d5ae49a 100644 --- a/xmloff/source/transform/DeepTContext.hxx +++ b/xmloff/source/transform/DeepTContext.hxx @@ -31,7 +31,7 @@ class XMLPersElemContentTContext : public XMLPersAttrListTContext XMLTransformerContextVector m_aChildContexts; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // element content persistence only XMLPersElemContentTContext( XMLTransformerBase& rTransformer, diff --git a/xmloff/source/transform/DlgOASISTContext.hxx b/xmloff/source/transform/DlgOASISTContext.hxx index 9e4318c198cf..aef34f634f62 100644 --- a/xmloff/source/transform/DlgOASISTContext.hxx +++ b/xmloff/source/transform/DlgOASISTContext.hxx @@ -25,7 +25,7 @@ class XMLDlgOASISTransformerContext : public XMLTransformerContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDlgOASISTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); diff --git a/xmloff/source/transform/DocumentTContext.hxx b/xmloff/source/transform/DocumentTContext.hxx index e2bf9bb754b2..669f3e4a3c94 100644 --- a/xmloff/source/transform/DocumentTContext.hxx +++ b/xmloff/source/transform/DocumentTContext.hxx @@ -25,7 +25,7 @@ class XMLDocumentTransformerContext : public XMLTransformerContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // A contexts constructor does anything that is required if an element // starts. Namespace processing has been done already. diff --git a/xmloff/source/transform/EventOASISTContext.hxx b/xmloff/source/transform/EventOASISTContext.hxx index ad3a89d65f58..f238d619c21e 100644 --- a/xmloff/source/transform/EventOASISTContext.hxx +++ b/xmloff/source/transform/EventOASISTContext.hxx @@ -27,7 +27,7 @@ class XMLTransformerOASISEventMap_Impl; class XMLEventOASISTransformerContext : public XMLRenameElemTransformerContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLEventOASISTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); diff --git a/xmloff/source/transform/EventOOoTContext.hxx b/xmloff/source/transform/EventOOoTContext.hxx index 1e00369c3791..1aab3b03b2d1 100644 --- a/xmloff/source/transform/EventOOoTContext.hxx +++ b/xmloff/source/transform/EventOOoTContext.hxx @@ -29,7 +29,7 @@ class XMLEventOOoTransformerContext : public XMLPersElemContentTContext sal_Bool m_bPersistent; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLEventOOoTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/FlatTContext.hxx b/xmloff/source/transform/FlatTContext.hxx index bbb6d06e6512..f4ecb2107fc3 100644 --- a/xmloff/source/transform/FlatTContext.hxx +++ b/xmloff/source/transform/FlatTContext.hxx @@ -28,7 +28,7 @@ class XMLPersTextContentTContext : public XMLPersAttrListTContext OUString m_aCharacters; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // A contexts constructor does anything that is required if an element // starts. Namespace processing has been done already. diff --git a/xmloff/source/transform/FormPropOASISTContext.hxx b/xmloff/source/transform/FormPropOASISTContext.hxx index 7bef55c2e592..81c61425701b 100644 --- a/xmloff/source/transform/FormPropOASISTContext.hxx +++ b/xmloff/source/transform/FormPropOASISTContext.hxx @@ -31,7 +31,7 @@ class XMLFormPropOASISTransformerContext : ::xmloff::token::XMLTokenEnum GetValueType( const OUString& rValue ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFormPropOASISTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index 14609173197f..4dcba94478db 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -39,7 +39,7 @@ class XMLFormPropValueTContext_Impl : public XMLTransformerContext sal_Bool m_bIsVoid; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // element content persistence only XMLFormPropValueTContext_Impl( XMLTransformerBase& rTransformer, diff --git a/xmloff/source/transform/FormPropOOoTContext.hxx b/xmloff/source/transform/FormPropOOoTContext.hxx index 8eae5124beb1..b0811b9b93d2 100644 --- a/xmloff/source/transform/FormPropOOoTContext.hxx +++ b/xmloff/source/transform/FormPropOOoTContext.hxx @@ -42,7 +42,7 @@ class XMLFormPropOOoTransformerContext : public XMLTransformerContext sal_Bool m_bIsList; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFormPropOOoTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); diff --git a/xmloff/source/transform/FrameOASISTContext.hxx b/xmloff/source/transform/FrameOASISTContext.hxx index 57434018f4ed..61364dc47e42 100644 --- a/xmloff/source/transform/FrameOASISTContext.hxx +++ b/xmloff/source/transform/FrameOASISTContext.hxx @@ -37,7 +37,7 @@ class XMLFrameOASISTransformerContext : public XMLTransformerContext ::com::sun::star::xml::sax::XAttributeList >& rAttrList ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFrameOASISTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); diff --git a/xmloff/source/transform/FrameOOoTContext.hxx b/xmloff/source/transform/FrameOOoTContext.hxx index 75bb89370544..4c2b7a32c14a 100644 --- a/xmloff/source/transform/FrameOOoTContext.hxx +++ b/xmloff/source/transform/FrameOOoTContext.hxx @@ -27,7 +27,7 @@ class XMLFrameOOoTransformerContext : public XMLPersElemContentTContext OUString m_aElemQName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLFrameOOoTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); diff --git a/xmloff/source/transform/IgnoreTContext.hxx b/xmloff/source/transform/IgnoreTContext.hxx index cf7a8f1e912f..aa9a1ce0f965 100644 --- a/xmloff/source/transform/IgnoreTContext.hxx +++ b/xmloff/source/transform/IgnoreTContext.hxx @@ -31,7 +31,7 @@ class XMLIgnoreTransformerContext : public XMLTransformerContext sal_Bool m_bRecursiveUse; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // A contexts constructor does anything that is required if an element // starts. Namespace processing has been done already. diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index 65c312515676..107adc244390 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -33,7 +33,7 @@ using namespace ::xmloff::token; class XMLParagraphTransformerContext : public XMLTransformerContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLParagraphTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName ); @@ -107,7 +107,7 @@ void XMLParagraphTransformerContext::Characters( const OUString& rChars ) class XMLPersTextContentRNGTransformTContext : public XMLPersTextContentTContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLPersTextContentRNGTransformTContext( XMLTransformerBase& rTransformer, diff --git a/xmloff/source/transform/MergeElemTContext.hxx b/xmloff/source/transform/MergeElemTContext.hxx index 434b14a96426..a730830cea56 100644 --- a/xmloff/source/transform/MergeElemTContext.hxx +++ b/xmloff/source/transform/MergeElemTContext.hxx @@ -38,7 +38,7 @@ class XMLMergeElemTransformerContext : public XMLTransformerContext void ExportStartElement(); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLMergeElemTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/MetaTContext.hxx b/xmloff/source/transform/MetaTContext.hxx index b37b05fcc15f..ca7296a98f2e 100644 --- a/xmloff/source/transform/MetaTContext.hxx +++ b/xmloff/source/transform/MetaTContext.hxx @@ -34,7 +34,7 @@ class XMLMetaTransformerContext : public XMLTransformerContext XMLMetaContexts_Impl m_aContexts; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // A contexts constructor does anything that is required if an element // starts. Namespace processing has been done already. diff --git a/xmloff/source/transform/NotesTContext.hxx b/xmloff/source/transform/NotesTContext.hxx index be944343e21d..8d6cb0004191 100644 --- a/xmloff/source/transform/NotesTContext.hxx +++ b/xmloff/source/transform/NotesTContext.hxx @@ -29,7 +29,7 @@ class XMLNotesTransformerContext : public XMLPersElemContentTContext ::xmloff::token::XMLTokenEnum m_eTypeToken; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLNotesTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 9a9deb434d8f..9108deecd8af 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1088,7 +1088,7 @@ class XMLDocumentTransformerContext_Impl : public XMLTransformerContext OUString m_aOldClass; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLDocumentTransformerContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName ); @@ -1237,7 +1237,7 @@ class XMLBodyTransformerContext_Impl : public XMLTransformerContext OUString m_aClassQName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLBodyTransformerContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName ); @@ -1299,7 +1299,7 @@ void XMLBodyTransformerContext_Impl::EndElement() class XMLTabStopOOoTContext_Impl : public XMLPersElemContentTContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTabStopOOoTContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName ); @@ -1400,7 +1400,7 @@ class XMLTrackedChangesOOoTContext_Impl : public XMLTransformerContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTrackedChangesOOoTContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName, @@ -1476,7 +1476,7 @@ class XMLTableOOoTransformerContext_Impl : public XMLTransformerContext OUString m_aElemQName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTableOOoTransformerContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName ); diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index cfcea4f031f3..7e58a6ed474c 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1147,7 +1147,7 @@ class XMLTableTransformerContext_Impl : public XMLTransformerContext OUString m_aElemQName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTableTransformerContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName ); @@ -1249,7 +1249,7 @@ class XMLBodyOASISTransformerContext_Impl : public XMLTransformerContext sal_Bool m_bFirstChild; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLBodyOASISTransformerContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName ); @@ -1309,7 +1309,7 @@ void XMLBodyOASISTransformerContext_Impl::EndElement() class XMLTabStopOASISTContext_Impl : public XMLPersElemContentTContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTabStopOASISTContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName ); @@ -1444,7 +1444,7 @@ class XMLConfigItemTContext_Impl : public XMLTransformerContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLConfigItemTContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName ); @@ -1559,7 +1559,7 @@ class XMLTrackedChangesOASISTContext_Impl : public XMLTransformerContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTrackedChangesOASISTContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/PersAttrListTContext.hxx b/xmloff/source/transform/PersAttrListTContext.hxx index a31a57068e7e..921e5cbcffb6 100644 --- a/xmloff/source/transform/PersAttrListTContext.hxx +++ b/xmloff/source/transform/PersAttrListTContext.hxx @@ -37,7 +37,7 @@ protected: void SetExportQName( const OUString& r ) { m_aElemQName = r; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // A contexts constructor does anything that is required if an element // starts. Namespace processing has been done already. diff --git a/xmloff/source/transform/PersMixedContentTContext.cxx b/xmloff/source/transform/PersMixedContentTContext.cxx index ce78be5e7e96..1212a693b3b5 100644 --- a/xmloff/source/transform/PersMixedContentTContext.cxx +++ b/xmloff/source/transform/PersMixedContentTContext.cxx @@ -28,7 +28,7 @@ class XMLPersTextTContext_Impl : public XMLTransformerContext OUString m_aCharacters; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLPersTextTContext_Impl( XMLTransformerBase& rTransformer, const OUString& rChars ); diff --git a/xmloff/source/transform/PersMixedContentTContext.hxx b/xmloff/source/transform/PersMixedContentTContext.hxx index 54f0902eceb4..d4aee30f9b3d 100644 --- a/xmloff/source/transform/PersMixedContentTContext.hxx +++ b/xmloff/source/transform/PersMixedContentTContext.hxx @@ -28,7 +28,7 @@ class XMLPersMixedContentTContext : public XMLPersElemContentTContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // mixed content persistence only XMLPersMixedContentTContext( XMLTransformerBase& rTransformer, diff --git a/xmloff/source/transform/ProcAddAttrTContext.hxx b/xmloff/source/transform/ProcAddAttrTContext.hxx index 91ac323b11e7..650982a29588 100644 --- a/xmloff/source/transform/ProcAddAttrTContext.hxx +++ b/xmloff/source/transform/ProcAddAttrTContext.hxx @@ -28,7 +28,7 @@ class XMLProcAddAttrTransformerContext : public XMLProcAttrTransformerContext OUString m_aAttrValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLProcAddAttrTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/ProcAttrTContext.hxx b/xmloff/source/transform/ProcAttrTContext.hxx index 32daf09142cf..b89c681b5e49 100644 --- a/xmloff/source/transform/ProcAttrTContext.hxx +++ b/xmloff/source/transform/ProcAttrTContext.hxx @@ -34,7 +34,7 @@ protected: sal_uInt16 GetActionMap() const { return m_nActionMap; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLProcAttrTransformerContext( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/RenameElemTContext.hxx b/xmloff/source/transform/RenameElemTContext.hxx index e1191ecbab62..81e2c8fa6ad0 100644 --- a/xmloff/source/transform/RenameElemTContext.hxx +++ b/xmloff/source/transform/RenameElemTContext.hxx @@ -31,7 +31,7 @@ class XMLRenameElemTransformerContext : public XMLTransformerContext OUString m_aAttrValue; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); // The following consutructor renames the element names "rQName" // to bPrefix/eToken diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 3d2ed2f98967..b78ea0134f27 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -77,7 +77,7 @@ public: XMLTransformerContext::SetQName( rQName ); }; - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLPropertiesTContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/StyleOASISTContext.hxx b/xmloff/source/transform/StyleOASISTContext.hxx index d3e528d8f2a3..883debcc4961 100644 --- a/xmloff/source/transform/StyleOASISTContext.hxx +++ b/xmloff/source/transform/StyleOASISTContext.hxx @@ -35,7 +35,7 @@ class XMLStyleOASISTContext : public XMLPersElemContentTContext OUString m_aStyleFamily; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLStyleOASISTContext( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index c28643171464..908da3556b0d 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -148,7 +148,7 @@ class XMLTypedPropertiesOOoTContext_Impl : public XMLPersElemContentTContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLTypedPropertiesOOoTContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName ); @@ -236,7 +236,7 @@ class XMLPropertiesOOoTContext_Impl : public XMLTransformerContext public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLPropertiesOOoTContext_Impl( XMLTransformerBase& rTransformer, const OUString& rQName, diff --git a/xmloff/source/transform/StyleOOoTContext.hxx b/xmloff/source/transform/StyleOOoTContext.hxx index 7eb9a3d18427..7d28206e2dda 100644 --- a/xmloff/source/transform/StyleOOoTContext.hxx +++ b/xmloff/source/transform/StyleOOoTContext.hxx @@ -34,7 +34,7 @@ class XMLStyleOOoTContext : public XMLPersElemContentTContext sal_Bool m_bPersistent; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLStyleOOoTContext( XMLTransformerBase& rTransformer, const OUString& rQName, |