summaryrefslogtreecommitdiff
authorMichael Stahl <mstahl@redhat.com>2012-11-28 11:13:00 (GMT)
committer Michael Stahl <mstahl@redhat.com>2012-11-28 13:23:05 (GMT)
commit6eb7ee11c6a8286de7141e3938e10c96e4f3d81d (patch) (side-by-side diff)
treedfde29a09f55a3b6f701424dc75f2b126270b8e0
parentb4a004e65655446c0bec8a134444b43f375b7471 (diff)
downloadcore-6eb7ee11c6a8286de7141e3938e10c96e4f3d81d.zip
core-6eb7ee11c6a8286de7141e3938e10c96e4f3d81d.tar.gz
API CHANGE: remove com.sun.star.corba module
The com.sun.star.corba module is entirely deprecated and unused. EXISTENCE: published key "/UCR/com/sun/star/corba/ObjectSystemID" exists only in registry 1 EXISTENCE: module "/UCR/com/sun/star/corba/iiop" with published children exists only in registry 1 EXISTENCE: published key "/UCR/com/sun/star/corba/OpaqueData" exists only in registry 1 EXISTENCE: published key "/UCR/com/sun/star/corba/ObjectKey" exists only in registry 1 EXISTENCE: module "/UCR/com/sun/star/corba/iop" with published children exists only in registry 1 EXISTENCE: module "/UCR/com/sun/star/corba/giop" with published children exists only in registry 1 EXISTENCE: published key "/UCR/com/sun/star/corba/CorbaString8" exists only in registry 1 EXISTENCE: published key "/UCR/com/sun/star/corba/OneThreadID" exists only in registry 1 EXISTENCE: published key "/UCR/com/sun/star/corba/CorbaUnion" exists only in registry 1 EXISTENCE: published key "/UCR/com/sun/star/corba/LogicalThreadID" exists only in registry 1 EXISTENCE: published key "/UCR/com/sun/star/corba/TCKind" exists only in registry 1 EXISTENCE: published key "/UCR/com/sun/star/corba/ThreadIDs" exists only in registry 1 Change-Id: I0331d0462f2187ba8d8eacf2a5b3f6af20963304
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--offapi/type_reference/types.rdbbin7646208 -> 7646208 bytes
-rw-r--r--udkapi/UnoApi_udkapi.mk12
-rw-r--r--udkapi/com/sun/star/corba/corba.idl102
-rw-r--r--udkapi/com/sun/star/corba/giop/giop.idl248
-rw-r--r--udkapi/com/sun/star/corba/iiop/iiop.idl84
-rw-r--r--udkapi/com/sun/star/corba/iop/iop.idl120
6 files changed, 0 insertions, 566 deletions
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index dc8fc10..e7e9c0e 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
Binary files differ
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 3826f3c..c322585 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -57,18 +57,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/bridge/
BridgeSupplier \
Factory \
))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba,\
- corba \
-))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/giop,\
- giop \
-))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iiop,\
- iiop \
-))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/corba/iop,\
- iop \
-))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,udkapi,udkapi/com/sun/star/io,\
DataInputStream \
DataOutputStream \
diff --git a/udkapi/com/sun/star/corba/corba.idl b/udkapi/com/sun/star/corba/corba.idl
deleted file mode 100644
index 191ea08..0000000
--- a/udkapi/com/sun/star/corba/corba.idl
+++ b/dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef __com_sun_star_corba_corba_idl__
-#define __com_sun_star_corba_corba_idl__
-
-module com { module sun { module star { module corba
-{
- /**
- @deprecated
- */
- published typedef unsigned long ObjectSystemID;
- /**
- @deprecated
- */
- published typedef sequence< byte > OpaqueData;
-
- /**
- @deprecated
- */
- published struct OneThreadID
- {
- ObjectSystemID objSysID;
- OpaqueData threadID;
- };
-
- /**
- @deprecated
- */
- published typedef sequence<OneThreadID> ThreadIDs;
-
- /**
- @deprecated
- */
- published struct LogicalThreadID // Service context
- {
- ThreadIDs IDs;
- };
-
- /**
- @deprecated
- */
- published struct CorbaString8
- {
- string theString;
- };
-
- /**
- @deprecated
- */
- published struct CorbaUnion
- {
- long dummy;
- };
-
- /**
- @deprecated
- */
- published struct ObjectKey
- {
- CorbaString8 sOid;
- CorbaString8 sType;
- };
-
- /**
- @deprecated
- */
- published enum TCKind
- {
- tk_null, tk_void,
- tk_short, tk_long, tk_ushort, tk_ulong,
- tk_float, tk_double, tk_boolean, tk_char,
- tk_octet, tk_any, tk_TypeCode, tk_Principal, tk_objref,
- tk_struct, tk_union, tk_enum, tk_string,
- tk_sequence, tk_array, tk_alias, tk_except,
- tk_longlong, tk_ulonglong, tk_longdouble,
- tk_wchar, tk_wstring, tk_fixed,
- tk_value, tk_value_box,
- tk_native,
- tk_abstract_interface
- };
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/corba/giop/giop.idl b/udkapi/com/sun/star/corba/giop/giop.idl
deleted file mode 100644
index 5e47576..0000000
--- a/udkapi/com/sun/star/corba/giop/giop.idl
+++ b/dev/null
@@ -1,248 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef __com_sun_star_corba_giop_giop_idl__
-#define __com_sun_star_corba_giop_giop_idl__
-
-#include <com/sun/star/corba/iop/iop.idl>
-module com { module sun { module star { module corba { module giop
-{
- /**
- @deprecated
- */
-published struct Version
- {
- byte major;
- byte minor;
- };
-
- /**
- @deprecated
- */
-published enum MsgType_1_1
- {
- Request, Reply, CancelRequest,
- LocateRequest, LocateReply,
- CloseConnection, MessageError,
- Fragment // GIOP 1.1 addition
- };
-
-
- /**
- @deprecated
- */
-published struct MessageHeader_1_0
- {// Renamed from MessageHeader
- byte magic_1;
- byte magic_2;
- byte magic_3;
- byte magic_4;
- Version GIOP_version;
- boolean byte_order;
- byte message_type;
- unsigned long message_size;
- };
-
- /**
- @deprecated
- */
-published struct MessageHeader_1_1
- {
- byte magic_1;
- byte magic_2;
- byte magic_3;
- byte magic_4;
- Version GIOP_version;
- byte flags; // GIOP 1.1 change
- byte message_type;
- unsigned long message_size;
- };
-
- /**
- @deprecated
- */
-published typedef MessageHeader_1_1 MessageHeader_1_2;
-
- /**
- @deprecated
- */
-published struct RequestHeader_1_0
- {
- com::sun::star::corba::iop::ServiceContextList service_context;
- unsigned long request_id;
- boolean response_expected;
- sequence < byte > object_key;
- com::sun::star::corba::CorbaString8 operation;
- sequence < byte > requesting_principal;
- };
-
- /**
- @deprecated
- */
-published struct RequestHeader_1_1
- {
- com::sun::star::corba::iop::ServiceContextList service_context;
- unsigned long request_id;
- boolean response_expected;
- byte reserved_1;
- byte reserved_2;
- byte reserved_3; // Added in GIOP 1.1
- sequence <byte> object_key;
- com::sun::star::corba::CorbaString8 operation;
- sequence <byte> requesting_principal; // binary compatible
- };
-
- /**
- @deprecated
- */
-published struct IORAddressingInfo
- {
- unsigned long selected_profile_index;
- com::sun::star::corba::iop::IOR ior;
- };
-
- /**
- @deprecated
- */
-published constants TargetAddressGroup
- {
- const short KeyAddr = 0;
- const short ProfileAddr = 1;
- const short ReferenceAddr = 2;
- };
-
- /**
- @deprecated
- */
-published struct TargetAddress : com::sun::star::corba::CorbaUnion
- {
- short nDiscriminator;
- sequence < byte > object_key; // KeyAddr
- com::sun::star::corba::iop::TaggedProfile profile; // ProfileAddr
- IORAddressingInfo ior; // ReferenceAddr
- };
-
-
- /**
- @deprecated
- */
-published struct RequestHeader_1_2
- {
- unsigned long request_id;
- byte response_flags;
- byte reserved_1;
- byte reserved_2;
- byte reserved_3;
- TargetAddress target;
- com::sun::star::corba::CorbaString8 operation;
-// Principal not in GIOP 1.2
- com::sun::star::corba::iop::ServiceContextList service_context; // 1.2 change
- };
-
-
- /**
- @deprecated
- */
-published enum ReplyStatusType_1_2
- {
- NO_EXCEPTION,
- USER_EXCEPTION,
- SYSTEM_EXCEPTION,
- LOCATION_FORWARD,
- LOCATION_FORWARD_PERM, // new value for 1.2
- NEEDS_ADDRESSING_MODE // new value for 1.2
- };
-
-
- /**
- @deprecated
- */
-published struct ReplyHeader_1_2
- {
- unsigned long request_id;
- ReplyStatusType_1_2 reply_status;
- com::sun::star::corba::iop::ServiceContextList service_context; // 1.2 change
- };
-
- /**
- @deprecated
- */
-published struct SystemExceptionReplyBody
- {
- com::sun::star::corba::CorbaString8 exception_id;
- unsigned long minor_code_value;
- unsigned long completion_status;
- };
-
- /**
- @deprecated
- */
-published struct CancelRequestHeader
- {
- unsigned long request_id;
- };
-
- /**
- @deprecated
- */
-published struct LocateRequestHeader_1_0
- {
-// Renamed LocationRequestHeader
- unsigned long request_id;
- sequence <byte> object_key;
- };
-
- /**
- @deprecated
- */
-published typedef LocateRequestHeader_1_0 LocateRequestHeader_1_1;
-
- /**
- @deprecated
- */
-published enum LocateStatusType_1_2 {
- UNKNOWN_OBJECT,
- OBJECT_HERE,
- OBJECT_FORWARD,
- OBJECT_FORWARD_PERM, // new value for GIOP 1.2
- LOC_SYSTEM_EXCEPTION, // new value for GIOP 1.2
- LOC_NEEDS_ADDRESSING_MODE // new value for GIOP 1.2
- };
-
- /**
- @deprecated
- */
-published struct LocateReplyHeader_1_2
- {
- unsigned long request_id;
- LocateStatusType_1_2 locate_status;
- };
-
- /**
- @deprecated
- */
-published struct FragmentHeader_1_2
- {
- unsigned long request_id;
- };
-
-
-}; }; }; }; };
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/corba/iiop/iiop.idl b/udkapi/com/sun/star/corba/iiop/iiop.idl
deleted file mode 100644
index 0dc76e4..0000000
--- a/udkapi/com/sun/star/corba/iiop/iiop.idl
+++ b/dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef __com_sun_star_corba_iiop_iiop_idl__
-#define __com_sun_star_corba_iiop_iiop_idl__
-
-#include <com/sun/star/corba/giop/giop.idl>
-module com { module sun { module star { module corba { module iiop
-{
- /**
- @deprecated
- */
-published struct Version
- {
- byte major;
- byte minor;
- };
-
-
- /**
- @deprecated
- */
-published struct ProfileBody_1_0
- {// renamed from ProfileBody
- Version iiop_version;
- com::sun::star::corba::CorbaString8 host;
- unsigned short port;
- sequence <byte> object_key;
- };
-
- /**
- @deprecated
- */
-published struct ProfileBody_1_1
- {// also used for 1.2
- Version iiop_version;
- com::sun::star::corba::CorbaString8 host;
- unsigned short port;
- sequence < byte > object_key;
-// Added in 1.1 unchanged for 1.2
- sequence <com::sun::star::corba::iop::TaggedComponent> components;
- };
-
- /**
- @deprecated
- */
-published struct ListenPoint
- {
- com::sun::star::corba::CorbaString8 host;
- unsigned short port;
- };
-
- /**
- @deprecated
- */
-published typedef sequence<ListenPoint> ListenPointList;
-
- /**
- @deprecated
- */
-published struct BiDirIIOPServiceContext
- {// BI_DIR_IIOP Service Context
- ListenPointList listen_points;
- };
-
-}; }; }; }; };
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/udkapi/com/sun/star/corba/iop/iop.idl b/udkapi/com/sun/star/corba/iop/iop.idl
deleted file mode 100644
index 3c52d8b..0000000
--- a/udkapi/com/sun/star/corba/iop/iop.idl
+++ b/dev/null
@@ -1,120 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef __com_sun_star_corba_iop_iop_idl__
-#define __com_sun_star_corba_iop_iop_idl__
-
-#include <com/sun/star/corba/corba.idl>
-module com { module sun { module star { module corba { module iop
-{ // IDL
-
- /**
- @deprecated
- */
- published typedef unsigned long ProfileId;
-
- /**
- @deprecated
- */
- published constants ProfileIdGroup
- {
- const ProfileId TAG_INTERNET_IOP = 0;
- const ProfileId TAG_MULTIPLE_COMPONENTS = 1;
- };
-
- /**
- @deprecated
- */
- published struct TaggedProfile
- {
- ProfileId tag;
- sequence <byte> profile_data;
- };
- // an Interoperable Object Reference is a sequence of
- // object-specific protocol profiles, plus a type ID.
-
- /**
- @deprecated
- */
- published struct IOR
- {
- com::sun::star::corba::CorbaString8 type_id;
- sequence <TaggedProfile> profiles;
- };
-
- // Standard way of representing multicomponent profiles.
- // This would be encapsulated in a TaggedProfile.
- /**
- @deprecated
- */
- published typedef unsigned long ComponentId;
-
- /**
- @deprecated
- */
- published struct TaggedComponent
- {
- ComponentId tag;
- sequence <byte> component_data;
- };
-
- /**
- @deprecated
- */
- published typedef sequence <TaggedComponent> MultipleComponentProfile;
-
- /**
- @deprecated
- */
- published typedef unsigned long ServiceId;
-
- /**
- @deprecated
- */
- published struct ServiceContext
- {
- ServiceId context_id;
- sequence < byte > context_data;
- };
-
- /**
- @deprecated
- */
- published typedef sequence <ServiceContext> ServiceContextList;
-
- /**
- @deprecated
- */
- published constants ServiceIdGroup
- {
- const ServiceId TransactionService = 0;
- const ServiceId CodeSets = 1;
- const ServiceId ChainBypassCheck = 2;
- const ServiceId ChainBypassInfo = 3;
- const ServiceId LogicalThreadId = 4;
- const ServiceId BI_DIR_IIOP = 5;
- const ServiceId SendingContextRunTime = 6;
- const ServiceId INVOCATION_POLICIES = 7;
- const ServiceId FORWARDED_IDENTITY = 8;
- const ServiceId UnknownExceptionInfo = 9;
- };
-
-}; }; }; }; };
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */