9 files changed, 2 insertions, 19 deletions
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
 {