diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-26 10:30:34 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-26 10:42:19 +0100 |
commit | 52370d787a8472b1e185e56b82e544a995ca5f65 (patch) | |
tree | 2b352bdd6749c7386354afd766ae51bf422cd0b0 /extensions | |
parent | 6e03518fb6ab1e3f0effe8a04ab984ba3fd9eff1 (diff) |
Move bogus OSL_ASSERT(msg) to OSL_FAIL(msg)
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/abpilot/abpservices.cxx | 2 | ||||
-rw-r--r-- | extensions/source/dbpilots/dbpservices.cxx | 2 | ||||
-rw-r--r-- | extensions/source/inc/componentmodule.cxx | 8 | ||||
-rw-r--r-- | extensions/source/preload/services.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/pcrservices.cxx | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx index 9f07a1aabb6b..1f52f1aeef24 100644 --- a/extensions/source/abpilot/abpservices.cxx +++ b/extensions/source/abpilot/abpservices.cxx @@ -81,7 +81,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException& ) { - OSL_ASSERT("abp::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); + OSL_FAIL("abp::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); } return sal_False; diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx index 3b251c144eb7..78bc4a45eb79 100644 --- a/extensions/source/dbpilots/dbpservices.cxx +++ b/extensions/source/dbpilots/dbpservices.cxx @@ -85,7 +85,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException& ) { - OSL_ASSERT("dbp::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); + OSL_FAIL("dbp::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); } return sal_False; diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx index 35daf0e83799..46580ce3e96b 100644 --- a/extensions/source/inc/componentmodule.cxx +++ b/extensions/source/inc/componentmodule.cxx @@ -203,7 +203,7 @@ namespace COMPMOD_NAMESPACE { if (!s_pImplementationNames) { - OSL_ASSERT("OModule::revokeComponent : have no class infos ! Are you sure called this method at the right time ?"); + OSL_FAIL("OModule::revokeComponent : have no class infos ! Are you sure called this method at the right time ?"); return; } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, @@ -245,7 +245,7 @@ namespace COMPMOD_NAMESPACE if (!s_pImplementationNames) { - OSL_ASSERT("OModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?"); + OSL_FAIL("OModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?"); return sal_True; } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, @@ -276,7 +276,7 @@ namespace COMPMOD_NAMESPACE } catch(Exception&) { - OSL_ASSERT("OModule::writeComponentInfos : something went wrong while creating the keys !"); + OSL_FAIL("OModule::writeComponentInfos : something went wrong while creating the keys !"); return sal_False; } } @@ -294,7 +294,7 @@ namespace COMPMOD_NAMESPACE if (!s_pImplementationNames) { - OSL_ASSERT("OModule::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?"); + OSL_FAIL("OModule::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?"); return NULL; } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, diff --git a/extensions/source/preload/services.cxx b/extensions/source/preload/services.cxx index 5c2b199275f9..96305c2f8ef5 100644 --- a/extensions/source/preload/services.cxx +++ b/extensions/source/preload/services.cxx @@ -81,7 +81,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException& ) { - OSL_ASSERT("preload::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); + OSL_FAIL("preload::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); } return sal_False; diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx index 034aee9881ef..15ac891604cf 100644 --- a/extensions/source/propctrlr/pcrservices.cxx +++ b/extensions/source/propctrlr/pcrservices.cxx @@ -117,7 +117,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( } catch (InvalidRegistryException& ) { - OSL_ASSERT("pcr::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); + OSL_FAIL("pcr::component_writeInfo: could not create a registry key (InvalidRegistryException) !"); } return sal_False; |