OSL_ENSHURE replaced by OSL_ENSURE

32 files changed, 178 insertions, 176 deletions

diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx
index 8b7e6671d710..1f683e5df952 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: base.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: svesik $ $Date: 2000-11-23 01:55:21 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:32:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -441,7 +441,7 @@ inline const Mapping & IdlMemberImpl::getCpp2Uno()
         {
             _aCpp2Uno = Mapping( OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ),
                                  OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ) );
-            OSL_ENSHURE( _aCpp2Uno.is(), "### cannot c++ to uno mapping!" );
+            OSL_ENSURE( _aCpp2Uno.is(), "### cannot c++ to uno mapping!" );
             if (! _aCpp2Uno.is())
             {
                 throw RuntimeException(
@@ -463,7 +463,7 @@ inline const Mapping & IdlMemberImpl::getUno2Cpp()
         {
             _aUno2Cpp = Mapping( OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ),
                                  OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) );
-            OSL_ENSHURE( _aUno2Cpp.is(), "### cannot uno to c++ mapping!" );
+            OSL_ENSURE( _aUno2Cpp.is(), "### cannot uno to c++ mapping!" );
             if (! _aUno2Cpp.is())
             {
                 throw RuntimeException(
diff --git a/stoc/source/corereflection/crbase.cxx b/stoc/source/corereflection/crbase.cxx
index 91250d0f4d4c..719bedd91112 100644
--- a/stoc/source/corereflection/crbase.cxx
+++ b/stoc/source/corereflection/crbase.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: crbase.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:33 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:32:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,7 +111,7 @@ IdlClassImpl::IdlClassImpl( IdlReflectionServiceImpl * pReflection,
 
 #ifdef TEST_LIST_CLASSES
     ClassNameList::const_iterator iFind( find( g_aClassNames.begin(), g_aClassNames.end(), _aName ) );
-    OSL_ENSHURE( iFind == g_aClassNames.end(), "### idl class already exists!" );
+    OSL_ENSURE( iFind == g_aClassNames.end(), "### idl class already exists!" );
     g_aClassNames.push_front( _aName );
 #endif
 }
@@ -125,7 +125,7 @@ IdlClassImpl::~IdlClassImpl()
 
 #ifdef TEST_LIST_CLASSES
     ClassNameList::iterator iFind( find( g_aClassNames.begin(), g_aClassNames.end(), _aName ) );
-    OSL_ENSHURE( iFind != g_aClassNames.end(), "### idl class does not exist!" );
+    OSL_ENSURE( iFind != g_aClassNames.end(), "### idl class does not exist!" );
     g_aClassNames.erase( iFind );
 #endif
 }
@@ -200,21 +200,21 @@ void IdlClassImpl::createObject( Any & rObj )
 Sequence< Reference< XIdlClass > > IdlClassImpl::getClasses()
     throw(::com::sun::star::uno::RuntimeException)
 {
-    OSL_ENSHURE( sal_False, "### unexpected use!" );
+    OSL_ENSURE( sal_False, "### unexpected use!" );
     return Sequence< Reference< XIdlClass > >();
 }
 //__________________________________________________________________________________________________
 Reference< XIdlClass > IdlClassImpl::getClass( const OUString & rName )
     throw(::com::sun::star::uno::RuntimeException)
 {
-    OSL_ENSHURE( sal_False, "### unexpected use!" );
+    OSL_ENSURE( sal_False, "### unexpected use!" );
     return Reference< XIdlClass >();
 }
 //__________________________________________________________________________________________________
 Sequence< Reference< XIdlClass > > IdlClassImpl::getInterfaces()
     throw(::com::sun::star::uno::RuntimeException)
 {
-//      OSL_ENSHURE( sal_False, "### unexpected use!" );
+//      OSL_ENSURE( sal_False, "### unexpected use!" );
     return Sequence< Reference< XIdlClass > >();
 }
 
diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx
index 4743f3d1c9ab..0e4b46ee2511 100644
--- a/stoc/source/corereflection/crcomp.cxx
+++ b/stoc/source/corereflection/crcomp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: crcomp.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:33 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:32:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -224,7 +224,7 @@ Any IdlCompFieldImpl::get( const Any & rObj )
         while (pTD && !typelib_typedescription_equals( pTD, pDeclTD ))
             pTD = (typelib_TypeDescription *)((typelib_CompoundTypeDescription *)pTD)->pBaseTypeDescription;
 
-        OSL_ENSHURE( pTD, "### illegal object type!" );
+        OSL_ENSURE( pTD, "### illegal object type!" );
         if (pTD)
         {
             TYPELIB_DANGER_RELEASE( pObjTD );
@@ -255,7 +255,7 @@ void IdlCompFieldImpl::set( const Any & rObj, const Any & rValue )
         while (pTD && !typelib_typedescription_equals( pTD, pDeclTD ))
             pTD = (typelib_TypeDescription *)((typelib_CompoundTypeDescription *)pTD)->pBaseTypeDescription;
 
-        OSL_ENSHURE( pTD, "### illegal object type!" );
+        OSL_ENSURE( pTD, "### illegal object type!" );
         if (pTD)
         {
             TYPELIB_DANGER_RELEASE( pObjTD );
@@ -305,7 +305,7 @@ sal_Bool CompoundIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > &
                 const Sequence< Reference< XIdlClass > > & rSeq = xType->getSuperclasses();
                 if (rSeq.getLength())
                 {
-                    OSL_ENSHURE( rSeq.getLength() == 1, "### unexpected len of super classes!" );
+                    OSL_ENSURE( rSeq.getLength() == 1, "### unexpected len of super classes!" );
                     return isAssignableFrom( rSeq[0] );
                 }
             }
@@ -372,7 +372,7 @@ Sequence< Reference< XIdlField > > CompoundIdlClassImpl::getFields()
             {
                 typelib_TypeDescription * pTD = 0;
                 TYPELIB_DANGER_GET( &pTD, ppTypeRefs[nPos] );
-                OSL_ENSHURE( pTD, "### cannot get field in struct!" );
+                OSL_ENSURE( pTD, "### cannot get field in struct!" );
                 if (pTD)
                 {
                     OUString aName( ppNames[nPos] );
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index 7a280a6eae4e..123a17746240 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: crefl.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:33 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:32:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,7 +96,7 @@ IdlReflectionServiceImpl::IdlReflectionServiceImpl( const Reference< XMultiServi
                UNO_QUERY )
     , _aElements( CACHE_SIZE )
 {
-    OSL_ENSHURE( _xTDMgr.is(), "### cannot get service \"com.sun.star.reflection.TypeDescriptionManager\"!" );
+    OSL_ENSURE( _xTDMgr.is(), "### cannot get service \"com.sun.star.reflection.TypeDescriptionManager\"!" );
 }
 //__________________________________________________________________________________________________
 IdlReflectionServiceImpl::~IdlReflectionServiceImpl()
@@ -179,7 +179,7 @@ void IdlReflectionServiceImpl::dispose()
     _xTDMgr.clear();
     _xMgr.clear();
 #ifdef TEST_LIST_CLASSES
-    OSL_ENSHURE( g_aClassNames.size() == 0, "### idl classes still alive!" );
+    OSL_ENSURE( g_aClassNames.size() == 0, "### idl classes still alive!" );
     ClassNameList::const_iterator iPos( g_aClassNames.begin() );
     while (iPos != g_aClassNames.end())
     {
@@ -228,7 +228,7 @@ Reference< XIdlClass > IdlReflectionServiceImpl::getType( const Any & rObj )
 inline Reference< XIdlClass > IdlReflectionServiceImpl::constructClass(
     typelib_TypeDescription * pTypeDescr )
 {
-    OSL_ENSHURE( pTypeDescr->eTypeClass != typelib_TypeClass_TYPEDEF, "### unexpected typedef!" );
+    OSL_ENSURE( pTypeDescr->eTypeClass != typelib_TypeClass_TYPEDEF, "### unexpected typedef!" );
 
     switch (pTypeDescr->eTypeClass)
     {
@@ -455,7 +455,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index 8ee9855f5d27..357e128250ea 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: criface.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ganaya $ $Date: 2000-10-10 05:35:45 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:32:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -226,7 +226,7 @@ Any IdlAttributeFieldImpl::get( const Any & rObj )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     uno_Interface * pUnoI = mapToUno( rObj, (typelib_InterfaceTypeDescription *)getDeclTypeDescr() );
-    OSL_ENSHURE( pUnoI, "### illegal destination object given!" );
+    OSL_ENSURE( pUnoI, "### illegal destination object given!" );
     if (pUnoI)
     {
         TypeDescription aTD( getTypeDescr()->pAttributeTypeRef );
@@ -273,7 +273,7 @@ void IdlAttributeFieldImpl::set( const Any & rObj, const Any & rValue )
     }
 
     uno_Interface * pUnoI = mapToUno( rObj, (typelib_InterfaceTypeDescription *)getDeclTypeDescr() );
-    OSL_ENSHURE( pUnoI, "### illegal destination object given!" );
+    OSL_ENSURE( pUnoI, "### illegal destination object given!" );
     if (pUnoI)
     {
         TypeDescription aTD( getTypeDescr()->pAttributeTypeRef );
@@ -646,7 +646,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
     }
 
     uno_Interface * pUnoI = mapToUno( rObj, (typelib_InterfaceTypeDescription *)getDeclTypeDescr() );
-    OSL_ENSHURE( pUnoI, "### illegal destination object given!" );
+    OSL_ENSURE( pUnoI, "### illegal destination object given!" );
     if (pUnoI)
     {
         sal_Int32 nParams = getTypeDescr()->nParams;
@@ -857,7 +857,7 @@ void InterfaceIdlClassImpl::initMembers()
 
         typelib_TypeDescription * pTD = 0;
         typelib_typedescriptionreference_getDescription( &pTD, ppAllMembers[nPos] );
-        OSL_ENSHURE( pTD, "### cannot get type description!" );
+        OSL_ENSURE( pTD, "### cannot get type description!" );
         pSortedMemberInit[nIndex].first = ((typelib_InterfaceMemberTypeDescription *)pTD)->pMemberName;
         pSortedMemberInit[nIndex].second = pTD;
     }
@@ -877,7 +877,7 @@ sal_Bool InterfaceIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > &
             const Sequence< Reference< XIdlClass > > & rSeq = xType->getSuperclasses();
             if (rSeq.getLength())
             {
-                OSL_ENSHURE( rSeq.getLength() == 1, "### unexpected len of super classes!" );
+                OSL_ENSURE( rSeq.getLength() == 1, "### unexpected len of super classes!" );
                 return isAssignableFrom( rSeq[0] );
             }
         }
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 5e5ba13ae124..4e6ee9ecd87e 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: defaultregistry.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:33 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:32:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1407,7 +1407,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 1f679ecc3ee3..11a03384bebe 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implreg.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: svesik $ $Date: 2000-11-23 01:32:54 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:33:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,8 @@
 #endif
 
 #include <uno/mapping.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.h>
+//#include <vos/thread.hxx>
 #include <vos/conditn.hxx>
 
 #include <rtl/ustring.hxx>
@@ -1717,7 +1718,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 995be4b2c47e..daa74303824b 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: introspection.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: svesik $ $Date: 2000-11-23 02:03:54 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:33:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,9 +75,10 @@
 #ifndef _OSL_MUTEX_HXX_
 #include <osl/mutex.hxx>
 #endif
-#ifndef _VOS_MODULE_HXX_
-#include <vos/module.hxx>
-#endif
+//#ifndef _VOS_MODULE_HXX_
+//#include <vos/module.hxx>
+//#endif
+#include <vos/macros.hxx>
 
 #ifndef _CPPUHELPER_QUERYINTERFACE_HXX_
 #include <cppuhelper/queryinterface.hxx>
@@ -1933,7 +1934,7 @@ Reference<XIdlClass> TypeToIdlClass( const Type& rType, const Reference< XMultiS
         if( !xRefl.is() )
         {
             xRefl = Reference< XIdlReflection >( xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.CoreReflection")) ), UNO_QUERY );
-            OSL_ENSHURE( xRefl.is(), "### no corereflection!" );
+            OSL_ENSURE( xRefl.is(), "### no corereflection!" );
         }
         xRetClass = xRefl->forName( sOWName );
     }
@@ -2229,7 +2230,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                 }
                 else
                 {
-                    OSL_ENSHURE( sal_False,
+                    OSL_ENSURE( sal_False,
                         OString( "Introspection: Property \"" ) +
                         OUStringToOString( aPropName, RTL_TEXTENCODING_ASCII_US ) +
                         OString( "\" found more than once in PropertySet" ) );
@@ -2857,7 +2858,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
                     if( aSuperClassSeq.getLength() >= 1 )
                     {
                         xImplClass = aSuperClassSeq.getConstArray()[0];
-                        OSL_ENSHURE( xImplClass.is(), "super class null" );
+                        OSL_ENSURE( xImplClass.is(), "super class null" );
                     }
                     else
                     {
@@ -2890,7 +2891,7 @@ IntrospectionAccessStatic_Impl* ImplIntrospection::implInspect(const Any& aToIns
         Reference<XIdlClass> xClassRef = TypeToIdlClass( aToInspectObj.getValueType(), m_xSMgr );
         if( !xClassRef.is() )
         {
-            OSL_ENSHURE( sal_False, "Can't get XIdlClass from Reflection" );
+            OSL_ENSURE( sal_False, "Can't get XIdlClass from Reflection" );
             return pAccess;
         }
 
@@ -2990,7 +2991,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 1953fa10b069..99b6bda88bf2 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: invocation.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: dbo $ $Date: 2000-12-12 09:01:16 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:34:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1266,7 +1266,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 91e7fb0bd36e..d28a271f54aa 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: iafactory.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dbo $ $Date: 2000-10-06 14:25:14 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:34:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -389,7 +389,7 @@ void AdapterImpl::invoke(
         TYPELIB_DANGER_GET( &pShortSeqTD, rSeqShortType.getTypeLibType() );
 
         // write changed out params
-        OSL_ENSHURE( pOutParams->nElements == pOutIndices->nElements, "### out params lens differ!" );
+        OSL_ENSURE( pOutParams->nElements == pOutIndices->nElements, "### out params lens differ!" );
         if (pOutParams->nElements == pOutIndices->nElements)
         {
             sal_Int16 * pIndices = (sal_Int16 *)pOutIndices->elements;
@@ -399,7 +399,7 @@ void AdapterImpl::invoke(
                 sal_Int32 nIndex = pIndices[nPos];
                 typelib_TypeDescription * pTD = 0;
                 TYPELIB_DANGER_GET( &pTD, pFormalParams[nIndex].pTypeRef );
-                OSL_ENSHURE( nIndex < nParams, "### illegal index!" );
+                OSL_ENSURE( nIndex < nParams, "### illegal index!" );
                 if (! pFormalParams[nIndex].bIn) // is pure out param
                     uno_constructData( pArgs[nIndex], pTD );
                 if (! coerce_assign( pArgs[nIndex], pTD, &pOut[nPos] )) // if fail
@@ -413,7 +413,7 @@ void AdapterImpl::invoke(
                         sal_Int32 nIndex = pIndices[n];
                         pTD = 0;
                         TYPELIB_DANGER_GET( &pTD, pFormalParams[nIndex].pTypeRef );
-                        OSL_ENSHURE( nIndex < nParams, "### illegal index!" );
+                        OSL_ENSURE( nIndex < nParams, "### illegal index!" );
                         uno_destructData( pArgs[nIndex], pTD, 0 );
                         TYPELIB_DANGER_RELEASE( pTD );
                     }
@@ -613,7 +613,7 @@ FactoryImpl::FactoryImpl()
 
     _aUno2Cpp = Mapping( aUnoEnvTypeName, aCppEnvTypeName );
     _aCpp2Uno = Mapping( aCppEnvTypeName, aUnoEnvTypeName );
-    OSL_ENSHURE( _aUno2Cpp.is() && _aCpp2Uno.is(), "### no uno / c++ mappings!" );
+    OSL_ENSURE( _aUno2Cpp.is() && _aCpp2Uno.is(), "### no uno / c++ mappings!" );
 }
 
 // XInvocationAdapterFactory
@@ -719,7 +719,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx
index 2881b24a12ee..ee1bbcc1f1e2 100644
--- a/stoc/source/javaloader/javaloader.cxx
+++ b/stoc/source/javaloader/javaloader.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: javaloader.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kr $ $Date: 2001-02-19 10:15:30 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:34:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -347,7 +347,7 @@ extern "C"
                 bRes = sal_True;
             }
             catch (InvalidRegistryException &) {
-                OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+                OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
             }
         }
 
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index d14610ca6798..f4d4e72011e0 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: javavm.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: pluby $ $Date: 2001-03-09 04:35:21 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:35:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,7 @@
 #include <vos/module.hxx>
 #include <vos/thread.hxx>
 #include <vos/conditn.hxx>
-#include <vos/profile.hxx>
+//#include <vos/profile.hxx>
 
 #include <uno/environment.h>
 
@@ -750,7 +750,7 @@ extern "C" {
                 return sal_True;
             }
             catch (InvalidRegistryException &) {
-                OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+                OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
             }
         }
         return sal_False;
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 1e99ca627da3..d4cd95072222 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dllcomponentloader.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: dbo $ $Date: 2000-12-19 15:49:47 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:35:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -291,7 +291,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index eed89f84af32..98914012f85f 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: namingservice.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: svesik $ $Date: 2000-11-23 02:15:58 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:36:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -269,7 +269,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index 24580516efed..51cfcf100d10 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: proxyfac.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: armin $ $Date: 2001-03-08 09:40:04 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:36:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,7 +120,7 @@ static inline uno_Interface * uno_queryInterface(
     (*((uno_Interface *)pUnoI)->pDispatcher)(
         (uno_Interface *)pUnoI, pMTqueryInterface, &aRetI, pArgs, &pExc );
 
-    OSL_ENSHURE( !pExc, "### Exception occured during queryInterface()!" );
+    OSL_ENSURE( !pExc, "### Exception occured during queryInterface()!" );
     if (pExc) // cleanup exception
     {
         uno_any_destruct( pExc, 0 );
@@ -246,7 +246,7 @@ inline ProxyRoot::ProxyRoot( FactoryImpl * pFactory_, const Reference< XInterfac
 {
     pFactory->acquire();
     pFactory->aCpp2Uno.mapInterface( (void **)&pTarget, xTarget_.get(), ::getCppuType( &xTarget_ ) );
-    OSL_ENSHURE( pTarget, "### mapping interface failed!" );
+    OSL_ENSURE( pTarget, "### mapping interface failed!" );
     aInterfaces.reserve( 8 );
 }
 //__________________________________________________________________________________________________
@@ -319,7 +319,7 @@ Any ProxyRoot::queryAggregation( const Type & rType )
 
             Reference< XInterface > xRet;
             pFactory->aUno2Cpp.mapInterface( (void **)&xRet, (uno_Interface *)p, pTypeDescr );
-            OSL_ENSHURE( xRet.is(), "### mapping interface failed!" );
+            OSL_ENSURE( xRet.is(), "### mapping interface failed!" );
             aInterfaces.push_back( p );
             aRet.setValue( &xRet, (typelib_TypeDescription *)pTypeDescr );
         }
@@ -345,8 +345,8 @@ FactoryImpl::FactoryImpl()
     , aCpp2Uno( OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ),
                 OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ) )
 {
-    OSL_ENSHURE( aUno2Cpp.is(), "### cannot get bridge uno <-> C++!" );
-    OSL_ENSHURE( aCpp2Uno.is(), "### cannot get bridge C++ <-> uno!" );
+    OSL_ENSURE( aUno2Cpp.is(), "### cannot get bridge uno <-> C++!" );
+    OSL_ENSURE( aCpp2Uno.is(), "### cannot get bridge C++ <-> uno!" );
 }
 
 // XProxyFactory
@@ -427,7 +427,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/registry_tdprovider/base.hxx b/stoc/source/registry_tdprovider/base.hxx
index ef30b7f872fa..e987a404d98c 100644
--- a/stoc/source/registry_tdprovider/base.hxx
+++ b/stoc/source/registry_tdprovider/base.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: base.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-07 14:48:04 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:36:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,7 +116,7 @@ inline sal_Int32 getRTValueAsInt32( const RTConstValue & rVal )
     case RT_TYPE_UINT32:
         return rVal.m_value.aULong;
     }
-    OSL_ENSHURE( sal_False, "### unexpected value type!" );
+    OSL_ENSURE( sal_False, "### unexpected value type!" );
     return 0;
 }
 //--------------------------------------------------------------------------------------------------
@@ -146,7 +146,7 @@ inline Any getRTValue( const RTConstValue & rVal )
         return Any( &aStr, ::getCppuType( (const OUString *)0 ) );
     }
     }
-    OSL_ENSHURE( sal_False, "### unexpected RTValue!" );
+    OSL_ENSURE( sal_False, "### unexpected RTValue!" );
     return Any();
 }
 
diff --git a/stoc/source/registry_tdprovider/tdcomp.cxx b/stoc/source/registry_tdprovider/tdcomp.cxx
index fb8c6ee67492..1bc63480ab5a 100644
--- a/stoc/source/registry_tdprovider/tdcomp.cxx
+++ b/stoc/source/registry_tdprovider/tdcomp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tdcomp.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-07 14:48:04 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:36:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -138,7 +138,7 @@ Sequence< Reference< XTypeDescription > > CompoundTypeDescriptionImpl::getMember
                 catch (NoSuchElementException &)
                 {
                 }
-                OSL_ENSHURE( pMembers[nFields].is(), "### compound member unknown!" );
+                OSL_ENSURE( pMembers[nFields].is(), "### compound member unknown!" );
             }
 
             _pMembers = pTempMembers;
diff --git a/stoc/source/registry_tdprovider/tdiface.cxx b/stoc/source/registry_tdprovider/tdiface.cxx
index dbf9a2304fb7..3711ec795548 100644
--- a/stoc/source/registry_tdprovider/tdiface.cxx
+++ b/stoc/source/registry_tdprovider/tdiface.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tdiface.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-07 14:48:04 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:36:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -354,7 +354,7 @@ Sequence<Reference<XTypeDescription > > InterfaceMethodImpl::getExceptions()
                 catch (NoSuchElementException &)
                 {
                 }
-                OSL_ENSHURE( pExc[nExc].is(), "### exception type unknown!" );
+                OSL_ENSURE( pExc[nExc].is(), "### exception type unknown!" );
             }
 
             _pExceptions = pExceptions;
diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx b/stoc/source/registry_tdprovider/tdprovider.cxx
index 316fcd18db97..0fe6596ea35f 100644
--- a/stoc/source/registry_tdprovider/tdprovider.cxx
+++ b/stoc/source/registry_tdprovider/tdprovider.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tdprovider.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-07 14:48:04 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:36:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -160,7 +160,7 @@ ProviderImpl::ProviderImpl( const Reference< XMultiServiceFactory > & xSMgr )
     , _xSMgr( xSMgr )
     , _xTDMgr( _xSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.TypeDescriptionManager") ) ), UNO_QUERY )
 {
-    OSL_ENSHURE( _xTDMgr.is(), "### cannot get service instance \"com.sun.star.reflection.TypeDescriptionManager\"!" );
+    OSL_ENSURE( _xTDMgr.is(), "### cannot get service instance \"com.sun.star.reflection.TypeDescriptionManager\"!" );
 }
 //__________________________________________________________________________________________________
 ProviderImpl::~ProviderImpl()
@@ -495,7 +495,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 6f612c1329f8..3d53ce16e9df 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: servicemanager.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: armin $ $Date: 2001-03-08 09:40:46 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:37:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -329,11 +329,11 @@ void OServiceManager_Listener::disposing(const EventObject & rEvt )
         }
         catch( const IllegalArgumentException & )
         {
-            OSL_ENSHURE( sal_False, "IllegalArgumentException catched" );
+            OSL_ENSURE( sal_False, "IllegalArgumentException catched" );
         }
         catch( const NoSuchElementException & )
         {
-            OSL_ENSHURE( sal_False, "NoSuchElementException catched" );
+            OSL_ENSURE( sal_False, "NoSuchElementException catched" );
         }
     }
 }
@@ -1382,7 +1382,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index d729706bea34..23607a40bef9 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: simpleregistry.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jsc $ $Date: 2001-02-19 17:44:20 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:37:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1231,7 +1231,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index 1a253aaf3d23..3b691d3c1ef0 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tdmgr.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: armin $ $Date: 2001-03-08 09:42:13 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:37:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -253,7 +253,7 @@ void EventListenerImpl::disposing( const EventObject & rEvt )
     if (rEvt.Source == _pMgr->_xSMgr)
     {
         Reference< XComponent > xComp( _pMgr->_xSMgr, UNO_QUERY );
-        OSL_ENSHURE( xComp.is(), "### service manager must implement XComponent!" );
+        OSL_ENSURE( xComp.is(), "### service manager must implement XComponent!" );
         xComp->removeEventListener( this );
         _pMgr->_bCaching = sal_False;
         _pMgr->_aElements.clear();
@@ -314,7 +314,7 @@ extern "C"
 static void SAL_CALL tdmgr_typelib_callback( void * pContext, typelib_TypeDescription ** ppRet,
                                              rtl_uString * pTypeName )
 {
-    OSL_ENSHURE( pContext && ppRet && pTypeName, "### null ptr!" );
+    OSL_ENSURE( pContext && ppRet && pTypeName, "### null ptr!" );
     if (ppRet)
     {
         if (*ppRet)
@@ -363,13 +363,13 @@ ManagerImpl::ManagerImpl( const Reference< XMultiServiceFactory > & xSMgr )
 
     // listen to service manager vanishing...
     Reference< XComponent > xComp( _xSMgr, UNO_QUERY );
-    OSL_ENSHURE( xComp.is(), "### service manager must implement XComponent!" );
+    OSL_ENSURE( xComp.is(), "### service manager must implement XComponent!" );
     xComp->addEventListener( &_aEventListener );
 }
 //__________________________________________________________________________________________________
 ManagerImpl::~ManagerImpl()
 {
-    OSL_ENSHURE( _aProviders.size() == 0, "### still providers left!" );
+    OSL_ENSURE( _aProviders.size() == 0, "### still providers left!" );
     TRACE( "> TypeDescriptionManager shut down. <\n" );
     MutexGuard aGuard( _aComponentMutex );
 
@@ -381,11 +381,11 @@ inline void ManagerImpl::initProviders()
 {
     // looking up service manager for all known provider implementations
     Reference< XContentEnumerationAccess > xEnumAccess( _xSMgr, UNO_QUERY );
-    OSL_ENSHURE( xEnumAccess.is(), "### service manager must export XContentEnumerationAccess!" );
+    OSL_ENSURE( xEnumAccess.is(), "### service manager must export XContentEnumerationAccess!" );
 
     Reference< XEnumeration > xEnum( xEnumAccess->createContentEnumeration(
         OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.TypeDescriptionProvider") ) ) );
-    OSL_ENSHURE( xEnum.is(), "### no TypeDescriptionProviders available!" );
+    OSL_ENSURE( xEnum.is(), "### no TypeDescriptionProviders available!" );
     if (xEnum.is())
     {
         while (xEnum->hasMoreElements())
@@ -400,7 +400,7 @@ inline void ManagerImpl::initProviders()
                 {
                     Reference< XSingleServiceFactory > xFactory(
                         *(const Reference< XInterface > *)aAny.getValue(), UNO_QUERY );
-                    OSL_ENSHURE( xFactory.is(), "### the thing that should not be!" );
+                    OSL_ENSURE( xFactory.is(), "### the thing that should not be!" );
 
                     Reference< XHierarchicalNameAccess > xHA( xFactory->createInstance(), UNO_QUERY );
                     if (xHA.is())
@@ -420,7 +420,7 @@ inline void ManagerImpl::initProviders()
             }
         }
     }
-    OSL_ENSHURE( !_aProviders.empty(), "### no typedescription providers found!" );
+    OSL_ENSURE( !_aProviders.empty(), "### no typedescription providers found!" );
 }
 
 // XServiceInfo
@@ -798,7 +798,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 901af16a8a8d..aa286bdeaa86 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: convert.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: fs $ $Date: 2001-02-13 15:33:53 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:38:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -989,7 +989,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/test/excomp/excomp1.cxx b/stoc/test/excomp/excomp1.cxx
index fc5f3577df80..7eedfddb547d 100644
--- a/stoc/test/excomp/excomp1.cxx
+++ b/stoc/test/excomp/excomp1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: excomp1.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:36 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:28:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -225,7 +225,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/test/excomp/excomp2.cxx b/stoc/test/excomp/excomp2.cxx
index ccedc6dbf907..4034dd9f3cc7 100644
--- a/stoc/test/excomp/excomp2.cxx
+++ b/stoc/test/excomp/excomp2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: excomp2.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:36 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:28:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -300,7 +300,7 @@ sal_Bool SAL_CALL component_writeInfo(
         }
         catch (InvalidRegistryException &)
         {
-            OSL_ENSHURE( sal_False, "### InvalidRegistryException!" );
+            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
         }
     }
     return sal_False;
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index 34c883f2168e..fb42a63d00ad 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testjavavm.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:36 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:28:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,7 +66,7 @@
 #include <stdio.h>
 #include <uno/api.h>
 
-#include <vos/diagnose.hxx>
+//#include <vos/diagnose.hxx>
 #include <vos/dynload.hxx>
 
 #include <cppuhelper/servicefactory.hxx>
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index 32fedbcdc35f..fa3e1d7b5c22 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testconv.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pluby $ $Date: 2001-02-12 03:30:52 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -713,7 +713,7 @@ int __cdecl main( int argc, char * argv[] )
     {
         Reference< XImplementationRegistration > xImplReg(
             xMgr->createInstance( OUString::createFromAscii("com.sun.star.registry.ImplementationRegistration") ), UNO_QUERY );
-        OSL_ENSHURE( xImplReg.is(), "### no impl reg!" );
+        OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
 
         OUString aLibName( OUString::createFromAscii( REG_PREFIX ) );
         aLibName += OUString::createFromAscii("tcv");
@@ -728,7 +728,7 @@ int __cdecl main( int argc, char * argv[] )
     }
     catch (Exception & rExc)
     {
-        OSL_ENSHURE( sal_False, "### exception occured!" );
+        OSL_ENSURE( sal_False, "### exception occured!" );
         OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
         OSL_TRACE( "### exception occured: " );
         OSL_TRACE( aMsg.getStr() );
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 2138bd2576fd..93692dec4eab 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testcorefl.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pluby $ $Date: 2001-02-12 03:30:52 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,7 +62,7 @@
 #include <osl/diagnose.h>
 
 #ifdef _DEBUG
-#define TEST_ENSHURE(c, m)   OSL_ENSHURE(c, m)
+#define TEST_ENSHURE(c, m)   OSL_ENSURE(c, m)
 #else
 #define TEST_ENSHURE(c, m)   OSL_VERIFY(c)
 #endif
@@ -412,7 +412,7 @@ int __cdecl main( int argc, char * argv[] )
     {
         Reference< XImplementationRegistration > xImplReg(
             xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration") ) ), UNO_QUERY );
-        OSL_ENSHURE( xImplReg.is(), "### no impl reg!" );
+        OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
 
         OUString aLibName( OUString::createFromAscii(REG_PREFIX) );
         aLibName += OUString::createFromAscii("corefl");
@@ -423,13 +423,13 @@ int __cdecl main( int argc, char * argv[] )
             OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), aLibName, Reference< XSimpleRegistry >() );
 
         Reference< XIdlReflection > xRefl( xMgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection") ), UNO_QUERY );
-        OSL_ENSHURE( xRefl.is(), "### no corereflection!" );
+        OSL_ENSURE( xRefl.is(), "### no corereflection!" );
 
         bSucc = test_corefl( xRefl );
     }
     catch (Exception & rExc)
     {
-        OSL_ENSHURE( sal_False, "### exception occured!" );
+        OSL_ENSURE( sal_False, "### exception occured!" );
         OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
         OSL_TRACE( "### exception occured: " );
         OSL_TRACE( aMsg.getStr() );
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index ed01ce086e1e..b6e3fae800e9 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testiadapter.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pluby $ $Date: 2001-02-12 03:30:53 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,21 +92,21 @@ using namespace com::sun::star::registry;
 //==================================================================================================
 sal_Bool equals( const test::TestElement & rData1, const test::TestElement & rData2 )
 {
-    OSL_ENSHURE( rData1.Bool == rData2.Bool, "### bool does not match!" );
-    OSL_ENSHURE( rData1.Char == rData2.Char, "### char does not match!" );
-    OSL_ENSHURE( rData1.Byte == rData2.Byte, "### byte does not match!" );
-    OSL_ENSHURE( rData1.Short == rData2.Short, "### short does not match!" );
-    OSL_ENSHURE( rData1.UShort == rData2.UShort, "### unsigned short does not match!" );
-    OSL_ENSHURE( rData1.Long == rData2.Long, "### long does not match!" );
-    OSL_ENSHURE( rData1.ULong == rData2.ULong, "### unsigned long does not match!" );
-    OSL_ENSHURE( rData1.Hyper == rData2.Hyper, "### hyper does not match!" );
-    OSL_ENSHURE( rData1.UHyper == rData2.UHyper, "### unsigned hyper does not match!" );
-    OSL_ENSHURE( rData1.Float == rData2.Float, "### float does not match!" );
-    OSL_ENSHURE( rData1.Double == rData2.Double, "### double does not match!" );
-    OSL_ENSHURE( rData1.Enum == rData2.Enum, "### enum does not match!" );
-    OSL_ENSHURE( rData1.String == rData2.String, "### string does not match!" );
-    OSL_ENSHURE( rData1.Interface == rData2.Interface, "### interface does not match!" );
-    OSL_ENSHURE( rData1.Any == rData2.Any, "### any does not match!" );
+    OSL_ENSURE( rData1.Bool == rData2.Bool, "### bool does not match!" );
+    OSL_ENSURE( rData1.Char == rData2.Char, "### char does not match!" );
+    OSL_ENSURE( rData1.Byte == rData2.Byte, "### byte does not match!" );
+    OSL_ENSURE( rData1.Short == rData2.Short, "### short does not match!" );
+    OSL_ENSURE( rData1.UShort == rData2.UShort, "### unsigned short does not match!" );
+    OSL_ENSURE( rData1.Long == rData2.Long, "### long does not match!" );
+    OSL_ENSURE( rData1.ULong == rData2.ULong, "### unsigned long does not match!" );
+    OSL_ENSURE( rData1.Hyper == rData2.Hyper, "### hyper does not match!" );
+    OSL_ENSURE( rData1.UHyper == rData2.UHyper, "### unsigned hyper does not match!" );
+    OSL_ENSURE( rData1.Float == rData2.Float, "### float does not match!" );
+    OSL_ENSURE( rData1.Double == rData2.Double, "### double does not match!" );
+    OSL_ENSURE( rData1.Enum == rData2.Enum, "### enum does not match!" );
+    OSL_ENSURE( rData1.String == rData2.String, "### string does not match!" );
+    OSL_ENSURE( rData1.Interface == rData2.Interface, "### interface does not match!" );
+    OSL_ENSURE( rData1.Any == rData2.Any, "### any does not match!" );
 
     return (rData1.Bool == rData2.Bool &&
             rData1.Char == rData2.Char &&
@@ -140,7 +140,7 @@ sal_Bool equals( const test::TestData & rData1, const test::TestData & rData2 )
         {
             if (! equals( pElements1[nLen], pElements2[nLen] ))
             {
-                OSL_ENSHURE( sal_False, "### sequence element did not match!" );
+                OSL_ENSURE( sal_False, "### sequence element did not match!" );
                 return sal_False;
             }
         }
@@ -551,7 +551,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
         }
         else
         {
-            OSL_ENSHURE( sal_False, "no XLanguageBindingTest call received on invocation!" );
+            OSL_ENSURE( sal_False, "no XLanguageBindingTest call received on invocation!" );
         }
     }
     catch (IllegalArgumentException & rExc)
@@ -563,7 +563,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
     }
     catch (Exception &)
     {
-        OSL_ENSHURE( sal_False, "### unexpected exception caught!" );
+        OSL_ENSURE( sal_False, "### unexpected exception caught!" );
         throw;
     }
 
@@ -770,7 +770,7 @@ test::TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_In
 //==================================================================================================
 sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
 {
-    OSL_ENSHURE( xLBT.is(), "### no test interface!" );
+    OSL_ENSURE( xLBT.is(), "### no test interface!" );
     if (xLBT.is())
     {
         // this data is never ever granted access to by calls other than equals(), assign()!
@@ -784,8 +784,8 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
                 (float)17.0815, 3.1415926359, TestEnum_LOLA, OUString::createFromAscii("dumdidum"), xI,
                 Any( &xI, ::getCppuType( (const Reference<XInterface > *)0 ) ) );
 
-        OSL_ENSHURE( aData.Any == xI, "### unexpected any!" );
-        OSL_ENSHURE( !(aData.Any != xI), "### unexpected any!" );
+        OSL_ENSURE( aData.Any == xI, "### unexpected any!" );
+        OSL_ENSURE( !(aData.Any != xI), "### unexpected any!" );
 
         aData.Sequence = Sequence<test::TestElement >( (const test::TestElement *)&aData, 1 );
         // aData complete
@@ -925,7 +925,7 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
             }
             catch (IllegalArgumentException aExc)
             {
-                OSL_ENSHURE( aExc.ArgumentPosition == 5 &&
+                OSL_ENSURE( aExc.ArgumentPosition == 5 &&
 //                               aExc.Context == xLBT &&
                              aExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")),
                              "### unexpected exception content!" );
@@ -933,7 +933,7 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
                 Reference<XLanguageBindingTest > xLBT(
                     Reference<XLanguageBindingTest >::query( aExc.Context ) );
 
-                OSL_ENSHURE( xLBT.is(), "### unexpected source of exception!" );
+                OSL_ENSURE( xLBT.is(), "### unexpected source of exception!" );
                 if (xLBT.is())
                     xLBT->getRuntimeException();
                 else
@@ -942,14 +942,14 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
         }
         catch (const RuntimeException & rExc)
         {
-            OSL_ENSHURE(//rExc.Context == xLBT &&
+            OSL_ENSURE(//rExc.Context == xLBT &&
                         rExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")),
                         "### unexpected exception content!" );
 
             Reference<XLanguageBindingTest > xLBT(
                 Reference<XLanguageBindingTest >::query( rExc.Context ) );
 
-            OSL_ENSHURE( xLBT.is(), "### unexpected source of exception!" );
+            OSL_ENSURE( xLBT.is(), "### unexpected source of exception!" );
             if (xLBT.is())
                 xLBT->setRuntimeException( 0xcafebabe );
             else
@@ -958,7 +958,7 @@ sal_Bool raiseException( const Reference<XLanguageBindingTest > & xLBT )
     }
     catch (Exception & aExc)
     {
-        OSL_ENSHURE( //aExc.Context == xLBT &&
+        OSL_ENSURE( //aExc.Context == xLBT &&
                      aExc.Message.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("dum dum dum ich tanz im kreis herum...")),
                      "### unexpected exception content!" );
         return (//aExc.Context == xLBT &&
@@ -1027,7 +1027,7 @@ int __cdecl main( int argc, char * argv[] )
             xMgr->createInstance(
                 OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration") ) ),
             UNO_QUERY );
-        OSL_ENSHURE( xImplReg.is(), "### no impl reg!" );
+        OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
 
         xImplReg->registerImplementation(
             OUString::createFromAscii("com.sun.star.loader.SharedLibrary"),
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 2639341cabcc..cb5cc8794468 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testintrosp.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pluby $ $Date: 2001-02-12 03:30:53 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,7 +64,7 @@
 #include <cppuhelper/servicefactory.hxx>
 
 #include <vos/diagnose.hxx>
-#include <vos/dynload.hxx>
+//#include <vos/dynload.hxx>
 
 #include <ModuleA/XIntroTest.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -88,7 +88,7 @@
 
 using namespace rtl;
 using namespace cppu;
-using namespace vos;
+//using namespace vos;
 using namespace ModuleA;
 //using namespace ModuleB;
 //using namespace ModuleC;
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index 285eb6ed4979..5872a5e27c9c 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testproxyfac.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pluby $ $Date: 2001-02-12 03:30:53 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -216,7 +216,7 @@ int __cdecl main( int argc, char * argv[] )
     {
         Reference< XImplementationRegistration > xImplReg(
             xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.ImplementationRegistration") ) ), UNO_QUERY );
-        OSL_ENSHURE( xImplReg.is(), "### no impl reg!" );
+        OSL_ENSURE( xImplReg.is(), "### no impl reg!" );
 
         OUString aLibName( OUString::createFromAscii(REG_PREFIX) );
         aLibName += OUString::createFromAscii("proxyfac");
@@ -227,13 +227,13 @@ int __cdecl main( int argc, char * argv[] )
             OUString::createFromAscii("com.sun.star.loader.SharedLibrary"), aLibName, Reference< XSimpleRegistry >() );
 
         Reference< XProxyFactory > xProxyFac( xMgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.ProxyFactory") ), UNO_QUERY );
-        OSL_ENSHURE( xProxyFac.is(), "### no proxy factory!" );
+        OSL_ENSURE( xProxyFac.is(), "### no proxy factory!" );
 
         bSucc = test_proxyfac( xProxyFac );
     }
     catch (Exception & rExc)
     {
-        OSL_ENSHURE( sal_False, "### exception occured!" );
+        OSL_ENSURE( sal_False, "### exception occured!" );
         OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
         OSL_TRACE( "### exception occured: " );
         OSL_TRACE( aMsg.getStr() );
diff --git a/stoc/test/testsmgr.cxx b/stoc/test/testsmgr.cxx
index a711898bad74..f645c81869e3 100644
--- a/stoc/test/testsmgr.cxx
+++ b/stoc/test/testsmgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: testsmgr.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 15:29:36 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 15:27:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,9 +59,9 @@
  *
  ************************************************************************/
 #include <stdio.h>
-#ifndef _VOS_MODULE_HXX_
-#include <vos/module.hxx>
-#endif
+//#ifndef _VOS_MODULE_HXX_
+//#include <vos/module.hxx>
+//#endif
 #ifndef _VOS_DIAGNOSE_HXX_
 #include <vos/diagnose.hxx>
 #endif