desktop/source/app/app.cxx | 35 ---------------------------------- desktop/source/app/appinit.cxx | 10 --------- desktop/source/app/check_ext_deps.cxx | 1 desktop/source/app/sofficemain.cxx | 2 - sfx2/source/appl/appopen.cxx | 1 sfx2/source/doc/objcont.cxx | 6 +---- vcl/source/app/svapp.cxx | 1 7 files changed, 3 insertions(+), 53 deletions(-)
New commits: commit 7fe192da23f4fac73b6ef7393bd8499a373170f3 Author: Tor Lillqvist <t...@collabora.com> Date: Sat Mar 28 15:50:41 2015 +0200 Bin a few SAL_INFOs that basically just say "we are here" Such are fairly pointless to keep permanently in the code. Use a temporary SAL_DEBUG if you need tracing output when you reach a certain lines while hacking. Change-Id: I13a898486731c6d2995e92e2c5dcd0d1429e47cc diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index cd9809d..bb352e2 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -523,7 +523,6 @@ Desktop::Desktop() , m_aBootstrapError(BE_OK) , m_aBootstrapStatus(BS_OK) { - SAL_INFO( "desktop.app", "desktop (cd100003) ::Desktop::Desktop" ); } Desktop::~Desktop() @@ -535,7 +534,6 @@ Desktop::~Desktop() void Desktop::Init() { - SAL_INFO( "desktop.app", "desktop (cd100003) ::Desktop::Init" ); SetBootstrapStatus(BS_OK); #if HAVE_FEATURE_EXTENSIONS @@ -576,7 +574,6 @@ void Desktop::Init() const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs(); // start ipc thread only for non-remote offices - SAL_INFO( "desktop.app", "desktop (cd100003) ::OfficeIPCThread::EnableOfficeIPCThread" ); OfficeIPCThread::Status aStatus = OfficeIPCThread::EnableOfficeIPCThread(); if ( aStatus == OfficeIPCThread::IPC_STATUS_PIPE_ERROR ) { @@ -621,21 +618,15 @@ void Desktop::Init() void Desktop::InitFinished() { - SAL_INFO( "desktop.app", "desktop (cd100003) ::Desktop::InitFinished" ); - CloseSplashScreen(); } void Desktop::DeInit() { - SAL_INFO( "desktop.app", "desktop (cd100003) ::Desktop::DeInit" ); - try { // instead of removing of the configManager just let it commit all the changes - SAL_INFO( "desktop.app", "<- store config items" ); utl::ConfigManager::storeConfigItems(); FlushConfiguration(); - SAL_INFO( "desktop.app", "<- store config items" ); // close splashscreen if it's still open CloseSplashScreen(); @@ -655,17 +646,13 @@ void Desktop::DeInit() // someone threw an exception during shutdown // this will leave some garbage behind.. } - - SAL_INFO( "desktop.app", "FINISHED WITH Desktop::DeInit" ); } bool Desktop::QueryExit() { try { - SAL_INFO( "desktop.app", "<- store config items" ); utl::ConfigManager::storeConfigItems(); - SAL_INFO( "desktop.app", "<- store config items" ); } catch ( const RuntimeException& ) { @@ -1294,8 +1281,6 @@ int Desktop::Main() { pExecGlobals = new ExecuteGlobals(); - SAL_INFO( "desktop.app", "desktop (cd100003) ::Desktop::Main" ); - // Remember current context object com::sun::star::uno::ContextLayer layer( com::sun::star::uno::getCurrentContext() ); @@ -1423,10 +1408,8 @@ int Desktop::Main() SetDisplayName( aTitle ); SetSplashScreenProgress(35); - SAL_INFO( "desktop.app", "{ create SvtPathOptions and SvtLanguageOptions" ); pExecGlobals->pPathOptions.reset( new SvtPathOptions); SetSplashScreenProgress(40); - SAL_INFO( "desktop.app", "} create SvtPathOptions and SvtLanguageOptions" ); xDesktop = css::frame::Desktop::create( xContext ); @@ -1470,9 +1453,7 @@ int Desktop::Main() bool bExistsRecoveryData = false; bool bExistsSessionData = false; - SAL_INFO( "desktop.app", "{ impl_checkRecoveryState" ); impl_checkRecoveryState(bCrashed, bExistsRecoveryData, bExistsSessionData); - SAL_INFO( "desktop.app", "} impl_checkRecoveryState" ); OUString pidfileName = rCmdLineArgs.GetPidfileName(); if ( !pidfileName.isEmpty() ) @@ -1526,9 +1507,7 @@ int Desktop::Main() (!bExistsSessionData ) && (!Application::AnyInput( VclInputFlags::APPEVENT ) )) { - SAL_INFO( "desktop.app", "{ create BackingComponent" ); ShowBackingComponent(this); - SAL_INFO( "desktop.app", "} create BackingComponent" ); } } } @@ -1575,7 +1554,6 @@ int Desktop::Main() !rCmdLineArgs.IsNoQuickstart() ) InitializeQuickstartMode( xContext ); - SAL_INFO( "desktop.app", "desktop (cd100003) createInstance com.sun.star.frame.Desktop" ); try { if ( xDesktop.is() ) @@ -1606,8 +1584,6 @@ int Desktop::Main() } // call Application::Execute to process messages in vcl message loop - SAL_INFO( "desktop.app", "PERFORMANCE - enter Application::Execute()" ); - try { #if HAVE_FEATURE_JAVA @@ -1720,15 +1696,12 @@ int Desktop::doShutdown() } // be sure that path/language options gets destroyed before // UCB is deinitialized - SAL_INFO( "desktop.app", "-> dispose path/language options" ); pExecGlobals->pLanguageOptions.reset( 0 ); pExecGlobals->pPathOptions.reset( 0 ); - SAL_INFO( "desktop.app", "<- dispose path/language options" ); bool bRR = pExecGlobals->bRestartRequested; delete pExecGlobals, pExecGlobals = NULL; - SAL_INFO( "desktop.app", "FINISHED WITH Desktop::Main" ); if ( bRR ) { restartOnMac(true); @@ -1747,7 +1720,6 @@ IMPL_LINK( Desktop, ImplInitFilterHdl, ConvertData*, pData ) bool Desktop::InitializeConfiguration() { - SAL_INFO( "desktop.app", "desktop (jb99855) ::InitConfiguration" ); try { css::configuration::theDefaultProvider::get( @@ -1827,7 +1799,6 @@ bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext >& rx // the shutdown icon sits in the systray and allows the user to keep // the office instance running for quicker restart // this will only be activated if --quickstart was specified on cmdline - SAL_INFO( "desktop.app", "desktop (cd100003) createInstance com.sun.star.office.Quickstart" ); bool bQuickstart = shouldLaunchQuickstart(); @@ -1916,8 +1887,6 @@ class ExitTimer : public Timer IMPL_LINK_NOARG(Desktop, OpenClients_Impl) { - SAL_INFO( "desktop.app", "PERFORMANCE - DesktopOpenClients_Impl()" ); - try { OpenClients(); @@ -1948,7 +1917,6 @@ IMPL_LINK_NOARG(Desktop, EnableAcceptors_Impl) // Registers a COM class factory of the service manager with the windows operating system. void Desktop::EnableOleAutomation() { - SAL_INFO( "desktop.app", "desktop (jl97489) ::Desktop::EnableOleAutomation" ); #ifdef WNT Reference< XMultiServiceFactory > xSMgr= comphelper::getProcessServiceFactory(); xSMgr->createInstance("com.sun.star.bridge.OleApplicationRegistration"); @@ -2421,9 +2389,6 @@ void Desktop::OpenClients() void Desktop::OpenDefault() { - - SAL_INFO( "desktop.app", "desktop (cd100003) ::Desktop::OpenDefault" ); - OUString aName; SvtModuleOptions aOpt; diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index cbfd1a3..c0f5a2b 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -69,8 +69,6 @@ namespace desktop static void configureUcb() { - SAL_INFO( "desktop.app", "desktop (sb93797) ::configureUcb" ); - // For backwards compatibility, in case some code still uses plain // createInstance w/o args directly to obtain an instance: UniversalContentBroker::create(comphelper::getProcessComponentContext()); @@ -105,7 +103,6 @@ static void configureUcb() void Desktop::InitApplicationServiceManager() { - SAL_INFO( "desktop.app", "desktop (cd100003) ::createApplicationServiceManager" ); Reference<XMultiServiceFactory> sm; #ifdef ANDROID OUString aUnoRc( "file:///assets/program/unorc" ); @@ -124,8 +121,6 @@ void Desktop::RegisterServices(Reference< XComponentContext > const & context) { if( !m_bServicesRegistered ) { - SAL_INFO( "desktop.app", "desktop (cd100003) ::registerServices" ); - // interpret command line arguments CommandLineArgs& rCmdLine = GetCommandLineArgs(); @@ -218,7 +213,6 @@ class enable void Desktop::enableAcceptors() { - SAL_INFO( "desktop.app", "enableAcceptors"); if (!bAccept) { // from now on, all new acceptors are enabled @@ -259,8 +253,6 @@ void Desktop::DeregisterServices() void Desktop::CreateTemporaryDirectory() { - SAL_INFO( "desktop.app", "desktop (cd100003) ::createTemporaryDirectory" ); - OUString aTempBaseURL; try { @@ -312,8 +304,6 @@ void Desktop::CreateTemporaryDirectory() void Desktop::RemoveTemporaryDirectory() { - SAL_INFO( "desktop.app", "desktop (cd100003) ::removeTemporaryDirectory" ); - // remove current temporary directory OUString &rCurrentTempURL = CurrentTempURL::get(); if ( !rCurrentTempURL.isEmpty() ) diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 2ddbf04..04896a4 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -413,7 +413,6 @@ bool Desktop::CheckExtensionDependencies() void Desktop::SynchronizeExtensionRepositories() { - SAL_INFO( "desktop.app", "desktop (jl) ::Desktop::SynchronizeExtensionRepositories"); uno::Reference< uno::XComponentContext > context( comphelper::getProcessComponentContext()); uno::Reference< ucb::XCommandEnvironment > silent( diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 4f7dec9..dea30fd 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -65,8 +65,6 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main() #endif tools::extendApplicationEnvironment(); - SAL_INFO("desktop.app", "PERFORMANCE - enter Main()" ); - desktop::Desktop aDesktop; // This string is used during initialization of the Gtk+ VCL module Application::SetAppName( OUString("soffice") ); diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 92d7c32..f17495a 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -1083,7 +1083,6 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) Reference < XDispatchProvider > xProv( xTargetFrame, UNO_QUERY ); Reference < XDispatch > xDisp = xProv.is() ? xProv->queryDispatch( aURL, aTarget, FrameSearchFlag::ALL ) : Reference < XDispatch >();; - SAL_INFO( "sfx.appl", "PERFORMANCE - SfxApplication::OpenDocExec_Impl" ); if ( xDisp.is() ) xDisp->dispatch( aURL, aArgs ); } diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 2bd83c3..3f54b39 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -164,10 +164,8 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( bool bFullContent ) const aDevice.SetDigitLanguage( eLang ); - { - SAL_INFO( "sfx.doc", "PERFORMANCE SfxObjectShell::CreatePreviewMetaFile_Impl" ); - const_cast<SfxObjectShell*>(this)->DoDraw( &aDevice, Point(0,0), aTmpSize, JobSetup(), nAspect ); - } + const_cast<SfxObjectShell*>(this)->DoDraw( &aDevice, Point(0,0), aTmpSize, JobSetup(), nAspect ); + xFile->Stop(); return xFile; commit f42272cab615f2a8cbda65b988e105e68532f43e Author: Tor Lillqvist <t...@collabora.com> Date: Sat Mar 28 15:40:56 2015 +0200 Make console-only mode a proper subset of headless mode Let's not make the mode space too complex. Do we really want to have to ponder what it means to be console-only but not headless? Make it so that turning on console-only mode also turns on headless mode (with dialogsAreFatal turned on, too). Change-Id: I630cb1bc605c1fb1787ace58180125509ef8789b diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 7da6b63..1c4eba9 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1512,6 +1512,7 @@ bool Application::IsConsoleOnly() void Application::EnableConsoleOnly() { + EnableHeadlessMode(true); bConsoleOnly = true; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits