remove vos dependencies

7 files changed, 51 insertions, 66 deletions

diff --git a/codemaker/source/bonobowrappermaker/makefile.mk b/codemaker/source/bonobowrappermaker/makefile.mk
index 126e44feb83e..6caf077b5ae6 100644
--- a/codemaker/source/bonobowrappermaker/makefile.mk
+++ b/codemaker/source/bonobowrappermaker/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: ts $ $Date: 2000-12-11 14:20:04 $
+#   last change: $Author: jsc $ $Date: 2001-03-13 12:04:23 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -90,7 +90,7 @@ APP1OBJS=   $(OBJ)$/corbamaker.obj	\
 
 APP1STDLIBS=\
             $(SALLIB) \
-            $(VOSLIB) \
+            $(SALHELPERLIB) \
             $(REGLIB) \
             $(STDLIBCPP)
 
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 28b96ee69510..15180bb2915c 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: global.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: svesik $ $Date: 2001-01-30 10:22:31 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:04:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -58,8 +58,8 @@
  *
  *
  ************************************************************************/
-#ifndef     _VOS_PROCESS_HXX_
-#include    <vos/process.hxx>
+#ifndef     _OSL_PROCESS_H_
+#include    <osl/process.h>
 #endif
 #ifndef     _RTL_OSTRINGBUFFER_HXX_
 #include    <rtl/strbuf.hxx>
@@ -86,7 +86,6 @@
 #include    <codemaker/global.hxx>
 #endif
 
-using namespace vos;
 using namespace rtl;
 
 OString makeTempName(sal_Char* prefix)
@@ -103,13 +102,11 @@ OString makeTempName(sal_Char* prefix)
     if (prefix)
         pPrefix = prefix;
 
-    OStartupInfo StartupInfo;
-
-    if (StartupInfo.getEnvironment(uTMP, uPattern) != OStartupInfo::E_None)
+    if ( osl_getEnvironment(uTMP.pData, &uPattern.pData) != osl_Process_E_None )
     {
-        if (StartupInfo.getEnvironment(uTEMP, uPattern) != OStartupInfo::E_None)
+        if ( osl_getEnvironment(uTEMP.pData, &uPattern.pData) != osl_Process_E_None )
         {
-#if defined(WIN32) || defined(WNT) || defined(OS2)
+#if defined(SAL_W32) || defined(SAL_OS2)
             strcpy(tmpPattern, ".");
 #else
             strcpy(tmpPattern, "/tmp");
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 202ab6d23c93..b0e64d0f799f 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cpputype.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-01-02 15:33:07 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:04:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -595,12 +595,12 @@ void CppuType::dumpLGetCppuType(FileStream& o)
 
     if (m_reader.getTypeClass() == RT_TYPE_TYPEDEF)
     {
-        o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << typeName << "_Type( ) throw()\n{\n";
+        o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << typeName << "_Type( ) SAL_THROW( () )\n{\n";
     } else
     {
         o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
         dumpType(o, m_typeName, sal_True, sal_False);
-        o << "* ) throw()\n{\n";
+        o << "* ) SAL_THROW( () )\n{\n";
     }
     inc();
 
@@ -646,7 +646,7 @@ void CppuType::dumpGetCppuType(FileStream& o)
 
     o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
     dumpType(o, m_typeName, sal_True, sal_False);
-    o << "* ) throw()\n{\n";
+    o << "* ) SAL_THROW( () )\n{\n";
     inc();
 
     if ( m_typeName.equals("com/sun/star/uno/Exception") )
@@ -769,7 +769,7 @@ void CppuType::dumpCGetCppuType(FileStream& o)
         o << "inline";
     o << " const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
     dumpType(o, m_typeName, sal_True, sal_False);
-    o << "* ) throw()\n{\n";
+    o << "* ) SAL_THROW( () )\n{\n";
     inc();
 
     o << "#if ! ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__)))\n"
@@ -1514,7 +1514,7 @@ sal_Bool InterfaceType::dumpHFile(FileStream& o)
         o << "inline";
     o << " const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
     dumpType(o, m_typeName, sal_True, sal_False);
-    o << "* ) throw();\n\n";
+    o << "* ) SAL_THROW( () );\n\n";
 
     if (getNestedTypeNames().getLength() > 0)
     {
@@ -1536,7 +1536,7 @@ sal_Bool InterfaceType::dumpHFile(FileStream& o)
 
                 o << " const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
                 dumpType(o, nestedName, sal_True, sal_False);
-                o << "* ) throw();\n\n";
+                o << "* ) SAL_THROW( () );\n\n";
             }
         }
     }
