remove vos dependencies

4 files changed, 43 insertions, 54 deletions

diff --git a/registry/inc/registry/reflread.hxx b/registry/inc/registry/reflread.hxx
index 7e414bce3561..c04efc741470 100644
--- a/registry/inc/registry/reflread.hxx
+++ b/registry/inc/registry/reflread.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: reflread.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obr $ $Date: 2000-11-03 13:44:33 $
+ *  last change: $Author: jsc $ $Date: 2001-03-14 09:37:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,8 @@
  *
  ************************************************************************/
 
-#ifndef __REGISTRY_REFLREAD_HXX__
-#define __REGISTRY_REFLREAD_HXX__
+#ifndef _REGISTRY_REFLREAD_HXX_
+#define _REGISTRY_REFLREAD_HXX_
 
 #ifndef _REGISTRY_REFLTYPE_HXX_
 #include <registry/refltype.hxx>
@@ -68,8 +68,8 @@
 #ifndef _REGISTRY_REGTYPE_H_
 #include <registry/regtype.h>
 #endif
-#ifndef _VOS_DYNLOAD_HXX_
-#include <vos/dynload.hxx>
+#ifndef _SALHELPER_DYNLOAD_HXX_
+#include <salhelper/dynload.hxx>
 #endif
 
 // Implememetation handle
@@ -138,11 +138,11 @@ typedef RegistryTypeReader_Api* (TYPEREG_CALLTYPE *InitRegistryTypeReader_Api)(v
     loader provides a valid Api for the RegistryTypeReader.
 */
 class RegistryTypeReaderLoader
-    : public ::vos::ODynamicLoader<RegistryTypeReader_Api>
+    : public ::salhelper::ODynamicLoader<RegistryTypeReader_Api>
 {
 public:
     RegistryTypeReaderLoader()
-        : ::vos::ODynamicLoader<RegistryTypeReader_Api>
+        : ::salhelper::ODynamicLoader<RegistryTypeReader_Api>
             (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "reg" LIBRARY_VERSION ) ) ),
              ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(REGISTRY_TYPE_READER_INIT_FUNCTION_NAME) ))
         {}
@@ -209,9 +209,9 @@ public:
 
 protected:
 
-    const RegistryTypeReader_Api*                                m_pApi;
-    const NAMESPACE_VOS(ODynamicLoader)<RegistryTypeReader_Api>  m_Api;
-    TypeReaderImpl                                               m_hImpl;
+    const RegistryTypeReader_Api*                               m_pApi;
+    const ::salhelper::ODynamicLoader< RegistryTypeReader_Api > m_Api;
+    TypeReaderImpl                                              m_hImpl;
 };
 
 
diff --git a/registry/inc/registry/refltype.hxx b/registry/inc/registry/refltype.hxx
index 947dd3cd4fb1..6419cfa2d6fd 100644
--- a/registry/inc/registry/refltype.hxx
+++ b/registry/inc/registry/refltype.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: refltype.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2000-10-09 14:48:24 $
+ *  last change: $Author: jsc $ $Date: 2001-03-14 09:37:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,6 +64,9 @@
     Source Code Control System - Update
 
     $Log: not supported by cvs2svn $
+    Revision 1.3  2000/10/09 14:48:24  hr
+    #65293#: syntax
+
     Revision 1.2  2000/10/09 11:53:09  jsc
     change the binary typelibrary format, make it extendable
 
@@ -130,8 +133,8 @@
 
 *************************************************************************/
 
-#ifndef __REGISTRY_REFLTYPE_HXX__
-#define __REGISTRY_REFLTYPE_HXX__
+#ifndef _REGISTRY_REFLTYPE_HXX_
+#define _REGISTRY_REFLTYPE_HXX_
 
 #ifdef SOLARIS
 #include <wchar.h>
@@ -161,7 +164,8 @@ enum RTTypeClass
     RT_TYPE_TYPEDEF,
     RT_TYPE_SERVICE,
     RT_TYPE_OBJECT,
-    RT_TYPE_CONSTANTS
+    RT_TYPE_CONSTANTS,
+    RT_TYPE_UNION
 };
 
 typedef sal_uInt16 RTFieldAccess;
@@ -180,19 +184,9 @@ typedef sal_uInt16 RTFieldAccess;
 #define RT_ACCESS_PROPERTY          0x0400
 #define RT_ACCESS_CONST             0x0800
 #define RT_ACCESS_READWRITE         0x1000
