INTEGRATION: CWS sb21 (1.7.32); FILE MERGED

2004/08/03 13:16:36 sb 1.7.32.1: #i25687# Reverted useless 1.7 changes (functionality replaced by writer.hxx), marked file as deprecated.

1 files changed, 5 insertions, 59 deletions

diff --git a/registry/inc/registry/reflwrit.hxx b/registry/inc/registry/reflwrit.hxx
index 613cc1ed4dfa..17a27d64a57b 100644
--- a/registry/inc/registry/reflwrit.hxx
+++ b/registry/inc/registry/reflwrit.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: reflwrit.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: hr $ $Date: 2004-02-03 11:50:46 $
+ *  last change: $Author: rt $ $Date: 2004-08-20 09:25:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,9 +107,6 @@ struct RegistryTypeWriter_Api
     sal_uInt32              (TYPEREG_CALLTYPE *getBlopSize)         (TypeWriterImpl);
 
     void                    (TYPEREG_CALLTYPE *setReferenceData)    (TypeWriterImpl, sal_uInt16, rtl_uString*, RTReferenceType, rtl_uString*, RTFieldAccess);
-
-    TypeWriterImpl          (TYPEREG_CALLTYPE *createMIEntry)       (RTTypeClass, rtl_uString*, sal_uInt16, sal_uInt16, sal_uInt16, sal_uInt16);
-    void                    (TYPEREG_CALLTYPE *setMISuperTypeData)  (TypeWriterImpl, sal_uInt16, rtl_uString*);
 };
 
 /** specifies a function pointer of the initialization function which is called to initialize
@@ -160,6 +157,9 @@ public:
     This class provides the necessary functions to write type informations
     for all kinds of types into a blob.
     The class is inline and use a load on call C-Api.
+
+    @deprecated
+    use typereg::Writer instead
 */
 class RegistryTypeWriter
 {
@@ -186,27 +186,6 @@ public:
                               sal_uInt16                methodCount,
                               sal_uInt16                referenceCount);
 
-    /** Constructor using the registry Api directly, for multiple-inheritance
-        types.
-
-        The constructor is used if the api is known.
-        @param RTTypeClass specifies the type of the new blob.
-        @param typeName specifies the full qualified type name with '/' as separator.
-        @param superTypeCount specifies the number of base types.
-        @param fieldCount specifies the number of fields (eg. number of attrbutes/properties,
-                          enum values or constants).
-        @param methodCount specifies the number of methods.
-        @param referenceCount specifies the number of references (eg. number of supported interfaces,
-                              exported services ...)
-     */
-    inline RegistryTypeWriter(const RegistryTypeWriter_Api* pApi,
-                              RTTypeClass               RTTypeClass,
-                              const ::rtl::OUString&    typeName,
-                              sal_uInt16                superTypeCount,
-                              sal_uInt16                fieldCount,
-                              sal_uInt16                methodCount,
-                              sal_uInt16                referenceCount);
-
     /** Constructor using the loader mechanism.
 
         This constructor is called with a RegistryTypeWriterLoader.
@@ -348,15 +327,6 @@ public:
                                     const ::rtl::OUString&  doku,
                                     RTFieldAccess               access = RT_ACCESS_INVALID);
 
-    /** sets the data for a base type of a multiple-inheritance type.
-
-        @param index indicates the index of the base type.
-        @param name specifies the full qualified type name of the base type
-                    with '/' as separator.
-     */
-    inline void setMISuperTypeData( sal_uInt16              index,
-                                    const ::rtl::OUString&  name);
-
 protected:
 
     /// stores the registry type writer Api.
@@ -388,24 +358,6 @@ inline RegistryTypeWriter::RegistryTypeWriter(const RegistryTypeWriter_Api* pApi
                                   referenceCount);
 }
 
-inline RegistryTypeWriter::RegistryTypeWriter(const RegistryTypeWriter_Api* pApi,
-                                              RTTypeClass               RTTypeClass,
-                                              const ::rtl::OUString&    typeName,
-                                              sal_uInt16                superTypeCount,
-                                              sal_uInt16                fieldCount,
-                                              sal_uInt16                methodCount,
-                                              sal_uInt16                referenceCount)
-    : m_pApi(pApi)
-    , m_Api()
-    , m_hImpl(NULL)
-{
-    m_hImpl = m_pApi->createMIEntry(RTTypeClass,
-                                    typeName.pData,
-                                    superTypeCount,
-                                    fieldCount,
-                                    methodCount,
-                                    referenceCount);
-}
 
 inline RegistryTypeWriter::RegistryTypeWriter(const RegistryTypeWriterLoader& rLoader,
                                               RTTypeClass               RTTypeClass,
@@ -528,10 +480,4 @@ inline void RegistryTypeWriter::setReferenceData( sal_uInt16                inde
     m_pApi->setReferenceData(m_hImpl, index, name.pData, refType, doku.pData, access);
 }
 
-inline void RegistryTypeWriter::setMISuperTypeData( sal_uInt16              index,
-                                                    const ::rtl::OUString&  name)
-{
-    m_pApi->setMISuperTypeData(m_hImpl, index, name.pData);
-}
-
 #endif