From 660b67a413fed152bc273bdc534e53b01b1e9d77 Mon Sep 17 00:00:00 2001 From: Radu Ioan Date: Mon, 27 May 2013 00:22:20 +0300 Subject: fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - replaced RTL_CONTEXT_ with SAL_INFO - replace OSL_* with SAL_* Change-Id: Id4e90b83a7275bfd30914f7514a609cebbfbf4ac Reviewed-on: https://gerrit.libreoffice.org/4044 Reviewed-by: Luboš Luňák Tested-by: Luboš Luňák --- framework/source/fwe/classes/bmkmenu.cxx | 3 +- framework/source/jobs/jobexecutor.cxx | 3 +- framework/source/layoutmanager/layoutmanager.cxx | 31 ++++++++++---------- framework/source/services/desktop.cxx | 5 ++-- framework/source/services/pathsettings.cxx | 17 ++++++----- .../source/uiconfiguration/imagemanagerimpl.cxx | 3 +- .../source/uiconfiguration/moduleimagemanager.cxx | 3 +- .../uiconfiguration/uicategorydescription.cxx | 33 +++++++++++----------- 8 files changed, 45 insertions(+), 53 deletions(-) (limited to 'framework') diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index 60301d9cd139..dd2074fbafd1 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -36,7 +36,6 @@ #include #include #include -#include using namespace ::comphelper; using namespace ::com::sun::star::uno; @@ -106,7 +105,7 @@ BmkMenu::~BmkMenu() void BmkMenu::Initialize() { - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::BmkMenu::Initialize" ); + SAL_INFO( "fwk", "framework (cd100003) ::BmkMenu::Initialize" ); if( _pImp->m_bInitialized ) return; diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index 6d6de63c989c..03eb209abda2 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -39,7 +39,6 @@ #include #include -#include namespace framework{ @@ -143,7 +142,7 @@ JobExecutor::~JobExecutor() */ void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT(aLog, "fwk (as96863) JobExecutor::trigger()"); + SAL_INFO( "fwk", "fwk (as96863) JobExecutor::trigger()"); /* SAFE { */ ReadGuard aReadLock(m_aLock); diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 05bab587e8b1..8bb3f0f29705 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -73,7 +73,6 @@ #include #include #include -#include #include #include @@ -1435,7 +1434,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent ) void SAL_CALL LayoutManager::createElement( const OUString& aName ) throw (RuntimeException) { - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::createElement" ); + SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::createElement" ); ReadGuard aReadLock( m_aLock ); Reference< XFrame > xFrame = m_xFrame; @@ -1569,7 +1568,7 @@ throw (RuntimeException) void SAL_CALL LayoutManager::destroyElement( const OUString& aName ) throw (RuntimeException) { - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::destroyElement" ); + SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::destroyElement" ); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ WriteGuard aWriteLock( m_aLock ); @@ -1656,7 +1655,7 @@ throw (uno::RuntimeException) WriteGuard aWriteLock( m_aLock ); OString aResName = OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); - RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s requested.", aResName.getStr() ); + SAL_INFO( "fwk", "framework (cd100003) Element " << aResName.getStr() << " requested." ); if (( aElementType.equalsIgnoreAsciiCase("statusbar") && aElementName.equalsIgnoreAsciiCase("statusbar") ) || @@ -1776,7 +1775,7 @@ throw (uno::RuntimeException) sal_Bool SAL_CALL LayoutManager::showElement( const OUString& aName ) throw (RuntimeException) { - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::showElement" ); + SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::showElement" ); bool bResult( false ); bool bNotify( false ); @@ -1787,7 +1786,7 @@ throw (RuntimeException) parseResourceURL( aName, aElementType, aElementName ); OString aResName = OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); - RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() ); + SAL_INFO( "fwk", "framework (cd100003) Element " << aResName.getStr() ); if ( aElementType.equalsIgnoreAsciiCase("menubar") && aElementName.equalsIgnoreAsciiCase("menubar") ) @@ -1861,7 +1860,7 @@ throw (RuntimeException) sal_Bool SAL_CALL LayoutManager::hideElement( const OUString& aName ) throw (RuntimeException) { - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::hideElement" ); + SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::hideElement" ); bool bNotify( false ); bool bMustLayout( false ); @@ -1870,7 +1869,7 @@ throw (RuntimeException) parseResourceURL( aName, aElementType, aElementName ); OString aResName = OUStringToOString( aElementName, RTL_TEXTENCODING_ASCII_US ); - RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) Element %s", aResName.getStr() ); + SAL_INFO( "fwk", "framework (cd100003) Element " << aResName.getStr() ); if ( aElementType.equalsIgnoreAsciiCase("menubar") && aElementName.equalsIgnoreAsciiCase("menubar") ) @@ -2259,13 +2258,13 @@ throw (RuntimeException) sal_Int32 nLockCount( m_nLockCount ); aReadLock.unlock(); - RTL_LOGFILE_TRACE1( "framework (cd100003) ::LayoutManager::lock lockCount=%d", nLockCount ); + SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::lock lockCount=" << nLockCount ); #ifdef DBG_UTIL OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("LayoutManager::lock ")); aStr.append(reinterpret_cast(this)); aStr.append(RTL_CONSTASCII_STRINGPARAM(" - ")); aStr.append(nLockCount); - OSL_TRACE(aStr.getStr()); + SAL_INFO( "fwk", "" << aStr.getStr()); #endif Any a( nLockCount ); @@ -2281,13 +2280,13 @@ throw (RuntimeException) sal_Int32 nLockCount( m_nLockCount ); aReadLock.unlock(); - RTL_LOGFILE_TRACE1( "framework (cd100003) ::LayoutManager::unlock lockCount=%d", nLockCount ); + SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::unlock lockCount=" << nLockCount ); #ifdef DBG_UTIL OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("LayoutManager::unlock ")); aStr.append(reinterpret_cast(this)); aStr.append(RTL_CONSTASCII_STRINGPARAM(" - ")); aStr.append(nLockCount); - OSL_TRACE(aStr.getStr()); + SAL_INFO( "fwk", "" << aStr.getStr()); #endif // conform to documentation: unlock with lock count == 0 means force a layout @@ -2327,7 +2326,7 @@ void LayoutManager::implts_doLayout_notify( sal_Bool bOuterResize ) sal_Bool LayoutManager::implts_doLayout( sal_Bool bForceRequestBorderSpace, sal_Bool bOuterResize ) { - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::implts_doLayout" ); + SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::implts_doLayout" ); /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ReadGuard aReadLock( m_aLock ); @@ -2812,7 +2811,7 @@ throw ( RuntimeException ) { if (( aEvent.Action == FrameAction_COMPONENT_ATTACHED ) || ( aEvent.Action == FrameAction_COMPONENT_REATTACHED )) { - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::frameAction (COMPONENT_ATTACHED|REATTACHED)" ); + SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::frameAction (COMPONENT_ATTACHED|REATTACHED)" ); WriteGuard aWriteLock( m_aLock ); m_bComponentAttached = sal_True; @@ -2825,7 +2824,7 @@ throw ( RuntimeException ) } else if (( aEvent.Action == FrameAction_FRAME_UI_ACTIVATED ) || ( aEvent.Action == FrameAction_FRAME_UI_DEACTIVATING )) { - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::frameAction (FRAME_UI_ACTIVATED|DEACTIVATING)" ); + SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::frameAction (FRAME_UI_ACTIVATED|DEACTIVATING)" ); WriteGuard aWriteLock( m_aLock ); m_bActive = ( aEvent.Action == FrameAction_FRAME_UI_ACTIVATED ); @@ -2835,7 +2834,7 @@ throw ( RuntimeException ) } else if ( aEvent.Action == FrameAction_COMPONENT_DETACHING ) { - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::LayoutManager::frameAction (COMPONENT_DETACHING)" ); + SAL_INFO( "fwk", "framework (cd100003) ::LayoutManager::frameAction (COMPONENT_DETACHING)" ); WriteGuard aWriteLock( m_aLock ); m_bComponentAttached = sal_False; diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 50004f382f77..b98f863acc7c 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -66,7 +66,6 @@ #include #include #include -#include #include #include @@ -640,14 +639,14 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom /* UNSAFE AREA --------------------------------------------------------------------------------------------- */ // Register transaction and reject wrong calls. TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS ); - RTL_LOGFILE_CONTEXT( aLog, "framework (as96863) ::Desktop::loadComponentFromURL" ); + SAL_INFO( "fwk.desktop", "framework (as96863) ::Desktop::loadComponentFromURL" ); ReadGuard aReadLock(m_aLock); css::uno::Reference< css::frame::XComponentLoader > xThis(static_cast< css::frame::XComponentLoader* >(this), css::uno::UNO_QUERY); css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xFactory; aReadLock.unlock(); - RTL_LOGFILE_PRODUCT_CONTEXT( aLog2, "PERFORMANCE - Desktop::loadComponentFromURL()" ); + SAL_INFO( "fwk.desktop", "PERFORMANCE - Desktop::loadComponentFromURL()" ); return LoadEnv::loadComponentFromURL(xThis, comphelper::getComponentContext(xSMGR), sURL, sTargetFrameName, nSearchFlags, lArguments); } diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index b2e2dd0563ae..bcdafce0ea23 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -38,7 +38,6 @@ #include #include -#include #include #include @@ -140,7 +139,7 @@ PathSettings::PathSettings( const css::uno::Reference< css::lang::XMultiServiceF , m_pPropHelp(0 ) , m_bIgnoreEvents(sal_False) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::PathSettings" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com PathSettings::PathSettings" ); } //----------------------------------------------------------------------------- @@ -157,7 +156,7 @@ PathSettings::~PathSettings() void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEvent) throw (css::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::changesOccurred" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com PathSettings::changesOccurred" ); sal_Int32 c = aEvent.Changes.getLength(); sal_Int32 i = 0; @@ -190,7 +189,7 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource) throw(css::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::disposing" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com PathSettings::disposing" ); WriteGuard aWriteLock(m_aLock); if (aSource.Source == m_xCfgNew) @@ -219,8 +218,8 @@ void PathSettings::setStringProperty(const OUString& p1, const OUString& p2) //----------------------------------------------------------------------------- void PathSettings::impl_readAll() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_readAll" ); - RTL_LOGFILE_CONTEXT(aLog, "framework (as96863) ::PathSettings::load config (all)"); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com PathSettings::impl_readAll" ); + SAL_INFO( "fwk", "framework (as96863) ::PathSettings::load config (all)"); try { @@ -246,7 +245,7 @@ void PathSettings::impl_readAll() // NO substitution here ! It's done outside ... OUStringList PathSettings::impl_readOldFormat(const OUString& sPath) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_readOldFormat" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com PathSettings::impl_readOldFormat" ); css::uno::Reference< css::container::XNameAccess > xCfg( fa_getCfgOld() ); OUStringList aPathVal; @@ -319,7 +318,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath) //----------------------------------------------------------------------------- void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_storePath" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com PathSettings::impl_storePath" ); m_bIgnoreEvents = sal_True; css::uno::Reference< css::container::XNameAccess > xCfgNew = fa_getCfgNew(); @@ -367,7 +366,7 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath) void PathSettings::impl_mergeOldUserPaths( PathSettings::PathInfo& rPath, const OUStringList& lOld ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "PathSettings::impl_mergeOldUserPaths" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com PathSettings::impl_mergeOldUserPaths" ); OUStringList::const_iterator pIt; for ( pIt = lOld.begin(); pIt != lOld.end() ; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index facc0e47345a..7411178dae39 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -45,7 +45,6 @@ #include #include #include -#include #include #include @@ -169,7 +168,7 @@ CmdImageList::~CmdImageList() void CmdImageList::impl_fillCommandToImageNameMap() { - RTL_LOGFILE_CONTEXT( aLog, "framework: CmdImageList::impl_fillCommandToImageNameMap" ); + SAL_INFO( "fwk", "framework: CmdImageList::impl_fillCommandToImageNameMap" ); if ( !m_bVectorInit ) { diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index b009b1c8af40..611629d25ab1 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -18,7 +18,6 @@ */ -#include #include #include #include @@ -128,7 +127,7 @@ Sequence< uno::Reference< XGraphic > > SAL_CALL ModuleImageManager::getImages( const Sequence< OUString >& aCommandURLSequence ) throw ( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ) { - RTL_LOGFILE_CONTEXT( aLog, "framework: ModuleImageManager::getImages" ); + SAL_INFO( "fwk", "framework: ModuleImageManager::getImages" ); return m_pImpl->getImages(nImageType,aCommandURLSequence); } diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 84dec3b1ff4b..8b7bc07c9a52 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -38,7 +38,6 @@ #include #include -#include //_________________________________________________________________________________________________________________ // Defines @@ -143,7 +142,7 @@ ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const OUString& m_bConfigAccessInitialized( sal_False ), m_bCacheFilled( sal_False ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::ConfigurationAccess_UICategory" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::ConfigurationAccess_UICategory" ); // Create configuration hierachical access name m_aConfigCategoryAccess += aModuleName; m_aConfigCategoryAccess += OUString( CONFIGURATION_CATEGORY_ELEMENT_ACCESS ); @@ -164,7 +163,7 @@ ConfigurationAccess_UICategory::~ConfigurationAccess_UICategory() Any SAL_CALL ConfigurationAccess_UICategory::getByName( const OUString& rId ) throw ( NoSuchElementException, WrappedTargetException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getByName" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::getByName" ); ResetableGuard aLock( m_aLock ); if ( !m_bConfigAccessInitialized ) { @@ -185,14 +184,14 @@ throw ( NoSuchElementException, WrappedTargetException, RuntimeException) Sequence< OUString > SAL_CALL ConfigurationAccess_UICategory::getElementNames() throw ( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getElementNames" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::getElementNames" ); return getAllIds(); } sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasByName( const OUString& rId ) throw (::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::hasByName" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::hasByName" ); return getByName( rId ).hasValue(); } @@ -200,22 +199,22 @@ throw (::com::sun::star::uno::RuntimeException) Type SAL_CALL ConfigurationAccess_UICategory::getElementType() throw ( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getElementType" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::getElementType" ); return( ::getCppuType( (const OUString*)NULL ) ); } sal_Bool SAL_CALL ConfigurationAccess_UICategory::hasElements() throw ( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::hasElements" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::hasElements" ); // There must be global categories! return sal_True; } sal_Bool ConfigurationAccess_UICategory::fillCache() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::fillCache" ); - RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ConfigurationAccess_UICategory::fillCache" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::fillCache" ); + SAL_INFO( "fwk", "framework (cd100003) ::ConfigurationAccess_UICategory::fillCache" ); if ( m_bCacheFilled ) return sal_True; @@ -251,7 +250,7 @@ sal_Bool ConfigurationAccess_UICategory::fillCache() Any ConfigurationAccess_UICategory::getUINameFromID( const OUString& rId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getUINameFromID" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::getUINameFromID" ); Any a; try @@ -287,7 +286,7 @@ Any ConfigurationAccess_UICategory::getUINameFromID( const OUString& rId ) Any ConfigurationAccess_UICategory::getUINameFromCache( const OUString& rId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getUINameFromCache" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::getUINameFromCache" ); Any a; IdToInfoCache::const_iterator pIter = m_aIdCache.find( rId ); @@ -299,7 +298,7 @@ Any ConfigurationAccess_UICategory::getUINameFromCache( const OUString& rId ) Sequence< OUString > ConfigurationAccess_UICategory::getAllIds() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::getAllIds" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::getAllIds" ); // SAFE ResetableGuard aLock( m_aLock ); @@ -348,7 +347,7 @@ Sequence< OUString > ConfigurationAccess_UICategory::getAllIds() sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::initializeConfigAccess" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::initializeConfigAccess" ); Sequence< Any > aArgs( 1 ); PropertyValue aPropValue; @@ -385,23 +384,23 @@ sal_Bool ConfigurationAccess_UICategory::initializeConfigAccess() // container.XContainerListener void SAL_CALL ConfigurationAccess_UICategory::elementInserted( const ContainerEvent& ) throw(RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::elementInserted" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::elementInserted" ); } void SAL_CALL ConfigurationAccess_UICategory::elementRemoved ( const ContainerEvent& ) throw(RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::elementRemoved " ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::elementRemoved " ); } void SAL_CALL ConfigurationAccess_UICategory::elementReplaced( const ContainerEvent& ) throw(RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::elementReplaced" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::elementReplaced" ); } // lang.XEventListener void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEvent ) throw(RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_UICategory::disposing" ); + SAL_INFO( "fwk", "framework Ocke.Janssen@sun.com ConfigurationAccess_UICategory::disposing" ); // SAFE // remove our reference to the config access ResetableGuard aLock( m_aLock ); -- cgit