OSL_ENSHURE replaced by OSL_ENSURE

7 files changed, 48 insertions, 48 deletions

diff --git a/cppuhelper/inc/cppuhelper/interfacecontainer.h b/cppuhelper/inc/cppuhelper/interfacecontainer.h
index 5486b278f235..9bc23a1eb219 100644
--- a/cppuhelper/inc/cppuhelper/interfacecontainer.h
+++ b/cppuhelper/inc/cppuhelper/interfacecontainer.h
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: interfacecontainer.h,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-09 12:15:26 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 13:38:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -374,8 +374,8 @@ struct OBroadcastHelperVar
         SAL_THROW( () )
     {
         ::osl::MutexGuard guard( rMutex );
-        OSL_ENSHURE( !bInDispose, "do not add listeners in the dispose call" );
-        OSL_ENSHURE( !bDisposed, "object is disposed" );
+        OSL_ENSURE( !bInDispose, "do not add listeners in the dispose call" );
+        OSL_ENSURE( !bDisposed, "object is disposed" );
         if( ! bInDispose && ! bDisposed  )
             aLC.addInterface( key , r );
     }
@@ -389,7 +389,7 @@ struct OBroadcastHelperVar
         SAL_THROW( () )
     {
         ::osl::MutexGuard guard( rMutex );
-        OSL_ENSHURE( !bDisposed, "object is disposed" );
+        OSL_ENSURE( !bDisposed, "object is disposed" );
         if( ! bInDispose && ! bDisposed  )
             aLC.removeInterface( key , r );
     }
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 4deb7a1766a5..834d571028e9 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: exc_thrower.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-09 12:15:28 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 13:39:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -233,7 +233,7 @@ static void SAL_CALL ExceptionThrower_dispatch(
         break;
     }
     default:
-        OSL_ENSHURE( sal_False, "### illegal member called!" );
+        OSL_ENSURE( sal_False, "### illegal member called!" );
     }
 }
 } // extern "C"
@@ -262,7 +262,7 @@ void SAL_CALL throwException( const Any & rExc ) SAL_THROW( (Exception) )
             {
                 Mapping aUno2Cpp( OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ),
                                   OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) );
-                OSL_ENSHURE( aUno2Cpp.is(), "### cannot get uno to cpp mapping!" );
+                OSL_ENSURE( aUno2Cpp.is(), "### cannot get uno to cpp mapping!" );
                 if (aUno2Cpp.is())
                 {
                     uno_Interface * pUnoI = new ExceptionThrower();
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 9b86fcc348e4..e363d344ba43 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: factory.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-09 12:15:28 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 13:39:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -527,7 +527,7 @@ Reference< XSingleServiceFactory > ORegistryFactoryHelper::createModuleFactory()
                 catch( CannotActivateFactoryException& e)
                 {
                     OString msg( OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US) );
-                    OSL_ENSHURE( !msg.getLength(), msg.getStr() );
+                    OSL_ENSURE( !msg.getLength(), msg.getStr() );
                 }
             }
             xFactory = Reference<XSingleServiceFactory >( xMF, UNO_QUERY );
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index 441dc512dc62..6ab99749535e 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implbase.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-09 12:15:28 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 13:39:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -144,7 +144,7 @@ void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THR
     {
         OString msg( "### cannot get type description for " );
         msg += OUStringToOString( rType.getTypeName(), RTL_TEXTENCODING_ASCII_US );
-        OSL_ENSHURE( sal_False, msg.getStr() );
+        OSL_ENSURE( sal_False, msg.getStr() );
     }
 #endif
 }
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index bed6c2a2b64c..3fe881748abe 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: interfacecontainer.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-09 12:15:28 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 13:39:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -161,7 +161,7 @@ OInterfaceIteratorHelper::~OInterfaceIteratorHelper() SAL_THROW( () )
     bShared = pData == rCont.pData && rCont.bIsList;
     if( bShared )
     {
-        OSL_ENSHURE( rCont.bInUse, "OInterfaceContainerHelper must be in use" );
+        OSL_ENSURE( rCont.bInUse, "OInterfaceContainerHelper must be in use" );
         rCont.bInUse = sal_False;
     }
     }
