Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)

9 files changed, 23 insertions, 23 deletions

diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx
index a8329919502d..e3a02dce4c1b 100644
--- a/comphelper/source/property/ChainablePropertySet.cxx
+++ b/comphelper/source/property/ChainablePropertySet.cxx
@@ -290,31 +290,31 @@ Any SAL_CALL ChainablePropertySet::getPropertyDefault( const ::rtl::OUString& rP
 void ChainablePropertySet::_preGetPropertyState ()
     throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 }
 
 void ChainablePropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& )
     throw(UnknownPropertyException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 }
 
 void ChainablePropertySet::_postGetPropertyState ()
     throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 }
 
 void ChainablePropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& )
     throw(UnknownPropertyException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 }
 
 Any ChainablePropertySet::_getPropertyDefault( const comphelper::PropertyInfo& )
     throw(UnknownPropertyException, WrappedTargetException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 
     Any aAny;
     return aAny;
diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index c8962e755013..0f53c6d0260b 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.cxx
@@ -77,7 +77,7 @@ void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount )
 #ifdef DBG_UTIL
         PropertyInfoHash::iterator aIter = maMap.find( aName );
         if( aIter != maMap.end() )
-            OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
+            OSL_FAIL( "Warning: PropertyInfo added twice, possible error!");
 #endif
         maMap[aName] = pMap++;
     }
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index 253c46ada1cf..2844031d370c 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -474,31 +474,31 @@ Any SAL_CALL MasterPropertySet::getPropertyDefault( const ::rtl::OUString& rProp
 void MasterPropertySet::_preGetPropertyState ()
     throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 }
 
 void MasterPropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& )
     throw(UnknownPropertyException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 }
 
 void MasterPropertySet::_postGetPropertyState ()
     throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 }
 
 void MasterPropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& )
     throw(UnknownPropertyException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 }
 
 Any MasterPropertySet::_getPropertyDefault( const comphelper::PropertyInfo& )
     throw(UnknownPropertyException, WrappedTargetException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
     Any aAny;
     return aAny;
 }
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index e46faf00447a..0cfaf6ec1a6f 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -83,7 +83,7 @@ void MasterPropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount, sal_uInt8
 #ifdef DBG_UTIL
         PropertyDataHash::iterator aIter = maMap.find( aName );
         if( aIter != maMap.end() )
-            OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
+            OSL_FAIL( "Warning: PropertyInfo added twice, possible error!");
 #endif
         maMap[aName] = new PropertyData ( nMapId, pMap );
     }
@@ -101,7 +101,7 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId )
 #ifdef DBG_UTIL
         PropertyDataHash::iterator aDebugIter = maMap.find( (*aIter).first );
         if( aDebugIter != maMap.end() )
-            OSL_ENSURE( sal_False, "Warning: PropertyInfo added twice, possible error!");
+            OSL_FAIL( "Warning: PropertyInfo added twice, possible error!");
 #endif
         maMap[(*aIter).first] = new PropertyData ( nMapId, (*aIter).second );
         ++aIter;
diff --git a/comphelper/source/property/composedprops.cxx b/comphelper/source/property/composedprops.cxx
index 74d1b23891f9..aa864f7ca47f 100644
--- a/comphelper/source/property/composedprops.cxx
+++ b/comphelper/source/property/composedprops.cxx
@@ -300,13 +300,13 @@ namespace comphelper
     //------------------------------------------------------------------------------
     void SAL_CALL OComposedPropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
     {
-        OSL_ENSURE(sal_False, "OComposedPropertySet::addVetoableChangeListener: no implemented (yet)!");
+        OSL_FAIL("OComposedPropertySet::addVetoableChangeListener: no implemented (yet)!");
     }
 
     //------------------------------------------------------------------------------
     void SAL_CALL OComposedPropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
     {
-        OSL_ENSURE(sal_False, "OComposedPropertySet::removeVetoableChangeListener: no implemented (yet)!");
+        OSL_FAIL("OComposedPropertySet::removeVetoableChangeListener: no implemented (yet)!");
     }
 
     //------------------------------------------------------------------------------
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index 15c509378fb6..b83c292689dc 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -959,7 +959,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O
         catch( const RuntimeException& ) { throw; }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "OPropertySetAggregationHelper::setPropertyToDefault: caught an exception which is not allowed to leave here!" );
+            OSL_FAIL( "OPropertySetAggregationHelper::setPropertyToDefault: caught an exception which is not allowed to leave here!" );
         }
     }
 }
diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx
index a13930e34fba..37bb62cc98ef 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.cxx
@@ -78,7 +78,7 @@ void copyProperties(const Reference<XPropertySet>& _rxSource,
 {
     if (!_rxSource.is() || !_rxDest.is())
     {
-        OSL_ENSURE(sal_False, "copyProperties: invalid arguments !");
+        OSL_FAIL("copyProperties: invalid arguments !");
         return;
     }
 
@@ -136,7 +136,7 @@ void copyProperties(const Reference<XPropertySet>& _rxSource,
                 }
                 aBuffer.append( "." );
 
-                OSL_ENSURE( sal_False, aBuffer.getStr() );
+                OSL_FAIL( aBuffer.getStr() );
 #endif
             }
         }
diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx
index 1a7455b8c956..0ad27a6949ed 100644
--- a/comphelper/source/property/propertysethelper.cxx
+++ b/comphelper/source/property/propertysethelper.cxx
@@ -312,17 +312,17 @@ Any SAL_CALL PropertySetHelper::getPropertyDefault( const ::rtl::OUString& aProp
 
 void PropertySetHelper::_getPropertyStates( const comphelper::PropertyMapEntry**, PropertyState* ) throw(UnknownPropertyException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 }
 
 void PropertySetHelper::_setPropertyToDefault( const comphelper::PropertyMapEntry* )  throw(UnknownPropertyException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 }
 
 Any PropertySetHelper::_getPropertyDefault( const comphelper::PropertyMapEntry* ) throw(UnknownPropertyException, WrappedTargetException )
 {
-    OSL_ENSURE( sal_False, "you have to implement this yourself!");
+    OSL_FAIL( "you have to implement this yourself!");
 
     Any aAny;
     return aAny;
diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index 1b3d8b92b951..4746a7e9ce43 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -84,12 +84,12 @@ void PropertyMapImpl::add( PropertyMapEntry* pMap, sal_Int32 nCount ) throw()
         PropertyMap::iterator aIter = maPropertyMap.find( aName );
         if( aIter != maPropertyMap.end() )
         {
-            OSL_ENSURE( sal_False, "Warning: PropertyMapEntry added twice, possible error!");
+            OSL_FAIL( "Warning: PropertyMapEntry added twice, possible error!");
         }
 #endif
         if( NULL == pMap->mpType )
         {
-            OSL_ENSURE( sal_False, "No type in PropertyMapEntry!");
+            OSL_FAIL( "No type in PropertyMapEntry!");
             pMap->mpType = &::getCppuType((const sal_Int32*)0);
         }