@@ -1728,7 +1728,7 @@ void InterfaceType::dumpAttributes(FileStream& o)
 
         o << indent() << "virtual ";
         dumpType(o, fieldType);
-        o << " SAL_CALL get" << fieldName << "() throw(::com::sun::star::uno::RuntimeException) = 0;\n";
+        o << " SAL_CALL get" << fieldName << "() throw (::com::sun::star::uno::RuntimeException) = 0;\n";
 
         if (access != RT_ACCESS_READONLY)
         {
@@ -1749,7 +1749,7 @@ void InterfaceType::dumpAttributes(FileStream& o)
 
             o << indent() << "virtual void SAL_CALL set" << fieldName << "( ";
             dumpType(o, fieldType, bConst, bRef);
-            o << " _" << fieldName.toLowerCase() << " ) throw(::com::sun::star::uno::RuntimeException) = 0;\n";
+            o << " _" << fieldName.toLowerCase() << " ) throw (::com::sun::star::uno::RuntimeException) = 0;\n";
         }
     }
 }
@@ -1829,7 +1829,7 @@ void InterfaceType::dumpMethods(FileStream& o)
         }
         o << " )";
 
-        o << " throw(";
+        o << " throw (";
         OString excpName;
         for (j=0; j < excCount; j++)
         {
@@ -1873,7 +1873,7 @@ void InterfaceType::dumpGetCppuType(FileStream& o)
 
     o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
     dumpType(o, m_typeName, sal_True, sal_False);
-    o << "* ) throw()\n{\n";
+    o << "* ) SAL_THROW( () )\n{\n";
     inc();
 
     if ( m_typeName.equals("com/sun/star/uno/XInterface") )
@@ -1934,7 +1934,7 @@ void InterfaceType::dumpCGetCppuType(FileStream& o)
         o << "inline";
     o << " const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
     dumpType(o, m_typeName, sal_True, sal_False);
-    o << "* ) throw()\n{\n";
+    o << "* ) SAL_THROW( () )\n{\n";
     inc();
 
     o << "#if ! ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__)))\n"
@@ -2779,7 +2779,7 @@ sal_Bool StructureType::dumpHFile(FileStream& o)
         o << "inline";
     o << " const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
     dumpType(o, m_typeName, sal_True, sal_False);
-    o << "* ) throw();\n\n";
+    o << "* ) SAL_THROW( () );\n\n";
 
     o << "#endif // "<< headerDefine << endl;
 
@@ -2803,7 +2803,7 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o)
 
     o << "\n{\n";
     inc();
-    o << indent() << "inline " << m_name << "();\n\n";
+    o << indent() << "inline " << m_name << "() SAL_THROW( () );\n\n";
 
     sal_uInt32      fieldCount = m_reader.getFieldCount();
     RTFieldAccess   access = RT_ACCESS_INVALID;
@@ -2834,7 +2834,7 @@ sal_Bool StructureType::dumpDeclaration(FileStream& o)
             dumpType(o, fieldType, sal_True, sal_True);
             o << " __" << fieldName;
         }
-        o << ");\n\n";
+        o << ") SAL_THROW( () );\n\n";
     }
 
     for (i=0; i < fieldCount; i++)
@@ -2882,7 +2882,7 @@ sal_Bool StructureType::dumpHxxFile(FileStream& o)
     dumpNameSpace(o);
     o << endl;
 
-    o << "inline " << m_name << "::" << m_name << "()\n";
+    o << "inline " << m_name << "::" << m_name << "() SAL_THROW( () )\n";
     inc();
     OString superType(m_reader.getSuperTypeName());
     sal_Bool first = sal_True;
@@ -2946,7 +2946,7 @@ sal_Bool StructureType::dumpHxxFile(FileStream& o)
             dumpType(o, fieldType, sal_True, sal_True);
             o << " __" << fieldName;
         }
