5th step to remove tools/rtti.hxx

tools/rtti.hxx removed
completed the interface of some Sdr.*  Items
and removed pseudo items

Change-Id: I0cdcd01494be35b97a27d5985aa908affa96048a
Reviewed-on: https://gerrit.libreoffice.org/19837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>

47 files changed, 9 insertions, 81 deletions

diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 58f42512ca20..3d25df8ba2fc 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -121,7 +121,6 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
         virtual const SwRect GetObjBoundRect() const override;
 
     public:
-        TYPEINFO_OVERRIDE();
 
         SwAnchoredDrawObject();
         virtual ~SwAnchoredDrawObject();
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index c02f0a20706c..803a3986ec1e 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_INC_ANCHOREDOBJECT_HXX
 #define INCLUDED_SW_INC_ANCHOREDOBJECT_HXX
 
-#include <tools/rtti.hxx>
 #include <swtypes.hxx>
 #include <swrect.hxx>
 #include <libxml/xmlwriter.h>
@@ -208,7 +207,6 @@ class SW_DLLPUBLIC SwAnchoredObject
 
         virtual const SwRect GetObjBoundRect() const = 0;
     public:
-        TYPEINFO();
 
         virtual ~SwAnchoredObject();
 
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index dcd6dc99ccdd..8032bc9c1d6d 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SW_INC_CALBCK_HXX
 #define INCLUDED_SW_INC_CALBCK_HXX
 
-#include <tools/rtti.hxx>
 #include "swdllapi.h"
 #include <boost/noncopyable.hpp>
 #include <ring.hxx>
@@ -131,8 +130,6 @@ public:
     const SwModify* GetRegisteredIn() const { return pRegisteredIn; }
     SwModify* GetRegisteredIn() { return pRegisteredIn; }
 
-    // needed for class SwClientIter
-    TYPEINFO();
 
     // get information about attribute
     virtual bool GetInfo( SfxPoolItem& ) const { return true; }
@@ -300,7 +297,7 @@ public:
             return static_cast<TElementType*>(Sync());
         while(GetRightOfPos())
             m_pPosition = GetRightOfPos();
-        if(static_cast<SwClient*>(m_pPosition)->IsA(TYPE(TElementType)))
+        if(dynamic_cast<const TElementType *>(static_cast<SwClient*>(m_pPosition)) != nullptr)
             return static_cast<TElementType*>(Sync());
         return Previous();
     }
@@ -308,14 +305,14 @@ public:
     {
         if(!IsChanged())
             m_pPosition = GetRightOfPos();
-        while(m_pPosition && !static_cast<SwClient*>(m_pPosition)->IsA( TYPE(TElementType) ) )
+        while(m_pPosition && dynamic_cast<const TElementType *>(static_cast<SwClient*>(m_pPosition)) == nullptr)
             m_pPosition = GetRightOfPos();
         return static_cast<TElementType*>(Sync());
     }
     TElementType* Previous()
     {
         m_pPosition = GetLeftOfPos();
-        while(m_pPosition && !static_cast<SwClient*>(m_pPosition)->IsA( TYPE(TElementType) ) )
+        while(m_pPosition && dynamic_cast<const TElementType *>(static_cast<SwClient*>(m_pPosition)) == nullptr)
             m_pPosition = GetLeftOfPos();
         return static_cast<TElementType*>(Sync());
     }
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 7a4d27ce2191..9c9c64d39a2f 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -56,7 +56,6 @@ public:
     SwCondCollItem(sal_uInt16 nWhich = FN_COND_COLL);
     virtual ~SwCondCollItem();
 
-                                TYPEINFO_OVERRIDE();
 
     virtual SfxPoolItem*        Clone( SfxItemPool *pPool = nullptr ) const override;
     virtual bool                operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index a9d029924a01..7d5ad9c27479 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -36,7 +36,6 @@ class SW_DLLPUBLIC SwCharFormat : public SwFormat
     {}
 
 public:
