diff options
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/app/app.cxx | 6 | ||||
-rw-r--r-- | desktop/source/app/appinit.cxx | 4 | ||||
-rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 5 | ||||
-rw-r--r-- | desktop/source/app/cmdlineargs.hxx | 4 |
4 files changed, 5 insertions, 14 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 5d76976569b3..72674493a0fb 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -589,7 +589,7 @@ bool Desktop::QueryExit() { xPropertySet->setPropertyValue( SUSPEND_QUICKSTARTVETO, Any(false) ); } - else if (!Application::IsEventTestingModeEnabled()) + else { FlushConfiguration(); try @@ -1511,7 +1511,7 @@ int Desktop::Main() } } - if ( rCmdLineArgs.IsHeadless() || rCmdLineArgs.IsEventTesting() ) + if ( rCmdLineArgs.IsHeadless() ) { // Ensure that we use not the system file dialogs as // headless mode relies on Application::EnableHeadlessMode() @@ -1637,7 +1637,7 @@ int Desktop::doShutdown() // Restore old value const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs(); - if ( rCmdLineArgs.IsHeadless() || rCmdLineArgs.IsEventTesting() ) + if ( rCmdLineArgs.IsHeadless() ) { std::shared_ptr< comphelper::ConfigurationChanges > xChanges( comphelper::ConfigurationChanges::create()); diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 1c837b833d16..8596f80aaafc 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -93,9 +93,7 @@ void Desktop::RegisterServices() CommandLineArgs& rCmdLine = GetCommandLineArgs(); // Headless mode for FAT Office, auto cancels any dialogs that popup - if (rCmdLine.IsEventTesting()) - Application::EnableEventTestingMode(); - else if (rCmdLine.IsHeadless()) + if (rCmdLine.IsHeadless()) Application::EnableHeadlessMode(false); // read accept string from configuration diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index f1949cbd0bbf..432bff1f4efc 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -326,10 +326,6 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) { setHeadless(); } - else if ( oArg == "eventtesting" ) - { - m_eventtesting = true; - } else if ( oArg == "safe-mode" ) { m_safemode = true; @@ -707,7 +703,6 @@ void CommandLineArgs::InitParamValues() m_invisible = true; m_headless = true; #endif - m_eventtesting = false; m_quickstart = false; m_noquickstart = false; m_terminateafterinit = false; diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index 74236f5b314f..64a1bcfd0ccb 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -60,12 +60,11 @@ class CommandLineArgs bool IsMinimized() const { return m_minimized;} bool IsInvisible() const { - return m_invisible || (m_headless && !m_eventtesting); + return m_invisible || m_headless; } bool IsNoRestore() const { return m_norestore;} bool IsNoDefault() const { return m_nodefault;} bool IsHeadless() const { return m_headless;} - bool IsEventTesting() const { return m_eventtesting;} bool IsQuickstart() const { return m_quickstart;} bool IsNoQuickstart() const { return m_noquickstart;} bool IsTerminateAfterInit() const { return m_terminateafterinit;} @@ -131,7 +130,6 @@ class CommandLineArgs bool m_invisible; bool m_norestore; bool m_headless; - bool m_eventtesting; bool m_quickstart; bool m_noquickstart; bool m_terminateafterinit; |