[PATCH 3/7] idl fix package for CorbaString8 and CorbaUnion

[Tomas Hlavaty]

---
 udkapi/com/sun/star/corba/giop/giop.idl |   10 +++++-----
 udkapi/com/sun/star/corba/iiop/iiop.idl |    6 +++---
 udkapi/com/sun/star/corba/iop/iop.idl   |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/udkapi/com/sun/star/corba/giop/giop.idl b/udkapi/com/sun/star/corba/giop/giop.idl
index 1a8da38..a5b71fd 100644
--- a/udkapi/com/sun/star/corba/giop/giop.idl
+++ b/udkapi/com/sun/star/corba/giop/giop.idl
@@ -96,7 +96,7 @@ published   struct RequestHeader_1_0
         unsigned long request_id;
         boolean response_expected;
         sequence < byte > object_key;
-        CorbaString8 operation;
+        com::sun::star::corba::CorbaString8 operation;
         sequence < byte > requesting_principal;
     };
 
@@ -112,7 +112,7 @@ published   struct RequestHeader_1_1
         byte reserved_2;
         byte reserved_3; // Added in GIOP 1.1
         sequence <byte> object_key;
-        CorbaString8 operation;
+        com::sun::star::corba::CorbaString8 operation;
         sequence <byte> requesting_principal; // binary compatible
     };
 
@@ -138,7 +138,7 @@ published constants TargetAddressGroup
     /**
       @deprecated
      */
-published struct TargetAddress : CorbaUnion
+published struct TargetAddress : com::sun::star::corba::CorbaUnion
     {
         short nDiscriminator;
         sequence < byte > object_key;  // KeyAddr
@@ -158,7 +158,7 @@ published   struct RequestHeader_1_2
         byte reserved_2;
         byte reserved_3;
         TargetAddress target;
-        CorbaString8 operation;
+        com::sun::star::corba::CorbaString8 operation;
 // Principal not in GIOP 1.2
         com::sun::star::corba::iop::ServiceContextList service_context; // 1.2 change
     };
@@ -193,7 +193,7 @@ published   struct ReplyHeader_1_2
      */
 published   struct SystemExceptionReplyBody
     {
-        CorbaString8 exception_id;
+        com::sun::star::corba::CorbaString8 exception_id;
         unsigned long minor_code_value;
         unsigned long completion_status;
     };
diff --git a/udkapi/com/sun/star/corba/iiop/iiop.idl b/udkapi/com/sun/star/corba/iiop/iiop.idl
index aa4becf..a6052bc 100644
--- a/udkapi/com/sun/star/corba/iiop/iiop.idl
+++ b/udkapi/com/sun/star/corba/iiop/iiop.idl
@@ -47,7 +47,7 @@ published   struct Version
 published   struct ProfileBody_1_0
     {// renamed from ProfileBody
         Version iiop_version;
-        CorbaString8 host;
+        com::sun::star::corba::CorbaString8 host;
         unsigned short port;
         sequence <byte> object_key;
     };
@@ -58,7 +58,7 @@ published   struct ProfileBody_1_0
 published   struct ProfileBody_1_1
     {// also used for 1.2
         Version iiop_version;
-        CorbaString8 host;
+        com::sun::star::corba::CorbaString8 host;
         unsigned short port;
         sequence < byte > object_key;
 // Added in 1.1 unchanged for 1.2
@@ -70,7 +70,7 @@ published   struct ProfileBody_1_1
     */
 published   struct ListenPoint
     {
-        CorbaString8 host;
+        com::sun::star::corba::CorbaString8 host;
         unsigned short port;
     };
 
diff --git a/udkapi/com/sun/star/corba/iop/iop.idl b/udkapi/com/sun/star/corba/iop/iop.idl
index b748c05..2d6a7fa 100644
--- a/udkapi/com/sun/star/corba/iop/iop.idl
+++ b/udkapi/com/sun/star/corba/iop/iop.idl
@@ -62,7 +62,7 @@ module com { module sun { module star { module corba { module iop
      */
     published struct IOR
     {
-        CorbaString8 type_id;
+        com::sun::star::corba::CorbaString8 type_id;
         sequence <TaggedProfile> profiles;
     };
 
-- 
1.7.5.4


--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline; filename=0004-idl-ifndef-fix.patch