-    TYPEINFO_OVERRIDE();    // already in base class Client
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 6de3f8a82452..124e5de8a4f2 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -23,7 +23,6 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/link.hxx>
-#include <tools/rtti.hxx>
 #include <vcl/keycod.hxx>
 
 #include <IShellCursorSupplier.hxx>
@@ -299,7 +298,6 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
 
 public:
-    TYPEINFO_OVERRIDE();
     SwCrsrShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr );
     // disguised copy constructor
     SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pWin );
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 1b3d20bb17b4..c565b66dee82 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -102,7 +102,6 @@ protected:
     void SetInDTOR();
 
 public:
-    TYPEINFO_OVERRIDE();
 
     /// For reader. Only the connection is created.
     SwContact( SwFrameFormat *pToRegisterIn );
@@ -195,7 +194,6 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     /// Creates DrawObject and registers it with the Model.
     SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn, SdrModel* pMod );
@@ -241,7 +239,6 @@ class SwDrawVirtObj : public SdrVirtObj
         virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override;
 
    public:
-        TYPEINFO_OVERRIDE();
 
         SwDrawVirtObj( SdrObject&       _rNewObj,
                        SwDrawContact&   _rDrawContact );
@@ -388,7 +385,6 @@ class SwDrawContact : public SwContact
         virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override;
 
     public:
-        TYPEINFO_OVERRIDE();
 
         SwDrawContact( SwFrameFormat *pToRegisterIn, SdrObject *pObj );
         virtual ~SwDrawContact();
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index bf20d9ba2015..bd9cf5419751 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -158,7 +158,6 @@ public:
     /// but we implement this ourselves.
     SFX_DECL_INTERFACE(SW_DOCSHELL)
     SFX_DECL_OBJECTFACTORY()
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 6e6ad6b86254..acd164809316 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -49,7 +49,6 @@ private:
     SwFormatCharFormat & operator= (const SwFormatCharFormat &) = delete;
 public:
 
-    TYPEINFO_OVERRIDE();
 
     /// "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 6ea8b19986ac..da9420ff973a 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -248,7 +248,6 @@ public:
 
     using SwEditShell::Insert;
 
-    TYPEINFO_OVERRIDE();
     SwFEShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr );
     SwFEShell( SwEditShell& rShell, vcl::Window *pWin );
     virtual ~SwFEShell();
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index f72adf0a5411..c736476060fa 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -40,7 +40,6 @@ private:
     SwFormatAutoFormat & operator= (const SwFormatAutoFormat &) = delete;
 public:
 
-    TYPEINFO_OVERRIDE();
 
     /// "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 7388af608a00..0ac5922a24a3 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -91,7 +91,6 @@ protected:
 
 public:
 
-    TYPEINFO_OVERRIDE(); ///< Already in base class Client.
 
     inline void SetNextTextFormatColl(SwTextFormatColl& rNext);
     SwTextFormatColl& GetNextTextFormatColl() const { return *mpNextTextFormatColl; }
@@ -153,7 +152,6 @@ protected:
     {}
 
 public:
-    TYPEINFO_OVERRIDE(); ///< Already in base class Client.
 };
 
 // FEATURE::CONDCOLL
@@ -184,7 +182,6 @@ class SW_DLLPUBLIC SwCollCondition : public SwClient
     } m_aSubCondition;
 
 public:
-    TYPEINFO_OVERRIDE(); ///< Already in base class Client.
 
     SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
                     sal_uLong nSubCond = 0 );
@@ -232,7 +229,6 @@ protected:
     {}
 
 public:
-    TYPEINFO_OVERRIDE(); ///< Already in base class Client.
 
     virtual ~SwConditionTextFormatColl();
 
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 4aba5ee50cab..1db9bbb6f749 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -57,7 +57,6 @@ protected:
     virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ) override;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     /// Single argument constructors shall be explicit.
     explicit SwFormatField( const SwField &rField );
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index a23e0f3e7501..031ef84df697 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -32,7 +32,6 @@ public:
     SwFormatFollowTextFlow( bool bFlag = false )
         : SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {}
 
-    TYPEINFO_OVERRIDE();
 
     /// "pure virtual methods" of SfxPoolItem
     virtual SfxPoolItem*    Clone( SfxItemPool *pPool = nullptr ) const override;
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index e0c9a513c081..c78cb01581d2 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -42,7 +42,6 @@ public:
     virtual ~SwFormatHeader();
     SwFormatHeader& operator=( const SwFormatHeader &rCpy );
 
-    TYPEINFO_OVERRIDE();
 
     /// "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const override;
@@ -74,7 +73,6 @@ public:
     virtual ~SwFormatFooter();
     SwFormatFooter& operator=( const SwFormatFooter &rCpy );
 
-    TYPEINFO_OVERRIDE();
 
     /// "pure virtual methods" of SfxPoolItem
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index aa6ca6f424e9..7515b85f2c42 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -48,7 +48,7 @@ public:
     SwFormatINetFormat();                     ///< For TypeInfo.
     virtual ~SwFormatINetFormat();
 
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 7d81094d3c9a..64f0f9a6f6d9 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -35,7 +35,7 @@ public:
     SwFormatLineNumber();
     virtual ~SwFormatLineNumber();
 
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 112d7fe343e2..b18ba45894fa 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -36,7 +36,6 @@ class SW_DLLPUBLIC SwFormatVertOrient: public SfxPoolItem
     sal_Int16       m_eOrient;
     sal_Int16       m_eRelation;
 public:
-    TYPEINFO_OVERRIDE();
     SwFormatVertOrient( SwTwips nY = 0, sal_Int16 eVert = css::text::VertOrientation::NONE,
                      sal_Int16 eRel = css::text::RelOrientation::PRINT_AREA );
     inline SwFormatVertOrient &operator=( const SwFormatVertOrient &rCpy );
@@ -73,7 +72,6 @@ class SW_DLLPUBLIC SwFormatHoriOrient: public SfxPoolItem
     sal_Int16       m_eRelation;
     bool            m_bPosToggle : 1; ///< Flip position on even pages.
 public:
-    TYPEINFO_OVERRIDE();
     SwFormatHoriOrient( SwTwips nX = 0, sal_Int16 eHori = css::text::HoriOrientation::NONE,
         sal_Int16 eRel = css::text::RelOrientation::PRINT_AREA, bool bPos = false );
     inline SwFormatHoriOrient &operator=( const SwFormatHoriOrient &rCpy );
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index c07a2182b9ef..63018fda786f 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -52,7 +52,6 @@ public:
     SwFormatPageDesc &operator=( const SwFormatPageDesc &rCpy );
     virtual ~SwFormatPageDesc();
 
