[Libreoffice-commits] .: cui/source extensions/source forms/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Sat Feb 26 01:42:05 PST 2011
cui/source/dialogs/insdlg.cxx | 2 +-
extensions/source/abpilot/abpservices.cxx | 2 +-
extensions/source/dbpilots/dbpservices.cxx | 2 +-
extensions/source/inc/componentmodule.cxx | 8 ++++----
extensions/source/preload/services.cxx | 2 +-
extensions/source/propctrlr/pcrservices.cxx | 2 +-
forms/source/inc/forms_module_impl.hxx | 8 ++++----
7 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 167fd71b2e2225963a3d371ede147ebef02dbc40
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sat Feb 26 10:30:34 2011 +0100
Move bogus OSL_ASSERT(msg) to OSL_FAIL(msg)
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index b957e28..e12ad0d 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 93818eb..2e3b800 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 e1e4172..a88afe0 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 6791fbe..55cc5aa 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 04dcc48..9f7a2a0 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 da6bbef..891feed 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 a1ac17d..98f123b 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,
More information about the Libreoffice-commits
mailing list