INTEGRATION: CWS sb18 (1.7.132); FILE MERGED

2004/05/21 15:09:30 sb 1.7.132.1: #i21150# Added published flag.

1 files changed, 22 insertions, 23 deletions

diff --git a/udkapi/com/sun/star/corba/giop/giop.idl b/udkapi/com/sun/star/corba/giop/giop.idl
index fdce29759c99..c4ae95be7778 100644
--- a/udkapi/com/sun/star/corba/giop/giop.idl
+++ b/udkapi/com/sun/star/corba/giop/giop.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: giop.idl,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: jbu $ $Date: 2002-01-18 13:47:42 $
+ *  last change: $Author: obo $ $Date: 2004-06-03 15:42:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,13 +59,12 @@
  *
  ************************************************************************/
 #include <com/sun/star/corba/iop/iop.idl>
-
 module com { module sun { module star { module corba { module giop
 {
     /**
       @deprecated
      */
-    struct Version
+published   struct Version
     {
         byte major;
         byte minor;
@@ -74,7 +73,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    enum MsgType_1_1
+published enum MsgType_1_1
     {
         Request, Reply, CancelRequest,
         LocateRequest, LocateReply,
@@ -86,7 +85,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct MessageHeader_1_0
+published   struct MessageHeader_1_0
     {// Renamed from MessageHeader
         byte magic_1;
         byte magic_2;
@@ -101,7 +100,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct MessageHeader_1_1
+published   struct MessageHeader_1_1
     {
         byte magic_1;
         byte magic_2;
@@ -116,12 +115,12 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    typedef MessageHeader_1_1 MessageHeader_1_2;
+published typedef MessageHeader_1_1 MessageHeader_1_2;
 
     /**
       @deprecated
      */
-    struct RequestHeader_1_0
+published   struct RequestHeader_1_0
     {
         com::sun::star::corba::iop::ServiceContextList service_context;
         unsigned long request_id;
@@ -134,7 +133,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct RequestHeader_1_1
+published   struct RequestHeader_1_1
     {
         com::sun::star::corba::iop::ServiceContextList service_context;
         unsigned long request_id;
@@ -150,7 +149,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct IORAddressingInfo
+published   struct IORAddressingInfo
     {
         unsigned long selected_profile_index;
         com::sun::star::corba::iop::IOR ior;
@@ -159,7 +158,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    constants TargetAddressGroup
+published constants TargetAddressGroup
         {
             const short KeyAddr = 0;
             const short ProfileAddr = 1;
@@ -169,7 +168,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct TargetAddress : CorbaUnion
+published struct TargetAddress : CorbaUnion
     {
         short nDiscriminator;
         sequence < byte > object_key;  // KeyAddr
@@ -181,7 +180,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct RequestHeader_1_2
+published   struct RequestHeader_1_2
     {
         unsigned long request_id;
         byte response_flags;
@@ -198,7 +197,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    enum ReplyStatusType_1_2
+published enum ReplyStatusType_1_2
     {
         NO_EXCEPTION,
         USER_EXCEPTION,
@@ -212,7 +211,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct ReplyHeader_1_2
+published   struct ReplyHeader_1_2
     {
         unsigned long request_id;
         ReplyStatusType_1_2 reply_status;
@@ -222,7 +221,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct SystemExceptionReplyBody
+published   struct SystemExceptionReplyBody
     {
         CorbaString8 exception_id;
         unsigned long minor_code_value;
@@ -232,7 +231,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct CancelRequestHeader
+published   struct CancelRequestHeader
     {
         unsigned long request_id;
     };
@@ -240,7 +239,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct LocateRequestHeader_1_0
+published   struct LocateRequestHeader_1_0
     {
 // Renamed LocationRequestHeader
         unsigned long request_id;
@@ -250,12 +249,12 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    typedef LocateRequestHeader_1_0 LocateRequestHeader_1_1;
+published typedef LocateRequestHeader_1_0 LocateRequestHeader_1_1;
 
     /**
       @deprecated
      */
-    enum LocateStatusType_1_2 {
+published enum LocateStatusType_1_2 {
         UNKNOWN_OBJECT,
         OBJECT_HERE,
         OBJECT_FORWARD,
@@ -267,7 +266,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct LocateReplyHeader_1_2
+published   struct LocateReplyHeader_1_2
     {
         unsigned long request_id;
         LocateStatusType_1_2 locate_status;
@@ -276,7 +275,7 @@ module com { module sun { module star { module corba { module giop
     /**
       @deprecated
      */
-    struct FragmentHeader_1_2
+published   struct FragmentHeader_1_2
     {
         unsigned long request_id;
     };