[Libreoffice-commits] core.git: framework/inc framework/source include/sal
Jelle van der Waa
jelle at vdwaa.nl
Tue Jul 23 07:05:33 PDT 2013
framework/inc/classes/filtercachedata.hxx | 1
framework/inc/macros/xserviceinfo.hxx | 2
framework/inc/pch/precompiled_fwk.hxx | 1
framework/source/accelerators/acceleratorconfiguration.cxx | 9 +-
framework/source/accelerators/moduleacceleratorconfiguration.cxx | 4 -
framework/source/dispatch/menudispatcher.cxx | 1
framework/source/dispatch/popupmenudispatcher.cxx | 1
framework/source/dispatch/windowcommanddispatch.cxx | 1
framework/source/fwe/xml/menudocumenthandler.cxx | 1
framework/source/fwe/xml/saxnamespacefilter.cxx | 1
framework/source/helper/uiconfigelementwrapperbase.cxx | 1
framework/source/helper/uielementwrapperbase.cxx | 1
framework/source/services/mediatypedetectionhelper.cxx | 1
framework/source/services/modulemanager.cxx | 1
framework/source/services/substitutepathvars.cxx | 12 ---
framework/source/uiconfiguration/imagemanager.cxx | 1
framework/source/uiconfiguration/moduleuicfgsupplier.cxx | 6 -
framework/source/uielement/addonstoolbarwrapper.cxx | 1
framework/source/uielement/langselectionstatusbarcontroller.cxx | 5 -
framework/source/uielement/menubarmanager.cxx | 36 ----------
framework/source/uielement/menubarwrapper.cxx | 2
framework/source/uielement/statusbarmanager.cxx | 25 ------
framework/source/uielement/statusbarwrapper.cxx | 1
framework/source/uielement/toolbarmanager.cxx | 11 ---
framework/source/uielement/toolbarsmenucontroller.cxx | 1
framework/source/uielement/toolbarwrapper.cxx | 1
framework/source/uielement/uicommanddescription.cxx | 8 --
framework/source/uifactory/factoryconfiguration.cxx | 13 ---
framework/source/uifactory/menubarfactory.cxx | 1
framework/source/uifactory/statusbarfactory.cxx | 2
framework/source/uifactory/uielementfactorymanager.cxx | 18 -----
include/sal/log-areas.dox | 2
32 files changed, 7 insertions(+), 165 deletions(-)
New commits:
commit cb590428d84fa63a1fe429cccd32943e0cbebd2d
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date: Sun Jul 21 20:58:49 2013 +0200
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
Change-Id: Ib0edc828691c6a8edbd1f45d3c0e2851c32c865f
Reviewed-on: https://gerrit.libreoffice.org/5013
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 324480b..4d4ff21 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -46,7 +46,6 @@
#include <unotools/configitem.hxx>
#include <cppuhelper/weak.hxx>
#include <rtl/ustring.hxx>
-#include <rtl/logfile.hxx>
namespace framework{
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 6bf913a..3032af5 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -36,7 +36,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <rtl/ustring.hxx>
-#include <rtl/logfile.hxx>
namespace framework{
@@ -110,7 +109,6 @@ ________________________________________________________________________________
/*===========================================================================================================*/ \
css::uno::Reference< css::uno::XInterface > SAL_CALL CLASS::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception ) \
{ \
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework","Ocke.Janssen at sun.com",U2B(IMPLEMENTATIONNAME).getStr()); \
/* create new instance of service */ \
CLASS* pClass = new CLASS( xServiceManager ); \
/* hold it alive by increasing his ref count!!! */ \
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index f8e1262..95ef40d 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -308,7 +308,6 @@
#include <rtl/bootstrap.hxx>
#include <rtl/instance.hxx>
#include <rtl/logfile.h>
-#include <rtl/logfile.hxx>
#include <rtl/strbuf.hxx>
#include <rtl/string.h>
#include <rtl/string.hxx>
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index bbf5c79..e7190fd 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -50,7 +50,6 @@
#include <com/sun/star/util/XChangesNotifier.hpp>
#include <comphelper/configurationhelper.hxx>
#include <unotools/configpaths.hxx>
-#include <rtl/logfile.hxx>
#include <svtools/acceleratorexecute.hxx>
#include <stdio.h>
@@ -681,7 +680,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
throw(css::lang::IllegalArgumentException,
css::uno::RuntimeException )
{
- RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "XCUBasedAcceleratorConfiguration::setKeyEvent" );
+ SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::setKeyEvent" );
if (
(aKeyEvent.KeyCode == 0) &&
@@ -939,7 +938,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
throw(css::uno::Exception ,
css::uno::RuntimeException)
{
- RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "XCUBasedAcceleratorConfiguration::reload()" );
+ SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::reload()" );
// SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock);
@@ -980,7 +979,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store()
throw(css::uno::Exception ,
css::uno::RuntimeException)
{
- RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "XCUBasedAcceleratorConfiguration::store()" );
+ SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::store()" );
// SAFE -> ----------------------------------
ReadGuard aReadLock(m_aLock);
@@ -1154,7 +1153,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::u
void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent)
throw(css::uno::RuntimeException)
{
- RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "XCUBasedAcceleratorConfiguration::changesOccurred()" );
+ SAL_INFO( "fwk.accelerators", "XCUBasedAcceleratorConfiguration::changesOccurred()" );
css::uno::Reference< css::container::XHierarchicalNameAccess > xHAccess;
aEvent.Base >>= xHAccess;
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index f1ee119..c20ee83 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -37,7 +37,6 @@
#include <com/sun/star/util/XChangesNotifier.hpp>
-#include <rtl/logfile.hxx>
#include <rtl/logfile.h>
@@ -69,7 +68,6 @@ DEFINE_INIT_SERVICE(ModuleAcceleratorConfiguration,
ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext)
: ModuleAcceleratorConfiguration_BASE(xContext)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ModuleAcceleratorConfiguration::ModuleAcceleratorConfiguration" );
}
//-----------------------------------------------
@@ -82,7 +80,6 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc
throw(css::uno::Exception ,
css::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ModuleAcceleratorConfiguration::initialize" );
// SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock);
@@ -111,7 +108,6 @@ void SAL_CALL ModuleAcceleratorConfiguration::initialize(const css::uno::Sequenc
//-----------------------------------------------
void ModuleAcceleratorConfiguration::impl_ts_fillCache()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ModuleAcceleratorConfiguration::impl_ts_fillCache" );
// SAFE -> ----------------------------------
ReadGuard aReadLock(m_aLock);
m_sModuleCFG = m_sModule;
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index 8976610..0f01e23 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -41,7 +41,6 @@
#include <tools/rcid.h>
#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <rtl/logfile.hxx>
#include <ucbhelper/content.hxx>
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx
index da1ed78..2503636 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -112,7 +112,6 @@ css::uno::Reference< css::uno::XInterface >
SAL_CALL PopupMenuDispatcher::impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager )
throw( css::uno::Exception )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework","Ocke.Janssen at sun.com",U2B(IMPLEMENTATIONNAME_POPUPMENUDISPATCHER).getStr());
/* create new instance of service */
PopupMenuDispatcher* pClass = new PopupMenuDispatcher( comphelper::getComponentContext(xServiceManager) );
/* hold it alive by increasing his ref count!!! */
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 4e260c5..e35f522 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -34,7 +34,6 @@
#include <vcl/cmdevt.hxx>
#include <osl/mutex.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <rtl/logfile.hxx>
namespace framework{
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 43a142a..75a0e25 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <comphelper/processfactory.hxx>
-#include <rtl/logfile.hxx>
#include <comphelper/attributelist.hxx>
diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx
index 165e537..b7ce4cf 100644
--- a/framework/source/fwe/xml/saxnamespacefilter.cxx
+++ b/framework/source/fwe/xml/saxnamespacefilter.cxx
@@ -30,7 +30,6 @@
#include <comphelper/attributelist.hxx>
#include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::uno;
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index 9774f65..4fff2ac 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/ui/XUIConfiguration.hpp>
#include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
#include <comphelper/sequence.hxx>
const int UIELEMENT_PROPHANDLE_CONFIGSOURCE = 1;
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 1463de1..2dd1a63 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
#include <comphelper/sequence.hxx>
const int UIELEMENT_PROPHANDLE_RESOURCEURL = 1;
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index b057f2c..339fb87 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -21,7 +21,6 @@
#include <services.h>
#include <svl/inettype.hxx>
#include <tools/string.hxx>
-#include <rtl/logfile.hxx>
namespace framework
{
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index f6990ca..4de26dc 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -34,7 +34,6 @@
#include <comphelper/sequenceasvector.hxx>
#include <comphelper/enumhelper.hxx>
-#include <rtl/logfile.hxx>
namespace framework
{
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index ac75295..ceb8b48 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -569,7 +569,6 @@ SubstitutePathVariables::SubstitutePathVariables( const Reference< XComponentCon
m_aImpl( LINK( this, SubstitutePathVariables, implts_ConfigurationNotify )),
m_xContext( xContext )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::SubstitutePathVariables" );
int i;
SetPredefinedPathVariables( m_aPreDefVars );
@@ -627,7 +626,6 @@ SubstitutePathVariables::~SubstitutePathVariables()
OUString SAL_CALL SubstitutePathVariables::substituteVariables( const OUString& aText, sal_Bool bSubstRequired )
throw ( NoSuchElementException, RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::substituteVariables" );
ResetableGuard aLock( m_aLock );
return impl_substituteVariable( aText, bSubstRequired );
}
@@ -635,7 +633,6 @@ throw ( NoSuchElementException, RuntimeException )
OUString SAL_CALL SubstitutePathVariables::reSubstituteVariables( const OUString& aText )
throw ( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::reSubstituteVariables" );
ResetableGuard aLock( m_aLock );
return impl_reSubstituteVariables( aText );
}
@@ -643,7 +640,6 @@ throw ( RuntimeException )
OUString SAL_CALL SubstitutePathVariables::getSubstituteVariableValue( const OUString& aVariable )
throw ( NoSuchElementException, RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::getSubstituteVariableValue" );
ResetableGuard aLock( m_aLock );
return impl_getSubstituteVariableValue( aVariable );
}
@@ -662,7 +658,6 @@ IMPL_LINK_NOARG(SubstitutePathVariables, implts_ConfigurationNotify)
OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const OUString& aOSLCompliantURL ) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::ConvertOSLtoUCBURL" );
OUString aResult;
OUString aTemp;
@@ -678,7 +673,6 @@ OUString SubstitutePathVariables::ConvertOSLtoUCBURL( const OUString& aOSLCompli
OUString SubstitutePathVariables::GetWorkPath() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::GetWorkPath" );
OUString aWorkPath;
try
@@ -703,7 +697,6 @@ OUString SubstitutePathVariables::GetWorkPath() const
OUString SubstitutePathVariables::GetWorkVariableValue() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::GetWorkVariableValue" );
OUString aWorkPath;
try
@@ -731,7 +724,6 @@ OUString SubstitutePathVariables::GetWorkVariableValue() const
OUString SubstitutePathVariables::GetHomeVariableValue() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::GetHomeVariableValue" );
osl::Security aSecurity;
OUString aHomePath;
@@ -741,7 +733,6 @@ OUString SubstitutePathVariables::GetHomeVariableValue() const
OUString SubstitutePathVariables::GetPathVariableValue() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::GetPathVariableValue" );
OUString aRetStr;
const char* pEnv = getenv( "PATH" );
@@ -778,7 +769,6 @@ OUString SubstitutePathVariables::GetPathVariableValue() const
OUString SubstitutePathVariables::impl_substituteVariable( const OUString& rText, bool bSubstRequired )
throw ( NoSuchElementException, RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::impl_substituteVariable" );
// This is maximal recursive depth supported!
const sal_Int32 nMaxRecursiveDepth = 8;
@@ -1086,7 +1076,6 @@ throw ( RuntimeException )
OUString SubstitutePathVariables::impl_getSubstituteVariableValue( const OUString& rVariable )
throw ( NoSuchElementException, RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::impl_getSubstituteVariableValue" );
OUString aVariable;
sal_Int32 nPos = rVariable.indexOf( m_aVarStart );
@@ -1139,7 +1128,6 @@ throw ( NoSuchElementException, RuntimeException )
void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariables& aPreDefPathVariables )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "SubstitutePathVariables::SetPredefinedPathVariables" );
aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] = OUString("$BRAND_BASE_DIR");
rtl::Bootstrap::expandMacros(
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 39d58a4..e43718a 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -43,7 +43,6 @@
#include <unotools/ucbstreamhelper.hxx>
#include <vcl/pngread.hxx>
#include <vcl/pngwrite.hxx>
-#include <rtl/logfile.hxx>
//_________________________________________________________________________________________________________________
// namespaces
diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 89c761d..832b102 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/embed/XPackageStructureCreator.hpp>
#include <com/sun/star/ui/ModuleUIConfigurationManager.hpp>
-#include <rtl/logfile.hxx>
#include <cppuhelper/implbase1.hxx>
#include <vcl/svapp.hxx>
@@ -92,7 +91,6 @@ ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier( cons
, m_xContext( xContext )
, m_aListenerContainer( m_aLock.getShareableOslMutex() )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ModuleUIConfigurationManagerSupplier::ModuleUIConfigurationManagerSupplier" );
try
{
// Retrieve known modules and insert them into our boost::unordered_map to speed-up access time.
@@ -126,7 +124,6 @@ ModuleUIConfigurationManagerSupplier::~ModuleUIConfigurationManagerSupplier()
void SAL_CALL ModuleUIConfigurationManagerSupplier::dispose()
throw ( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ModuleUIConfigurationManagerSupplier::dispose" );
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
css::lang::EventObject aEvent( xThis );
@@ -141,7 +138,6 @@ throw ( RuntimeException )
void SAL_CALL ModuleUIConfigurationManagerSupplier::addEventListener( const Reference< XEventListener >& xListener )
throw ( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ModuleUIConfigurationManagerSupplier::addEventListener" );
{
ResetableGuard aGuard( m_aLock );
@@ -156,7 +152,6 @@ throw ( RuntimeException )
void SAL_CALL ModuleUIConfigurationManagerSupplier::removeEventListener( const Reference< XEventListener >& xListener )
throw ( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ModuleUIConfigurationManagerSupplier::removeEventListener" );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
}
@@ -165,7 +160,6 @@ throw ( RuntimeException )
Reference< XUIConfigurationManager > SAL_CALL ModuleUIConfigurationManagerSupplier::getUIConfigurationManager( const OUString& sModuleIdentifier )
throw ( NoSuchElementException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ModuleUIConfigurationManagerSupplier::getUIConfigurationManager" );
ResetableGuard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx
index 3c71c18..2c6c533 100644
--- a/framework/source/uielement/addonstoolbarwrapper.cxx
+++ b/framework/source/uielement/addonstoolbarwrapper.cxx
@@ -40,7 +40,6 @@
#include <svtools/miscopt.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
-#include <rtl/logfile.hxx>
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx
index 903da76..c6073c9 100644
--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -92,7 +92,6 @@ LangSelectionStatusbarController::LangSelectionStatusbarController( const uno::R
void SAL_CALL LangSelectionStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "LangSelectionStatusbarController::initialize" );
SolarMutexGuard aSolarMutexGuard;
svt::StatusbarController::initialize( aArguments );
@@ -107,7 +106,6 @@ void LangSelectionStatusbarController::LangMenu(
const ::com::sun::star::awt::Point& aPos )
throw (::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "LangSelectionStatusbarController::LangMenu" );
if (!m_bShowMenu)
return;
@@ -246,7 +244,6 @@ void SAL_CALL LangSelectionStatusbarController::command(
const ::com::sun::star::uno::Any& /*aData*/ )
throw (::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "LangSelectionStatusbarController::command" );
if ( nCommand & ::awt::Command::CONTEXTMENU )
{
LangMenu( aPos );
@@ -257,7 +254,6 @@ void SAL_CALL LangSelectionStatusbarController::click(
const ::com::sun::star::awt::Point& aPos )
throw (::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "LangSelectionStatusbarController::click" );
LangMenu( aPos );
}
@@ -272,7 +268,6 @@ throw ( RuntimeException )
// at some later point in the member variables
// m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedText
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "LangSelectionStatusbarController::statusChanged" );
SolarMutexGuard aSolarMutexGuard;
if ( m_bDisposed )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index bb38c5e..bec9d49 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -72,7 +72,6 @@
#include <osl/file.hxx>
#include <cppuhelper/implbase1.hxx>
#include <svtools/acceleratorexecute.hxx>
-#include <rtl/logfile.hxx>
#include "svtools/miscopt.hxx"
#include <uielement/menubarmerger.hxx>
@@ -182,7 +181,6 @@ MenuBarManager::MenuBarManager(
, m_xURLTransformer(_xURLTransformer)
, m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::MenuBarManager" );
m_xPopupMenuControllerFactory = frame::PopupMenuControllerFactory::create(m_xContext);
FillMenuManager( pMenu, rFrame, rDispatchProvider, rModuleIdentifier, bDelete, bDeleteChildren );
}
@@ -205,7 +203,6 @@ MenuBarManager::MenuBarManager(
, m_xURLTransformer(_xURLTransformer)
, m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::MenuBarManager" );
Init(rFrame,pAddonMenu,bDelete,bDeleteChildren);
}
@@ -227,7 +224,6 @@ MenuBarManager::MenuBarManager(
, m_xURLTransformer(_xURLTransformer)
, m_nSymbolsStyle( SvtMiscOptions().GetCurrentSymbolsStyle() )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::MenuBarManager" );
Init(rFrame,pAddonPopupMenu,bDelete,bDeleteChildren,true);
}
@@ -263,7 +259,6 @@ void SAL_CALL MenuBarManager::release() throw()
Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*ProcessId*/, sal_Int16 SystemType ) throw (RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::getMenuHandle" );
ResetableGuard aGuard( m_aLock );
if ( m_bDisposed )
@@ -309,7 +304,6 @@ MenuBarManager::~MenuBarManager()
void MenuBarManager::Destroy()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::Destroy" );
SolarMutexGuard aGuard;
if ( !m_bDisposed )
@@ -342,7 +336,6 @@ void MenuBarManager::Destroy()
// XComponent
void SAL_CALL MenuBarManager::dispose() throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::dispose" );
Reference< XComponent > xThis( static_cast< OWeakObject* >(this), UNO_QUERY );
EventObject aEvent( xThis );
@@ -393,7 +386,6 @@ void SAL_CALL MenuBarManager::dispose() throw( RuntimeException )
void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::addEventListener" );
ResetableGuard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -405,7 +397,6 @@ void SAL_CALL MenuBarManager::addEventListener( const Reference< XEventListener
void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::removeEventListener" );
ResetableGuard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
m_aListenerContainer.removeInterface( ::getCppuType( ( const Reference< XEventListener >* ) NULL ), xListener );
@@ -414,7 +405,6 @@ void SAL_CALL MenuBarManager::removeEventListener( const Reference< XEventListen
void SAL_CALL MenuBarManager::elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event )
throw (RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::elementInserted" );
ResetableGuard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -431,14 +421,12 @@ throw (RuntimeException)
void SAL_CALL MenuBarManager::elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event )
throw (RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::elementRemoved" );
elementInserted(Event);
}
void SAL_CALL MenuBarManager::elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event )
throw (RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::elementReplaced" );
elementInserted(Event);
}
@@ -446,7 +434,6 @@ throw (RuntimeException)
void SAL_CALL MenuBarManager::frameAction( const FrameActionEvent& Action )
throw ( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::frameAction" );
ResetableGuard aGuard( m_aLock );
if ( m_bDisposed )
@@ -468,7 +455,6 @@ throw ( RuntimeException )
void SAL_CALL MenuBarManager::statusChanged( const FeatureStateEvent& Event )
throw ( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::statusChanged" );
OUString aFeatureURL = Event.FeatureURL.Complete;
SolarMutexGuard aSolarGuard;
@@ -565,7 +551,6 @@ throw ( RuntimeException )
// Helper to retrieve own structure from item ID
MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( sal_uInt16 nItemId )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::GetMenuItemHandler" );
ResetableGuard aGuard( m_aLock );
std::vector< MenuItemHandler* >::iterator p;
@@ -582,7 +567,6 @@ MenuBarManager::MenuItemHandler* MenuBarManager::GetMenuItemHandler( sal_uInt16
// Helper to set request images flag
void MenuBarManager::RequestImages()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::RequestImages" );
m_bRetrieveImages = sal_True;
const sal_uInt32 nCount = m_aMenuItemHandlerVector.size();
@@ -600,7 +584,6 @@ void MenuBarManager::RequestImages()
// Helper to reset objects to prepare shutdown
void MenuBarManager::RemoveListener()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::RemoveListener" );
ResetableGuard aGuard( m_aLock );
// Check service manager reference. Remove listener can be called due
@@ -682,7 +665,6 @@ void MenuBarManager::RemoveListener()
void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::disposing(evt)" );
MenuItemHandler* pMenuItemDisposing = NULL;
ResetableGuard aGuard( m_aLock );
@@ -748,7 +730,6 @@ void SAL_CALL MenuBarManager::disposing( const EventObject& Source ) throw ( Run
void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::CheckAndAddMenuExtension" );
// retrieve menu extension item
MenuExtensionItem aMenuItem( GetMenuExtension() );
@@ -819,7 +800,6 @@ private:
IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::Activate" );
if ( pMenu == m_pVCLMenu )
{
com::sun::star::uno::ContextLayer layer(
@@ -1019,7 +999,6 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::Deactivate" );
if ( pMenu == m_pVCLMenu )
{
m_bActive = sal_False;
@@ -1055,7 +1034,6 @@ IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,)
IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::Select" );
URL aTargetURL;
Sequence<PropertyValue> aArgs;
Reference< XDispatch > xDispatch;
@@ -1133,7 +1111,6 @@ IMPL_LINK_NOARG(MenuBarManager, Highlight)
sal_Bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< XURLTransformer >& rTransformer )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::MustBeHidden" );
if ( pPopupMenu )
{
URL aTargetURL;
@@ -1183,7 +1160,6 @@ String MenuBarManager::RetrieveLabelFromCommand( const String& aCmdURL )
sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHandler )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::CreatePopupMenuController" );
OUString aItemCommand( pMenuItemHandler->aMenuItemURL );
// Try instanciate a popup menu controller. It is stored in the menu item handler.
@@ -1220,7 +1196,6 @@ sal_Bool MenuBarManager::CreatePopupMenuController( MenuItemHandler* pMenuItemHa
void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rFrame, const Reference< XDispatchProvider >& rDispatchProvider, const OUString& rModuleIdentifier, sal_Bool bDelete, sal_Bool bDeleteChildren )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::FillMenuManager" );
m_xFrame = rFrame;
m_bActive = sal_False;
m_bDeleteMenu = bDelete;
@@ -1492,7 +1467,6 @@ void MenuBarManager::impl_RetrieveShortcutsFromConfiguration(
const Sequence< OUString >& rCommands,
std::vector< MenuItemHandler* >& aMenuShortCuts )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::impl_RetrieveShortcutsFromConfiguration" );
if ( rAccelCfg.is() )
{
try
@@ -1513,7 +1487,6 @@ void MenuBarManager::impl_RetrieveShortcutsFromConfiguration(
void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuShortCuts )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::RetrieveShortcuts" );
if ( !m_bModuleIdentified )
{
m_bModuleIdentified = sal_True;
@@ -1610,7 +1583,6 @@ void MenuBarManager::RetrieveShortcuts( std::vector< MenuItemHandler* >& aMenuSh
void MenuBarManager::RetrieveImageManagers()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::RetrieveImageManagers" );
if ( !m_xDocImageManager.is() )
{
Reference< XController > xController = m_xFrame->getController();
@@ -1664,7 +1636,6 @@ void MenuBarManager::FillMenuWithConfiguration(
const Reference< XIndexAccess >& rItemContainer,
const Reference< XURLTransformer >& rTransformer )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::FillMenuWithConfiguration" );
Reference< XDispatchProvider > xEmptyDispatchProvider;
MenuBarManager::FillMenu( nId, pMenu, rModuleIdentifier, rItemContainer, xEmptyDispatchProvider );
@@ -1700,7 +1671,6 @@ void MenuBarManager::FillMenu(
const Reference< XIndexAccess >& rItemContainer,
const Reference< XDispatchProvider >& rDispatchProvider )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::FillMenu" );
// Fill menu bar with container contents
for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
{
@@ -1809,7 +1779,6 @@ void MenuBarManager::MergeAddonMenus(
const MergeMenuInstructionContainer& aMergeInstructionContainer,
const OUString& rModuleIdentifier )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::MergeAddonMenus" );
// set start value for the item ID for the new addon menu items
sal_uInt16 nItemId = ADDONMENU_MERGE_ITEMID_START;
@@ -1861,7 +1830,6 @@ void MenuBarManager::MergeAddonMenus(
void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemContainer )
{
- RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::MenuBarManager::SetItemContainer" );
ResetableGuard aGuard( m_aLock );
@@ -1922,7 +1890,6 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::GetPopupController" );
SolarMutexGuard aSolarMutexGuard;
@@ -1973,7 +1940,6 @@ const Reference< XComponentContext >& MenuBarManager::getComponentContext()
void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sItemCommand,sal_uInt16 _nItemId)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::AddMenu" );
Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
m_xFrame->addFrameActionListener( Reference< XFrameActionListener >( xSubMenuManager, UNO_QUERY ));
@@ -1990,7 +1956,6 @@ void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sI
sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu,sal_uInt16 _nIndex) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::FillItemCommand" );
sal_uInt16 nItemId = _pMenu->GetItemId( _nIndex );
_rItemCommand = _pMenu->GetItemCommand( nItemId );
@@ -2005,7 +1970,6 @@ sal_uInt16 MenuBarManager::FillItemCommand(OUString& _rItemCommand, Menu* _pMenu
}
void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMenu,sal_Bool bDelete,sal_Bool bDeleteChildren,bool _bHandlePopUp)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "MenuBarManager::Init" );
m_bActive = sal_False;
m_bDeleteMenu = bDelete;
m_bDeleteChildren = bDeleteChildren;
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index d2f3a1f..565be80 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -35,7 +35,6 @@
#include <comphelper/processfactory.hxx>
#include <tools/solar.h>
#include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -116,7 +115,6 @@ void SAL_CALL MenuBarWrapper::dispose() throw (::com::sun::star::uno::RuntimeExc
// XInitialization
void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException )
{
- RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::MenuBarWrapper::initialize" );
ResetableGuard aLock( m_aLock );
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx
index d7d140a..a014cfa 100644
--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -51,7 +51,6 @@
#include <vcl/status.hxx>
#include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
#include <functional>
@@ -147,7 +146,6 @@ StatusBarManager::StatusBarManager(
m_aListenerContainer( m_aLock.getShareableOslMutex() ),
m_xContext( rxContext )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::StatusBarManager" );
m_xStatusbarControllerFactory = frame::StatusbarControllerFactory::create(
::comphelper::getProcessComponentContext());
@@ -162,7 +160,6 @@ StatusBarManager::~StatusBarManager()
StatusBar* StatusBarManager::GetStatusBar() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::GetStatusBar" );
ResetableGuard aGuard( m_aLock );
return m_pStatusBar;
}
@@ -170,7 +167,6 @@ StatusBar* StatusBarManager::GetStatusBar() const
void StatusBarManager::frameAction( const frame::FrameActionEvent& Action )
throw ( uno::RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::frameAction" );
ResetableGuard aGuard( m_aLock );
if ( Action.Action == frame::FrameAction_CONTEXT_CHANGED )
UpdateControllers();
@@ -178,7 +174,6 @@ throw ( uno::RuntimeException )
void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) throw ( uno::RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::disposing" );
{
ResetableGuard aGuard( m_aLock );
if ( m_bDisposed )
@@ -199,7 +194,6 @@ void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) thr
// XComponent
void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::dispose" );
uno::Reference< lang::XComponent > xThis(
static_cast< OWeakObject* >(this), uno::UNO_QUERY );
@@ -247,7 +241,6 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException )
void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::addEventListener" );
ResetableGuard aGuard( m_aLock );
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -260,7 +253,6 @@ void SAL_CALL StatusBarManager::addEventListener( const uno::Reference< lang::XE
void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) throw( uno::RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::removeEventListener" );
m_aListenerContainer.removeInterface( ::getCppuType(
( const uno::Reference< lang::XEventListener >* ) NULL ), xListener );
}
@@ -268,7 +260,6 @@ void SAL_CALL StatusBarManager::removeEventListener( const uno::Reference< lang:
// XUIConfigurationListener
void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::elementInserted" );
ResetableGuard aGuard( m_aLock );
if ( m_bDisposed )
@@ -277,7 +268,6 @@ void SAL_CALL StatusBarManager::elementInserted( const css::ui::ConfigurationEve
void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::elementRemoved" );
ResetableGuard aGuard( m_aLock );
if ( m_bDisposed )
@@ -286,7 +276,6 @@ void SAL_CALL StatusBarManager::elementRemoved( const css::ui::ConfigurationEven
void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEvent& ) throw ( uno::RuntimeException )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::elementReplaced" );
ResetableGuard aGuard( m_aLock );
if ( m_bDisposed )
@@ -295,7 +284,6 @@ void SAL_CALL StatusBarManager::elementReplaced( const css::ui::ConfigurationEve
void StatusBarManager::UpdateControllers()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::UpdateControllers" );
if ( !m_bUpdateControllers )
{
m_bUpdateControllers = sal_True;
@@ -308,7 +296,6 @@ void StatusBarManager::UpdateControllers()
void StatusBarManager::RemoveControllers()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::RemoveControllers" );
ResetableGuard aGuard( m_aLock );
if ( m_bDisposed )
@@ -327,7 +314,6 @@ OUString StatusBarManager::RetrieveLabelFromCommand( const OUString& aCmdURL )
void StatusBarManager::CreateControllers()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::CreateControllers" );
uno::Reference< awt::XWindow > xStatusbarWindow = VCLUnoHelper::GetInterface( m_pStatusBar );
for ( sal_uInt16 i = 0; i < m_pStatusBar->GetItemCount(); i++ )
@@ -431,7 +417,6 @@ void StatusBarManager::CreateControllers()
void StatusBarManager::AddFrameActionListener()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::AddFrameActionListener" );
if ( !m_bFrameActionRegistered && m_xFrame.is() )
{
m_bFrameActionRegistered = sal_True;
@@ -442,7 +427,6 @@ void StatusBarManager::AddFrameActionListener()
void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAccess >& rItemContainer )
{
- RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::StatusBarManager::FillStatusbar" );
ResetableGuard aGuard( m_aLock );
@@ -459,7 +443,6 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
for ( sal_Int32 n = 0; n < rItemContainer->getCount(); n++ )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::FillStatusBar" );
uno::Sequence< beans::PropertyValue > aProp;
OUString aCommandURL;
OUString aHelpURL;
@@ -568,12 +551,10 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc
void StatusBarManager::StateChanged( StateChangedType )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::StateChanged" );
}
void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::DataChanged" );
ResetableGuard aGuard( m_aLock );
if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) ||
@@ -596,7 +577,6 @@ void StatusBarManager::DataChanged( const DataChangedEvent& rDCEvt )
void StatusBarManager::UserDraw( const UserDrawEvent& rUDEvt )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::UserDraw" );
ResetableGuard aGuard( m_aLock );
if ( m_bDisposed )
@@ -624,7 +604,6 @@ void StatusBarManager::UserDraw( const UserDrawEvent& rUDEvt )
void StatusBarManager::Command( const CommandEvent& rEvt )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::Command" );
ResetableGuard aGuard( m_aLock );
if ( m_bDisposed )
@@ -650,13 +629,11 @@ void StatusBarManager::Command( const CommandEvent& rEvt )
void StatusBarManager::MouseMove( const MouseEvent& rMEvt )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::MouseMove" );
MouseButton(rMEvt,&frame::XStatusbarController::mouseMove);
}
void StatusBarManager::MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL frame::XStatusbarController::*_pMethod )(const ::com::sun::star::awt::MouseEvent&))
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::MouseButton" );
ResetableGuard aGuard( m_aLock );
if ( !m_bDisposed )
@@ -681,13 +658,11 @@ void StatusBarManager::MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL
void StatusBarManager::MouseButtonDown( const MouseEvent& rMEvt )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::MouseButtonDown" );
MouseButton(rMEvt,&frame::XStatusbarController::mouseButtonDown);
}
void StatusBarManager::MouseButtonUp( const MouseEvent& rMEvt )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "StatusBarManager::MouseButtonUp" );
MouseButton(rMEvt,&frame::XStatusbarController::mouseButtonUp);
}
diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx
index 869841b..6e96a96 100644
--- a/framework/source/uielement/statusbarwrapper.cxx
+++ b/framework/source/uielement/statusbarwrapper.cxx
@@ -40,7 +40,6 @@
#include <tools/solar.h>
#include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index d8d6554..8741366 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -69,7 +69,6 @@
#include <vcl/syswin.hxx>
#include <vcl/taskpanelist.hxx>
#include <vcl/toolbox.hxx>
-#include <rtl/logfile.hxx>
#include <svtools/menuoptions.hxx>
#include <boost/bind.hpp>
#include <svtools/acceleratorexecute.hxx>
@@ -416,7 +415,6 @@ void ToolBarManager::UpdateImageOrientation()
void ToolBarManager::UpdateControllers()
{
- RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" );
if( SvtMiscOptions().DisableUICustomization() )
{
@@ -461,7 +459,6 @@ void ToolBarManager::UpdateControllers()
//for update toolbar controller via Support Visible
void ToolBarManager::UpdateController( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XToolbarController > xController)
{
- RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::UpdateControllers" );
if ( !m_bUpdateControllers )
{
@@ -854,7 +851,6 @@ sal_Int32 ToolBarManager::RetrievePropertiesFromCommand( const OUString& aCmdURL
void ToolBarManager::CreateControllers()
{
- RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::CreateControllers" );
Reference< XWindow > xToolbarWindow = VCLUnoHelper::GetInterface( m_pToolBar );
@@ -1151,9 +1147,7 @@ sal_uInt16 ToolBarManager::ConvertStyleToToolboxItemBits( sal_Int32 nStyle )
void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContainer )
{
OString aTbxName = OUStringToOString( m_aResourceName, RTL_TEXTENCODING_ASCII_US );
-
- RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::FillToolbar" );
- RTL_LOGFILE_CONTEXT_TRACE1( aLog, "framework (cd100003) ::ToolBarManager::FillToolbar %s", aTbxName.getStr() );
+ SAL_INFO( "fwk.uielement", "framework (cd100003) ::ToolBarManager::FillToolbar " << aTbxName.getStr() );
ResetableGuard aGuard( m_aLock );
@@ -1456,7 +1450,6 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine
void ToolBarManager::RequestImages()
{
- RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ToolBarManager::RequestImages" );
// Request images from image manager
Sequence< OUString > aCmdURLSeq( m_aCommandMap.size() );
@@ -2153,7 +2146,6 @@ bool ToolBarManager::impl_RetrieveShortcutsFromConfiguration(
const OUString& rCommand,
OUString& rShortCut )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ToolBarManager::impl_RetrieveShortcutsFromConfiguration" );
if ( rAccelCfg.is() )
{
try
@@ -2182,7 +2174,6 @@ bool ToolBarManager::impl_RetrieveShortcutsFromConfiguration(
bool ToolBarManager::RetrieveShortcut( const OUString& rCommandURL, OUString& rShortCut )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "ToolBarManager::RetrieveShortcuts" );
if ( m_bModuleIdentified )
{
Reference< XAcceleratorConfiguration > xDocAccelCfg( m_xDocAcceleratorManager );
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index 56bf0f1..aa2a270 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -53,7 +53,6 @@
#include <vcl/window.hxx>
#include <svtools/menuoptions.hxx>
#include <unotools/cmdoptions.hxx>
-#include <rtl/logfile.hxx>
#include <svtools/miscopt.hxx>
//_________________________________________________________________________________________________________________
diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx
index 3eba7d9..29263c7 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -40,7 +40,6 @@
#include <svtools/miscopt.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
-#include <rtl/logfile.hxx>
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index c44b3c5..9280afe 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -41,7 +41,6 @@
#include <vcl/mnemonic.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/string.hxx>
-#include <rtl/logfile.hxx>
//_________________________________________________________________________________________________________________
// Defines
@@ -377,7 +376,6 @@ void ConfigurationAccess_UICommand::impl_fill(const Reference< XNameAccess >& _x
}
sal_Bool ConfigurationAccess_UICommand::fillCache()
{
- RTL_LOGFILE_CONTEXT( aLog, "framework (cd100003) ::ConfigurationAccess_UICommand::fillCache" );
if ( m_bCacheFilled )
return sal_True;
@@ -626,7 +624,6 @@ UICommandDescription::UICommandDescription( const Reference< XComponentContext >
m_aPrivateResourceURL( PRIVATE_RESOURCE_URL ),
m_xContext( rxContext )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "UICommandDescription::UICommandDescription" );
Reference< XNameAccess > xEmpty;
OUString aGenericUICommand( "GenericCommands" );
m_xGenericUICommands = new ConfigurationAccess_UICommand( aGenericUICommand, xEmpty, m_xContext );
@@ -690,7 +687,6 @@ Reference< XNameAccess > UICommandDescription::impl_createConfigAccess(const OUS
Any SAL_CALL UICommandDescription::getByName( const OUString& aName )
throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "UICommandDescription::getByName" );
Any a;
ResetableGuard aLock( m_aLock );
@@ -732,7 +728,6 @@ throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::la
Sequence< OUString > SAL_CALL UICommandDescription::getElementNames()
throw (::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "UICommandDescription::getElementNames" );
ResetableGuard aLock( m_aLock );
Sequence< OUString > aSeq( m_aModuleToCommandFileMap.size() );
@@ -751,7 +746,6 @@ throw (::com::sun::star::uno::RuntimeException)
sal_Bool SAL_CALL UICommandDescription::hasByName( const OUString& aName )
throw (::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "UICommandDescription::hasByName" );
ResetableGuard aLock( m_aLock );
ModuleToCommandFileMap::const_iterator pIter = m_aModuleToCommandFileMap.find( aName );
@@ -762,14 +756,12 @@ throw (::com::sun::star::uno::RuntimeException)
Type SAL_CALL UICommandDescription::getElementType()
throw (::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "UICommandDescription::getElementType" );
return( ::getCppuType( (const Reference< XNameAccess >*)NULL ) );
}
sal_Bool SAL_CALL UICommandDescription::hasElements()
throw (::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen at sun.com", "UICommandDescription::hasElements" );
// generic UI commands are always available!
return sal_True;
}
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index 73fa872..4dddf51 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 ca7db53..be4ec89 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 fbc1b54..729e1b7 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 at 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 at 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 cf3237a..a550a8e 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at sun.com", "UIElementFactoryManager::deregisterFactory" );
// SAFE
ResetableGuard aLock( m_aLock );
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index a78abda..6622069 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -153,6 +153,8 @@ certain functionality.
@li @c fwk.desktop
@li @c fwk.dispatch
@li @c fwk.session
+ at li @c fwk.accelerators
+ at li @c fwk.uielement
@section i18nlangtag
More information about the Libreoffice-commits
mailing list