-        o << ")\n";
+        o << ") SAL_THROW( () )\n";
 
         inc();
         sal_Bool first = sal_True;
@@ -3130,7 +3130,7 @@ sal_Bool ExceptionType::dumpHFile(FileStream& o)
         o << "inline";
     o << " const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
     dumpType(o, m_typeName, sal_True, sal_False);
-    o << "* ) throw();\n\n";
+    o << "* ) SAL_THROW( () );\n\n";
 
     o << "#endif // "<< headerDefine << endl;
 
@@ -3148,8 +3148,7 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o)
 
     o << "\n{\npublic:\n";
     inc();
-    o << indent() << "inline " << m_name << "();\n\n";
-//  o << indent() << "inline " << m_name << "() { }\n\n";
+    o << indent() << "inline " << m_name << "() SAL_THROW( () );\n\n";
 
     sal_uInt32      fieldCount = m_reader.getFieldCount();
     RTFieldAccess   access = RT_ACCESS_INVALID;
@@ -3181,7 +3180,7 @@ sal_Bool ExceptionType::dumpDeclaration(FileStream& o)
             dumpType(o, fieldType, sal_True, sal_True);
             o << " __" << fieldName;
         }
-        o << ");\n\n";
+        o << ") SAL_THROW( () );\n\n";
     }
 
     for (i=0; i < fieldCount; i++)
@@ -3224,7 +3223,7 @@ sal_Bool ExceptionType::dumpHxxFile(FileStream& o)
     dumpNameSpace(o);
     o << endl;
 
-    o << "inline " << m_name << "::" << m_name << "()\n";
+    o << "inline " << m_name << "::" << m_name << "() SAL_THROW( () )\n";
     inc();
     OString superType(m_reader.getSuperTypeName());
     sal_Bool first = sal_True;
@@ -3298,7 +3297,7 @@ sal_Bool ExceptionType::dumpHxxFile(FileStream& o)
             dumpType(o, fieldType, sal_True, sal_True);
             o << " __" << fieldName;
         }
-        o << ")\n";
+        o << ") SAL_THROW( () )\n";
 
         inc();
         sal_Bool first = sal_True;
@@ -3489,7 +3488,7 @@ sal_Bool EnumType::dumpHFile(FileStream& o)
         o << "inline";
     o << " const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
     dumpType(o, m_typeName, sal_True, sal_False);
-    o << "* ) throw();\n\n";
+    o << "* ) SAL_THROW( () );\n\n";
 
     o << "#endif // "<< headerDefine << endl;
 
@@ -3572,7 +3571,7 @@ void EnumType::dumpGetCppuType(FileStream& o)
 
     o << "inline const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
     dumpType(o, m_typeName, sal_True, sal_False);
-    o << "* ) throw()\n{\n";
+    o << "* ) SAL_THROW( () )\n{\n";
     inc();
 
     o << indent() << "#if ! ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__)))\n"
@@ -3611,7 +3610,7 @@ void EnumType::dumpCGetCppuType(FileStream& o)
         o << "inline";
     o << " const ::com::sun::star::uno::Type& SAL_CALL getCppuType( ";
     dumpType(o, m_typeName, sal_True, sal_False);
-    o << "* ) throw()\n{\n";
+    o << "* ) SAL_THROW( () )\n{\n";
     inc();
 
     o << "#if ! ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__)))\n"
@@ -3734,7 +3733,7 @@ sal_Bool TypeDefType::dumpHFile(FileStream& o)
 //  o << "\nnamespace com { namespace sun { namespace star { namespace uno {\n"
 //    << "class Type;\n} } } }\n\n";
 //  o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << m_typeName.replace('/', '_')
-//    <<  "_Type( ) throw();\n\n";
+//    <<  "_Type( ) SAL_THROW( () );\n\n";
 
     o << "#endif // "<< headerDefine << endl;
 
@@ -3799,7 +3798,7 @@ void TypeDefType::dumpCGetCppuType(FileStream& o)
       <<  "static ::com::sun::star::uno::Type * pType_" << typeName << " = 0;\n"
       << "#endif\n\n";
 
-    o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << typeName << "_Type( ) throw()\n{\n";
+    o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << typeName << "_Type( ) SAL_THROW( () )\n{\n";
     inc();
 
     o << "#if ! ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__)))\n"
