diff options
Diffstat (limited to 'ucbhelper/source/client')
| -rw-r--r-- | ucbhelper/source/client/content.cxx | 6 | ||||
| -rw-r--r-- | ucbhelper/source/client/interceptedinteraction.cxx | 2 | ||||
| -rw-r--r-- | ucbhelper/source/client/proxydecider.cxx | 32 |
3 files changed, 14 insertions, 26 deletions
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 3592049c95f4..7f73b6492d55 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -1533,8 +1533,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent, ContentBroker* pBroker = ContentBroker::get(); if ( !pBroker ) { - OSL_ENSURE( sal_False, - "Content::transferContent - No Content Broker!" ); + OSL_FAIL( "Content::transferContent - No Content Broker!" ); return sal_False; } @@ -1542,8 +1541,7 @@ sal_Bool Content::transferContent( const Content& rSourceContent, pBroker->getCommandProcessorInterface() ); if ( !xCmdProc.is() ) { - OSL_ENSURE( sal_False, - "Content::transferContent - No XCommandProcessor!" ); + OSL_FAIL( "Content::transferContent - No XCommandProcessor!" ); return sal_False; } diff --git a/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx index 0556e181c48b..0d774b29c793 100644 --- a/ucbhelper/source/client/interceptedinteraction.cxx +++ b/ucbhelper/source/client/interceptedinteraction.cxx @@ -130,7 +130,7 @@ void InterceptedInteraction::impl_handleDefault(const ::com::sun::star::uno::Ref // Runtime error! The defined continuation could not be located // inside the set of available containuations of the incoming request. // Whats wrong - the interception list or the request? - OSL_ENSURE(sal_False, "InterceptedInteraction::handle()\nCould intercept this interaction request - but cant locate the right continuation!"); + OSL_FAIL("InterceptedInteraction::handle()\nCould intercept this interaction request - but cant locate the right continuation!"); } break; diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index beb1b194fac2..4f99baacbb2d 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -260,8 +260,7 @@ bool getConfigStringValue( if ( !( xNameAccess->getByName( rtl::OUString::createFromAscii( key ) ) >>= value ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - " + OSL_FAIL( "InternetProxyDecider - " "Error getting config item value!" ); return false; } @@ -289,8 +288,7 @@ bool getConfigInt32Value( rtl::OUString::createFromAscii( key ) ); if ( aValue.hasValue() && !( aValue >>= value ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - " + OSL_FAIL( "InternetProxyDecider - " "Error getting config item value!" ); return false; } @@ -406,7 +404,7 @@ InternetProxyDecider_Impl::InternetProxyDecider_Impl( catch ( uno::Exception const & ) { // createInstance, createInstanceWithArguments - OSL_ENSURE( sal_False, "InternetProxyDecider - Exception!" ); + OSL_FAIL( "InternetProxyDecider - Exception!" ); } } @@ -603,8 +601,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_nProxyType ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } } @@ -614,8 +611,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( rtl::OUString aNoProxyList; if ( !( rElem.Element >>= aNoProxyList ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } @@ -626,8 +622,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aHttpProxy.aName ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } } @@ -636,8 +631,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aHttpProxy.nPort ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } @@ -649,8 +643,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aHttpsProxy.aName ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } } @@ -659,8 +652,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aHttpsProxy.nPort ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } @@ -672,8 +664,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aFtpProxy.aName ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } } @@ -682,8 +673,7 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred( { if ( !( rElem.Element >>= m_aFtpProxy.nPort ) ) { - OSL_ENSURE( sal_False, - "InternetProxyDecider - changesOccurred - " + OSL_FAIL( "InternetProxyDecider - changesOccurred - " "Error getting config item value!" ); } } |