make these less noisy

2 files changed, 8 insertions, 21 deletions

diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index 73dca167e9..3d45cdea03 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 e9b341b7b6..7cc46abee7 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 >();
 }