OSL_ENSHURE replaced by OSL_ENSURE

7 files changed, 46 insertions, 46 deletions

diff --git a/configmgr/source/xml/typeconverter.cxx b/configmgr/source/xml/typeconverter.cxx
index 50eda8817ee0..27062a48f4d2 100644
--- a/configmgr/source/xml/typeconverter.cxx
+++ b/configmgr/source/xml/typeconverter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: typeconverter.cxx,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: jb $ $Date: 2001-03-16 17:37:28 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:36:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -147,13 +147,13 @@ namespace configmgr
                 }
                 catch (script::CannotConvertException&)
                 {
-                    OSL_ENSHURE(sal_False, "toAny : could not convert !");
+                    OSL_ENSURE(sal_False, "toAny : could not convert !");
                 }
             }
         }
         catch (lang::IllegalArgumentException&)
         {
-            OSL_ENSHURE(sal_False, "toAny : could not convert !");
+            OSL_ENSURE(sal_False, "toAny : could not convert !");
         }
         return aRes;
     }
@@ -175,7 +175,7 @@ namespace configmgr
         {
             ::rtl::OString aStr("Wrong typeclass! ");
             aStr += ::rtl::OString::valueOf((sal_Int32)_rTypeClass);
-            OSL_ENSHURE(0,aStr.getStr());
+            OSL_ENSURE(0,aStr.getStr());
         }
         }
         return aRet;
@@ -198,7 +198,7 @@ namespace configmgr
         {
             ::rtl::OString aStr("Wrong typeclass! ");
             aStr += rtl::OUStringToOString(_rType,RTL_TEXTENCODING_ASCII_US);
-            OSL_ENSHURE(0,aStr.getStr());
+            OSL_ENSURE(0,aStr.getStr());
         }
 
         return aRet;
@@ -264,7 +264,7 @@ namespace configmgr
   {
   ::rtl::OString aStr("Wrong typeclass! ");
   aStr += ::rtl::OString::valueOf((sal_Int32)_rTypeClass);
-  OSL_ENSHURE(0,aStr.getStr());
+  OSL_ENSURE(0,aStr.getStr());
   }
   }
   return aRet;
@@ -295,7 +295,7 @@ namespace configmgr
         {
             ::rtl::OString aStr("Unknown type! ");
             aStr += rtl::OUStringToOString(_rType,RTL_TEXTENCODING_ASCII_US);
-            OSL_ENSHURE(0,aStr.getStr());
+            OSL_ENSURE(0,aStr.getStr());
         }
 
         return aRet;
@@ -332,7 +332,7 @@ namespace configmgr
         {
             ::rtl::OString aStr("Unknown type! ");
             aStr += rtl::OUStringToOString(_rsElementType,RTL_TEXTENCODING_ASCII_US);
-            OSL_ENSHURE(0,aStr.getStr());
+            OSL_ENSURE(0,aStr.getStr());
         }
 
         return aRet;