-    TYPEINFO_OVERRIDE();
 
     /// "Pure virtual methods" of SfxPoolItem.
     virtual bool            operator==( const SfxPoolItem& ) const override;
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index d60d9c829c66..ca67be21402d 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -30,7 +30,6 @@ private:
     sal_Int16 mnWrapInfluenceOnPosition;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     // #i35017# - constant name has changed
     SwFormatWrapInfluenceOnObjPos(
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index fe0ddfd2ec55..63d41185a8cf 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -70,7 +70,6 @@ protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override;
 
 public:
-    TYPEINFO_OVERRIDE();     ///< Already in base class Client.
 
     virtual ~SwFormat();
     SwFormat &operator=(const SwFormat&);
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 3e881645a6f9..717f3702995a 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -65,7 +65,6 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override;
 
 public:
-    TYPEINFO_OVERRIDE();     ///< Already in base class Client.
     virtual ~SwFrameFormat();
 
     /// Destroys all Frms in aDepend (Frms are identified via dynamic_cast).
@@ -169,7 +168,6 @@ protected:
     {}
 
 public:
-    TYPEINFO_OVERRIDE();
     virtual ~SwFlyFrameFormat();
 
     /// Creates the views.
@@ -265,7 +263,6 @@ protected:
     {}
 
 public:
-    TYPEINFO_OVERRIDE();
     virtual ~SwDrawFrameFormat();
 
     /** DrawObjects are removed from the arrays at the layout.
diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx
index 09f933afd0c5..2d35d10ab96f 100644
--- a/sw/inc/globdoc.hxx
+++ b/sw/inc/globdoc.hxx
@@ -26,7 +26,6 @@ class SwGlobalDocShell : public SwDocShell
 public:
 
     SFX_DECL_OBJECTFACTORY();
-    TYPEINFO_OVERRIDE();
 
     SwGlobalDocShell(SfxObjectCreateMode eMode = SfxObjectCreateMode::EMBEDDED);
     virtual ~SwGlobalDocShell();
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 9b16b4b44c2c..d4aa180dcddc 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -82,7 +82,6 @@ public:
 class SW_DLLPUBLIC SwCropGrf : public SvxGrfCrop
 {
 public:
-    TYPEINFO_OVERRIDE();
     SwCropGrf();
     SwCropGrf(  sal_Int32 nLeft,    sal_Int32 nRight,
                 sal_Int32 nTop,     sal_Int32 nBottom );
@@ -195,7 +194,6 @@ class SW_DLLPUBLIC SwGammaGrf : public SfxPoolItem
 {
     double nValue;
 public:
-    TYPEINFO_OVERRIDE();
     SwGammaGrf() : SfxPoolItem( RES_GRFATR_GAMMA ), nValue( 1.0 )
     {}
 
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index d7b6fef945d6..a1400553c73e 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_INC_INDEX_HXX
 
 #include <sal/types.h>
-#include <tools/rtti.hxx>
 #include <swdllapi.h>
 
 #include <iostream>
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 24a6bea2a96a..bf0a17494684 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -737,7 +737,6 @@ public:
 
     bool IsHidden() const;
 
-    TYPEINFO_OVERRIDE(); // fuer rtti
 
     /// override SwIndexReg
     virtual void Update(
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index b7e973fb321a..bcadbfee7408 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -379,7 +379,6 @@ protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
 
 public:
-    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 2fa8fbc52153..65dcacac9abd 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -59,7 +59,7 @@ class SW_DLLPUBLIC SwFormatDrop: public SfxPoolItem, public SwClient
     sal_uInt8  nChars;          ///< Character count.
     bool   bWholeWord;      ///< First word with initials.
 public:
-    TYPEINFO_OVERRIDE(); ///< Already in base class SwClient.
+    static SfxPoolItem* CreateDefault();
 
     SwFormatDrop();
     virtual ~SwFormatDrop();
@@ -113,7 +113,7 @@ public:
 class SwRegisterItem : public SfxBoolItem
 {
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     inline SwRegisterItem( const bool bRegister = false );
 
@@ -143,7 +143,7 @@ inline SwRegisterItem& SwRegisterItem::operator=(
 class SW_DLLPUBLIC SwNumRuleItem : public SfxStringItem
 {
 public:
-    TYPEINFO_OVERRIDE();
+    static SfxPoolItem* CreateDefault();
 
     SwNumRuleItem()
         : SfxStringItem( RES_PARATR_NUMRULE, OUString() ) {}
@@ -175,7 +175,6 @@ public:
 class SwParaConnectBorderItem : public SfxBoolItem
 {
 public:
-    TYPEINFO_OVERRIDE();
 
     inline SwParaConnectBorderItem( const bool bConnect = true );
 
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index bcc8c963b01a..d5f843be6c24 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -1026,7 +1026,6 @@
 #include <tools/resary.hxx>
 #include <tools/resid.hxx>
 #include <tools/resmgr.hxx>
-#include <tools/rtti.hxx>
 #include <tools/stream.hxx>
 #include <tools/time.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index f3581ce9968b..793b4147f91d 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Sequence.h>
 
-#include <tools/rtti.hxx>
 #include <tools/ref.hxx>
 #include <svl/smplhint.hxx>
 #include <sfx2/lnkbase.hxx>
@@ -159,7 +158,6 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
 
 public:
-    TYPEINFO_OVERRIDE();     // rtti
 
     SwSection(SectionType const eType, OUString const& rName,
                 SwSectionFormat & rFormat);
@@ -292,7 +290,6 @@ protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
 
 public:
-    TYPEINFO_OVERRIDE();     // Already contained in base class client.
     virtual ~SwSectionFormat();
 
     // Deletes all Frms in aDepend (Frms are recognized via dynamic_cast).
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 602c5919af06..e5b292a997cf 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -35,7 +35,6 @@ protected:
     SwBaseLink() {}
 
 public:
-    TYPEINFO_OVERRIDE();
 
     SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = nullptr )
         : ::sfx2::SvBaseLink( nMode, nFormat ), pContentNode( pNode ),
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index 808a2c98ddfa..73eeb5b2c519 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.hxx
@@ -27,7 +27,6 @@ class SwDDETable : public SwTable
 {
     SwDepend aDepend;
 public:
-    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 9ccb175bb1ab..66cb66b8ff79 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -118,7 +118,6 @@ public:
     // public Data - used for internal Clipboard / Drag & Drop / XSelection
     SwTransferable  *m_pDragDrop, *m_pXSelection;
 
-    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SW_INTERFACE_MODULE)
 
 private:
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index ee21c78430ef..0f1b4a8ec150 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -135,7 +135,6 @@ public:
         SEARCH_COL  // column selection
     };
 
-    TYPEINFO_OVERRIDE();
 
     // single argument ctors shall be explicit.
     explicit SwTable( SwTableFormat* );
@@ -348,7 +347,6 @@ class SW_DLLPUBLIC SwTableLine: public SwClient     // Client of FrameFormat.
     SwTableBox *m_pUpper;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     SwTableLine() : m_pUpper(nullptr) {}
 
@@ -408,7 +406,6 @@ class SW_DLLPUBLIC SwTableBox: public SwClient      //Client of FrameFormat.
     static SwTableBoxFormat* CheckBoxFormat( SwTableBoxFormat* );
 
 public:
-    TYPEINFO_OVERRIDE();
 
     SwTableBox();
 
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 6ace791b7e8b..999b7c5fefe2 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -38,7 +38,6 @@ protected:
     {}
 
 public:
-    TYPEINFO_OVERRIDE();     // Already in base class Content.
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwTableFormat)
 
@@ -60,7 +59,6 @@ protected:
     {}
 
 public:
-    TYPEINFO_OVERRIDE();     // Already in base class Content.
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFormat)
 
@@ -85,7 +83,6 @@ protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override;
 
 public:
-    TYPEINFO_OVERRIDE();     // Already in base class Content.
 
     DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFormat)
 
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index fde50c3519a7..89f117b22794 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -83,7 +83,6 @@ protected:
    virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
 
 public:
-    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 a31cb125cdc9..2712a7c7264d 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -78,7 +78,6 @@ protected:
 public:
     SwTextRuby( SwFormatRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
     virtual ~SwTextRuby();
-    TYPEINFO_OVERRIDE();
 
     virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
 
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index e16b36ec944a..6f9dd900a772 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -38,7 +38,6 @@ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
 public:
     SwTextINetFormat( SwFormatINetFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
     virtual ~SwTextINetFormat();
-    TYPEINFO_OVERRIDE();
 
     virtual bool GetInfo( SfxPoolItem& rInfo ) const override;
 
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 298c9ca69941..f07aa30f3c74 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -23,7 +23,7 @@
 #include <memory>
 
 #include <svl/undo.hxx>
-
+#include <tools/solar.h>
 #include <SwRewriter.hxx>
 #include <swundo.hxx>
 
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 661b9acc5917..8a14e748f377 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -227,7 +227,6 @@ protected:
 public:
     SwXShape(css::uno::Reference< css::uno::XInterface > & xShape);
 
-    TYPEINFO_OVERRIDE();
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 4a3eb3718d79..b5822dd92c8b 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -93,7 +93,6 @@ public:
     //XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
-    TYPEINFO_OVERRIDE();
 
     //XNamed
     virtual OUString SAL_CALL getName() throw( css::uno::RuntimeException, std::exception ) override;
@@ -360,7 +359,6 @@ class SwXOLEListener : public cppu::WeakImplHelper
 public:
     SwXOLEListener(SwFormat& rOLEFormat, css::uno::Reference< css::frame::XModel > xOLE);
     virtual ~SwXOLEListener();
-    TYPEINFO_OVERRIDE();
 
 // css::lang::XEventListener
     virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index 2c0cadfc0522..30e03ddaec71 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -75,7 +75,6 @@ public:
     SwXRedline(SwRangeRedline& rRedline, SwDoc& rDoc);
     virtual ~SwXRedline();
 
-    TYPEINFO_OVERRIDE();
 
     virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL acquire(  ) throw() override {OWeakObject::acquire();}
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 5f2b64d4a440..8aabdff3c082 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -206,7 +206,6 @@ public:
 
     virtual ~SwXStyle();
 
-    TYPEINFO_OVERRIDE();
 
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index c5fc850c94cc..73770e381484 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -96,7 +96,6 @@ public:
     SwXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, size_t nPos = NOTFOUND);
     SwXCell(SwFrameFormat* pTableFormat, const SwStartNode& rStartNode); // XML import interface
 
-    TYPEINFO_OVERRIDE();
 
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
@@ -178,7 +177,6 @@ protected:
 public:
     SwXTextTableRow(SwFrameFormat* pFormat, SwTableLine* pLine);
 
-    TYPEINFO_OVERRIDE();
 
     //XPropertySet
     virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException, std::exception) override;
@@ -336,7 +334,6 @@ public:
     //XUnoTunnel
     virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
-    TYPEINFO_OVERRIDE();
 
     //XTextTable
     virtual void SAL_CALL initialize( sal_Int32 nRows, sal_Int32 nColumns ) throw(css::uno::RuntimeException, std::exception) override;
@@ -474,7 +471,6 @@ public:
     virtual ~SwXCellRange() {};
     std::vector< css::uno::Reference< css::table::XCell > > GetCells();
 
-    TYPEINFO_OVERRIDE();
 
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
@@ -562,7 +558,6 @@ protected:
 public:
     SwXTableRows(SwFrameFormat& rFrameFormat);
 
-    TYPEINFO_OVERRIDE();
 
     //XIndexAccess
     virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
@@ -603,7 +598,6 @@ protected:
 public:
     SwXTableColumns(SwFrameFormat& rFrameFormat);
 
-    TYPEINFO_OVERRIDE();
 
     //XIndexAccess
     virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception ) override;
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 359f2e80d8e3..873b31127e74 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -368,7 +368,6 @@ protected:
 public:
     SFX_DECL_VIEWFACTORY(SwView);
     SFX_DECL_INTERFACE(SW_VIEWSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 61b562b7a753..8b8875b620eb 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/embed/XClassifiedObject.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <tools/rtti.hxx>
 #include "swdllapi.h"
 #include <swtypes.hxx>
 #include <ring.hxx>
@@ -197,7 +196,6 @@ protected:
     bool mbOutputToWindow;
 
 public:
-    TYPEINFO();
 
           SwViewShellImp *Imp() { return mpImp; }
     const SwViewShellImp *Imp() const { return mpImp; }
diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx
index 411b0082b535..286c16ddade0 100644
--- a/sw/inc/wdocsh.hxx
+++ b/sw/inc/wdocsh.hxx
@@ -29,7 +29,6 @@ public:
     // But implement yourself.
     SFX_DECL_INTERFACE(SW_WEBDOCSHELL)
     SFX_DECL_OBJECTFACTORY();
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.