Split TYPEINFO into plain and TYPEINFO_OVERRIDE

...where the latter contains SAL_OVERRIDE annotations

Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1

42 files changed, 68 insertions, 68 deletions

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();