summaryrefslogtreecommitdiff
path: root/ucb/source/core
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-03 09:42:00 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-03 10:33:56 +0100
commitc8eede4ee31e5000a782769ec311dc5f68532382 (patch)
tree46927330bad9c89753f20f6a7b13e5551c03490b /ucb/source/core
parent6c505f23af72fa7317823907e6963c11fcd70b60 (diff)
make these less noisy
Diffstat (limited to 'ucb/source/core')
-rw-r--r--ucb/source/core/ucb.cxx6
-rw-r--r--ucb/source/core/ucbstore.cxx23
2 files changed, 8 insertions, 21 deletions
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 6c6946bbe03b..77206563fca6 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -790,7 +790,7 @@ bool UniversalContentBroker::configureUcb()
ContentProviderDataList aData;
if (!getContentProviderData(aKey1, aKey2, aData))
{
- OSL_FAIL("UniversalContentBroker::configureUcb(): No configuration");
+ OSL_TRACE("UniversalContentBroker::configureUcb(): No configuration");
return false;
}
@@ -916,14 +916,14 @@ bool UniversalContentBroker::getContentProviderData(
}
catch (const uno::RuntimeException&)
{
- OSL_FAIL( "UniversalContentBroker::getContentProviderData - caught RuntimeException!" );
+ OSL_TRACE( "UniversalContentBroker::getContentProviderData - caught RuntimeException!" );
return false;
}
catch (const uno::Exception&)
{
// createInstance, createInstanceWithArguments
- OSL_FAIL( "UniversalContentBroker::getContentProviderData - caught Exception!" );
+ OSL_TRACE( "UniversalContentBroker::getContentProviderData - caught Exception!" );
return false;
}
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 534c7dcea993..f9cb872d6cad 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -519,7 +519,7 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create )
}
}
- OSL_FAIL( "PropertySetRegistry::openPropertySet - Error!" );
+ OSL_TRACE( "PropertySetRegistry::openPropertySet no root access" );
}
}
@@ -547,14 +547,6 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key )
getConfigWriteAccess( OUString() ), UNO_QUERY );
Reference< XNameContainer > xContainer( xBatch, UNO_QUERY );
- OSL_ENSURE( xBatch.is(),
- "PropertySetRegistry::removePropertySet - "
- "No batch!" );
-
- OSL_ENSURE( xContainer.is(),
- "PropertySetRegistry::removePropertySet - "
- "No conteiner!" );
-
if ( xBatch.is() && xContainer.is() )
{
try
@@ -588,7 +580,7 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key )
return;
}
- OSL_FAIL( "PropertySetRegistry::removePropertySet - Error!" );
+ OSL_TRACE( "PropertySetRegistry::removePropertySet - no root access" );
}
//=========================================================================
@@ -1065,16 +1057,11 @@ Reference< XMultiServiceFactory > PropertySetRegistry::getConfigProvider()
OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.configuration."
"ConfigurationProvider" )) ),
- UNO_QUERY );
-
- OSL_ENSURE( m_pImpl->m_xConfigProvider.is(),
- "PropertySetRegistry::getConfigProvider - "
- "No config provider!" );
-
+ UNO_QUERY_THROW );
}
catch (const Exception&)
{
- OSL_FAIL( "PropertySetRegistry::getConfigProvider - "
+ OSL_TRACE( "PropertySetRegistry::getConfigProvider - "
"caught exception!" );
}
}
@@ -1141,7 +1128,7 @@ Reference< XInterface > PropertySetRegistry::getRootConfigReadAccess()
return Reference< XInterface >();
}
- OSL_FAIL( "PropertySetRegistry::getRootConfigReadAccess - Error!" );
+ OSL_TRACE( "PropertySetRegistry::getRootConfigReadAccess - Error!" );
return Reference< XInterface >();
}