summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--idl/inc/attrib.hxx79
-rw-r--r--idl/inc/basobj.hxx30
-rw-r--r--idl/source/objects/basobj.cxx3
-rw-r--r--idl/source/objects/module.cxx3
-rw-r--r--idl/source/objects/object.cxx3
-rw-r--r--idl/source/objects/slot.cxx5
-rw-r--r--idl/source/objects/types.cxx3
7 files changed, 9 insertions, 117 deletions
diff --git a/idl/inc/attrib.hxx b/idl/inc/attrib.hxx
deleted file mode 100644
index fadb5feeec..0000000000
--- 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 ed8a0707d2..5993e0f939 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -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 *)
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 474ca866f3..46936b3124 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -34,7 +34,6 @@
#include <tools/debug.hxx>
-#include <attrib.hxx>
#include <basobj.hxx>
#include <module.hxx>
#include <globals.hxx>
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index d9c148e280..73b20cc1ff 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -32,7 +32,6 @@
#include <ctype.h>
#include <stdio.h>
-#include <attrib.hxx>
#include <module.hxx>
#include <globals.hxx>
#include <database.hxx>
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index 369033674c..fb76ff10af 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -34,7 +34,6 @@
#include <tools/debug.hxx>
-#include <attrib.hxx>
#include <object.hxx>
#include <globals.hxx>
#include <database.hxx>
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index ee93d5bbc5..2ebc6c1d6d 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -32,7 +32,6 @@
#include <ctype.h>
#include <stdio.h>
#include <tools/debug.hxx>
-#include <attrib.hxx>
#include <slot.hxx>
#include <globals.hxx>
#include <database.hxx>
@@ -42,7 +41,7 @@ SV_IMPL_META_FACTORY1( SvMetaSlot, SvMetaAttribute );
SvMetaObject *SvMetaSlot::MakeClone() const
{
- return new SvMetaSlot( *this );
+ return new SvMetaSlot( *this );
}
/*************************************************************************
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index bed45839cd..d8085e3b2b 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -34,7 +34,6 @@
#include <tools/debug.hxx>
-#include <attrib.hxx>
#include <types.hxx>
#include <globals.hxx>
#include <database.hxx>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-02 04:03:35 +0000