diff options
Diffstat (limited to 'sw/source/core')
48 files changed, 10 insertions, 88 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; |