@@ -340,7 +340,7 @@ namespace configmgr
 
     uno::Type getSequenceElementType(uno::Type const& rSequenceType)
     {
-        OSL_ENSHURE(rSequenceType.getTypeClass() == uno::TypeClass_SEQUENCE,
+        OSL_ENSURE(rSequenceType.getTypeClass() == uno::TypeClass_SEQUENCE,
                     "getSequenceElementType() must be called with a  sequence type");
 
         if (!(rSequenceType.getTypeClass() == uno::TypeClass_SEQUENCE))
diff --git a/configmgr/source/xml/valueconverter.cxx b/configmgr/source/xml/valueconverter.cxx
index afdc1fbea5e4..80a78677b6f4 100644
--- a/configmgr/source/xml/valueconverter.cxx
+++ b/configmgr/source/xml/valueconverter.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: valueconverter.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: jb $ $Date: 2001-03-16 17:28:50 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:36:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -276,7 +276,7 @@ bool OValueConverter::convertScalarToAny(OUString const& aContent, uno::Any& rVa
     {
         if (m_aValueDesc.sType.equalsIgnoreCase(TYPE_STRING))
         {
-            OSL_ENSHURE(m_xTypeConverter.is(), "Warning: OValueConverter has no TypeConverter");
+            OSL_ENSURE(m_xTypeConverter.is(), "Warning: OValueConverter has no TypeConverter");
             rValue <<= aContent;
             bResult = true;
         }
@@ -289,7 +289,7 @@ bool OValueConverter::convertScalarToAny(OUString const& aContent, uno::Any& rVa
 
         else
         {
-            OSL_ENSHURE(m_xTypeConverter.is(), "ERROR: OValueConverter has no TypeConverter");
+            OSL_ENSURE(m_xTypeConverter.is(), "ERROR: OValueConverter has no TypeConverter");
 
             script::CannotConvertException aError;
             aError.Message = OUString::createFromAscii("No type converter available to translate value \"");
diff --git a/configmgr/workben/apitest/cfgregistry.cxx b/configmgr/workben/apitest/cfgregistry.cxx
index 2c56ad013801..2738996f8b4d 100644
--- a/configmgr/workben/apitest/cfgregistry.cxx
+++ b/configmgr/workben/apitest/cfgregistry.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfgregistry.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:13:43 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:38:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -140,7 +140,7 @@ OAsciiOutput::OAsciiOutput(const ::rtl::OUString& _rUnicodeChars)
 #endif
     for (sal_Int32 i=0; i<nLen; ++i, ++pFillPtr, ++pSourcePtr)
     {
-        OSL_ENSHURE(bAsserted || !(bAsserted = (*pSourcePtr >= 0x80)),
+        OSL_ENSURE(bAsserted || !(bAsserted = (*pSourcePtr >= 0x80)),
             "OAsciiOutput::OAsciiOutput : non-ascii character found !");
         *pFillPtr = *reinterpret_cast<const sal_Char*>(pSourcePtr);
     }
diff --git a/configmgr/workben/local_io/cfglocal.cxx b/configmgr/workben/local_io/cfglocal.cxx
index 8c2111b8f364..e84b5038d77a 100644
--- a/configmgr/workben/local_io/cfglocal.cxx
+++ b/configmgr/workben/local_io/cfglocal.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfglocal.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:13:43 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:38:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -131,7 +131,7 @@ OAsciiOutput::OAsciiOutput(const ::rtl::OUString& _rUnicodeChars)
 #endif
     for (sal_Int32 i=0; i<nLen; ++i, ++pFillPtr, ++pSourcePtr)
     {
-        OSL_ENSHURE(bAsserted || !(bAsserted = (*pSourcePtr >= 0x80)),
+        OSL_ENSURE(bAsserted || !(bAsserted = (*pSourcePtr >= 0x80)),
             "OAsciiOutput::OAsciiOutput : non-ascii character found !");
         *pFillPtr = *reinterpret_cast<const sal_Char*>(pSourcePtr);
     }
diff --git a/configmgr/workben/local_io/simpletest.cxx b/configmgr/workben/local_io/simpletest.cxx
index 66f5dcb889ca..22c49f381df7 100644
--- a/configmgr/workben/local_io/simpletest.cxx
+++ b/configmgr/workben/local_io/simpletest.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: simpletest.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: armin $ $Date: 2001-03-08 09:08:21 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:38:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -362,19 +362,19 @@ namespace configmgr
             OUString aStr = ASCII("SAXParseException occured in ");
             sError = aStr + ASCII(" Line: (") + sLine + ASCII(")");
 
-            OSL_ENSHURE(0, rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US).getStr());
+            OSL_ENSURE(0, rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US).getStr());
             nRet = 3;
         }
         catch( SAXException &e )
         {
             sError = e.Message;
-            OSL_ENSHURE(0, rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US).getStr());
+            OSL_ENSURE(0, rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US).getStr());
             nRet = 4;
         }
         catch( IOException &e )
         {
             sError = e.Message;
-            OSL_ENSHURE(0, rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US).getStr());
+            OSL_ENSURE(0, rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US).getStr());
             nRet = 5;
         }
     }
@@ -401,12 +401,12 @@ public:
     void stop()
         {
             osl_getSystemTime(&m_aEndTime);
-            OSL_ENSHURE(m_bStarted, "Not Started.");
+            OSL_ENSURE(m_bStarted, "Not Started.");
             m_bStarted = false;
         }
     void  showTime(const rtl::OString & aWhatStr)
         {
-            OSL_ENSHURE(!m_bStarted, "Not Stopped.");
+            OSL_ENSURE(!m_bStarted, "Not Stopped.");
 
             sal_Int32 nSeconds = m_aEndTime.Seconds - m_aStartTime.Seconds;
             sal_Int32 nNanoSec = m_aEndTime.Nanosec - m_aStartTime.Nanosec;
diff --git a/configmgr/workben/local_io/xmlexport.cxx b/configmgr/workben/local_io/xmlexport.cxx
index 341647154baa..3e2b6cf13093 100644
--- a/configmgr/workben/local_io/xmlexport.cxx
+++ b/configmgr/workben/local_io/xmlexport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlexport.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:13:43 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:38:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -166,20 +166,20 @@ namespace configmgr
         virtual void SAL_CALL disposing( const lang::EventObject& Source )
             throw(::com::sun::star::uno::RuntimeException)
             {
-                OSL_ENSHURE(0, "disposing");
+                OSL_ENSURE(0, "disposing");
             }
 
 
         virtual void SAL_CALL finished( const io::DataTransferEvent& aEvent )
             throw(uno::RuntimeException)
             {
-                OSL_ENSHURE(0, "finished");
+                OSL_ENSURE(0, "finished");
             }
 
         virtual void SAL_CALL cancelled( const io::DataTransferEvent& aEvent )
             throw(uno::RuntimeException)
             {
-                OSL_ENSHURE(0, "cancelled");
+                OSL_ENSURE(0, "cancelled");
             }
     };
 
