diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-08 23:00:27 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-08 23:51:41 +0300 |
| commit | 9a8e2d09bc2111371f149498481dd422b86f9b68 (patch) | |
| tree | 14d40d448c39fd126337cb52ab8c8826a61c6700 /framework/source/fwi | |
| parent | b022cfb6caccaee89c3f95dcdd585a4e77eb61df (diff) | |
Use SAL_WARN_IF instead of framework's home-grown LOG_ASSERT(2)
Also remove declarations for debug function that don't exist (have been
removed (misguidedly?) as unused perhaps).
Change-Id: I0bc3320c52b3d50dc851a07fdc30b593cc4856b1
Diffstat (limited to 'framework/source/fwi')
| -rw-r--r-- | framework/source/fwi/classes/protocolhandlercache.cxx | 2 | ||||
| -rw-r--r-- | framework/source/fwi/threadhelp/transactionmanager.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index 274613c9a74e..0f588a0421fc 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -231,7 +231,7 @@ void HandlerCFGAccess::read( HandlerHash** ppHandler , // get values at all css::uno::Sequence< css::uno::Any > lValues = GetProperties( lFullNames ); - LOG_ASSERT2( lFullNames.getLength()!=lValues.getLength(), "HandlerCFGAccess::read()", "Miss some configuration values of handler set!" ) + SAL_WARN_IF( lFullNames.getLength()!=lValues.getLength(), "fwk", "HandlerCFGAccess::read(): Miss some configuration values of handler set!" ); // fill structures nSource = 0; diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index c4075402c140..95297f5526d7 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -296,7 +296,7 @@ void TransactionManager::impl_throwExceptions( EExceptionMode eMode, ERejectReas case E_UNINITIALIZED : if( eMode == E_HARDEXCEPTIONS ) { // Help programmer to find out, why this exception is thrown! - LOG_ERROR( "TransactionManager...", "Owner instance not correctly initialized yet. Call was rejected! Normally it's an algorithm error ... wrong use of class!" ) + SAL_WARN( "fwk", "TransactionManager...: Owner instance not correctly initialized yet. Call was rejected! Normally it's an algorithm error ... wrong use of class!" ); //ATTENTION: temp. disabled - till all bad code positions are detected and changed! */ // throw css::uno::RuntimeException( DECLARE_ASCII("TransactionManager...\nOwner instance not right initialized yet. Call was rejected! Normaly it's an algorithm error ... wrong usin of class!\n" ), css::uno::Reference< css::uno::XInterface >() ); } @@ -304,18 +304,18 @@ void TransactionManager::impl_throwExceptions( EExceptionMode eMode, ERejectReas case E_INCLOSE : if( eMode == E_HARDEXCEPTIONS ) { // Help programmer to find out, why this exception is thrown! - LOG_ERROR( "TransactionManager...", "Owner instance stand in close method. Call was rejected!" ) + SAL_WARN( "fwk", "TransactionManager...: Owner instance stand in close method. Call was rejected!" ); throw css::lang::DisposedException( DECLARE_ASCII("TransactionManager...\nOwner instance stand in close method. Call was rejected!\n" ), css::uno::Reference< css::uno::XInterface >() ); } break; case E_CLOSED : { // Help programmer to find out, why this exception is thrown! - LOG_ERROR( "TransactionManager...", "Owner instance already closed. Call was rejected!" ) + SAL_WARN( "fwk", "TransactionManager...: Owner instance already closed. Call was rejected!" ); throw css::lang::DisposedException( DECLARE_ASCII("TransactionManager...\nOwner instance already closed. Call was rejected!\n" ), css::uno::Reference< css::uno::XInterface >() ); } case E_NOREASON : { // Help programmer to find out - LOG_ERROR( "TransactionManager...", "Impossible case E_NOREASON!" ) + SAL_WARN( "fwk", "TransactionManager...: Impossible case E_NOREASON!" ); } break; default: break; // nothing to do |