summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cui/source/dialogs/insdlg.cxx2
-rw-r--r--extensions/source/abpilot/abpservices.cxx2
-rw-r--r--extensions/source/dbpilots/dbpservices.cxx2
-rw-r--r--extensions/source/inc/componentmodule.cxx8
-rw-r--r--extensions/source/preload/services.cxx2
-rw-r--r--extensions/source/propctrlr/pcrservices.cxx2
-rw-r--r--forms/source/inc/forms_module_impl.hxx8
7 files changed, 13 insertions, 13 deletions
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index b957e28cd838..e12ad0ddfce1 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -364,7 +364,7 @@ short SvInsertOleDlg::Execute()
}
else
{
- OSL_ASSERT( "Can not get InteractionHandler!\n" );
+ OSL_FAIL( "Can not get InteractionHandler!\n" );
aMedium.realloc( 1 );
}
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;
diff --git a/forms/source/inc/forms_module_impl.hxx b/forms/source/inc/forms_module_impl.hxx
index b3063b30546f..fc3bbafec326 100644
--- a/forms/source/inc/forms_module_impl.hxx
+++ b/forms/source/inc/forms_module_impl.hxx
@@ -74,7 +74,7 @@ namespace FORMS_MODULE_NAMESPACE
{
if (!s_pImplementationNames)
{
- OSL_ASSERT("OFormsModule::revokeComponent : have no class infos ! Are you sure called this method at the right time ?");
+ OSL_FAIL("OFormsModule::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,
@@ -116,7 +116,7 @@ namespace FORMS_MODULE_NAMESPACE
if (!s_pImplementationNames)
{
- OSL_ASSERT("OFormsModule::writeComponentInfos : have no class infos ! Are you sure called this method at the right time ?");
+ OSL_FAIL("OFormsModule::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,
@@ -147,7 +147,7 @@ namespace FORMS_MODULE_NAMESPACE
}
catch(Exception&)
{
- OSL_ASSERT("OFormsModule::writeComponentInfos : something went wrong while creating the keys !");
+ OSL_FAIL("OFormsModule::writeComponentInfos : something went wrong while creating the keys !");
return sal_False;
}
}
@@ -165,7 +165,7 @@ namespace FORMS_MODULE_NAMESPACE
if (!s_pImplementationNames)
{
- OSL_ASSERT("OFormsModule::getComponentFactory : have no class infos ! Are you sure called this method at the right time ?");
+ OSL_FAIL("OFormsModule::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,