diff options
| author | Frank Schönheit <fs@openoffice.org> | 2001-04-03 13:16:03 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2001-04-03 13:16:03 +0000 |
| commit | d22a1fcd9f3cb49bb80276d0d332941af39ee1bb (patch) | |
| tree | 27c4ee413acadac364add96b77874b1f3ee149b6 /dbaccess/source/shared | |
| parent | b616acfed18dd6c364baf79ef2d14f044a354848 (diff) | |
corrected some wrong OSL_ASSERTs
Diffstat (limited to 'dbaccess/source/shared')
| -rw-r--r-- | dbaccess/source/shared/apitools.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/shared/registrationhelper.cxx | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/dbaccess/source/shared/apitools.cxx b/dbaccess/source/shared/apitools.cxx index ae9e5fae8afc..789242c8ff5f 100644 --- a/dbaccess/source/shared/apitools.cxx +++ b/dbaccess/source/shared/apitools.cxx @@ -2,9 +2,9 @@ * * $RCSfile: apitools.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: oj $ $Date: 2000-10-27 07:34:13 $ + * last change: $Author: fs $ $Date: 2001-04-03 14:16:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -133,7 +133,7 @@ void OSubComponent::release() throw (RuntimeException) dispose(); // only the alive ref holds the object - OSL_ASSERT( m_refCount == 1 ); + OSL_ENSURE( m_refCount == 1, "OSubComponent::release: invalid ref count!" ); // release the parent in the ~ if (xParent.is()) diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx index 312d8fcbdcb3..efe4af98177a 100644 --- a/dbaccess/source/shared/registrationhelper.cxx +++ b/dbaccess/source/shared/registrationhelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registrationhelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: oj $ $Date: 2001-04-02 06:15:29 $ + * last change: $Author: fs $ $Date: 2001-04-03 14:16:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -116,7 +116,7 @@ void OModuleRegistration::revokeComponent(const ::rtl::OUString& _rImplementatio { if (!s_pImplementationNames) { - OSL_ASSERT("OModuleRegistration::revokeComponent : have no class infos ! Are you sure called this method at the right time ?"); + OSL_ENSURE(sal_False, "OModuleRegistration::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, @@ -158,7 +158,7 @@ sal_Bool OModuleRegistration::writeComponentInfos( if (!s_pImplementationNames) { - OSL_ASSERT("OModuleRegistration::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?"); + OSL_ENSURE(sal_False, "OModuleRegistration::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, @@ -189,7 +189,7 @@ sal_Bool OModuleRegistration::writeComponentInfos( } catch(Exception&) { - OSL_ASSERT("OModuleRegistration::writeComponentInfos : something went wrong while creating the keys !"); + OSL_ENSURE(sal_False, "OModuleRegistration::writeComponentInfos : something went wrong while creating the keys !"); return sal_False; } } @@ -207,7 +207,7 @@ Reference< XInterface > OModuleRegistration::getComponentFactory( if (!s_pImplementationNames) { - OSL_ASSERT("OModuleRegistration::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?"); + OSL_ENSURE(sal_False, "OModuleRegistration::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, |