summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-12 12:10:42 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-12 14:19:48 +0100
commitff29e2d893da04490a159f9bc7111199f5e368ff (patch)
treea234bdf5a29ee4644b0c4dbb4c3e5195c3664757 /stoc
parent547e296bf1edbd5ef4811d6db00164b113745df8 (diff)
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/corereflection/crefl.cxx2
-rw-r--r--stoc/source/implementationregistration/implreg.cxx2
-rw-r--r--stoc/source/loader/dllcomponentloader.cxx2
-rw-r--r--stoc/source/security/access_controller.cxx4
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx2
-rw-r--r--stoc/test/javavm/testjavavm.cxx2
6 files changed, 7 insertions, 7 deletions
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index 8949d41f1..3f9555c96 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -531,7 +531,7 @@ sal_Bool SAL_CALL component_writeInfo(
{
#if OSL_DEBUG_LEVEL > 0
OString cstr( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) );
- OSL_ENSURE( 0, cstr.getStr() );
+ OSL_FAIL( cstr.getStr() );
#else
(void) exc; // unused
#endif
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index cae292243..750609660 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1667,7 +1667,7 @@ sal_Bool ImplementationRegistration::revokeImplementation(const OUString& locati
{
// no way to transport the error, as no exception is specified and a runtime
// exception is not appropriate.
- OSL_ENSURE( 0 , "InvalidRegistryException during revokeImplementation" );
+ OSL_FAIL( "InvalidRegistryException during revokeImplementation" );
}
}
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index b700247e0..215b0a99a 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -179,7 +179,7 @@ Sequence<OUString> SAL_CALL DllComponentLoader::getSupportedServiceNames( )
void DllComponentLoader::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& )
throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
{
- OSL_ENSURE( 0, "dllcomponentloader::initialize should not be called !" );
+ OSL_FAIL( "dllcomponentloader::initialize should not be called !" );
// if( aArgs.getLength() != 1 )
// {
// throw IllegalArgumentException();
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index 914b174e1..7350c4a03 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -689,7 +689,7 @@ void AccessController::checkAndClearPostPoned() SAL_THROW( (RuntimeException) )
break;
}
default:
- OSL_ENSURE( 0, "### this should never be called in this ac mode!" );
+ OSL_FAIL( "### this should never be called in this ac mode!" );
break;
}
}
@@ -743,7 +743,7 @@ PermissionCollection AccessController::getEffectivePermissions(
break;
}
default:
- OSL_ENSURE( 0, "### this should never be called in this ac mode!" );
+ OSL_FAIL( "### this should never be called in this ac mode!" );
return PermissionCollection();
}
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 1a5d8ae71..d617f38b7 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -1376,7 +1376,7 @@ void OServiceManager::initialize( Sequence< Any > const & )
throw (Exception)
{
check_undisposed();
- OSL_ENSURE( 0, "not impl!" );
+ OSL_FAIL( "not impl!" );
}
// XServiceInfo
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index 8114e99ca..d0b2af148 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -79,7 +79,7 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
Any anyVM = xVM->getJavaVM( Sequence<sal_Int8>(arId, 16));
if ( ! anyVM.hasValue())
{
- OSL_ENSURE(0,"could not get Java VM");
+ OSL_FAIL("could not get Java VM");
return sal_False;
}