diff options
author | Joseph Powers <jpowers27@cox.net> | 2010-12-28 07:16:01 -0800 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2010-12-31 06:57:20 -0800 |
commit | cdd425de05e1a6098a732115014b258e2a69a076 (patch) | |
tree | 36e9fe84dbe5f3b1ff9cf795e5de313f7f388e96 /idl/inc | |
parent | 8b33788c270f5caf630915ab067ff4d685a081c2 (diff) |
Remove DECLARE_LIST(SvAttributeListImpl,SvAttribute*)
Diffstat (limited to 'idl/inc')
-rw-r--r-- | idl/inc/attrib.hxx | 79 | ||||
-rw-r--r-- | idl/inc/basobj.hxx | 28 |
2 files changed, 2 insertions, 105 deletions
diff --git a/idl/inc/attrib.hxx b/idl/inc/attrib.hxx deleted file mode 100644 index ca7399304f0e..000000000000 --- a/idl/inc/attrib.hxx +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _ATTRIB_HXX -#define _ATTRIB_HXX - -#ifdef IDL_COMPILER -#include <hash.hxx> -#include <object.hxx> - -/******************** class SvAttribute **********************************/ -class SvAttribute -{ - SvStringHashEntryRef aName; - CreateMetaObjectType pCreateMethod; - SvMetaObjectRef aTmpClass; -public: - SvAttribute( SvStringHashEntry * pAttribName, - CreateMetaObjectType pMethod ) - : aName( pAttribName ), - pCreateMethod( pMethod ) {} - - SvMetaObjectRef CreateClass() - { - if( aTmpClass.Is() ) - { - SvMetaObjectRef aTmp( aTmpClass ); - aTmpClass.Clear(); - return aTmp; - } - return pCreateMethod(); - } -}; - -#define SV_ATTRIBUTE( AttributeName, PostfixClassName ) \ - SvAttribute( SvHash_##AttributeName(), \ - SvMeta##PostfixClassName::Create ) - -/******************** class SvAttributeList ******************************/ -DECLARE_LIST(SvAttributeListImpl,SvAttribute*) -class SvAttributeList : public SvAttributeListImpl -{ -public: - SvAttributeList() : SvAttributeListImpl() {} - - void Append( SvAttribute * pObj ) - { Insert( pObj, LIST_APPEND ); } -}; - - -#endif // IDL_COMPILER -#endif // _ATTRIB_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 134c62880234..f029b71b4cc8 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -60,43 +60,20 @@ enum typedef int WriteAttribute; /******************** Meta Factory **************************************/ -#ifdef IDL_COMPILER - -#define PRV_SV_DECL_META_FACTORY( Class ) \ - static SvAttributeList * pAttribList; \ - static SvMetaObject * Create() { return new Class; } \ - static const char * GetClassName() { return #Class; } - -#define PRV_SV_IMPL_META_FACTORY( Class ) \ - SvAttributeList * Class::pAttribList = NULL; - -#else - -#define PRV_SV_DECL_META_FACTORY( Class ) - -#define PRV_SV_IMPL_META_FACTORY( Class ) - -#endif // IDL_COMPILER - #define SV_DECL_META_FACTORY( Class, CLASS_ID ) \ - SV_DECL_PERSIST( Class, CLASS_ID ) \ - PRV_SV_DECL_META_FACTORY( Class ) + SV_DECL_PERSIST( Class, CLASS_ID ) #define SV_DECL_META_FACTORY1( Class, Super1, CLASS_ID ) \ - SV_DECL_PERSIST1( Class, Super1, CLASS_ID ) \ - PRV_SV_DECL_META_FACTORY( Class ) + SV_DECL_PERSIST1( Class, Super1, CLASS_ID ) #define SV_IMPL_META_FACTORY( Class ) \ - PRV_SV_IMPL_META_FACTORY( Class ) \ SV_IMPL_PERSIST( Class ) #define SV_IMPL_META_FACTORY1( Class, Super1 ) \ - PRV_SV_IMPL_META_FACTORY( Class ) \ SV_IMPL_PERSIST1( Class, Super1 ) - /******************** class SvMetaObject ********************************/ class SvMetaObject : public SvPersistBase { @@ -121,7 +98,6 @@ public: #endif }; SV_DECL_IMPL_REF(SvMetaObject) -//SV_DECL_IMPL_PERSIST_LIST(SvMetaObject,SvMetaObject *) SV_DECL_PERSIST_LIST(SvMetaObject,SvMetaObject *) SV_IMPL_PERSIST_LIST(SvMetaObject,SvMetaObject *) |