diff options
Diffstat (limited to 'svl/source')
31 files changed, 49 insertions, 55 deletions
diff --git a/svl/source/inc/strmadpt.hxx b/svl/source/inc/strmadpt.hxx index 079cda74dd86..90fc31eb139b 100644 --- a/svl/source/inc/strmadpt.hxx +++ b/svl/source/inc/strmadpt.hxx @@ -31,7 +31,6 @@ class SvOutputStreamOpenLockBytes: public SvOpenLockBytes sal_uInt64 m_nPosition; public: - TYPEINFO_OVERRIDE(); SvOutputStreamOpenLockBytes( const css::uno::Reference< css::io::XOutputStream > & rTheOutputStream): diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 57dbd88d9996..f56d4045da97 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -23,7 +23,7 @@ #include <vector> -TYPEINIT1_AUTOFACTORY(SfxAllEnumItem, SfxEnumItem) +SfxPoolItem* SfxAllEnumItem::CreateDefault() { return new SfxAllEnumItem; } struct SfxAllEnumValue_Impl diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index a01f4b3eb99e..6f1bd0512ce3 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -26,7 +26,6 @@ #include <comphelper/extract.hxx> -TYPEINIT1(SfxEnumItemInterface, SfxPoolItem) // virtual bool SfxEnumItemInterface::operator ==(const SfxPoolItem & rItem) const @@ -119,7 +118,6 @@ SfxEnumItem::SfxEnumItem(sal_uInt16 const nWhich, SvStream & rStream) rStream.ReadUInt16( m_nValue ); } -TYPEINIT1(SfxEnumItem, SfxEnumItemInterface) // virtual SvStream & SfxEnumItem::Store(SvStream & rStream, sal_uInt16) const @@ -146,7 +144,10 @@ void SfxEnumItem::SetValue(sal_uInt16 const nTheValue) m_nValue = nTheValue; } -TYPEINIT1_AUTOFACTORY(SfxBoolItem, SfxPoolItem); +SfxPoolItem* SfxBoolItem::CreateDefault() +{ + return new SfxBoolItem(); +} SfxBoolItem::SfxBoolItem(sal_uInt16 const nWhich, SvStream & rStream) : SfxPoolItem(nWhich) diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index 4013cf771f16..6d30f4a44dd6 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -22,7 +22,6 @@ #include <tools/stream.hxx> #include <svl/cintitem.hxx> -TYPEINIT1_AUTOFACTORY(CntByteItem, SfxPoolItem); // virtual bool CntByteItem::operator ==(const SfxPoolItem & rItem) const @@ -85,7 +84,6 @@ SfxPoolItem * CntByteItem::Clone(SfxItemPool *) const return new CntByteItem(*this); } -TYPEINIT1_AUTOFACTORY(CntUInt16Item, SfxPoolItem); CntUInt16Item::CntUInt16Item(sal_uInt16 which, SvStream & rStream) : SfxPoolItem(which) @@ -157,7 +155,6 @@ SfxPoolItem * CntUInt16Item::Clone(SfxItemPool *) const return new CntUInt16Item(*this); } -TYPEINIT1_AUTOFACTORY(CntInt32Item, SfxPoolItem); CntInt32Item::CntInt32Item(sal_uInt16 which, SvStream & rStream) : SfxPoolItem(which) @@ -226,7 +223,6 @@ SfxPoolItem * CntInt32Item::Clone(SfxItemPool *) const return new CntInt32Item(*this); } -TYPEINIT1_AUTOFACTORY(CntUInt32Item, SfxPoolItem); CntUInt32Item::CntUInt32Item(sal_uInt16 which, SvStream & rStream) : SfxPoolItem(which) diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 7728f6b56d8a..0bba3ae92086 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -29,7 +29,6 @@ #define CNTWALLPAPERITEM_STREAM_MAGIC ( (sal_uInt32)0xfefefefe ) #define CNTWALLPAPERITEM_STREAM_SEEKREL (-( (long)( sizeof( sal_uInt32 ) ) ) ) -TYPEINIT1( CntWallpaperItem, SfxPoolItem ); CntWallpaperItem::CntWallpaperItem( sal_uInt16 which ) diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 3f87e5468df7..ae559c3affad 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -33,7 +33,6 @@ // class CntContentTypeItem Implementation. -TYPEINIT1_AUTOFACTORY( CntContentTypeItem, CntUnencodedStringItem ); #define CONTENT_TYPE_NOT_INIT ( (INetContentType)-1 ) diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index 8109d4877689..9f84dc32a0e6 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -24,7 +24,6 @@ #include <tools/stream.hxx> #include <svl/custritm.hxx> -TYPEINIT1_AUTOFACTORY(CntUnencodedStringItem, SfxPoolItem) // virtual bool CntUnencodedStringItem::operator ==(const SfxPoolItem & rItem) const diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index faa63f53d0df..905555dcdd54 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -22,7 +22,6 @@ #include <svl/poolitem.hxx> #include <tools/stream.hxx> -TYPEINIT1(SfxFlagItem, SfxPoolItem); diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 67aec474d1e4..793d0a79206b 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -31,8 +31,8 @@ // STATIC DATA -TYPEINIT1_AUTOFACTORY(SfxGlobalNameItem, SfxPoolItem); +SfxPoolItem* SfxGlobalNameItem::CreateDefault() { return new SfxGlobalNameItem; } SfxGlobalNameItem::SfxGlobalNameItem() diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx index 19213b65764c..2ed43f672785 100644 --- a/svl/source/items/grabbagitem.cxx +++ b/svl/source/items/grabbagitem.cxx @@ -14,7 +14,6 @@ #include <comphelper/sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -TYPEINIT1_AUTOFACTORY(SfxGrabBagItem, SfxPoolItem); using namespace com::sun::star; diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx index fe36cb62337a..ca2acb7a3da6 100644 --- a/svl/source/items/ilstitem.cxx +++ b/svl/source/items/ilstitem.cxx @@ -24,7 +24,8 @@ #include <svl/ilstitem.hxx> -TYPEINIT1_AUTOFACTORY(SfxIntegerListItem, SfxPoolItem); + +SfxPoolItem* SfxIntegerListItem::CreateDefault() { return new SfxIntegerListItem; } SfxIntegerListItem::SfxIntegerListItem() { diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index 4c56f41f1fca..e956460f9641 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -21,7 +21,8 @@ #include <svl/imageitm.hxx> #include <com/sun/star/uno/Sequence.hxx> -TYPEINIT1( SfxImageItem, SfxInt16Item ); + +SfxPoolItem* SfxImageItem::CreateDefault() { return new SfxImageItem; } struct SfxImageItem_Impl { diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 05eb03912451..2757ed0e0745 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -30,7 +30,10 @@ // class SfxByteItem -TYPEINIT1_AUTOFACTORY(SfxByteItem, CntByteItem); +SfxPoolItem* SfxByteItem::CreateDefault() +{ + return new SfxByteItem(); +}; // virtual SfxPoolItem * SfxByteItem::Create(SvStream & rStream, sal_uInt16) const @@ -40,7 +43,10 @@ SfxPoolItem * SfxByteItem::Create(SvStream & rStream, sal_uInt16) const return new SfxByteItem(Which(), sal_uInt8(nValue)); } -TYPEINIT1_AUTOFACTORY(SfxInt16Item, SfxPoolItem); +SfxPoolItem* SfxInt16Item::CreateDefault() +{ + return new SfxInt16Item(); +}; SfxInt16Item::SfxInt16Item(sal_uInt16 which, SvStream & rStream): SfxPoolItem(which) @@ -110,7 +116,10 @@ SfxPoolItem * SfxInt16Item::Clone(SfxItemPool *) const } // class SfxUInt16Item -TYPEINIT1_AUTOFACTORY(SfxUInt16Item, CntUInt16Item); +SfxPoolItem* SfxUInt16Item::CreateDefault() +{ + return new SfxUInt16Item(); +}; void SfxUInt16Item::dumpAsXml(xmlTextWriterPtr pWriter) const { @@ -124,16 +133,21 @@ void SfxUInt16Item::dumpAsXml(xmlTextWriterPtr pWriter) const // class SfxInt32Item -TYPEINIT1_AUTOFACTORY(SfxInt32Item, CntInt32Item); +SfxPoolItem* SfxInt32Item::CreateDefault() +{ + return new SfxInt32Item(); +}; // class SfxUInt32Item -TYPEINIT1_AUTOFACTORY(SfxUInt32Item, CntUInt32Item); +SfxPoolItem* SfxUInt32Item::CreateDefault() +{ + return new SfxUInt32Item(); +}; -TYPEINIT1_AUTOFACTORY(SfxMetricItem, SfxInt32Item); SfxMetricItem::SfxMetricItem(sal_uInt16 which, sal_uInt32 nValue): SfxInt32Item(which, nValue) diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 71dcfb0e57a8..de032c0af575 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -669,7 +669,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich } SFX_ASSERT( !pImp->ppStaticDefaults || - rItem.IsA(GetDefaultItem(nWhich).Type()), nWhich, + typeid(rItem) == typeid(GetDefaultItem(nWhich)), nWhich, "SFxItemPool: wrong item type in Put" ); SfxPoolItemArray_Impl* pItemArr = pImp->maPoolItems[nIndex]; diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index a21cdb5ebf8b..352019f1c57c 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -440,7 +440,7 @@ SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich, // Different ones are present return SfxItemState::DONTCARE; - if ( (*ppFnd)->Type() == TYPE(SfxVoidItem) ) + if ( dynamic_cast<const SfxVoidItem *>(*ppFnd) != nullptr ) return SfxItemState::DISABLED; if (ppItem) diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 573765b0bea5..4cc6d2f305d8 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -26,7 +26,8 @@ -TYPEINIT1_AUTOFACTORY(SfxLockBytesItem, SfxPoolItem); + +SfxPoolItem* SfxLockBytesItem::CreateDefault() { return new SfxLockBytesItem; } diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index f8406c477fe8..133a1d944bac 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -25,8 +25,7 @@ #include <svl/macitem.hxx> #include <stringio.hxx> -TYPEINIT1_FACTORY(SvxMacroItem, SfxPoolItem, new SvxMacroItem(0)); - +SfxPoolItem* SvxMacroItem::CreateDefault() { return new SvxMacroItem(0); } SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLanguage) diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 7df7535d65cb..36eaac4f2f78 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -22,12 +22,7 @@ #include <tools/stream.hxx> #include <osl/diagnose.h> #include <libxml/xmlwriter.h> - -TYPEINIT0(SfxPoolItem); -TYPEINIT1(SfxVoidItem, SfxPoolItem); -// @@@ TYPEINIT1(SfxInvalidItem, SfxPoolItem); -TYPEINIT1(SfxSetItem, SfxPoolItem); -// @@@ TYPEINIT1(SfxItemChangedHint, SfxHint); +#include <typeinfo> #if OSL_DEBUG_LEVEL > 1 @@ -125,7 +120,7 @@ SfxPoolItem::~SfxPoolItem() bool SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const { - return rCmp.Type() == Type(); + return typeid(rCmp) == typeid(*this); } @@ -200,6 +195,10 @@ void SfxPoolItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr())); xmlTextWriterEndElement(pWriter); } +SfxPoolItem* SfxVoidItem::CreateDefault() +{ + return new SfxVoidItem(0); +} SfxVoidItem::SfxVoidItem( sal_uInt16 which ): SfxPoolItem(which) diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index 56dfd45fd67f..e4f5c3593edb 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -30,8 +30,8 @@ using namespace ::com::sun::star; -TYPEINIT1_AUTOFACTORY(SfxPointItem, SfxPoolItem); +SfxPoolItem* SfxPointItem::CreateDefault() { return new SfxPointItem; } SfxPointItem::SfxPointItem() diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index ffc1d8ad4800..f4c95be10485 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -27,8 +27,8 @@ #include <svl/poolitem.hxx> #include <svl/memberid.hrc> -TYPEINIT1_AUTOFACTORY(SfxRectangleItem, SfxPoolItem); +SfxPoolItem* SfxRectangleItem::CreateDefault() { return new SfxRectangleItem; } SfxRectangleItem::SfxRectangleItem() diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index 1eb615b2a2b0..a1205894aee1 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -32,8 +32,6 @@ static inline sal_uInt16 Count_Impl(const sal_uInt16 * pRanges) -TYPEINIT1_AUTOFACTORY(SfxRangeItem, SfxPoolItem); -TYPEINIT1_AUTOFACTORY(SfxUShortRangesItem, SfxPoolItem); SfxRangeItem::SfxRangeItem() { diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 9f35483ec7fd..11dac598010b 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -26,8 +26,7 @@ #include <tools/stream.hxx> #include <stringio.hxx> -TYPEINIT1_AUTOFACTORY(SfxStringListItem, SfxPoolItem); - +SfxPoolItem* SfxStringListItem::CreateDefault() { return new SfxStringListItem; } class SfxImpStringList { public: diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx index 1756a43b369b..9cfcbfa22eea 100644 --- a/svl/source/items/srchitem.cxx +++ b/svl/source/items/srchitem.cxx @@ -61,8 +61,8 @@ using namespace com::sun::star::util; // STATIC DATA -TYPEINIT1_FACTORY(SvxSearchItem, SfxPoolItem, new SvxSearchItem(0)); +SfxPoolItem* SvxSearchItem::CreateDefault() { return new SvxSearchItem(0);} static Sequence< OUString > lcl_GetNotifyNames() diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx index dea5550102c9..d2665fe3fa4c 100644 --- a/svl/source/items/stritem.cxx +++ b/svl/source/items/stritem.cxx @@ -24,7 +24,6 @@ // class SfxStringItem -TYPEINIT1_AUTOFACTORY(SfxStringItem, CntUnencodedStringItem) // virtual SfxStringItem::SfxStringItem(sal_uInt16 which, SvStream & rStream): @@ -60,5 +59,8 @@ void SfxStringItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(GetValue().toUtf8().getStr())); xmlTextWriterEndElement(pWriter); } - +SfxPoolItem* SfxStringItem::CreateDefault() +{ + return new SfxStringItem(); +}; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index a164475a1ec4..a10cc04a7d66 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -58,9 +58,7 @@ aDbgStyleSheetReferences; #endif -TYPEINIT0(SfxStyleSheetBase) -TYPEINIT3(SfxStyleSheet, SfxStyleSheetBase, SfxListener, SfxBroadcaster) SfxStyleSheetHintExtended::SfxStyleSheetHintExtended ( diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index 90a7074eeb64..dffa4bdac26e 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -27,7 +27,6 @@ #include <svl/poolitem.hxx> #include <svl/memberid.hrc> -TYPEINIT1_AUTOFACTORY(SfxSizeItem, SfxPoolItem); diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index d73e54deeb0c..99f3ca4fbac0 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -22,7 +22,6 @@ #include <osl/diagnose.h> #include <tools/stream.hxx> -TYPEINIT1_AUTOFACTORY(SfxVisibilityItem, SfxPoolItem); SfxVisibilityItem::SfxVisibilityItem(sal_uInt16 which, SvStream & rStream): SfxPoolItem(which) diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index f350153a8b9f..e0157a1406b1 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -129,7 +129,6 @@ inline bool SvDataPipe_Impl::isEOF() const // SvOutputStreamOpenLockBytes -TYPEINIT1(SvOutputStreamOpenLockBytes, SvOpenLockBytes) // virtual ErrCode SvOutputStreamOpenLockBytes::ReadAt(sal_uInt64, void *, sal_uLong, sal_uLong*) diff --git a/svl/source/notify/SfxBroadcaster.cxx b/svl/source/notify/SfxBroadcaster.cxx index d132e86e0651..0a7ef4b4e963 100644 --- a/svl/source/notify/SfxBroadcaster.cxx +++ b/svl/source/notify/SfxBroadcaster.cxx @@ -28,7 +28,6 @@ #include <cassert> #include <vector> -TYPEINIT0(SfxBroadcaster); typedef std::vector<SfxListener*> SfxListenerArr_Impl; diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx index 4fc3426b8bd4..e24becc4f1e1 100644 --- a/svl/source/notify/lstner.cxx +++ b/svl/source/notify/lstner.cxx @@ -26,7 +26,6 @@ #include <cassert> #include <deque> -TYPEINIT0(SfxListener); typedef std::deque<SfxBroadcaster*> SfxBroadcasterArr_Impl; diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 7048b99f2bf4..c65ea1bfef5f 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -34,10 +34,6 @@ using ::com::sun::star::uno::Exception; -TYPEINIT0(SfxUndoAction); -TYPEINIT0(SfxListUndoAction); -TYPEINIT0(SfxLinkUndoAction); -TYPEINIT0(SfxRepeatTarget); SfxRepeatTarget::~SfxRepeatTarget() |