summaryrefslogtreecommitdiff
path: root/framework/source/uifactory
diff options
context:
space:
mode:
authorJelle van der Waa <jelle@vdwaa.nl>2013-07-21 20:58:49 +0200
committerFridrich Strba <fridrich@documentfoundation.org>2013-07-23 14:05:13 +0000
commitcb590428d84fa63a1fe429cccd32943e0cbebd2d (patch)
treed4acdd4e40ffeee497e425cfc07de96ff059a1f4 /framework/source/uifactory
parentd8fa15f0ea3bbf38f5142f83121b7c72c483c7f5 (diff)
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: Ib0edc828691c6a8edbd1f45d3c0e2851c32c865f Reviewed-on: https://gerrit.libreoffice.org/5013 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'framework/source/uifactory')
-rw-r--r--framework/source/uifactory/factoryconfiguration.cxx13
-rw-r--r--framework/source/uifactory/menubarfactory.cxx1
-rw-r--r--framework/source/uifactory/statusbarfactory.cxx2
-rw-r--r--framework/source/uifactory/uielementfactorymanager.cxx18
4 files changed, 0 insertions, 34 deletions
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index 73fa872259ed..4dddf510e7c5 100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -32,7 +32,6 @@
#include <rtl/ustrbuf.hxx>
#include <cppuhelper/weak.hxx>
-#include <rtl/logfile.hxx>
//_________________________________________________________________________________________________________________
// Defines
@@ -70,7 +69,6 @@ ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( co
m_bConfigAccessInitialized( sal_False ),
m_bAskValue(_bAskValue)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory" );
m_xConfigProvider = configuration::theDefaultProvider::get( rxContext );
}
@@ -86,7 +84,6 @@ ConfigurationAccess_ControllerFactory::~ConfigurationAccess_ControllerFactory()
OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::getServiceFromCommandModule" );
// SAFE
ResetableGuard aLock( m_aLock );
MenuControllerMap::const_iterator pIter = m_aMenuControllerMap.find( getHashKeyFromStrings( rCommandURL, rModule ));
@@ -106,7 +103,6 @@ OUString ConfigurationAccess_ControllerFactory::getServiceFromCommandModule( con
}
OUString ConfigurationAccess_ControllerFactory::getValueFromCommandModule( const OUString& rCommandURL, const OUString& rModule ) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::getValueFromCommandModule" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -132,7 +128,6 @@ void ConfigurationAccess_ControllerFactory::addServiceToCommandModule(
const OUString& rModule,
const OUString& rServiceSpecifier )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::addServiceToCommandModule" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -144,7 +139,6 @@ void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule(
const OUString& rCommandURL,
const OUString& rModule )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -155,7 +149,6 @@ void ConfigurationAccess_ControllerFactory::removeServiceFromCommandModule(
// container.XContainerListener
void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::elementInserted" );
OUString aCommand;
OUString aModule;
OUString aService;
@@ -177,7 +170,6 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementInserted( const Cont
void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::elementRemoved" );
OUString aCommand;
OUString aModule;
OUString aService;
@@ -197,14 +189,12 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::elementRemoved ( const Cont
void SAL_CALL ConfigurationAccess_ControllerFactory::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::elementReplaced" );
elementInserted(aEvent);
}
// lang.XEventListener
void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObject& ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::disposing" );
// SAFE
// remove our reference to the config access
ResetableGuard aLock( m_aLock );
@@ -213,7 +203,6 @@ void SAL_CALL ConfigurationAccess_ControllerFactory::disposing( const EventObjec
void ConfigurationAccess_ControllerFactory::readConfigurationData()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::readConfigurationData" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -256,7 +245,6 @@ void ConfigurationAccess_ControllerFactory::readConfigurationData()
void ConfigurationAccess_ControllerFactory::updateConfigurationData()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::updateConfigurationData" );
// SAFE
ResetableGuard aLock( m_aLock );
if ( m_xConfigAccess.is() )
@@ -294,7 +282,6 @@ void ConfigurationAccess_ControllerFactory::updateConfigurationData()
sal_Bool ConfigurationAccess_ControllerFactory::impl_getElementProps( const Any& aElement, OUString& aCommand, OUString& aModule, OUString& aServiceSpecifier,OUString& aValue ) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "ConfigurationAccess_ControllerFactory::impl_getElementProps" );
Reference< XPropertySet > xPropertySet;
aElement >>= xPropertySet;
diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx
index ca7db534313c..be4ec8943223 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -35,7 +35,6 @@
#include <vcl/menu.hxx>
#include <vcl/svapp.hxx>
#include <rtl/ustrbuf.hxx>
-#include <rtl/logfile.hxx>
//_________________________________________________________________________________________________________________
// Defines
diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx
index fbc1b54403d0..729e1b719996 100644
--- a/framework/source/uifactory/statusbarfactory.cxx
+++ b/framework/source/uifactory/statusbarfactory.cxx
@@ -62,7 +62,6 @@ DEFINE_INIT_SERVICE ( StatusBarFactory, {} )
StatusBarFactory::StatusBarFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) :
MenuBarFactory( xContext,true )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarFactory::StatusBarFactory" );
}
// XUIElementFactory
@@ -71,7 +70,6 @@ Reference< XUIElement > SAL_CALL StatusBarFactory::createUIElement(
const Sequence< PropertyValue >& Args )
throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarFactory::createUIElement" );
// SAFE
ResetableGuard aLock( m_aLock );
StatusBarWrapper* pWrapper = new StatusBarWrapper( m_xContext );
diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx
index cf3237ac76eb..a550a8ece38f 100644
--- a/framework/source/uifactory/uielementfactorymanager.cxx
+++ b/framework/source/uifactory/uielementfactorymanager.cxx
@@ -36,7 +36,6 @@
#include <rtl/ustrbuf.hxx>
#include <cppuhelper/weak.hxx>
#include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
//_________________________________________________________________________________________________________________
// Defines
@@ -84,7 +83,6 @@ ConfigurationAccess_FactoryManager::ConfigurationAccess_FactoryManager( const Re
m_sRoot(_sRoot),
m_bConfigAccessInitialized( sal_False )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::ConfigurationAccess_FactoryManager" );
m_xConfigProvider = theDefaultProvider::get( rxContext );
}
@@ -100,7 +98,6 @@ ConfigurationAccess_FactoryManager::~ConfigurationAccess_FactoryManager()
OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule ) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactorySpecifierFromTypeNameModule" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -136,7 +133,6 @@ OUString ConfigurationAccess_FactoryManager::getFactorySpecifierFromTypeNameModu
void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule, const OUString& rServiceSpecifier )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::addFactorySpecifierToTypeNameModule" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -153,7 +149,6 @@ void ConfigurationAccess_FactoryManager::addFactorySpecifierToTypeNameModule( co
void ConfigurationAccess_FactoryManager::removeFactorySpecifierFromTypeNameModule( const OUString& rType, const OUString& rName, const OUString& rModule )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::removeFactorySpecifierFromTypeNameModule" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -169,7 +164,6 @@ void ConfigurationAccess_FactoryManager::removeFactorySpecifierFromTypeNameModul
Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFactoriesDescription() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactoriesDescription" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -213,7 +207,6 @@ Sequence< Sequence< PropertyValue > > ConfigurationAccess_FactoryManager::getFac
// container.XContainerListener
void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const ContainerEvent& aEvent ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementInserted" );
OUString aType;
OUString aName;
OUString aModule;
@@ -233,7 +226,6 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementInserted( const Contain
void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const ContainerEvent& aEvent ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementRemoved " );
OUString aType;
OUString aName;
OUString aModule;
@@ -253,7 +245,6 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementRemoved ( const Contain
void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const ContainerEvent& aEvent ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::elementReplaced" );
OUString aType;
OUString aName;
OUString aModule;
@@ -275,7 +266,6 @@ void SAL_CALL ConfigurationAccess_FactoryManager::elementReplaced( const Contain
// lang.XEventListener
void SAL_CALL ConfigurationAccess_FactoryManager::disposing( const EventObject& ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::disposing" );
// SAFE
// remove our reference to the config access
ResetableGuard aLock( m_aLock );
@@ -284,7 +274,6 @@ void SAL_CALL ConfigurationAccess_FactoryManager::disposing( const EventObject&
void ConfigurationAccess_FactoryManager::readConfigurationData()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::readConfigurationData" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -342,7 +331,6 @@ void ConfigurationAccess_FactoryManager::readConfigurationData()
sal_Bool ConfigurationAccess_FactoryManager::impl_getElementProps( const Any& aElement, OUString& rType, OUString& rName, OUString& rModule, OUString& rServiceSpecifier ) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::impl_getElementProps" );
Reference< XPropertySet > xPropertySet;
aElement >>= xPropertySet;
@@ -384,7 +372,6 @@ UIElementFactoryManager::UIElementFactoryManager( const Reference< XComponentCon
m_bConfigRead( sal_False ),
m_xContext(rxContext)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::UIElementFactoryManager" );
m_pConfigAccess = new ConfigurationAccess_FactoryManager( rxContext, OUString( "/org.openoffice.Office.UI.Factories/Registered/UIElementFactories" ) );
m_pConfigAccess->acquire();
m_xModuleManager = ModuleManager::create( rxContext );
@@ -404,7 +391,6 @@ Reference< XUIElement > SAL_CALL UIElementFactoryManager::createUIElement(
const Sequence< PropertyValue >& Args )
throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::createUIElement" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -453,7 +439,6 @@ throw ( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::l
Sequence< Sequence< PropertyValue > > SAL_CALL UIElementFactoryManager::getRegisteredFactories()
throw ( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getRegisteredFactories" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -469,7 +454,6 @@ throw ( RuntimeException )
Reference< XUIElementFactory > SAL_CALL UIElementFactoryManager::getFactory( const OUString& aResourceURL, const OUString& aModuleId )
throw ( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::getFactory" );
ResetableGuard aLock( m_aLock );
if ( !m_bConfigRead )
@@ -497,7 +481,6 @@ throw ( RuntimeException )
void SAL_CALL UIElementFactoryManager::registerFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId, const OUString& aFactoryImplementationName )
throw ( ElementExistException, RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::registerFactory" );
// SAFE
ResetableGuard aLock( m_aLock );
@@ -514,7 +497,6 @@ throw ( ElementExistException, RuntimeException )
void SAL_CALL UIElementFactoryManager::deregisterFactory( const OUString& aType, const OUString& aName, const OUString& aModuleId )
throw ( NoSuchElementException, RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "UIElementFactoryManager::deregisterFactory" );
// SAFE
ResetableGuard aLock( m_aLock );