@@ -188,18 +188,18 @@ namespace configmgr
         virtual void SAL_CALL dispose(  )
             throw(uno::RuntimeException)
             {
-                OSL_ENSHURE(0, "dispose");
+                OSL_ENSURE(0, "dispose");
 
             }
         virtual void SAL_CALL addEventListener( const uno::Reference< lang::XEventListener >& xListener )
             throw(uno::RuntimeException)
             {
-                OSL_ENSHURE(0, "addEventListener");
+                OSL_ENSURE(0, "addEventListener");
             }
         virtual void SAL_CALL removeEventListener( const uno::Reference< lang::XEventListener >& aListener )
             throw(uno::RuntimeException)
             {
-                OSL_ENSHURE(0, "removeEventListener");
+                OSL_ENSURE(0, "removeEventListener");
             }
     };
 
@@ -262,7 +262,7 @@ namespace configmgr
         {
             sError = ASCII("XMLExportTest:");
             rtl::OString aStr = rtl::OUStringToOString(sError,RTL_TEXTENCODING_ASCII_US);
-            OSL_ENSHURE(0, aStr.getStr());
+            OSL_ENSURE(0, aStr.getStr());
             return;
         }
 
diff --git a/configmgr/workben/local_io/xmlimport.cxx b/configmgr/workben/local_io/xmlimport.cxx
index 8b29ab613ec6..3ed1a83e55c6 100644
--- a/configmgr/workben/local_io/xmlimport.cxx
+++ b/configmgr/workben/local_io/xmlimport.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xmlimport.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: armin $ $Date: 2001-03-08 09:08:52 $
+ *  last change: $Author: jl $ $Date: 2001-03-21 12:38:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -215,21 +215,21 @@ public:
     virtual void SAL_CALL disposing( const lang::EventObject& Source )
         throw(::com::sun::star::uno::RuntimeException)
         {
-            OSL_ENSHURE(0, "disposing");
+            OSL_ENSURE(0, "disposing");
             m_aCondition.set();              // will not block
         }
 
     virtual void SAL_CALL finished( const io::DataTransferEvent& aEvent )
         throw(uno::RuntimeException)
         {
-            OSL_ENSHURE(0, "finished");
+            OSL_ENSURE(0, "finished");
             m_aCondition.set();              // will not block
         }
 
     virtual void SAL_CALL cancelled( const io::DataTransferEvent& aEvent )
         throw(uno::RuntimeException)
         {
-            OSL_ENSHURE(0, "cancelled");
+            OSL_ENSURE(0, "cancelled");
             m_aCondition.set();              // will not block
         }
 public:
@@ -244,18 +244,18 @@ class Component: public ::cppu::WeakImplHelper1<lang::XComponent>
     virtual void SAL_CALL dispose(  )
         throw(uno::RuntimeException)
         {
-            OSL_ENSHURE(0, "dispose");
+            OSL_ENSURE(0, "dispose");
 
         }
     virtual void SAL_CALL addEventListener( const uno::Reference< lang::XEventListener >& xListener )
         throw(uno::RuntimeException)
         {
-            OSL_ENSHURE(0, "addEventListener");
+            OSL_ENSURE(0, "addEventListener");
         }
     virtual void SAL_CALL removeEventListener( const uno::Reference< lang::XEventListener >& aListener )
         throw(uno::RuntimeException)
         {
-            OSL_ENSHURE(0, "removeEventListener");
+            OSL_ENSURE(0, "removeEventListener");
         }
 };
 
@@ -314,7 +314,7 @@ namespace configmgr
         uno::Reference<io::XInputStream> xInputStream = new configmgr::OSLInputStreamWrapper(aFile);
 
         uno::Reference <uno::XInterface> xPump = xMSF->createInstance( L"com.sun.star.io.Pump" );
-        OSL_ENSHURE(xPump.is(), "there is no pump");
+        OSL_ENSURE(xPump.is(), "there is no pump");
 
         uno::Reference<io::XActiveDataSink> xPumpSink(xPump, uno::UNO_QUERY);
         xPumpSink->setInputStream(xInputStream);
@@ -391,7 +391,7 @@ void hierarchyTest()
 
     if (!xCfgProvider.is())
     {
-        OSL_ENSHURE(0, "No Configuration Provider");
+        OSL_ENSURE(0, "No Configuration Provider");
     }
 
     OUString sPath = ASCII("com.sun.star.ucb.Hierarchy");