From 8f6c55a839d790c9268c1d0686f3eaf2f23484cb Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 7 Apr 2014 12:31:09 +0200 Subject: Replace SV_DECL/IMPL_REF macros with SvRef template Change-Id: I0ef2e67f6d61e0ce118c0f5e926b8194ef9d8058 --- idl/inc/basobj.hxx | 11 +++++------ idl/inc/hash.hxx | 2 +- idl/inc/module.hxx | 2 +- idl/inc/object.hxx | 6 ++---- idl/inc/slot.hxx | 2 +- idl/inc/types.hxx | 19 +++++++++---------- 6 files changed, 19 insertions(+), 23 deletions(-) (limited to 'idl') diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 623dedb72ca7..d09ef13d0abd 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -72,7 +72,7 @@ public: virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0 ); }; -SV_DECL_IMPL_REF(SvMetaObject) +typedef tools::SvRef SvMetaObjectRef; class SvMetaObjectMemberList : public SvDeclPersistList {}; @@ -141,12 +141,12 @@ public: WriteType, WriteAttribute = 0) SAL_OVERRIDE; void WriteDescription( SvStream& rOutStm ); }; -SV_DECL_IMPL_REF(SvMetaName) +typedef tools::SvRef SvMetaNameRef; class SvMetaNameMemberList : public SvDeclPersistList {}; - -SV_DECL_REF(SvMetaReference) +class SvMetaReference; +typedef tools::SvRef SvMetaReferenceRef; class SvMetaReference : public SvMetaName { protected: @@ -190,7 +190,6 @@ public: void SetRef( SvMetaReference * pRef ) { aRef = pRef; } }; -SV_IMPL_REF(SvMetaReference) class SvMetaReferenceMemberList : public SvDeclPersistList {}; @@ -225,7 +224,7 @@ protected: virtual void WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0) SAL_OVERRIDE; }; -SV_DECL_IMPL_REF(SvMetaExtern) +typedef tools::SvRef SvMetaExternRef; class SvMetaExternMemberList : public SvDeclPersistList {}; diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx index 5cf0b837edc4..267b514b84ff 100644 --- a/idl/inc/hash.hxx +++ b/idl/inc/hash.hxx @@ -92,7 +92,7 @@ public: } }; -SV_DECL_IMPL_REF(SvStringHashEntry) +typedef tools::SvRef SvStringHashEntryRef; typedef ::std::vector< SvStringHashEntry* > SvStringHashList; diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index 5200a27aa983..ff76450609ee 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -89,7 +89,7 @@ public: virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, HelpIdTable& rTable ); }; -SV_DECL_IMPL_REF(SvMetaModule) +typedef tools::SvRef SvMetaModuleRef; class SvMetaModuleMemberList : public SvDeclPersistList {}; diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 55f839dcd9c4..7f26446077e4 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -39,7 +39,7 @@ typedef std::vector< SvSlotElement* > SvSlotElementList; class SvMetaClass; typedef ::std::vector< SvMetaClass* > SvMetaClassList; -SV_DECL_REF(SvMetaClass) +typedef tools::SvRef SvMetaClassRef; class SvClassElement : public SvPersistBase { SvBOOL aAutomation; @@ -65,7 +65,7 @@ public: { return xClass; } }; -SV_DECL_IMPL_REF(SvClassElement) +typedef tools::SvRef SvClassElementRef; class SvClassElementMemberList : public SvDeclPersistList {}; @@ -134,8 +134,6 @@ public: virtual void WriteHelpIds( SvIdlDataBase & rBase, SvStream & rOutStm, HelpIdTable& rTable ); }; -SV_IMPL_REF(SvMetaClass) - #endif // _OBJECT_HXX diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index c0041ef29de5..48a85c00c325 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -253,7 +253,7 @@ public: HelpIdTable& rIdTable ) SAL_OVERRIDE; virtual void WriteCSV( SvIdlDataBase&, SvStream& ) SAL_OVERRIDE; }; -SV_DECL_IMPL_REF(SvMetaSlot) +typedef tools::SvRef SvMetaSlotRef; class SvMetaSlotMemberList : public SvDeclPersistList {}; diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index b127d70e13bb..ee0d363739a2 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -31,10 +31,8 @@ typedef std::vector< SvSlotElement* > SvSlotElementList; class SvMetaSlot; typedef std::map HelpIdTable; -SV_DECL_REF(SvMetaType) -SV_DECL_REF(SvMetaAttribute) - -class SvMetaAttributeMemberList : public SvDeclPersistList {}; +class SvMetaType; +typedef tools::SvRef SvMetaTypeRef; class SvMetaAttribute : public SvMetaReference { @@ -120,8 +118,10 @@ public: void FillIDTable(HelpIdTable& rIDTable); OString Compare( SvMetaAttribute *pAttr ); }; -SV_IMPL_REF(SvMetaAttribute) +typedef tools::SvRef SvMetaAttributeRef; + +class SvMetaAttributeMemberList : public SvDeclPersistList {}; enum { CALL_VALUE, CALL_POINTER, CALL_REFERENCE }; enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM, TYPE_UNION, @@ -236,7 +236,6 @@ public: void WriteParamNames( SvIdlDataBase & rBase, SvStream & rOutStm, const OString& rChief ); }; -SV_IMPL_REF(SvMetaType) class SvMetaTypeMemberList : public SvDeclPersistList {}; @@ -246,7 +245,7 @@ public: SV_DECL_META_FACTORY1( SvMetaTypeString, SvMetaType, 19 ) SvMetaTypeString(); }; -SV_DECL_IMPL_REF(SvMetaTypeString) +typedef tools::SvRef SvMetaTypeStringRef; class SvMetaTypeStringMemberList : public SvDeclPersistList {}; @@ -262,7 +261,7 @@ public: virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, sal_uInt16 nTab, WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; }; -SV_DECL_IMPL_REF(SvMetaEnumValue) +typedef tools::SvRef SvMetaEnumValueRef; class SvMetaEnumValueMemberList : public SvDeclPersistList {}; @@ -293,7 +292,7 @@ public: sal_uInt16 nTab, WriteType, WriteAttribute = 0 ) SAL_OVERRIDE; }; -SV_DECL_IMPL_REF(SvMetaTypeEnum) +typedef tools::SvRef SvMetaTypeEnumRef; class SvMetaTypeEnumMemberList : public SvDeclPersistList {}; @@ -303,7 +302,7 @@ public: SV_DECL_META_FACTORY1( SvMetaTypevoid, SvMetaName, 22 ) SvMetaTypevoid(); }; -SV_DECL_IMPL_REF(SvMetaTypevoid) +typedef tools::SvRef SvMetaTypevoidRef; class SvMetaTypevoidMemberList : public SvDeclPersistList {}; -- cgit