-/*
-enum RTFieldAccess
-{
-    RT_ACCESS_INVALID,
-    RT_ACCESS_CONST,
-    RT_ACCESS_READONLY,
-    RT_ACCESS_WRITEONLY,
-    RT_ACCESS_READWRITE,
-    RT_ACCESS_READONLY_OPTIONAL,
-    RT_ACCESS_WRITEONLY_OPTIONAL,
-    RT_ACCESS_READWRITE_OPTIONAL
-};
-*/
+// only to describe a union default label
+#define RT_ACCESS_DEFAULT           0x2000
+
 enum RTReferenceType
 {
     RT_REF_INVALID,
@@ -243,8 +237,8 @@ union RTConstValueUnion
     sal_uInt16      aUShort;
     sal_Int32       aLong;
     sal_uInt32      aULong;
-//  sal_Int64       aHyper;
-//  sal_UInt64      aUHyper;
+    sal_Int64       aHyper;
+    sal_uInt64      aUHyper;
     float           aFloat;
     double          aDouble;
     const sal_Unicode*  aString;
diff --git a/registry/inc/registry/reflwrit.hxx b/registry/inc/registry/reflwrit.hxx
index 39ec5526c013..b80ebb2b10cf 100644
--- a/registry/inc/registry/reflwrit.hxx
+++ b/registry/inc/registry/reflwrit.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: reflwrit.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: obr $ $Date: 2000-11-03 13:44:33 $
+ *  last change: $Author: jsc $ $Date: 2001-03-14 09:37:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,8 @@
  *
  ************************************************************************/
 
-#ifndef __REGISTRY_REFLWRIT_HXX__
-#define __REGISTRY_REFLWRIT_HXX__
+#ifndef _REGISTRY_REFLWRIT_HXX_
+#define _REGISTRY_REFLWRIT_HXX_
 
 #ifndef _REGISTRY_REFLTYPE_HXX_
 #include <registry/refltype.hxx>
@@ -68,8 +68,8 @@
 #ifndef _REGISTRY_REGTYPE_H_
 #include <registry/regtype.h>
 #endif
-#ifndef _VOS_DYNLOAD_HXX_
-#include <vos/dynload.hxx>
+#ifndef _SALHELPER_DYNLOAD_HXX_
+#include <salhelper/dynload.hxx>
 #endif
 
 // Implememetation handle
@@ -117,11 +117,11 @@ typedef RegistryTypeWriter_Api* (TYPEREG_CALLTYPE *InitRegistryTypeWriter_Api)(v
     loader provides a valid Api for the RegistryTypeWriter.
 */
 class RegistryTypeWriterLoader
-    : public ::vos::ODynamicLoader<RegistryTypeWriter_Api>
+    : public ::salhelper::ODynamicLoader<RegistryTypeWriter_Api>
 {
 public:
     RegistryTypeWriterLoader()
-        : ::vos::ODynamicLoader<RegistryTypeWriter_Api>
+        : ::salhelper::ODynamicLoader<RegistryTypeWriter_Api>
             (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "reg" LIBRARY_VERSION  ) ) ),
              ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(REGISTRY_TYPE_WRITER_INIT_FUNCTION_NAME) ))
         {}
@@ -203,7 +203,7 @@ public:
 protected:
 
     const RegistryTypeWriter_Api*                                m_pApi;
-    const NAMESPACE_VOS(ODynamicLoader)<RegistryTypeWriter_Api>  m_Api;
+    const ::salhelper::ODynamicLoader< RegistryTypeWriter_Api >  m_Api;
     TypeWriterImpl                                               m_hImpl;
 };
 
diff --git a/registry/inc/registry/registry.hxx b/registry/inc/registry/registry.hxx
index 7bf6a1da38b2..26e5b649bcc0 100644
--- a/registry/inc/registry/registry.hxx
+++ b/registry/inc/registry/registry.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: registry.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: obr $ $Date: 2000-11-03 13:44:33 $
+ *  last change: $Author: jsc $ $Date: 2001-03-14 09:37:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,13 +65,8 @@
 #ifndef _REGISTRY_REGTYPE_H_
 #include <registry/regtype.h>
 #endif
-
-#ifndef _VOS_DYNLOAD_HXX_
-#include <vos/dynload.hxx>
-#endif
-
-#ifndef _VOS_MACROS_HXX_
-#include <vos/macros.hxx>
+#ifndef _SALHELPER_DYNLOAD_HXX_
+#include <salhelper/dynload.hxx>
 #endif
 
 #ifdef __cplusplus
@@ -139,12 +134,12 @@ class RegistryKey;
     The loader can be checked if the DLL is loaded. If the DLL is loaded the
     loader provides a valid Api for the registry.
 */
-class RegistryLoader : public ::vos::ODynamicLoader<Registry_Api>
+class RegistryLoader : public ::salhelper::ODynamicLoader<Registry_Api>
 {
 public:
     /// Default constructor, try to load the registry DLL and initialize the needed api.
     RegistryLoader()
-        : ::vos::ODynamicLoader<Registry_Api>
+        : ::salhelper::ODynamicLoader<Registry_Api>
             (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SAL_MODULENAME( "reg" LIBRARY_VERSION ) ) ),
              ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(REGISTRY_INIT_FUNCTION_NAME) ))
         {}
@@ -285,9 +280,9 @@ public:
     const Registry_Api* getApi() { return m_pApi; }
 protected:
 
-    const Registry_Api*                         m_pApi;
-    NAMESPACE_VOS(ODynamicLoader)<Registry_Api> m_Api;
-    RegHandle                                   m_hImpl;
+    const Registry_Api*                          m_pApi;
+    ::salhelper::ODynamicLoader< Registry_Api >  m_Api;
+    RegHandle                                    m_hImpl;
 };