summaryrefslogtreecommitdiff
path: root/ucb/source/core
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2011-03-12 14:27:45 +0100
committerThomas Arnhold <thomas@arnhold.org>2011-03-13 16:50:43 +0100
commit1848de2f4cce84862cf0843e15f38ce5d1f26108 (patch)
tree38d3983e56f5d2c900c24750e0050556435cfd6b /ucb/source/core
parente4d0bb122a93d243067814b9d43f9c9ab1e4df65 (diff)
Move OSL_ENSURE(false,...) to OSL_FAIL(...)
Diffstat (limited to 'ucb/source/core')
-rw-r--r--ucb/source/core/ucb.cxx28
-rw-r--r--ucb/source/core/ucbcmds.cxx2
2 files changed, 11 insertions, 19 deletions
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 2cd0f6d1d238..4124c8c6ec71 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -200,8 +200,7 @@ bool createContentProviderData(
if ( !( rxHierNameAccess->getByHierarchicalName(
aKeyBuffer.makeStringAndClear() ) >>= aValue ) )
{
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - "
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - "
"Error getting item value!" );
}
}
@@ -219,8 +218,7 @@ bool createContentProviderData(
if ( !( rxHierNameAccess->getByHierarchicalName(
aKeyBuffer.makeStringAndClear() ) >>= aValue ) )
{
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - "
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - "
"Error getting item value!" );
}
@@ -233,8 +231,7 @@ bool createContentProviderData(
if ( !( rxHierNameAccess->getByHierarchicalName(
aKeyBuffer.makeStringAndClear() ) >>= aValue ) )
{
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - "
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - "
"Error getting item value!" );
}
@@ -786,14 +783,14 @@ bool UniversalContentBroker::configureUcb()
if (m_aArguments.getLength() < 2
|| !(m_aArguments[0] >>= aKey1) || !(m_aArguments[1] >>= aKey2))
{
- OSL_ENSURE(false, "UniversalContentBroker::configureUcb(): Bad arguments");
+ OSL_FAIL("UniversalContentBroker::configureUcb(): Bad arguments");
return false;
}
ContentProviderDataList aData;
if (!getContentProviderData(aKey1, aKey2, aData))
{
- OSL_ENSURE(false, "UniversalContentBroker::configureUcb(): No configuration");
+ OSL_FAIL("UniversalContentBroker::configureUcb(): No configuration");
return false;
}
@@ -823,8 +820,7 @@ void UniversalContentBroker::prepareAndRegister(
}
else
- OSL_ENSURE(false,
- "UniversalContentBroker::prepareAndRegister(): Bad argument placeholders");
+ OSL_FAIL("UniversalContentBroker::prepareAndRegister(): Bad argument placeholders");
}
}
@@ -836,8 +832,7 @@ bool UniversalContentBroker::getContentProviderData(
{
if ( !m_xSMgr.is() || !rKey1.getLength() || !rKey2.getLength() )
{
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - Invalid argument!" );
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - Invalid argument!" );
return false;
}
@@ -913,8 +908,7 @@ bool UniversalContentBroker::getContentProviderData(
catch ( container::NoSuchElementException& )
{
// getByHierarchicalName
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - "
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - "
"caught NoSuchElementException!" );
}
}
@@ -922,16 +916,14 @@ bool UniversalContentBroker::getContentProviderData(
}
catch ( uno::RuntimeException& )
{
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - caught RuntimeException!" );
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - caught RuntimeException!" );
return false;
}
catch ( uno::Exception& )
{
// createInstance, createInstanceWithArguments
- OSL_ENSURE( false,
- "UniversalContentBroker::getContentProviderData - caught Exception!" );
+ OSL_FAIL( "UniversalContentBroker::getContentProviderData - caught Exception!" );
return false;
}
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 0fd4a8fa37b4..488fcbfcd731 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -1438,7 +1438,7 @@ void globalTransfer_(
"BUG: UnsupportedNameClashException not allowed here!" );
if (exc.NameClash != ucb::NameClash::ERROR) {
- OSL_ENSURE( false, "BUG: NameClash::ERROR expected!" );
+ OSL_FAIL( "BUG: NameClash::ERROR expected!" );
}
// No chance to solve name clashes, because I'm not able to detect