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>

108 files changed, 15 insertions, 178 deletions

diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index d7ec7cd2f8a4..e98cd5cac8ca 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -26,7 +26,6 @@
 
 sw::LegacyModifyHint::~LegacyModifyHint() {}
 
-TYPEINIT0( SwClient );
 
 SwClient::~SwClient()
 {
diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx b/sw/source/core/attr/fmtfollowtextflow.cxx
index 7cd973a47fb8..b30df30e6e45 100644
--- a/sw/source/core/attr/fmtfollowtextflow.cxx
+++ b/sw/source/core/attr/fmtfollowtextflow.cxx
@@ -19,7 +19,6 @@
 
 #include <fmtfollowtextflow.hxx>
 
-TYPEINIT1(SwFormatFollowTextFlow, SfxBoolItem);
 
 SfxPoolItem*    SwFormatFollowTextFlow::Clone( SfxItemPool * ) const
 {
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index 6ee45e2c913e..dc27d270926e 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -25,7 +25,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-TYPEINIT1(SwFormatWrapInfluenceOnObjPos, SfxPoolItem);
 
 SwFormatWrapInfluenceOnObjPos::SwFormatWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
     : SfxPoolItem( RES_WRAP_INFLUENCE_ON_OBJPOS ),
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 580b2c623ecd..1c86b77d92e2 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -38,7 +38,6 @@
 
 using namespace com::sun::star;
 
-TYPEINIT1( SwFormat, SwClient );
 
 SwFormat::SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
               const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm,
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 7ba3d9fab95e..6709941a4fb2 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -69,7 +69,6 @@
 using namespace com::sun::star;
 using namespace util;
 
-TYPEINIT2(SwCrsrShell,SwViewShell,SwModify);
 
 /**
  * Delete all overlapping Cursors from a Cursor ring.
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 795c037227cb..3508b079f9ce 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -77,7 +77,6 @@
 
 using namespace ::com::sun::star;
 
-TYPEINIT2( SwTOXBaseSection, SwTOXBase, SwSection );    // for RTTI
 
 sal_uInt16 SwDoc::GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const
 {
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 5a677db5fc44..e436506425c9 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -35,10 +35,6 @@
 #include <calbck.hxx>
 #include <svl/intitem.hxx>
 
-TYPEINIT1( SwTextFormatColl, SwFormatColl );
-TYPEINIT1( SwGrfFormatColl, SwFormatColl );
-TYPEINIT1( SwConditionTextFormatColl, SwTextFormatColl );
-TYPEINIT1( SwCollCondition, SwClient );
 
 namespace TextFormatCollFunc
 {
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 6b9ef815b1a2..9c0612cfdbdd 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -70,7 +70,6 @@
 
 using namespace ::com::sun::star::i18n;
 
-TYPEINIT1( SwContentNode, SwModify )
 
 /*
  * Some local helper functions for the attribute set handle of a content node.
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 698cf64873f9..e7214fee20b8 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -92,8 +92,6 @@ public:
     }
 };
 
-TYPEINIT1(SwSectionFormat,SwFrameFormat );
-TYPEINIT1(SwSection,SwClient );
 
 SwSectionData::SwSectionData(SectionType const eType, OUString const& rName)
     : m_eType(eType)
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index d96b397df9a6..852db82278b9 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -57,7 +57,6 @@ using namespace com::sun::star;
 
 static bool SetGrfFlySize( const Size& rGrfSz, SwGrfNode* pGrfNd, const Size &rOrigGrfSize );
 
-TYPEINIT1( SwBaseLink, ::sfx2::SvBaseLink );
 
 static void lcl_CallModify( SwGrfNode& rGrfNd, SfxPoolItem& rItem )
 {
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index b0087471967b..c94781b33110 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -72,9 +72,6 @@
 
 using namespace ::com::sun::star;
 
-TYPEINIT1( SwContact, SwClient )
-TYPEINIT1( SwFlyDrawContact, SwContact )
-TYPEINIT1( SwDrawContact, SwContact )
 
 void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor )
 {
@@ -2148,7 +2145,6 @@ namespace sdr
 } // end of namespace sdr
 
 /// implementation of class <SwDrawVirtObj>
-TYPEINIT1(SwDrawVirtObj,SdrVirtObj);
 
 sdr::contact::ViewContact* SwDrawVirtObj::CreateObjectSpecificViewContact()
 {
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 67ce43953a14..3b9cf03713c0 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -64,8 +64,6 @@ using namespace ::com::sun::star;
 
 static bool bInResize = false;
 
-TYPEINIT1( SwFlyDrawObj, SdrObject )
-TYPEINIT1( SwVirtFlyDrawObj, SdrVirtObj )
 
 namespace sdr
 {
diff --git a/sw/source/core/fields/ddetbl.cxx b/sw/source/core/fields/ddetbl.cxx
index fe5df4207a42..6c356ae47be7 100644
--- a/sw/source/core/fields/ddetbl.cxx
+++ b/sw/source/core/fields/ddetbl.cxx
@@ -33,7 +33,6 @@
 #include <swtblfmt.hxx>
 #include <fieldhint.hxx>
 
-TYPEINIT1( SwDDETable, SwTable );
 
 /// Ctor moves all lines/boxes from a SwTable into itself.
 /// Afterwards the SwTable is empty and must be deleted.
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 21c01eba28e6..a5c04992d31e 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -52,7 +52,6 @@
 
 using namespace com::sun::star;
 
-TYPEINIT1(SwFEShell,SwEditShell)
 
 void SwFEShell::EndAllActionAndCall()
 {
diff --git a/sw/source/core/graphic/grfatr.cxx b/sw/source/core/graphic/grfatr.cxx
index 855e9b7a9d79..71cf98283d6b 100644
--- a/sw/source/core/graphic/grfatr.cxx
+++ b/sw/source/core/graphic/grfatr.cxx
@@ -40,8 +40,6 @@
 
 using namespace ::com::sun::star;
 
-TYPEINIT1_AUTOFACTORY(SwCropGrf, SfxPoolItem)
-TYPEINIT1_AUTOFACTORY(SwGammaGrf, SfxPoolItem)
 
 SfxPoolItem* SwMirrorGrf::Clone( SfxItemPool* ) const
 {
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index 92f574ba0a87..e534b4d05f93 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -67,7 +67,6 @@ protected:
     virtual ~SwContentFrm();
 
 public:
-    TYPEINFO_OVERRIDE(); // already in base class
 
     virtual void Cut() override;
     virtual void Paste( SwFrm* pParent, SwFrm* pSibling = nullptr ) override;
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 36e9c7747721..c21fa1ad1d23 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -45,7 +45,6 @@ protected:
     virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override;
 
 public:
-    TYPEINFO_OVERRIDE();
 
     SwFlyDrawObj();
     virtual ~SwFlyDrawObj();
@@ -78,7 +77,6 @@ public:
     basegfx::B2DRange getOuterBound() const;
     basegfx::B2DRange getInnerBound() const;
 
-    TYPEINFO_OVERRIDE();
 
     SwVirtFlyDrawObj(SdrObject& rNew, SwFlyFrm* pFly);
     virtual ~SwVirtFlyDrawObj();
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 2b084ede4ebd..bc9c543e1519 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -77,7 +77,6 @@ public:
     void Update( const SfxItemSet* pAttr = nullptr,
                  const bool        _bNewTOX = false );
     void UpdatePageNum();               // insert page numbering
-    TYPEINFO_OVERRIDE();                         // for rtti
 
     const SwTOXSortTabBases& GetTOXSortTabBases() const { return aSortArr; }
 
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index cbd417c01dc0..dbe0e03812b3 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -153,7 +153,6 @@ protected:
 
 public:
     // #i26791#
-    TYPEINFO_OVERRIDE();
 
     // get client information
     virtual bool GetInfo( SfxPoolItem& ) const override;
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 2a38939f9de5..0deb6b7b96fa 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -69,7 +69,6 @@ protected:
 
 public:
     // #i28701#
-    TYPEINFO_OVERRIDE();
 
     virtual void MakeAll(vcl::RenderContext* pRenderContext) override;
 
@@ -126,7 +125,6 @@ class SwFlyLayFrm : public SwFlyFreeFrm
 {
 public:
     // #i28701#
-    TYPEINFO_OVERRIDE();
 
     SwFlyLayFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
 
@@ -153,7 +151,6 @@ protected:
 
 public:
     // #i28701#
-    TYPEINFO_OVERRIDE();
 
     SwFlyAtCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
 
@@ -191,7 +188,6 @@ protected:
 
 public:
     // #i28701#
-    TYPEINFO_OVERRIDE();
 
     SwFlyInCntFrm( SwFlyFrameFormat*, SwFrm*, SwFrm *pAnchor );
 
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 42b1a443661d..9fcc0a9c9870 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -423,7 +423,6 @@ public:
         return css::uno::Sequence< css::style::TabStop >();
     }
 
-    TYPEINFO_OVERRIDE(); // already in base class
 
     sal_uInt16 GetType() const { return mnFrmType; }
 
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index 7a422eabbecf..972c0daff1a8 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -64,7 +64,6 @@ protected:
 
 public:
     // --> #i28701#
-    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 9c565ddc52d9..79b4d78a8a17 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -374,7 +374,6 @@ public:
     SwTwips HangingMargin() const;
 
     // RTTI
-    TYPEINFO_OVERRIDE();
     DECL_FIXEDMEMPOOL_NEWDEL(SwTextFrm)
 
     // Locking
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 568665073748..2d09ae61a509 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -190,7 +190,6 @@ bool SwObjPosOscillationControl::OscillationDetected()
     return bOscillationDetected;
 }
 
-TYPEINIT1(SwAnchoredDrawObject,SwAnchoredObject);
 
 SwAnchoredDrawObject::SwAnchoredDrawObject() :
     SwAnchoredObject(),
diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx
index b6d6553b02df..d054a05d50c2 100644
--- a/sw/source/core/layout/anchoredobject.cxx
+++ b/sw/source/core/layout/anchoredobject.cxx
@@ -64,7 +64,6 @@ SwObjPositioningInProgress::~SwObjPositioningInProgress()
     }
 }
 
-TYPEINIT0(SwAnchoredObject);
 
 SwAnchoredObject::SwAnchoredObject() :
     mpDrawObj( nullptr ),
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 43e448ed1516..129eca5fd76e 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -87,12 +87,8 @@
 
 using namespace ::com::sun::star;
 
-TYPEINIT1(SwFormatVertOrient, SfxPoolItem);
-TYPEINIT1(SwFormatHoriOrient, SfxPoolItem);
-TYPEINIT2(SwFormatHeader,  SfxPoolItem, SwClient );
-TYPEINIT2(SwFormatFooter,  SfxPoolItem, SwClient );
-TYPEINIT2(SwFormatPageDesc,  SfxPoolItem, SwClient );
-TYPEINIT1_AUTOFACTORY(SwFormatLineNumber, SfxPoolItem);
+
+SfxPoolItem* SwFormatLineNumber::CreateDefault() { return new SwFormatLineNumber; }
 
 static sal_Int16 lcl_IntToRelation(const uno::Any& rVal)
 {
@@ -2499,7 +2495,6 @@ SfxPoolItem* SwHeaderAndFooterEatSpacingItem::Clone( SfxItemPool* ) const
 }
 
 // Partially implemented inline in hxx
-TYPEINIT1( SwFrameFormat, SwFormat );
 IMPL_FIXEDMEMPOOL_NEWDEL_DLL( SwFrameFormat )
 
 SwFrameFormat::SwFrameFormat(
@@ -2848,7 +2843,6 @@ void SwFrameFormats::dumpAsXml(xmlTextWriterPtr pWriter, const char* pName) cons
 //  class SwFlyFrameFormat
 //  Partially implemented inline in hxx
 
-TYPEINIT1( SwFlyFrameFormat, SwFrameFormat );
 IMPL_FIXEDMEMPOOL_NEWDEL( SwFlyFrameFormat )
 
 SwFlyFrameFormat::~SwFlyFrameFormat()
@@ -3295,7 +3289,6 @@ SwHandleAnchorNodeChg::~SwHandleAnchorNodeChg()
 //  class SwDrawFrameFormat
 //  Partially implemented inline in hxx
 
-TYPEINIT1( SwDrawFrameFormat, SwFrameFormat );
 IMPL_FIXEDMEMPOOL_NEWDEL( SwDrawFrameFormat )
 
 SwDrawFrameFormat::~SwDrawFrameFormat()
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 5745f83f6820..afc4f926fbb9 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -66,7 +66,6 @@
 
 using namespace ::com::sun::star;
 
-TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject);
 
 SwFlyFrm::SwFlyFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch ) :
     SwLayoutFrm( pFormat, pSib ),
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index f2780c5b2971..f2fec6a7d311 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -74,7 +74,6 @@ SwFlyAtCntFrm::SwFlyAtCntFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAn
 }
 
 // #i28701#
-TYPEINIT1(SwFlyAtCntFrm,SwFlyFreeFrm);
 
 void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 {
diff --git a/sw/source/core/layout/flyincnt.cxx b/sw/source/core/layout/flyincnt.cxx
index 21c599fe6c09..c0a41ec2fa8f 100644
--- a/sw/source/core/layout/flyincnt.cxx
+++ b/sw/source/core/layout/flyincnt.cxx
@@ -58,7 +58,6 @@ SwFlyInCntFrm::~SwFlyInCntFrm()
 }
 
 // #i28701#
-TYPEINIT1(SwFlyInCntFrm,SwFlyFrm);
 
 void SwFlyInCntFrm::SetRefPoint( const Point& rPoint,
                                  const Point& rRelAttr,
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index 767a93e9b075..d365fe291711 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -87,7 +87,6 @@ SwFlyFreeFrm::~SwFlyFreeFrm()
 }
 
 // #i28701#
-TYPEINIT1(SwFlyFreeFrm,SwFlyFrm);
 /** Notifies the background (all ContentFrms that currently are overlapping).
  *
  * Additionally, the window is also directly invalidated (especially where
@@ -474,7 +473,6 @@ SwFlyLayFrm::SwFlyLayFrm( SwFlyFrameFormat *pFormat, SwFrm* pSib, SwFrm *pAnch )
 }
 
 // #i28701#
-TYPEINIT1(SwFlyLayFrm,SwFlyFreeFrm);
 
 void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew )
 {
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index b579454fe4f6..d4af1593e468 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -340,8 +340,6 @@ SwRectFn fnRectVL2R = &aVerticalRightToLeft;
 // #i65250#
 sal_uInt32 SwFrm::mnLastFrmId=0;
 
-TYPEINIT1(SwFrm,SwClient);      //rtti for SwFrm
-TYPEINIT1(SwContentFrm,SwFrm);    //rtti for SwContentFrm
 
 void _FrmInit()
 {
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 896e82a830ce..446ac29582fb 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2153,7 +2153,6 @@ SwLayoutFrm::SwLayoutFrm(SwFrameFormat *const pFormat, SwFrm *const pSib)
 }
 
 // #i28701#
-TYPEINIT1(SwLayoutFrm,SwFrm);
 
 SwTwips SwLayoutFrm::InnerHeight() const
 {
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index fb9b973f01a3..e017364d4cc3 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -43,10 +43,10 @@
 
 using namespace ::com::sun::star;
 
-TYPEINIT2_AUTOFACTORY( SwFormatDrop, SfxPoolItem, SwClient);
-TYPEINIT1_AUTOFACTORY( SwRegisterItem, SfxBoolItem);
-TYPEINIT1_AUTOFACTORY( SwNumRuleItem, SfxStringItem);
-TYPEINIT1_AUTOFACTORY( SwParaConnectBorderItem, SfxBoolItem);
+
+SfxPoolItem* SwFormatDrop::CreateDefault() { return new SwFormatDrop; }
+SfxPoolItem* SwRegisterItem::CreateDefault() { return new SwRegisterItem; }
+SfxPoolItem* SwNumRuleItem::CreateDefault() { return new SwNumRuleItem; }
 
 SwFormatDrop::SwFormatDrop()
     : SfxPoolItem( RES_PARATR_DROP ),
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 8cb9d0eb1e72..b0363a4725f2 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -69,12 +69,6 @@
 
 using namespace com::sun::star;
 
-TYPEINIT1( SwTable, SwClient );
-TYPEINIT1( SwTableBox, SwClient );
-TYPEINIT1( SwTableLine, SwClient );
-TYPEINIT1( SwTableFormat, SwFrameFormat );
-TYPEINIT1( SwTableBoxFormat, SwFrameFormat );
-TYPEINIT1( SwTableLineFormat, SwFrameFormat );
 
 #define COLFUZZY 20
 
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 267b3c9e5a50..e9b2f94531a8 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -78,7 +78,6 @@
 #include <calbck.hxx>
 #include <ftnidx.hxx>
 
-TYPEINIT1( SwTextFrm, SwContentFrm );
 
 /// Switches width and height of the text frame
 void SwTextFrm::SwapWidthAndHeight()
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 2285d9150b89..68066b783ba5 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -91,7 +91,6 @@ static void lcl_FillAuthPattern(SwFormTokens &rAuthTokens, sal_uInt16 nTypeId)
 
 }
 
-TYPEINIT2( SwTOXMark, SfxPoolItem, SwClient );    // fuers rtti
 
 /// pool default constructor
 SwTOXMark::SwTOXMark()
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index 89649a0cb06c..a201bf33ba60 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -41,7 +41,6 @@
 #include <fieldhint.hxx>
 #include <svl/smplhint.hxx>
 
-TYPEINIT3(SwFormatField, SfxPoolItem, SwModify, SfxBroadcaster)
 
 // constructor for default item in attribute-pool
 SwFormatField::SwFormatField( sal_uInt16 nWhich )
diff --git a/sw/source/core/txtnode/chrfmt.cxx b/sw/source/core/txtnode/chrfmt.cxx
index 9e303170105e..f8776f540d68 100644
--- a/sw/source/core/txtnode/chrfmt.cxx
+++ b/sw/source/core/txtnode/chrfmt.cxx
@@ -22,7 +22,6 @@
 #include <charfmt.hxx>
 #include <docary.hxx>
 
-TYPEINIT1( SwCharFormat, SwFormat );  //rtti fuer SwCharFormat
 
 void SwCharFormat::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index b9def1c5c168..796d84a7e836 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -52,8 +52,8 @@
 
 using namespace ::com::sun::star;
 
-TYPEINIT1_AUTOFACTORY(SwFormatINetFormat, SfxPoolItem);
-TYPEINIT1_AUTOFACTORY(SwFormatAutoFormat, SfxPoolItem);
+
+SfxPoolItem* SwFormatINetFormat::CreateDefault() { return new SwFormatINetFormat; }
 
 SwFormatCharFormat::SwFormatCharFormat( SwCharFormat *pFormat )
     : SfxPoolItem( RES_TXTATR_CHARFMT ),
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index aa805592b77d..2d6bcd82a771 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -95,7 +95,6 @@ using namespace ::com::sun::star;
 
 typedef std::vector<SwTextAttr*> SwpHts;
 
-TYPEINIT1( SwTextNode, SwContentNode )
 
 // unfortunately everyone can change Hints without ensuring order or the linking between them
 #ifdef DBG_UTIL
@@ -3599,7 +3598,7 @@ void SwTextNode::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewVa
 SwFormatColl* SwTextNode::ChgFormatColl( SwFormatColl *pNewColl )
 {
     OSL_ENSURE( pNewColl,"ChgFormatColl: Collectionpointer has value 0." );
-    OSL_ENSURE( HAS_BASE( SwTextFormatColl, pNewColl ),
+    OSL_ENSURE( dynamic_cast<const SwTextFormatColl *>(pNewColl) != nullptr,
                 "ChgFormatColl: is not a Text Collection pointer." );
 
     SwTextFormatColl *pOldColl = GetTextColl();
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index 3e96644ad11e..450444911fe1 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -35,8 +35,7 @@
 #include <IDocumentState.hxx>
 #include <IDocumentStylePoolAccess.hxx>
 
-TYPEINIT1(SwTextINetFormat,SwClient);
-TYPEINIT1(SwTextRuby,SwClient);
+
 
 SwTextCharFormat::SwTextCharFormat( SwFormatCharFormat& rAttr,
                     sal_Int32 nStt, sal_Int32 nEnde )
diff --git a/sw/source/core/undo/SwUndoField.cxx b/sw/source/core/undo/SwUndoField.cxx
index c57b279a51f7..e983c6bb2512 100644
--- a/sw/source/core/undo/SwUndoField.cxx
+++ b/sw/source/core/undo/SwUndoField.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/rtti.hxx>
 
 #include <SwUndoField.hxx>
 #include <swundo.hxx>
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 5577eb249738..c2e8b5fe6726 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -878,7 +878,6 @@ SwDoc* SwXDrawPage::GetDoc()
     return pDoc;
 }
 
-TYPEINIT1(SwXShape, SwClient);
 
 namespace
 {
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index feed9a498431..eb0e40822504 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1171,7 +1171,6 @@ sal_Int64 SAL_CALL SwXFrame::getSomething( const ::uno::Sequence< sal_Int8 >& rI
     return 0;
 }
 
-TYPEINIT1(SwXFrame, SwClient);
 
 OUString SwXFrame::getImplementationName() throw( uno::RuntimeException, std::exception )
 {
@@ -3748,7 +3747,6 @@ uno::Reference<container::XNameReplace> SAL_CALL
     return new SwFrameEventDescriptor( *this );
 }
 
-TYPEINIT1(SwXOLEListener, SwClient);
 
 SwXOLEListener::SwXOLEListener( SwFormat& rOLEFormat, uno::Reference< XModel > xOLE) :
     SwClient(&rOLEFormat),
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index 7c705789a212..ce58ecd5cca9 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -362,7 +362,6 @@ uno::Sequence< beans::PropertyValue > SwXRedlinePortion::CreateRedlineProperties
     return aRet;
 }
 
-TYPEINIT1(SwXRedline, SwClient);
 SwXRedline::SwXRedline(SwRangeRedline& rRedline, SwDoc& rDoc) :
     SwXText(&rDoc, CURSOR_REDLINE),
     pDoc(&rDoc),
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 20de3d335ecd..16dfb092a078 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1150,7 +1150,6 @@ sal_Int64 SAL_CALL SwXStyle::getSomething( const uno::Sequence< sal_Int8 >& rId
     return 0;
 }
 
-TYPEINIT1(SwXStyle, SfxListener);
 
 OUString SwXStyle::getImplementationName() throw( uno::RuntimeException, std::exception )
 {
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index d42b1ab09a50..ac526d230538 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -718,7 +718,6 @@ void sw_setValue( SwXCell &rCell, double nVal )
     pDoc->getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
 }
 
-TYPEINIT1(SwXCell, SwClient);
 
 SwXCell::SwXCell(SwFrameFormat* pTableFormat, SwTableBox* pBx, size_t const nPos) :
     SwXText(pTableFormat->GetDoc(), CURSOR_TBLTEXT),
@@ -1236,7 +1235,6 @@ sal_Bool SwXTextTableRow::supportsService(const OUString& rServiceName) throw( u
 uno::Sequence< OUString > SwXTextTableRow::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
     { return {"com.sun.star.text.TextTableRow"}; }
 
-TYPEINIT1(SwXTextTableRow, SwClient);
 
 SwXTextTableRow::SwXTextTableRow(SwFrameFormat* pFormat, SwTableLine* pLn) :
     SwClient(pFormat),
@@ -1939,7 +1937,6 @@ sal_Int64 SAL_CALL SwXTextTable::getSomething( const uno::Sequence< sal_Int8 >&
     return 0;
 }
 
-TYPEINIT1(SwXTextTable, SwClient)
 
 SwXTextTable::SwXTextTable()
     : m_pImpl(new Impl)
@@ -3122,7 +3119,6 @@ sal_Int64 SAL_CALL SwXCellRange::getSomething( const uno::Sequence< sal_Int8 >&
     return 0;
 }
 
-TYPEINIT1(SwXCellRange, SwClient);
 
 OUString SwXCellRange::getImplementationName() throw( uno::RuntimeException, std::exception )
     { return OUString("SwXCellRange"); }
@@ -3749,7 +3745,6 @@ sal_Bool SwXTableRows::supportsService(const OUString& rServiceName) throw( uno:
 uno::Sequence< OUString > SwXTableRows::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
     { return { "com.sun.star.text.TableRows" }; }
 
-TYPEINIT1(SwXTableRows, SwClient);
 
 SwXTableRows::SwXTableRows(SwFrameFormat& rFrameFormat) :
     SwClient(&rFrameFormat)
@@ -3901,7 +3896,6 @@ sal_Bool SwXTableColumns::supportsService(const OUString& rServiceName) throw( u
 uno::Sequence< OUString > SwXTableColumns::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
     { return { "com.sun.star.text.TableColumns"}; }
 
-TYPEINIT1(SwXTableColumns, SwClient);
 
 SwXTableColumns::SwXTableColumns(SwFrameFormat& rFrameFormat) :
     SwClient(&rFrameFormat)
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index c1cb98e1f96b..c682566691fb 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -93,7 +93,6 @@ BitmapEx* SwViewShell::mpReplaceBmp = nullptr;
 
 bool bInSizeNotify = false;
 
-TYPEINIT0(SwViewShell);
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/filter/ww8/writerhelper.hxx b/sw/source/filter/ww8/writerhelper.hxx
index 7a840e9542a6..af98c92dbd0e 100644
--- a/sw/source/filter/ww8/writerhelper.hxx
+++ b/sw/source/filter/ww8/writerhelper.hxx
@@ -236,7 +236,7 @@ namespace sw
         template<class T> const T & item_cast(const SfxPoolItem &rItem)
             throw(std::bad_cast)
         {
-            if (!rItem.IsA(STATICTYPE(T)))
+            if (dynamic_cast<const T *>(&rItem) == nullptr)
                 throw std::bad_cast();
             return static_cast<const T &>(rItem);
         }
@@ -261,9 +261,7 @@ namespace sw
         */
         template<class T> const T * item_cast(const SfxPoolItem *pItem)
         {
-            if (pItem && !pItem->IsA(STATICTYPE(T)))
-                pItem = nullptr;
-            return static_cast<const T *>(pItem);
+            return dynamic_cast<const T *>(pItem);
         }
 
         /** Extract a SfxPoolItem derived property from a SwContentNode
diff --git a/sw/source/filter/xml/xmlbrsh.cxx b/sw/source/filter/xml/xmlbrsh.cxx
index 9b1bcc5960c0..ec9c2cbb4971 100644
--- a/sw/source/filter/xml/xmlbrsh.cxx
+++ b/sw/source/filter/xml/xmlbrsh.cxx
@@ -65,7 +65,6 @@ static SvXMLTokenMapEntry aBGImgAttributesAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-TYPEINIT1( SwXMLBrushItemImportContext, SvXMLImportContext );
 
 void SwXMLBrushItemImportContext::ProcessAttrs(
     const uno::Reference< xml::sax::XAttributeList >& xAttrList,
diff --git a/sw/source/filter/xml/xmlbrshi.hxx b/sw/source/filter/xml/xmlbrshi.hxx
index f65604cafcfa..56fef7456e51 100644
--- a/sw/source/filter/xml/xmlbrshi.hxx
+++ b/sw/source/filter/xml/xmlbrshi.hxx
@@ -43,7 +43,6 @@ private:
                const SvXMLUnitConverter& rUnitConv );
 
 public:
-    TYPEINFO_OVERRIDE();
 
     SwXMLBrushItemImportContext(
             SvXMLImport& rImport,
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index acf62efd26a6..aa728f99aff9 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -202,7 +202,6 @@ public:
             const uno::Reference< xml::sax::XAttributeList > & xAttrList );
     virtual ~SwXMLConditionContext_Impl();
 
-    TYPEINFO_OVERRIDE();
 
     bool IsValid() const { return 0 != nCondition; }
 
@@ -253,7 +252,6 @@ SwXMLConditionContext_Impl::~SwXMLConditionContext_Impl()
 {
 }
 
-TYPEINIT1( SwXMLConditionContext_Impl, XMLTextStyleContext );
 
 typedef std::vector<SwXMLConditionContext_Impl*> SwXMLConditions_Impl;
 
@@ -267,7 +265,6 @@ protected:
 
 public:
 
-    TYPEINFO_OVERRIDE();
 
     SwXMLTextStyleContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName,
@@ -284,7 +281,6 @@ public:
     virtual void Finish( bool bOverwrite ) override;
 };
 
-TYPEINIT1( SwXMLTextStyleContext_Impl, XMLTextStyleContext );
 
 uno::Reference < style::XStyle > SwXMLTextStyleContext_Impl::Create()
 {
@@ -443,7 +439,6 @@ protected:
 
 public:
 
-    TYPEINFO_OVERRIDE();
 
     SwXMLItemSetStyleContext_Impl(
             SwXMLImport& rImport, sal_uInt16 nPrfx,
@@ -547,7 +542,6 @@ SvXMLImportContext *SwXMLItemSetStyleContext_Impl::CreateItemSetContext(
     return pContext;
 }
 
-TYPEINIT1( SwXMLItemSetStyleContext_Impl, SvXMLStyleContext );
 
 SwXMLItemSetStyleContext_Impl::SwXMLItemSetStyleContext_Impl( SwXMLImport& rImport,
         sal_uInt16 nPrfx, const OUString& rLName,
@@ -730,7 +724,6 @@ protected:
 
 public:
 
-    TYPEINFO_OVERRIDE();
 
     SwXMLStylesContext_Impl(
             SwXMLImport& rImport, sal_uInt16 nPrfx,
@@ -744,7 +737,6 @@ public:
     virtual void EndElement() override;
 };
 
-TYPEINIT1( SwXMLStylesContext_Impl, SvXMLStylesContext );
 
 SvXMLStyleContext *SwXMLStylesContext_Impl::CreateStyleStyleChildContext(
         sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -912,7 +904,6 @@ protected:
 
 public:
 
-    TYPEINFO_OVERRIDE();
 
     SwXMLMasterStylesContext_Impl(
             SwXMLImport& rImport, sal_uInt16 nPrfx,
@@ -922,7 +913,6 @@ public:
     virtual void EndElement() override;
 };
 
-TYPEINIT1( SwXMLMasterStylesContext_Impl, XMLTextMasterStylesContext );
 
 SwXMLMasterStylesContext_Impl::SwXMLMasterStylesContext_Impl(
         SwXMLImport& rImport, sal_uInt16 nPrfx,
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 78ee5864f0fa..776f5512d77b 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -126,7 +126,6 @@ public:
                 const Reference< xml::sax::XAttributeList > & xAttrList );
     virtual ~SwXMLBodyContext_Impl();
 
-    TYPEINFO_OVERRIDE();
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                 const OUString& rLocalName,
@@ -144,7 +143,6 @@ SwXMLBodyContext_Impl::~SwXMLBodyContext_Impl()
 {
 }
 
-TYPEINIT1( SwXMLBodyContext_Impl, SvXMLImportContext );
 
 SvXMLImportContext *SwXMLBodyContext_Impl::CreateChildContext(
         sal_uInt16 /*nPrefix*/,
@@ -171,7 +169,6 @@ public:
                 const Reference< xml::sax::XAttributeList > & xAttrList );
     virtual ~SwXMLDocContext_Impl();
 
-    TYPEINFO_OVERRIDE();
 
     virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
                 const OUString& rLocalName,
@@ -189,7 +186,6 @@ SwXMLDocContext_Impl::~SwXMLDocContext_Impl()
 {
 }
 
-TYPEINIT1( SwXMLDocContext_Impl, SvXMLImportContext );
 
 SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext(
         sal_uInt16 nPrefix,
@@ -261,7 +257,6 @@ public:
                 const Reference< document::XDocumentProperties >& xDocProps);
     virtual ~SwXMLOfficeDocContext_Impl();
 
-    TYPEINFO_OVERRIDE();
 
     virtual SvXMLImportContext *CreateChildContext(
                 sal_uInt16 nPrefix,
@@ -285,7 +280,6 @@ SwXMLOfficeDocContext_Impl::~SwXMLOfficeDocContext_Impl()
 {
 }
 
-TYPEINIT1( SwXMLOfficeDocContext_Impl, SwXMLDocContext_Impl );
 
 SvXMLImportContext* SwXMLOfficeDocContext_Impl::CreateChildContext(
                 sal_uInt16 nPrefix,
@@ -325,7 +319,6 @@ public:
                                 const Reference< xml::sax::XAttributeList > & xAttrList );
     virtual ~SwXMLDocStylesContext_Impl();
 
-    TYPEINFO_OVERRIDE();
 
     virtual void EndElement() override;
 };
@@ -344,7 +337,6 @@ SwXMLDocStylesContext_Impl::~SwXMLDocStylesContext_Impl()
 {
 }
 
-TYPEINIT1( SwXMLDocStylesContext_Impl, SwXMLDocContext_Impl );
 
 void SwXMLDocStylesContext_Impl::EndElement()
 {
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 8999e9c7c285..59e44c1bb3a4 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1066,7 +1066,6 @@ class SwXMLDDETableContext_Impl : public SvXMLImportContext
 
 public:
 
-    TYPEINFO_OVERRIDE();
 
     SwXMLDDETableContext_Impl(
         SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName);
@@ -1083,7 +1082,6 @@ public:
     bool GetIsAutomaticUpdate() { return bIsAutomaticUpdate; }
 };
 
-TYPEINIT1( SwXMLDDETableContext_Impl, SvXMLImportContext );
 
 SwXMLDDETableContext_Impl::SwXMLDDETableContext_Impl(
     SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName) :
@@ -1273,7 +1271,6 @@ SwXMLTableCell_Impl *SwXMLTableContext::GetCell( sal_uInt32 nRow,
     return (*m_pRows)[nRow]->GetCell( nCol );
 }
 
-TYPEINIT1( SwXMLTableContext, XMLTextTableContext );
 
 SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
         sal_uInt16 nPrfx,
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index ff23336ce92d..c3fad16f6d2d 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -127,7 +127,6 @@ class SwXMLTableContext : public XMLTextTableContext
 
 public:
 
-    TYPEINFO_OVERRIDE();
 
     SwXMLTableContext( SwXMLImport& rImport, sal_uInt16 nPrfx,
                        const OUString& rLName,
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 3a6fb3e4c8fb..a412f5a921a4 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -139,7 +139,6 @@ void SwDocShell::InitInterface_Impl()
 {
 }
 
-TYPEINIT2(SwDocShell, SfxObjectShell, SfxListener);
 
 SFX_IMPL_OBJECTFACTORY(SwDocShell, SvGlobalName(SO3_SW_CLASSID), SfxObjectShellFlags::STD_NORMAL|SfxObjectShellFlags::HASMENU, "swriter"  )
 
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 2a2d7c98b518..238d9fb451d5 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -137,7 +137,6 @@ bool     g_bNoInterrupt     = false;
 
 using namespace com::sun::star;
 
-TYPEINIT1( SwModule, SfxModule );
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/chrdlg/ccoll.cxx b/sw/source/uibase/chrdlg/ccoll.cxx
index 6967722b60c6..ed65626e3008 100644
--- a/sw/source/uibase/chrdlg/ccoll.cxx
+++ b/sw/source/uibase/chrdlg/ccoll.cxx
@@ -129,7 +129,6 @@ const CommandStruct SwCondCollItem::aCmds[] =
     { PARA_IN_LIST,         9 }
 };
 
-TYPEINIT1_AUTOFACTORY(SwCondCollItem, SfxPoolItem)
 
 // Item for the transport of the condition table
 SwCondCollItem::SwCondCollItem(sal_uInt16 _nWhich ) :
diff --git a/sw/source/uibase/config/cfgitems.cxx b/sw/source/uibase/config/cfgitems.cxx
index 91f306116636..b80a68f422e1 100644
--- a/sw/source/uibase/config/cfgitems.cxx
+++ b/sw/source/uibase/config/cfgitems.cxx
@@ -29,10 +29,6 @@
 #include "cfgitems.hxx"
 #include "crstate.hxx"
 
-TYPEINIT1_AUTOFACTORY(SwDocDisplayItem, SfxPoolItem)
-TYPEINIT1_AUTOFACTORY(SwElemItem, SfxPoolItem)
-TYPEINIT1_AUTOFACTORY(SwAddPrinterItem, SfxPoolItem)
-TYPEINIT1_AUTOFACTORY(SwShadowCursorItem, SfxPoolItem)
 
 SwDocDisplayItem::SwDocDisplayItem( sal_uInt16 _nWhich ) :
         SfxPoolItem(_nWhich),
diff --git a/sw/source/uibase/dialog/swwrtshitem.cxx b/sw/source/uibase/dialog/swwrtshitem.cxx
index 2918c8972f65..e9816626dafd 100644
--- a/sw/source/uibase/dialog/swwrtshitem.cxx
+++ b/sw/source/uibase/dialog/swwrtshitem.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "swwrtshitem.hxx"
-TYPEINIT1(SwWrtShellItem,SfxPoolItem);
 SwWrtShellItem::SwWrtShellItem( sal_uInt16 _nWhich, SwWrtShell* pSh )
     : SfxPoolItem( _nWhich ), pWrtSh( pSh )
 {
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index e5f12bbbca66..99a2ef4b0027 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -43,7 +43,8 @@
 using namespace utl;
 using namespace ::com::sun::star::uno;
 
-TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem );
+
+SfxPoolItem* SwEnvItem::CreateDefault() { return new SwEnvItem; }
 
 OUString MakeSender()
 {
diff --git a/sw/source/uibase/globdoc/globdoc.cxx b/sw/source/uibase/globdoc/globdoc.cxx
index 7e9a6c78236d..40f60b8ac26d 100644
--- a/sw/source/uibase/globdoc/globdoc.cxx
+++ b/sw/source/uibase/globdoc/globdoc.cxx
@@ -30,7 +30,6 @@
 
 // Description: Register all filters
 
-TYPEINIT1(SwGlobalDocShell, SwDocShell);
 
 SFX_IMPL_OBJECTFACTORY( SwGlobalDocShell, SvGlobalName(SO3_SWGLOB_CLASSID), SfxObjectShellFlags::STD_NORMAL|SfxObjectShellFlags::HASMENU, "swriter/GlobalDocument" )
 
diff --git a/sw/source/uibase/inc/annotsh.hxx b/sw/source/uibase/inc/annotsh.hxx
index 23c31e68b293..c9bfb4601770 100644
--- a/sw/source/uibase/inc/annotsh.hxx
+++ b/sw/source/uibase/inc/annotsh.hxx
@@ -32,7 +32,6 @@ class SwAnnotationShell: public SfxShell
 
 public:
     SFX_DECL_INTERFACE(SW_ANNOTATIONSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 628fd856fcb7..b730c04e45bf 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.hxx
@@ -70,7 +70,6 @@ public:
     virtual     ~SwBaseShell();
 
     SFX_DECL_INTERFACE(SW_BASESHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/beziersh.hxx b/sw/source/uibase/inc/beziersh.hxx
index 2116c1b659d3..ad943b25ba45 100644
--- a/sw/source/uibase/inc/beziersh.hxx
+++ b/sw/source/uibase/inc/beziersh.hxx
@@ -25,7 +25,6 @@ class SwBezierShell: public SwBaseShell
 {
 public:
     SFX_DECL_INTERFACE(SW_BEZIERSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index e21869810765..50928483b905 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.hxx
@@ -57,7 +57,6 @@ class SW_DLLPUBLIC SwDocDisplayItem : public SfxPoolItem
     Color aIndexBackgrndCol;
 
 public:
-                                TYPEINFO_OVERRIDE();
                                 SwDocDisplayItem( sal_uInt16 nWhich = FN_PARAM_DOCDISP );
                                 SwDocDisplayItem(
                                     const SwDocDisplayItem& rSwDocDisplayItem );
@@ -90,7 +89,6 @@ class SW_DLLPUBLIC SwElemItem : public SfxPoolItem
     friend class SwContentOptPage;
 
 public:
-                            TYPEINFO_OVERRIDE();
                             SwElemItem( sal_uInt16 nWhich = FN_PARAM_ELEM );
                             SwElemItem(const SwElemItem& rElemItem);
                             SwElemItem(const SwViewOption& rVOpt, sal_uInt16 nWhich);
@@ -112,7 +110,6 @@ class SW_DLLPUBLIC SwAddPrinterItem : public SfxPoolItem, public SwPrintData
     using  SwPrintData::operator ==;
 
 public:
-    TYPEINFO_OVERRIDE();
     SwAddPrinterItem( sal_uInt16 nWhich = FN_PARAM_ADDPRINTER );
     SwAddPrinterItem( sal_uInt16 nWhich, const SwPrintData& rPrtData );
     SwAddPrinterItem( const SwAddPrinterItem& rAddPrinterItem);
@@ -130,7 +127,6 @@ class SW_DLLPUBLIC SwShadowCursorItem : public SfxPoolItem
     sal_uInt8 eMode;
     bool bOn;
 public:
-    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/uibase/inc/drawsh.hxx b/sw/source/uibase/inc/drawsh.hxx
index c95505070edc..8d7fa6c657c1 100644
--- a/sw/source/uibase/inc/drawsh.hxx
+++ b/sw/source/uibase/inc/drawsh.hxx
@@ -27,7 +27,6 @@ class SwDrawShell: public SwDrawBaseShell
 {
 public:
     SFX_DECL_INTERFACE(SW_DRAWSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/drformsh.hxx b/sw/source/uibase/inc/drformsh.hxx
index 19063344d8a0..194a6f706757 100644
--- a/sw/source/uibase/inc/drformsh.hxx
+++ b/sw/source/uibase/inc/drformsh.hxx
@@ -27,7 +27,6 @@ class SwDrawFormShell: public SwDrawBaseShell
 {
 public:
     SFX_DECL_INTERFACE(SW_DRAWFORMSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/drwbassh.hxx b/sw/source/uibase/inc/drwbassh.hxx
index 95254b27ac9c..1ade7acc6a73 100644
--- a/sw/source/uibase/inc/drwbassh.hxx
+++ b/sw/source/uibase/inc/drwbassh.hxx
@@ -37,7 +37,6 @@ public:
     virtual     ~SwDrawBaseShell();
 
     SFX_DECL_INTERFACE(SW_DRAWBASESHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx
index 98e5757c9a9d..d4d027671b0e 100644
--- a/sw/source/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/uibase/inc/drwtxtsh.hxx
@@ -40,7 +40,6 @@ class SwDrawTextShell: public SfxShell
 
 public:
     SFX_DECL_INTERFACE(SW_DRWTXTSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index 62dc0bcc2d7e..02fb1700df0d 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.hxx
@@ -56,8 +56,7 @@ public:
     SwEnvItem();
     SwEnvItem(const SwEnvItem& rItem);
 
-    TYPEINFO_OVERRIDE();
-
+    static SfxPoolItem* CreateDefault();
     SwEnvItem& operator =(const SwEnvItem& rItem);
 
     virtual bool operator ==(const SfxPoolItem& rItem) const override;
diff --git a/sw/source/uibase/inc/glshell.hxx b/sw/source/uibase/inc/glshell.hxx
index 6722ec79f5b3..3421e14570be 100644
--- a/sw/source/uibase/inc/glshell.hxx
+++ b/sw/source/uibase/inc/glshell.hxx
@@ -30,7 +30,6 @@ protected:
     virtual bool Save() override;
 
 public:
-    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SW_GLOSDOCSHELL)
 
 private:
@@ -61,7 +60,6 @@ protected:
     virtual bool Save() override;
 
 public:
-    TYPEINFO_OVERRIDE();
     SFX_DECL_INTERFACE(SW_WEBGLOSDOCSHELL)
 
 private:
diff --git a/sw/source/uibase/inc/listsh.hxx b/sw/source/uibase/inc/listsh.hxx
index 733d26ca06f4..0caecf64282e 100644
--- a/sw/source/uibase/inc/listsh.hxx
+++ b/sw/source/uibase/inc/listsh.hxx
@@ -25,7 +25,6 @@ class SwListShell: public SwBaseShell
 {
 public:
     SFX_DECL_INTERFACE(SW_LISTSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 88af21b6da6a..0c97e69b2d31 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -228,7 +228,6 @@ protected:
 public:
     SFX_DECL_VIEWFACTORY(SwPagePreview);
     SFX_DECL_INTERFACE(SW_PAGEPREVIEW)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx
index e381e4c201a6..96be7e5ea884 100644
--- a/sw/source/uibase/inc/srcview.hxx
+++ b/sw/source/uibase/inc/srcview.hxx
@@ -52,7 +52,6 @@ protected:
 public:
     SFX_DECL_VIEWFACTORY(SwSrcView);
     SFX_DECL_INTERFACE(SW_SRC_VIEWSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx
index a0474a77c1a2..21309f06260d 100644
--- a/sw/source/uibase/inc/swwrtshitem.hxx
+++ b/sw/source/uibase/inc/swwrtshitem.hxx
@@ -28,7 +28,6 @@ class SW_DLLPUBLIC SwWrtShellItem: public SfxPoolItem
     SwWrtShell*         pWrtSh;
 
 public:
-                            TYPEINFO_OVERRIDE();
                             SwWrtShellItem();
                             SwWrtShellItem( sal_uInt16 nWhich , SwWrtShell* pWrtSh);
                             SwWrtShellItem( const SwWrtShellItem& );
diff --git a/sw/source/uibase/inc/tabsh.hxx b/sw/source/uibase/inc/tabsh.hxx
index bc1d636f77aa..1ae2653d4964 100644
--- a/sw/source/uibase/inc/tabsh.hxx
+++ b/sw/source/uibase/inc/tabsh.hxx
@@ -33,7 +33,6 @@ class SwTableShell: public SwBaseShell
 {
 public:
     SFX_DECL_INTERFACE(SW_TABSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx
index 5cf3c0e3746a..9abef5b0d499 100644
--- a/sw/source/uibase/inc/textsh.hxx
+++ b/sw/source/uibase/inc/textsh.hxx
@@ -39,7 +39,6 @@ class SW_DLLPUBLIC SwTextShell: public SwBaseShell
 
 public:
     SFX_DECL_INTERFACE(SW_TEXTSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/wformsh.hxx b/sw/source/uibase/inc/wformsh.hxx
index dfbfd7ba847b..09fdcbeee479 100644
--- a/sw/source/uibase/inc/wformsh.hxx
+++ b/sw/source/uibase/inc/wformsh.hxx
@@ -34,7 +34,6 @@ private:
     static void InitInterface_Impl();
 
 public:
-    TYPEINFO_OVERRIDE();
 };
 
 #endif
diff --git a/sw/source/uibase/inc/wfrmsh.hxx b/sw/source/uibase/inc/wfrmsh.hxx
index 2ab9335ab6fd..4ad5dabc2948 100644
--- a/sw/source/uibase/inc/wfrmsh.hxx
+++ b/sw/source/uibase/inc/wfrmsh.hxx
@@ -26,7 +26,6 @@ class SwWebFrameShell: public SwFrameShell
 {
 public:
     SFX_DECL_INTERFACE(SW_WEBFRAMESHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/wgrfsh.hxx b/sw/source/uibase/inc/wgrfsh.hxx
index 26ee0bf015b8..4e423dfc8afb 100644
--- a/sw/source/uibase/inc/wgrfsh.hxx
+++ b/sw/source/uibase/inc/wgrfsh.hxx
@@ -28,7 +28,6 @@ public:
     virtual     ~SwWebGrfShell();
 
     SFX_DECL_INTERFACE(SW_WEBGRFSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/wlistsh.hxx b/sw/source/uibase/inc/wlistsh.hxx
index 77a266d27278..752a3f33d657 100644
--- a/sw/source/uibase/inc/wlistsh.hxx
+++ b/sw/source/uibase/inc/wlistsh.hxx
@@ -31,7 +31,6 @@ private:
     static void InitInterface_Impl();
 
 public:
-    TYPEINFO_OVERRIDE();
 
     SwWebListShell(SwView &rView);
     virtual ~SwWebListShell();
diff --git a/sw/source/uibase/inc/wtabsh.hxx b/sw/source/uibase/inc/wtabsh.hxx
index 3249e64ea3a4..319cf71def54 100644
--- a/sw/source/uibase/inc/wtabsh.hxx
+++ b/sw/source/uibase/inc/wtabsh.hxx
@@ -25,7 +25,6 @@ class SwWebTableShell: public SwTableShell
 {
 public:
     SFX_DECL_INTERFACE(SW_WEBTABSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/wtextsh.hxx b/sw/source/uibase/inc/wtextsh.hxx
index a7b76007a361..10b683a12891 100644
--- a/sw/source/uibase/inc/wtextsh.hxx
+++ b/sw/source/uibase/inc/wtextsh.hxx
@@ -26,7 +26,6 @@ class SwWebTextShell: public SwTextShell
 {
 public:
     SFX_DECL_INTERFACE(SW_WEBTEXTSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/inc/wview.hxx b/sw/source/uibase/inc/wview.hxx
index 40b1f8872ed7..88a57458f22e 100644
--- a/sw/source/uibase/inc/wview.hxx
+++ b/sw/source/uibase/inc/wview.hxx
@@ -30,7 +30,6 @@ protected:
 public:
     SFX_DECL_VIEWFACTORY(SwWebView);
     SFX_DECL_INTERFACE(SW_WEBVIEWSHELL)
-    TYPEINFO_OVERRIDE();
 
 private:
     /// SfxInterface initializer.
diff --git a/sw/source/uibase/misc/glshell.cxx b/sw/source/uibase/misc/glshell.cxx
index be79bafab709..9b05cb57550b 100644
--- a/sw/source/uibase/misc/glshell.cxx
+++ b/sw/source/uibase/misc/glshell.cxx
@@ -68,8 +68,6 @@ void SwWebGlosDocShell::InitInterface_Impl()
 {
 }
 
-TYPEINIT1( SwGlosDocShell, SwDocShell );
-TYPEINIT1( SwWebGlosDocShell, SwWebDocShell );
 
 static void lcl_Execute( SwDocShell& rSh, SfxRequest& rReq )
 {
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index e0239fd1bb48..2d46ca8ceda0 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -144,7 +144,6 @@ void SwAnnotationShell::InitInterface_Impl()
     GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_ANNOTATION_POPUPMENU));
 }
 
-TYPEINIT1(SwAnnotationShell,SfxShell)
 
 SfxItemPool* SwAnnotationShell::GetAnnotationPool(SwView& rV)
 {
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 8949cea9121b..1fcfc3a68c4f 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -161,7 +161,6 @@ void SwBaseShell::InitInterface_Impl()
     GetStaticInterface()->RegisterChildWindow(SvxContourDlgChildWindow::GetChildWindowId());
 }
 
-TYPEINIT1(SwBaseShell,SfxShell)
 
 static void lcl_UpdateIMapDlg( SwWrtShell& rSh )
 {
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index ef49f21f72fb..fbe4f54d956a 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -52,7 +52,6 @@ void SwBezierShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_BEZIER_TOOLBOX);
 }
 
-TYPEINIT1(SwBezierShell,SwBaseShell)
 
 SwBezierShell::SwBezierShell(SwView &_rView):
     SwBaseShell( _rView )
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 3f1e09814594..e580ef5eeab7 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -80,7 +80,6 @@ void SwDrawShell::InitInterface_Impl()
     GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
 }
 
-TYPEINIT1(SwDrawShell,SwDrawBaseShell)
 
 // #i123922# check as the name implies
 SdrObject* SwDrawShell::IsSingleFillableNonOLESelected()
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index 6162ba5498e9..3d2ef44960c3 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -66,7 +66,6 @@ void SwDrawFormShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
 }
 
-TYPEINIT1(SwDrawFormShell, SwDrawBaseShell)
 
 void SwDrawFormShell::Execute(SfxRequest &rReq)
 {
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index ec43a4f81cc4..a5fcf6b350b7 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -72,7 +72,6 @@ void SwDrawBaseShell::InitInterface_Impl()
 {
 }
 
-TYPEINIT1(SwDrawBaseShell,SwBaseShell)
 
 SwDrawBaseShell::SwDrawBaseShell(SwView &_rView)
     : SwBaseShell(_rView)
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 4a8cb89257fe..391d0f175f6d 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -92,7 +92,6 @@ void SwDrawTextShell::InitInterface_Impl()
     GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
 }
 
-TYPEINIT1(SwDrawTextShell,SfxShell)
 
 void SwDrawTextShell::Init()
 {
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index 0ec00e554c19..91d0c7355d6d 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -58,7 +58,6 @@ void SwListShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_NUM_TOOLBOX);
 }
 
-TYPEINIT1(SwListShell,SwBaseShell)
 
 // #i35572# Functionality of Numbering/Bullet toolbar
 // for outline numbered paragraphs should match the functions for outlines
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 96016f8cf94e..55162768b06d 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -100,7 +100,6 @@ void SwTableShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TABLE_TOOLBOX);
 }
 
-TYPEINIT1(SwTableShell,SwBaseShell)
 
 static const sal_uInt16 aUITableAttrRange[] =
 {
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 619186115204..c0d542ec8aa2 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -133,7 +133,6 @@ void SwTextShell::InitInterface_Impl()
     GetStaticInterface()->RegisterChildWindow(FN_WORDCOUNT_DIALOG);
 }
 
-TYPEINIT1(SwTextShell,SwBaseShell)
 
 void SwTextShell::ExecInsert(SfxRequest &rReq)
 {
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 3c388fe66a8c..dc727de22312 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -99,7 +99,6 @@ void SwPagePreview::InitInterface_Impl()
                                             RID_PVIEW_TOOLBOX);
 }
 
-TYPEINIT1(SwPagePreview,SfxViewShell)
 
 #define SWVIEWFLAGS ( SfxViewShellFlags::CAN_PRINT | SfxViewShellFlags::HAS_PRINTOPTIONS )
 
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 7f1bc323ff53..0c55eedca0a4 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -126,7 +126,6 @@ void SwSrcView::InitInterface_Impl()
     GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId());
 }
 
-TYPEINIT1(SwSrcView, SfxViewShell)
 
 static void lcl_PrintHeader( vcl::RenderContext &rOutDev, sal_Int32 nPages, sal_Int32 nCurPage, const OUString& rTitle )
 {
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index c762faa60e13..aaa4703a9fa5 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -117,7 +117,6 @@ void SwView::InitInterface_Impl()
 #endif
 }
 
-TYPEINIT1(SwView,SfxViewShell)
 
 ShellModes  SwView::GetShellMode()
 {
diff --git a/sw/source/uibase/utlui/attrdesc.cxx b/sw/source/uibase/utlui/attrdesc.cxx
index 7b2db477f0cb..11653aa705c0 100644
--- a/sw/source/uibase/utlui/attrdesc.cxx
+++ b/sw/source/uibase/utlui/attrdesc.cxx
@@ -59,7 +59,6 @@
 
 using namespace com::sun::star;
 
-TYPEINIT2(SwFormatCharFormat,SfxPoolItem,SwClient);
 
 // query the attribute descriptions
 void SwAttrSet::GetPresentation(
diff --git a/sw/source/uibase/web/wdocsh.cxx b/sw/source/uibase/web/wdocsh.cxx
index e5ba996d5383..8cca32f3b570 100644
--- a/sw/source/uibase/web/wdocsh.cxx
+++ b/sw/source/uibase/web/wdocsh.cxx
@@ -47,7 +47,6 @@ void SwWebDocShell::InitInterface_Impl()
 {
 }
 
-TYPEINIT1(SwWebDocShell, SwDocShell);
 
 SFX_IMPL_OBJECTFACTORY(SwWebDocShell, SvGlobalName(SO3_SWWEB_CLASSID), SfxObjectShellFlags::STD_NORMAL|SfxObjectShellFlags::HASMENU, "swriter/web" )
 
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index 6daf3022188d..844de0332fd4 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -48,7 +48,6 @@ void SwWebDrawFormShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
 }
 
-TYPEINIT1(SwWebDrawFormShell, SwDrawFormShell)
 
 SwWebDrawFormShell::SwWebDrawFormShell(SwView& rVw) :
     SwDrawFormShell(rVw)
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index f455f57db584..de1b7896c7f6 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -47,7 +47,6 @@ void SwWebFrameShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBFRAME_TOOLBOX);
 }
 
-TYPEINIT1(SwWebFrameShell, SwFrameShell)
 
 SwWebFrameShell::SwWebFrameShell(SwView &_rView) :
     SwFrameShell(_rView)
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index 5994df559fd5..02433c941add 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -50,7 +50,6 @@ void SwWebGrfShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBGRAPHIC_TOOLBOX);
 }
 
-TYPEINIT1(SwWebGrfShell,SwGrfShell)
 
 SwWebGrfShell::SwWebGrfShell(SwView &_rView) :
     SwGrfShell(_rView)
diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx
index 65397e033dad..b58861a844aa 100644
--- a/sw/source/uibase/web/wlistsh.cxx
+++ b/sw/source/uibase/web/wlistsh.cxx
@@ -44,7 +44,6 @@ void SwWebListShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_NUM_TOOLBOX);
 }
 
-TYPEINIT1(SwWebListShell,SwListShell)
 
 SwWebListShell::SwWebListShell(SwView &_rView) :
     SwListShell(_rView)
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index f6578e83f6df..e58ab8a7b8b0 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -50,7 +50,6 @@ void SwWebTableShell::InitInterface_Impl()
     GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TABLE_TOOLBOX);
 }
 
-TYPEINIT1(SwWebTableShell,SwTableShell)
 
 SwWebTableShell::SwWebTableShell(SwView &_rView) :
     SwTableShell(_rView)
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index a572f85b1361..19f732c71222 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -56,7 +56,6 @@ void SwWebTextShell::InitInterface_Impl()
     GetStaticInterface()->RegisterChildWindow(FN_INSERT_FIELD);
 }
 
-TYPEINIT1(SwWebTextShell, SwTextShell)
 
 SwWebTextShell::SwWebTextShell(SwView &_rView) :
     SwTextShell(_rView)
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 0954f8bf69d0..8d298b7cf03d 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -86,7 +86,6 @@ void SwWebView::InitInterface_Impl()
                                             RID_WEBTOOLS_TOOLBOX);
 }
 
-TYPEINIT1(SwWebView,SwView)
 
 SwWebView::SwWebView(SfxViewFrame* _pFrame, SfxViewShell* _pShell) :
     SwView(_pFrame, _pShell)