@@ -3879,7 +3878,7 @@ void TypeDefType::dumpLGetCppuType(FileStream& o)
       << "static typelib_TypeDescriptionReference * s_pType_" << typeName << " = 0;\n"
       << "#endif\n\n";
 
-    o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << typeName << "_Type( ) throw()\n{\n";
+    o << "inline const ::com::sun::star::uno::Type& SAL_CALL get_" << typeName << "_Type( ) SAL_THROW( () )\n{\n";
     inc();
 
     o << indent() << "#if ! ((defined(__SUNPRO_CC) && (__SUNPRO_CC == 0x500)) || (defined(__GNUC__) && defined(__APPLE__)))\n"
diff --git a/codemaker/source/cppumaker/makefile.mk b/codemaker/source/cppumaker/makefile.mk
index fe915e3cb1d7..47c776e32293 100644
--- a/codemaker/source/cppumaker/makefile.mk
+++ b/codemaker/source/cppumaker/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1.1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: hr $ $Date: 2000-09-18 15:25:27 $
+#   last change: $Author: jsc $ $Date: 2001-03-13 12:04:24 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -89,7 +89,7 @@ APP1OBJS=   $(OBJ)$/cppumaker.obj	\
 
 APP1STDLIBS=\
             $(SALLIB) \
-            $(VOSLIB) \
+            $(SALHELPERLIB) \
             $(REGLIB) \
             $(STDLIBCPP)
 
diff --git a/codemaker/source/idlmaker/makefile.mk b/codemaker/source/idlmaker/makefile.mk
index 83977c7d6d37..6a9b4702b953 100644
--- a/codemaker/source/idlmaker/makefile.mk
+++ b/codemaker/source/idlmaker/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: mm $ $Date: 2000-09-21 07:43:11 $
+#   last change: $Author: jsc $ $Date: 2001-03-13 12:04:26 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -89,7 +89,7 @@ APP1OBJS=   $(OBJ)$/idlmaker.obj	\
 
 APP1STDLIBS=\
             $(SALLIB) \
-            $(VOSLIB) \
+            $(SALHELPERLIB) \
             $(REGLIB) \
             $(STDLIBCPP)
 
diff --git a/codemaker/source/javamaker/javatype.hxx b/codemaker/source/javamaker/javatype.hxx
index d281176befbf..c374c118c8ff 100644
--- a/codemaker/source/javamaker/javatype.hxx
+++ b/codemaker/source/javamaker/javatype.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: javatype.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:25:28 $
+ *  last change: $Author: jsc $ $Date: 2001-03-13 12:04:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,18 +154,7 @@ inline int operator < (const UnoInfo& u1, const UnoInfo& u2)
         return (u1.m_name < u2.m_name);
 }
 
-/*
-struct LessUnoInfo
-{
-    bool operator()(const UnoInfo& unoInfo1, const UnoInfo& unoInfo2) const
-    {
-        return (unoInfo1.m_name < unoInfo2.m_name);
-    }
-};
-
-typedef NAMESPACE_STD(set) <UnoInfo, LessUnoInfo> UnoInfoSet;
-*/
-typedef NAMESPACE_STD(list) <UnoInfo> UnoInfoList;
+typedef ::std::list< UnoInfo > UnoInfoList;
 
 class JavaOptions;
 class FileStream;
diff --git a/codemaker/source/javamaker/makefile.mk b/codemaker/source/javamaker/makefile.mk
index 113f19ddf3c4..1584429d8086 100644
--- a/codemaker/source/javamaker/makefile.mk
+++ b/codemaker/source/javamaker/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.1.1.1 $
+#   $Revision: 1.2 $
 #
-#   last change: $Author: hr $ $Date: 2000-09-18 15:25:28 $
+#   last change: $Author: jsc $ $Date: 2001-03-13 12:04:26 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -89,7 +89,7 @@ APP1OBJS=   $(OBJ)$/javamaker.obj	\
 
 APP1STDLIBS=\
             $(SALLIB) \
-            $(VOSLIB) \
+            $(SALHELPERLIB)	\
             $(REGLIB) \
             $(STDLIBCPP)