INTEGRATION: CWS sb18 (1.2.4); FILE MERGED

2004/05/18 15:35:24 sb 1.2.4.1: #i21150# Added new feature: published.

2 files changed, 36 insertions, 4 deletions

diff --git a/registry/inc/registry/reader.h b/registry/inc/registry/reader.h
index 2c7a4255f816..a86ef9d745ae 100644
--- a/registry/inc/registry/reader.h
+++ b/registry/inc/registry/reader.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: reader.h,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-03-30 16:33:12 $
+ *  last change: $Author: obo $ $Date: 2004-06-04 02:42:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -173,6 +173,11 @@ void SAL_CALL typereg_reader_getFileName(void * handle, rtl_uString ** result)
 /**
    Returns the type class of a type reader.
 
+   <p>This function will always return the type class without the internal
+   <code>RT_TYPE_PUBLISHED</code> flag set.  Use
+   <code>typereg_reader_isPublished</code> to determine whether a type reader is
+   published.</p>
+
    @param handle a handle on a type reader; may be null
 
    @return the type class of the type reader; if <code>handle</code> is null,
@@ -184,6 +189,19 @@ enum RTTypeClass SAL_CALL typereg_reader_getTypeClass(void * handle)
     SAL_THROW_EXTERN_C();
 
 /**
+   Returns whether a type reader is published.
+
+   @param handle a handle on a type reader; may be null
+
+   @return whether the type reader is published; if <code>handle</code> is null,
+   <code>sal_False</code> is returned
+
+   @since #i21150#
+ */
+sal_Bool SAL_CALL typereg_reader_isPublished(void * handle)
+    SAL_THROW_EXTERN_C();
+
+/**
    Returns the type name of a type reader.
 
    @param handle a handle on a type reader; may be null
diff --git a/registry/inc/registry/reader.hxx b/registry/inc/registry/reader.hxx
index cffb11513820..f563726458fe 100644
--- a/registry/inc/registry/reader.hxx
+++ b/registry/inc/registry/reader.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: reader.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2004-03-30 16:33:22 $
+ *  last change: $Author: obo $ $Date: 2004-06-04 02:42:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -214,6 +214,10 @@ public:
     /**
        Returns the type class of this type reader.
 
+       <p>This function will always return the type class without the internal
+       <code>RT_TYPE_PUBLISHED</code> flag set.  Use <code>isPublished</code> to
+       determine whether this type reader is published.</p>
+
        @return the type class of this type reader; if this type reader is
        invalid, <code>RT_TYPE_INVALID</code> is returned
      */
@@ -222,6 +226,16 @@ public:
     }
 
     /**
+       Returns whether this type reader is published.
+
+       @return whether this type reader is published; if this type reader is
+       invalid, <code>false</code> is returned
+     */
+    bool isPublished() const {
+        return typereg_reader_isPublished(m_handle);
+    }
+
+    /**
        Returns the type name of this type reader.
 
        @return the type name of this type reader; if this type reader is