diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 12:10:42 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-12 14:19:48 +0100 |
commit | adc6fe00e3ef3cca5bbd49a4633181856bf111df (patch) | |
tree | ea50caa8979aa23d77f912bee478d968ccf18232 /stoc | |
parent | Remove unnecessary brackets (diff) | |
download | core-adc6fe00e3ef3cca5bbd49a4633181856bf111df.tar.gz core-adc6fe00e3ef3cca5bbd49a4633181856bf111df.zip |
Move OSL_ENSURE(0,...) to OSL_FAIL(...)
Diffstat (limited to 'stoc')
-rw-r--r-- | stoc/source/corereflection/crefl.cxx | 2 | ||||
-rw-r--r-- | stoc/source/implementationregistration/implreg.cxx | 2 | ||||
-rw-r--r-- | stoc/source/loader/dllcomponentloader.cxx | 2 | ||||
-rw-r--r-- | stoc/source/security/access_controller.cxx | 4 | ||||
-rw-r--r-- | stoc/source/servicemanager/servicemanager.cxx | 2 | ||||
-rw-r--r-- | stoc/test/javavm/testjavavm.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx index 44655df15c5c..b625d705a183 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 01f4df8b3552..94be3f1670e7 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 1769ac5874f0..e326b980909f 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 816dd6868798..529899a53aae 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 664a5a82a90d..ce0d1b32adad 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 0329f785b046..f3ff52851e7c 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; } |