INTEGRATION: CWS adc8 (1.1.84); FILE MERGED

2004/07/02 11:03:59 np 1.1.84.1: #i26261#

4 files changed, 24 insertions, 13 deletions

diff --git a/autodoc/inc/ary/idl/ik_attribute.hxx b/autodoc/inc/ary/idl/ik_attribute.hxx
index 5e8c196a668e..33f0fcd90e09 100644
--- a/autodoc/inc/ary/idl/ik_attribute.hxx
+++ b/autodoc/inc/ary/idl/ik_attribute.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ik_attribute.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: np $ $Date: 2002-11-01 17:11:46 $
+ *  last change: $Author: rt $ $Date: 2004-07-12 15:08:41 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,14 +79,25 @@ namespace ifc_attribute
 {
 
 using ifc_ce::DocText;
+using ::ary::idl::ifc_ce::Dyn_TypeIterator;
 
 
 struct attr: public ifc_ce::attr
 {
+    static bool         HasAnyStereotype(
+                            const CodeEntity &  i_ce );
     static bool         IsReadOnly(
                             const CodeEntity &  i_ce );
+    static bool         IsBound(
+                            const CodeEntity &  i_ce );
     static Type_id      Type(
                             const CodeEntity &  i_ce );
+    static void         Get_GetExceptions(
+                            Dyn_TypeIterator &  o_result,
+                            const CodeEntity &  i_ce );
+    static void         Get_SetExceptions(
+                            Dyn_TypeIterator &  o_result,
+                            const CodeEntity &  i_ce );
 };
 
 struct xref : public ifc_ce::xref
diff --git a/autodoc/inc/ary/idl/ik_function.hxx b/autodoc/inc/ary/idl/ik_function.hxx
index df64a9a55930..15f73971c54f 100644
--- a/autodoc/inc/ary/idl/ik_function.hxx
+++ b/autodoc/inc/ary/idl/ik_function.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ik_function.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: np $ $Date: 2002-11-01 17:11:55 $
+ *  last change: $Author: rt $ $Date: 2004-07-12 15:08:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,10 +91,10 @@ struct attr: public ifc_ce::attr
 {
     static Type_id      ReturnType(
                             const CodeEntity &  i_ce );
-    static bool         IsConst(
-                            const CodeEntity &  i_ce );
     static bool         IsOneway(
                             const CodeEntity &  i_ce );
+    static bool         HasEllipse(
+                            const CodeEntity &  i_ce );
     static void         Get_Parameters(
                             Dyn_StdConstIterator<ary::idl::Parameter> &
                                                 o_result,
diff --git a/autodoc/inc/ary/idl/ik_property.hxx b/autodoc/inc/ary/idl/ik_property.hxx
index 633721bf839e..95f313a83030 100644
--- a/autodoc/inc/ary/idl/ik_property.hxx
+++ b/autodoc/inc/ary/idl/ik_property.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ik_property.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: np $ $Date: 2002-11-01 17:12:02 $
+ *  last change: $Author: rt $ $Date: 2004-07-12 15:09:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,7 +91,7 @@ struct attr: public ifc_ce::attr
                             const CodeEntity &  i_ce );
     static bool         IsConstrained(
                             const CodeEntity &  i_ce );
-    static bool         IsMayBeAmbigious(
+    static bool         IsMayBeAmbiguous(
                             const CodeEntity &  i_ce );
     static bool         IsMayBeDefault(
                             const CodeEntity &  i_ce );
diff --git a/autodoc/inc/ary/idl/ik_service.hxx b/autodoc/inc/ary/idl/ik_service.hxx
index 5b2ed4ca51e2..05bc6e608424 100644
--- a/autodoc/inc/ary/idl/ik_service.hxx
+++ b/autodoc/inc/ary/idl/ik_service.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ik_service.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: np $ $Date: 2002-11-01 17:12:03 $
+ *  last change: $Author: rt $ $Date: 2004-07-12 15:09:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,11 +86,11 @@ using ifc_ce::DocText;
 struct attr: public ifc_ce::attr
 {
     static void         Get_IncludedServices(
-                            Dyn_StdConstIterator<CommentedReference> &
+                            Dyn_StdConstIterator<CommentedRelation> &
                                                 o_result,
                             const CodeEntity &  i_ce );
     static void         Get_ExportedInterfaces(
-                            Dyn_StdConstIterator<CommentedReference> &
+                            Dyn_StdConstIterator<CommentedRelation> &
                                                 o_result,
                             const CodeEntity &  i_ce );
     static void         Get_Properties(