diff options
-rw-r--r-- | binfilter/bf_basic/source/sbx/sbxbase.cxx | 4 | ||||
-rw-r--r-- | binfilter/bf_svtools/source/items1/svt_poolio.cxx | 6 | ||||
-rw-r--r-- | binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx | 20 |
3 files changed, 14 insertions, 16 deletions
diff --git a/binfilter/bf_basic/source/sbx/sbxbase.cxx b/binfilter/bf_basic/source/sbx/sbxbase.cxx index 691030b2e..2a380c1e4 100644 --- a/binfilter/bf_basic/source/sbx/sbxbase.cxx +++ b/binfilter/bf_basic/source/sbx/sbxbase.cxx @@ -27,7 +27,7 @@ ************************************************************************/ #include <rtl/oustringostreaminserter.hxx> -#include <sal/log.h> +#include <sal/log.hxx> #include <tools/stream.hxx> #include "sbx.hxx" @@ -214,7 +214,7 @@ SbxObject* SbxBase::CreateObject( const rtl::OUString& rClass ) if( pNew ) break; } - SAL_WARN_IF_S(!pNew, "binfilter", "No factory for object class " << rClass); + SAL_WARN_IF(!pNew, "binfilter", "No factory for object class " << rClass); return pNew; } diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx b/binfilter/bf_svtools/source/items1/svt_poolio.cxx index cd2426e42..712846d96 100644 --- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx +++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx @@ -31,7 +31,7 @@ #include <string.h> #include <stdio.h> -#include <sal/log.h> +#include <sal/log.hxx> #include <bf_svtools/bf_solar.h> #include <bf_svtools/itempool.hxx> #include "whassert.hxx" @@ -669,11 +669,11 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream) delete rpNewItem; rpNewItem = pOldItem; bFound = TRUE; - SAL_INFO_S( + SAL_INFO( "binfilter", "reusing item" << pOldItem); } } - SAL_INFO_IF_S( + SAL_INFO_IF( !bFound, "binfilter", "item not found: " << pOldItem); } diff --git a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx index e4ade6f4a..bde599468 100644 --- a/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx +++ b/binfilter/legacysmgr/source/legacy/legacy_binfilters_smgr.cxx @@ -40,7 +40,7 @@ #include "rtl/oustringostreaminserter.hxx" #include "rtl/ustrbuf.hxx" #include "rtl/unload.h" -#include "sal/log.h" +#include "sal/log.hxx" #include "uno/dispatcher.h" @@ -491,12 +491,12 @@ void OServiceManager_Listener::disposing(const EventObject & rEvt ) } catch( const IllegalArgumentException & e ) { - SAL_WARN_S( + SAL_WARN( "binfilter", "IllegalArgumentException caught: " << e.Message); } catch( const NoSuchElementException & e ) { - SAL_WARN_S( + SAL_WARN( "binfilter", "NoSuchElementException caught: " << e.Message); } } @@ -804,7 +804,7 @@ void OServiceManager::disposing() } catch (const RuntimeException & e) { - SAL_WARN_S( + SAL_WARN( "binfilter", "RuntimeException occurred upon disposing factory: " << e.Message); @@ -1003,7 +1003,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext( Reference< XSingleServiceFactory > xFac2( xFactory, UNO_QUERY ); if (xFac2.is()) { - SAL_INFO_S( + SAL_INFO( "binfilter", "ignoring given context raising service " << rServiceSpecifier); @@ -1014,8 +1014,7 @@ Reference< XInterface > OServiceManager::createInstanceWithContext( } catch (const lang::DisposedException & e) { - SAL_WARN_S( - "binfilter", "DisposedException occurred: " << e.Message); + SAL_WARN("binfilter", "DisposedException occurred: " << e.Message); } } @@ -1050,7 +1049,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext( Reference< XSingleServiceFactory > xFac2( xFactory, UNO_QUERY ); if (xFac2.is()) { - SAL_INFO_S( + SAL_INFO( "binfilter", "ignoring given context raising service " << rServiceSpecifier); @@ -1061,8 +1060,7 @@ Reference< XInterface > OServiceManager::createInstanceWithArgumentsAndContext( } catch (const lang::DisposedException & e) { - SAL_WARN_S( - "binfilter", "DisposedException occurred: " << e.Message); + SAL_WARN("binfilter", "DisposedException occurred: " << e.Message); } } @@ -2088,7 +2086,7 @@ void * SAL_CALL legacysmgr_component_getFactory( } catch (const Exception & e) { - SAL_WARN_S( + SAL_WARN( "binfilter", "unexpected exception in legacysmgr_component_getFactory: \"" << e.Message << '"'); |