Split TYPEINFO into plain and TYPEINFO_OVERRIDE

...where the latter contains SAL_OVERRIDE annotations

Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1

20 files changed, 74 insertions, 74 deletions

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,