summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-19 14:11:09 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-19 14:11:09 +0100
commit3d874bdf409ca4a099853b30aeb9932e45c56f60 (patch)
tree3b88c39fa7cf3aa598a286534afc7de6f4ec98ab /comphelper
parent4edacef4f14f1992f8e0cbded5a86730c8353b4d (diff)
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/source/container/embeddedobjectcontainer.cxx15
-rw-r--r--comphelper/source/eventattachermgr/eventattachermgr.cxx2
-rw-r--r--comphelper/source/misc/accessiblecontexthelper.cxx2
-rw-r--r--comphelper/source/misc/accessiblewrapper.cxx5
-rw-r--r--comphelper/source/misc/accimplaccess.cxx2
-rw-r--r--comphelper/source/misc/componentcontext.cxx2
-rw-r--r--comphelper/source/misc/mediadescriptor.cxx2
-rw-r--r--comphelper/source/misc/mimeconfighelper.cxx2
-rw-r--r--comphelper/source/misc/numbers.cxx2
-rw-r--r--comphelper/source/misc/synchronousdispatch.cxx2
-rw-r--r--comphelper/source/misc/types.cxx2
-rw-r--r--comphelper/source/property/ChainablePropertySet.cxx10
-rw-r--r--comphelper/source/property/ChainablePropertySetInfo.cxx2
-rw-r--r--comphelper/source/property/MasterPropertySet.cxx10
-rw-r--r--comphelper/source/property/MasterPropertySetInfo.cxx4
-rw-r--r--comphelper/source/property/composedprops.cxx4
-rw-r--r--comphelper/source/property/propagg.cxx2
-rw-r--r--comphelper/source/property/property.cxx4
-rw-r--r--comphelper/source/property/propertysethelper.cxx6
-rw-r--r--comphelper/source/property/propertysetinfo.cxx4
-rw-r--r--comphelper/source/streaming/otransactedfilestream.cxx6
21 files changed, 44 insertions, 46 deletions
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index b9d8702ccee1..9f84b7afa053 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -715,8 +715,7 @@ sal_Bool EmbeddedObjectContainer::CopyEmbeddedObject( EmbeddedObjectContainer& r
{
RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CopyEmbeddedObject" );
- OSL_ENSURE( sal_False,
- "This method is depricated! Use EmbeddedObjectContainer::CopyAndGetEmbeddedObject() to copy object!\n" );
+ OSL_FAIL( "This method is depricated! Use EmbeddedObjectContainer::CopyAndGetEmbeddedObject() to copy object!\n" );
// get the object name before(!) it is assigned to a new storage
::rtl::OUString aOrigName;
@@ -844,7 +843,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb
{
// impossibility to copy readonly property is not treated as an error for now
// but the assertion is helpful to detect such scenarios and review them
- OSL_ENSURE( sal_False, "Could not copy readonly property!\n" );
+ OSL_FAIL( "Could not copy readonly property!\n" );
}
}
}
@@ -912,7 +911,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r
catch ( uno::Exception& e )
{
(void)e;
- OSL_ENSURE( sal_False, "Failed to insert embedded object into storage!" );
+ OSL_FAIL( "Failed to insert embedded object into storage!" );
bRet = sal_False;
}
@@ -944,7 +943,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Failed to remove object from storage!" );
+ OSL_FAIL( "Failed to remove object from storage!" );
bRet = sal_False;
}
}
@@ -1094,7 +1093,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Can not set the new media type to a storage!\n" );
+ OSL_FAIL( "Can not set the new media type to a storage!\n" );
}
}
@@ -1154,7 +1153,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e
}
catch ( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Failed to remove object from storage!" );
+ OSL_FAIL( "Failed to remove object from storage!" );
return sal_False;
}
}
@@ -1365,7 +1364,7 @@ namespace {
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "The pictures storage is not available!\n" );
+ OSL_FAIL( "The pictures storage is not available!\n" );
}
}
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index cd618cffd8a6..acbb962ea4d7 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -989,7 +989,7 @@ void SAL_CALL ImplEventAttacherManager::read(const Reference< XObjectInputStream
// Ganze richtig sein. Sonst ist etwas voellig daneben gegangen.
if( nRealLen > nLen || nVersion == 1 )
{
- OSL_ENSURE( sal_False, "ImplEventAttacherManager::read(): Fatal Error, wrong object length" );
+ OSL_FAIL( "ImplEventAttacherManager::read(): Fatal Error, wrong object length" );
}
else
{
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index 5dcda7148275..fb89a0bf86a9 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -319,7 +319,7 @@ namespace comphelper
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OAccessibleContextHelper::getAccessibleIndexInParent: caught an exception!" );
+ OSL_FAIL( "OAccessibleContextHelper::getAccessibleIndexInParent: caught an exception!" );
}
return nRet;
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index 693d2bbe3218..650130939cda 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -249,7 +249,7 @@ namespace comphelper
break;
default:
- OSL_ENSURE( sal_False, "OWrappedAccessibleChildrenManager::translateAccessibleEvent: unknown (or unexpected) event id!" );
+ OSL_FAIL( "OWrappedAccessibleChildrenManager::translateAccessibleEvent: unknown (or unexpected) event id!" );
break;
}
}
@@ -279,8 +279,7 @@ namespace comphelper
#if OSL_DEBUG_LEVEL > 0
if ( m_aChildrenMap.end() == aDisposedPos )
{
- OSL_ENSURE( sal_False,
- "OWrappedAccessibleChildrenManager::disposing: where did this come from?" );
+ OSL_FAIL( "OWrappedAccessibleChildrenManager::disposing: where did this come from?" );
// helper for dignostics
Reference< XAccessible > xOwningAccessible( m_aOwningAccessible );
Reference< XAccessibleContext > xContext;
diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index 65dfd98364c9..7128d4e13991 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.cxx
@@ -166,7 +166,7 @@ namespace comphelper
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "OAccessibleImplementationAccess::setAccessibleParent: caught an exception while retrieving the implementation!" );
+ OSL_FAIL( "OAccessibleImplementationAccess::setAccessibleParent: caught an exception while retrieving the implementation!" );
}
return pImplementation;
}
diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx
index 072cafbcee4c..86224687d9f4 100644
--- a/comphelper/source/misc/componentcontext.cxx
+++ b/comphelper/source/misc/componentcontext.cxx
@@ -105,7 +105,7 @@ namespace comphelper
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "ComponentContext::getContextValueByName: caught an exception!" );
+ OSL_FAIL( "ComponentContext::getContextValueByName: caught an exception!" );
}
return aReturn;
}
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 7bf1eaea266d..68a2999b738e 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -598,7 +598,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
::rtl::OUStringBuffer sMsg(256);
sMsg.appendAscii("Invalid MediaDescriptor detected:\n");
sMsg.append (ex.Message );
- OSL_ENSURE(sal_False, ::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr());
+ OSL_FAIL(::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr());
}
#else
catch(const css::uno::Exception&)
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index fb6936ea6d1f..d8d81aadea3f 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -800,7 +800,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
if ( !( nFlags & SFX_FILTER_IMPORT ) )
{
- OSL_ENSURE( sal_False, "This is no import filter!" );
+ OSL_FAIL( "This is no import filter!" );
throw uno::Exception();
}
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index d86bef05f21a..334a9e52178d 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.cxx
@@ -139,7 +139,7 @@ Any getNumberFormatProperty( const Reference< XNumberFormatter >& _rxFormatter,
}
catch( const Exception& )
{
- OSL_ENSURE( sal_False, "::getNumberFormatProperty: caught an exception (did you create the key with another formatter?)!" );
+ OSL_FAIL( "::getNumberFormatProperty: caught an exception (did you create the key with another formatter?)!" );
}
return aReturn;
diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx
index ad7c83c8bb15..ca4d4b36f72a 100644
--- a/comphelper/source/misc/synchronousdispatch.cxx
+++ b/comphelper/source/misc/synchronousdispatch.cxx
@@ -90,7 +90,7 @@ uno::Reference< lang::XComponent > SynchronousDispatch::dispatch(
catch ( uno::Exception& )
{
rtl::OUString aMsg = UNISTRING( "SynchronousDispatch::dispatch() Error while dispatching! ");
- OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
+ OSL_FAIL( OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
}
}
diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index 713e03caf23e..629e890ae62a 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -128,7 +128,7 @@ sal_Bool getBOOL(const Any& _rAny)
if (_rAny.getValueType() == ::getCppuBooleanType())
nReturn = *(sal_Bool*)_rAny.getValue();
else
- OSL_ENSURE(sal_False, "comphelper::getBOOL : invalid argument !");
+ OSL_FAIL("comphelper::getBOOL : invalid argument !");
return nReturn;
}
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);
}
diff --git a/comphelper/source/streaming/otransactedfilestream.cxx b/comphelper/source/streaming/otransactedfilestream.cxx
index bac4403fd6ad..9bcfac5fb66b 100644
--- a/comphelper/source/streaming/otransactedfilestream.cxx
+++ b/comphelper/source/streaming/otransactedfilestream.cxx
@@ -232,7 +232,7 @@ void OTruncatedTransactedFileStream::CloseAll_Impl()
xFileAccess->kill( aURL );
} catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "Could not remove the file!" );
+ OSL_FAIL( "Could not remove the file!" );
}
}
}
@@ -313,7 +313,7 @@ void OTruncatedTransactedFileStream::Commit_Impl()
}
catch( uno::Exception& )
{
- OSL_ENSURE( sal_False, "These calls are pretty simple, they should not fail!\n" );
+ OSL_FAIL( "These calls are pretty simple, they should not fail!\n" );
}
m_pStreamData->FreeOriginal();
@@ -537,7 +537,7 @@ void SAL_CALL OTruncatedTransactedFileStream::flush( )
if ( !m_pStreamData )
{
- OSL_ENSURE( sal_False, "flush() call on closed stream!\n" );
+ OSL_FAIL( "flush() call on closed stream!\n" );
return;
// in future throw exception, for now some code might call flush() on closed stream
// since file ucp implementation allows it