diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-05-20 18:00:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-05-20 18:00:29 +0000 |
| commit | f4407464f22cd4fd93264c2fa007895e0819b0d7 (patch) | |
| tree | 5db06883d4eb29bb3a09ec79bf30afe80afd6f79 /idl | |
| parent | 1114d78012d14e4055ed4e14c323abe7e7b9652b (diff) | |
INTEGRATION: CWS mba30patches01 (1.3.36); FILE MERGED
2008/04/23 09:44:43 mba 1.3.36.2: RESYNC: (1.3-1.4); FILE MERGED
2008/03/18 15:40:03 mba 1.3.36.1: #i86353#: remove unused code
Diffstat (limited to 'idl')
| -rw-r--r-- | idl/inc/basobj.hxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index c818d311b3c9..eba0e6a1547f 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: basobj.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.5 $ * * This file is part of OpenOffice.org. * @@ -66,7 +66,6 @@ typedef int WriteAttribute; #define PRV_SV_DECL_META_FACTORY( Class ) \ static SvAttributeList * pAttribList; \ - static SvAttributeList & GetAttributeList(); \ static SvMetaObject * Create() { return new Class; } \ static const char * GetClassName() { return #Class; } @@ -83,27 +82,21 @@ typedef int WriteAttribute; #define SV_DECL_META_FACTORY( Class, CLASS_ID ) \ SV_DECL_PERSIST( Class, CLASS_ID ) \ - PRV_SV_DECL_META_FACTORY( Class ) \ - SvMetaObject * MakeClone() const; \ - Class * Clone() const { return (Class *)MakeClone(); } + PRV_SV_DECL_META_FACTORY( Class ) #define SV_DECL_META_FACTORY1( Class, Super1, CLASS_ID ) \ SV_DECL_PERSIST1( Class, Super1, CLASS_ID ) \ - PRV_SV_DECL_META_FACTORY( Class ) \ - SvMetaObject * MakeClone() const; \ - Class * Clone() const { return (Class *)MakeClone(); } + PRV_SV_DECL_META_FACTORY( Class ) #define SV_IMPL_META_FACTORY( Class ) \ PRV_SV_IMPL_META_FACTORY( Class ) \ - SV_IMPL_PERSIST( Class ) \ - SvMetaObject * Class::MakeClone() const { return new Class( *this ); } + SV_IMPL_PERSIST( Class ) #define SV_IMPL_META_FACTORY1( Class, Super1 ) \ PRV_SV_IMPL_META_FACTORY( Class ) \ - SV_IMPL_PERSIST1( Class, Super1 ) \ - SvMetaObject * Class::MakeClone() const { return new Class( *this ); } + SV_IMPL_PERSIST1( Class, Super1 ) /******************** class SvMetaObject ********************************/ |