[Libreoffice-commits] core.git: desktop/source filter/source framework/source
Tor Lillqvist
tml at collabora.com
Tue Feb 3 03:29:36 PST 2015
desktop/source/app/app.cxx | 6 ------
desktop/source/app/appinit.cxx | 2 +-
desktop/source/splash/splash.cxx | 3 +--
filter/source/config/cache/filtercache.cxx | 18 +++++++++---------
framework/source/jobs/jobexecutor.cxx | 2 +-
framework/source/services/desktop.cxx | 3 +--
6 files changed, 13 insertions(+), 21 deletions(-)
New commits:
commit b5008653ec887447fe2a0e6b725710550a606ce7
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Feb 3 12:19:26 2015 +0100
Clean up some weird logging
Change-Id: I8da0a89b7d6e044af8188a87220c654cb7bf9d4d
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2118fcc..562b1f2 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1346,9 +1346,7 @@ int Desktop::Main()
ResMgr::SetReadStringHook( ReplaceStringHookProc );
// Startup screen
- SAL_INFO( "desktop.app", "desktop (lo119109) Desktop::Main { OpenSplashScreen" );
OpenSplashScreen();
- SAL_INFO( "desktop.app", "desktop (lo119109) Desktop::Main } OpenSplashScreen" );
SetSplashScreenProgress(10);
@@ -1383,7 +1381,6 @@ int Desktop::Main()
#if HAVE_FEATURE_DESKTOP
// check user installation directory for lockfile so we can be sure
// there is no other instance using our data files from a remote host
- SAL_INFO( "desktop.app", "desktop (lo119109) Desktop::Main -> Lockfile" );
m_xLockfile.reset(new Lockfile);
if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() &&
@@ -1392,16 +1389,13 @@ int Desktop::Main()
// Lockfile exists, and user clicked 'no'
return EXIT_FAILURE;
}
- SAL_INFO( "desktop.app", "desktop (lo119109) Desktop::Main <- Lockfile" );
// check if accessibility is enabled but not working and allow to quit
- SAL_INFO( "desktop.app", "{ GetEnableATToolSupport" );
if( Application::GetSettings().GetMiscSettings().GetEnableATToolSupport() )
{
if( !InitAccessBridge() )
return EXIT_FAILURE;
}
- SAL_INFO( "desktop.app", "} GetEnableATToolSupport" );
#endif
// terminate if requested...
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 797ea9c..cbfd1a3 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -218,7 +218,7 @@ class enable
void Desktop::enableAcceptors()
{
- SAL_INFO( "desktop.app", "desktop (lo119109) Desktop::enableAcceptors");
+ SAL_INFO( "desktop.app", "enableAcceptors");
if (!bAccept)
{
// from now on, all new acceptors are enabled
diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx
index f3163a2..2649c24 100644
--- a/desktop/source/splash/splash.cxx
+++ b/desktop/source/splash/splash.cxx
@@ -222,8 +222,7 @@ void SAL_CALL SplashScreen::setText(const OUString& rText)
void SAL_CALL SplashScreen::setValue(sal_Int32 nValue)
throw (RuntimeException, std::exception)
{
- SAL_INFO( "desktop.splash", "::SplashScreen::setValue (lo119109)" );
- SAL_INFO( "desktop.splash", "value=" << nValue );
+ SAL_INFO( "desktop.splash", "setValue: " << nValue );
SolarMutexGuard aSolarGuard;
if (_bVisible && !_bProgressEnd) {
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 83537b7..c6da21f 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -813,7 +813,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
return m_xConfigTypes;
sPath = CFGPACKAGE_TD_TYPES;
pConfig = &m_xConfigTypes;
- sRtlLog = "framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_TYPES)";
+ sRtlLog = "impl_openconfig(E_PROVIDER_TYPES)";
}
break;
@@ -823,7 +823,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
return m_xConfigFilters;
sPath = CFGPACKAGE_TD_FILTERS;
pConfig = &m_xConfigFilters;
- sRtlLog = "framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_FILTERS)";
+ sRtlLog = "impl_openconfig(E_PROVIDER_FILTERS)";
}
break;
@@ -833,7 +833,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
return m_xConfigOthers;
sPath = CFGPACKAGE_TD_OTHERS;
pConfig = &m_xConfigOthers;
- sRtlLog = "framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_OTHERS)";
+ sRtlLog = "impl_openconfig(E_PROVIDER_OTHERS)";
}
break;
@@ -843,7 +843,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
// the old configuration format only. Its not cached!
sPath = CFGPACKAGE_TD_OLD;
pConfig = &xOld;
- sRtlLog = "framework (as96863) ::FilterCache::impl_openconfig(E_PROVIDER_OLD)";
+ sRtlLog = "impl_openconfig(E_PROVIDER_OLD)";
}
break;
@@ -1337,7 +1337,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
// to our calli ...
css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW);
{
- SAL_INFO( "filter.config", "framework (as96863) ::FilterCache::load std");
+ SAL_INFO( "filter.config", "FilterCache::load std");
impl_loadSet(xTypes, E_TYPE, E_READ_STANDARD, &m_lTypes);
}
}
@@ -1354,7 +1354,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
// to our calli ...
css::uno::Reference< css::container::XNameAccess > xTypes(impl_openConfig(E_PROVIDER_TYPES), css::uno::UNO_QUERY_THROW);
{
- SAL_INFO( "filter.config", "framework (as96863) ::FilterCache::load all types");
+ SAL_INFO( "filter.config", "FilterCache::load all types");
impl_loadSet(xTypes, E_TYPE, E_READ_UPDATE, &m_lTypes);
}
}
@@ -1371,7 +1371,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
// to our calli ...
css::uno::Reference< css::container::XNameAccess > xFilters(impl_openConfig(E_PROVIDER_FILTERS), css::uno::UNO_QUERY_THROW);
{
- SAL_INFO( "filter.config", "framework (as96863) ::FilterCache::load all filters");
+ SAL_INFO( "filter.config", "FilterCache::load all filters");
impl_loadSet(xFilters, E_FILTER, E_READ_ALL, &m_lFilters);
}
}
@@ -1388,7 +1388,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
// to our calli ...
css::uno::Reference< css::container::XNameAccess > xLoaders(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW);
{
- SAL_INFO( "filter.config", "framework (as96863) ::FilterCache::load all frame loader");
+ SAL_INFO( "filter.config", "FilterCache::load all frame loader");
impl_loadSet(xLoaders, E_FRAMELOADER, E_READ_ALL, &m_lFrameLoaders);
}
}
@@ -1405,7 +1405,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
// to our calli ...
css::uno::Reference< css::container::XNameAccess > xHandlers(impl_openConfig(E_PROVIDER_OTHERS), css::uno::UNO_QUERY_THROW);
{
- SAL_INFO( "filter.config", "framework (as96863) ::FilterCache::load all content handler");
+ SAL_INFO( "filter.config", "FilterCache::load all content handler");
impl_loadSet(xHandlers, E_CONTENTHANDLER, E_READ_ALL, &m_lContentHandlers);
}
}
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index 1a19b98..5ce6b99 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -200,7 +200,7 @@ void JobExecutor::disposing() {
*/
void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::RuntimeException, std::exception)
{
- SAL_INFO( "fwk", "fwk (as96863) JobExecutor::trigger()");
+ SAL_INFO( "fwk", "JobExecutor::trigger()");
css::uno::Sequence< OUString > lJobs;
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 379551b..502f7d9 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -559,11 +559,10 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom
/* UNSAFE AREA --------------------------------------------------------------------------------------------- */
// Register transaction and reject wrong calls.
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
- SAL_INFO( "fwk.desktop", "framework (as96863) ::Desktop::loadComponentFromURL" );
+ SAL_INFO( "fwk.desktop", "loadComponentFromURL" );
css::uno::Reference< css::frame::XComponentLoader > xThis(static_cast< css::frame::XComponentLoader* >(this), css::uno::UNO_QUERY);
- SAL_INFO( "fwk.desktop", "PERFORMANCE - Desktop::loadComponentFromURL()" );
return LoadEnv::loadComponentFromURL(xThis, m_xContext, sURL, sTargetFrameName, nSearchFlags, lArguments);
}
More information about the Libreoffice-commits
mailing list