@@ -224,7 +224,7 @@ OInterfaceContainerHelper::OInterfaceContainerHelper( Mutex & rMutex_ ) SAL_THRO
 
 OInterfaceContainerHelper::~OInterfaceContainerHelper() SAL_THROW( () )
 {
-    OSL_ENSHURE( !bInUse, "~OInterfaceContainerHelper but is in use" );
+    OSL_ENSURE( !bInUse, "~OInterfaceContainerHelper but is in use" );
     if( bIsList )
         delete (Sequence< Reference< XInterface > >*)pData;
     else if( pData )
@@ -256,7 +256,7 @@ Sequence< Reference<XInterface> > OInterfaceContainerHelper::getElements() const
 
 void OInterfaceContainerHelper::copyAndResetInUse() SAL_THROW( () )
 {
-    OSL_ENSHURE( bInUse, "OInterfaceContainerHelper not in use" );
+    OSL_ENSURE( bInUse, "OInterfaceContainerHelper not in use" );
     if( bInUse )
     {
         // this should be the worst case. If a iterator is active
@@ -365,7 +365,7 @@ void OInterfaceContainerHelper::disposeAndClear( const EventObject & rEvt ) SAL_
     ClearableMutexGuard aGuard( rMutex );
     OInterfaceIteratorHelper aIt( *this );
     // Container freigeben, falls im disposing neue Eintr�ge kommen
-    OSL_ENSHURE( !bIsList || bInUse, "OInterfaceContainerHelper not in use" );
+    OSL_ENSURE( !bIsList || bInUse, "OInterfaceContainerHelper not in use" );
     if( !bIsList && pData )
         ((XInterface *)pData)->release();
     // set the member to null, the iterator delete the values
@@ -395,7 +395,7 @@ void OInterfaceContainerHelper::clear() SAL_THROW( () )
     ClearableMutexGuard aGuard( rMutex );
     OInterfaceIteratorHelper aIt( *this );
     // Container freigeben, falls im disposing neue Eintr�ge kommen
-    OSL_ENSHURE( !bIsList || bInUse, "OInterfaceContainerHelper not in use" );
+    OSL_ENSURE( !bIsList || bInUse, "OInterfaceContainerHelper not in use" );
     if( !bIsList && pData )
         ((XInterface *)pData)->release();
     // set the member to null, the iterator delete the values
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index b3e66ded955e..57df796e0a38 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propshlp.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-09 12:21:00 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 13:39:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -256,8 +256,8 @@ void OPropertySetHelper::addPropertyChangeListener(
            ::com::sun::star::uno::RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
-    OSL_ENSHURE( !rBHelper.bInDispose, "do not addPropertyChangeListener in the dispose call" );
-    OSL_ENSHURE( !rBHelper.bDisposed, "object is disposed" );
+    OSL_ENSURE( !rBHelper.bInDispose, "do not addPropertyChangeListener in the dispose call" );
+    OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
     if( !rBHelper.bInDispose && !rBHelper.bDisposed )
     {
         // only add listeners if you are not disposed
@@ -277,7 +277,7 @@ void OPropertySetHelper::addPropertyChangeListener(
             rPH.fillPropertyMembersByHandle( NULL, &nAttributes, nHandle );
             if( !(nAttributes & ::com::sun::star::beans::PropertyAttribute::BOUND) )
             {
-                OSL_ENSHURE( sal_False, "add listener to an unbound property" );
+                OSL_ENSURE( sal_False, "add listener to an unbound property" );
                 // silent ignore this
                 return;
             }
@@ -304,7 +304,7 @@ void OPropertySetHelper::removePropertyChangeListener(
           ::com::sun::star::uno::RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
-    OSL_ENSHURE( !rBHelper.bDisposed, "object is disposed" );
+    OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
     // all listeners are automaticly released in a dispose call
     if( !rBHelper.bInDispose && !rBHelper.bDisposed )
     {
@@ -338,8 +338,8 @@ void OPropertySetHelper::addVetoableChangeListener(
           ::com::sun::star::uno::RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
-    OSL_ENSHURE( !rBHelper.bInDispose, "do not addVetoableChangeListener in the dispose call" );
-    OSL_ENSHURE( !rBHelper.bDisposed, "object is disposed" );
+    OSL_ENSURE( !rBHelper.bInDispose, "do not addVetoableChangeListener in the dispose call" );
+    OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
     if( !rBHelper.bInDispose && !rBHelper.bDisposed )
     {
         // only add listeners if you are not disposed
@@ -359,7 +359,7 @@ void OPropertySetHelper::addVetoableChangeListener(
             rPH.fillPropertyMembersByHandle( NULL, &nAttributes, nHandle );
             if( !(nAttributes & PropertyAttribute::CONSTRAINED) )
             {
-                OSL_ENSHURE( sal_False, "addVetoableChangeListener, and property is not constrained" );
+                OSL_ENSURE( sal_False, "addVetoableChangeListener, and property is not constrained" );
                 // silent ignore this
                 return;
             }
@@ -384,7 +384,7 @@ void OPropertySetHelper::removeVetoableChangeListener(
           ::com::sun::star::uno::RuntimeException)
 {
     MutexGuard aGuard( rBHelper.rMutex );
-    OSL_ENSHURE( !rBHelper.bDisposed, "object is disposed" );
+    OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
     // all listeners are automaticly released in a dispose call
     if( !rBHelper.bInDispose && !rBHelper.bDisposed )
     {
@@ -418,8 +418,8 @@ void OPropertySetHelper::setFastPropertyValue( sal_Int32 nHandle, const Any& rVa
            ::com::sun::star::lang::WrappedTargetException,
            ::com::sun::star::uno::RuntimeException)
 {
-    OSL_ENSHURE( !rBHelper.bInDispose, "do not setFastPropertyValue in the dispose call" );
-    OSL_ENSHURE( !rBHelper.bDisposed, "object is disposed" );
+    OSL_ENSURE( !rBHelper.bInDispose, "do not setFastPropertyValue in the dispose call" );
+    OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
 
     IPropertyArrayHelper & rInfo = getInfoHelper();
     sal_Int16 nAttributes;
@@ -602,8 +602,8 @@ void OPropertySetHelper::setFastPropertyValues(
     sal_Int32 nHitCount )
     SAL_THROW( (::com::sun::star::uno::Exception) )
 {
-    OSL_ENSHURE( !rBHelper.bInDispose, "do not getFastPropertyValue in the dispose call" );
-    OSL_ENSHURE( !rBHelper.bDisposed, "object is disposed" );
+    OSL_ENSURE( !rBHelper.bInDispose, "do not getFastPropertyValue in the dispose call" );
+    OSL_ENSURE( !rBHelper.bDisposed, "object is disposed" );
 
     Any * pConvertedValues = NULL;
     Any * pOldValues = NULL;
@@ -864,7 +864,7 @@ void OPropertyArrayHelper::init( sal_Bool bSorted ) SAL_THROW( () )
     {
         if(  pProperties[i-1].Name >= pProperties[i].Name )
         {
-            OSL_ENSHURE( !bSorted, "Property array is not sorted" );
+            OSL_ENSURE( !bSorted, "Property array is not sorted" );
             // not sorted
             qsort( aInfos.getArray(), nElements, sizeof( Property ),
                     compare_Property_Impl );
diff --git a/cppuhelper/source/servicefactory.cxx b/cppuhelper/source/servicefactory.cxx
index 1cf165dc6c17..2721e4a25a82 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: servicefactory.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: dbo $ $Date: 2001-03-09 12:15:28 $
+ *  last change: $Author: jl $ $Date: 2001-03-12 13:39:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -188,12 +188,12 @@ static Reference< XMultiServiceFactory > createImplServiceFactory(
     Reference< XMultiServiceFactory > xSF( xSMFac->createInstance(), UNO_QUERY );
     Reference< XInitialization > xInit( xSF, UNO_QUERY );
 
-    OSL_ENSHURE( xInit.is() && xSF.is(), "### failed loading servicemanager!" );
+    OSL_ENSURE( xInit.is() && xSF.is(), "### failed loading servicemanager!" );
     if (xInit.is() && xSF.is())
     {
         Reference< XSingleServiceFactory > xSimRegFac( createSimpleRegistryFactory( xSF, rBootstrapPath ) );
         Reference< XSingleServiceFactory > xNesRegFac( createNestedRegistryFactory( xSF, rBootstrapPath ) );
-        OSL_ENSHURE( xSimRegFac.is() && xNesRegFac.is(), "### cannot get registry factories!" );
+        OSL_ENSURE( xSimRegFac.is() && xNesRegFac.is(), "### cannot get registry factories!" );
 
         // write initial shared lib loader, simple registry, default registry, impl reg
         Reference< XSet > xSet( xSF, UNO_QUERY );
@@ -207,7 +207,7 @@ static Reference< XMultiServiceFactory > createImplServiceFactory(
                              Reference< XInterface >() );
         }
         xSet->insert( makeAny( xFac ) );
-        OSL_ENSHURE( xSet->has( makeAny( xFac ) ), "### failed registering loader!" );
+        OSL_ENSURE( xSet->has( makeAny( xFac ) ), "### failed registering loader!" );
         }
         // simple registry
         {
@@ -217,7 +217,7 @@ static Reference< XMultiServiceFactory > createImplServiceFactory(
                              Reference< XInterface >() );
         }
         xSet->insert( makeAny( xSimRegFac ) );
-        OSL_ENSHURE( xSet->has( makeAny( xSimRegFac ) ), "### failed registering simple registry!" );
+        OSL_ENSURE( xSet->has( makeAny( xSimRegFac ) ), "### failed registering simple registry!" );
         }
         // nested registry
         {
@@ -227,7 +227,7 @@ static Reference< XMultiServiceFactory > createImplServiceFactory(
                              Reference< XInterface >() );
         }
         xSet->insert( makeAny( xNesRegFac ) );
-        OSL_ENSHURE( xSet->has( makeAny( xNesRegFac ) ), "### failed registering default registry!" );
+        OSL_ENSURE( xSet->has( makeAny( xNesRegFac ) ), "### failed registering default registry!" );
         }
         // implementation registration
         {
@@ -238,7 +238,7 @@ static Reference< XMultiServiceFactory > createImplServiceFactory(
                              Reference< XInterface >() );
         }
         xSet->insert( makeAny( xFac ) );
-        OSL_ENSHURE( xSet->has( makeAny( xFac ) ), "### failed registering impl reg!" );
+        OSL_ENSURE( xSet->has( makeAny( xFac ) ), "### failed registering impl reg!" );
         }
 
         Reference< XSimpleRegistry > xRegistry;
@@ -309,7 +309,7 @@ static Reference< XMultiServiceFactory > createImplServiceFactory(
                              Reference< XInterface >() );
         }
 
-//      OSL_ENSHURE( xRegistry.is(), "### got no registry!" );
+//      OSL_ENSURE( xRegistry.is(), "### got no registry!" );
         Reference< XInterface > xInst;
         if (xRegistry.is())
         {
@@ -334,7 +334,7 @@ static Reference< XMultiServiceFactory > createImplServiceFactory(
                                      Reference< XInterface >() );
                 }
                 xSet->insert( makeAny( xFac ) );
-                OSL_ENSHURE( xSet->has( makeAny( xFac ) ), "### failed registering registry td provider!" );
+                OSL_ENSURE( xSet->has( makeAny( xFac ) ), "### failed registering registry td provider!" );
             }
             // stoc td manager registration
             {
@@ -345,7 +345,7 @@ static Reference< XMultiServiceFactory > createImplServiceFactory(
                                      Reference< XInterface >() );
                 }
                 xSet->insert( makeAny( xFac ) );
-                OSL_ENSHURE( xSet->has( makeAny( xFac ) ), "### failed registering td manager!" );
+                OSL_ENSURE( xSet->has( makeAny( xFac ) ), "### failed registering td manager!" );
             }
             xInst = xSF->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.TypeDescriptionManager")) );
         }