Kaydet (Commit) c65aa43e authored tarafından Caolán McNamara's avatar Caolán McNamara

afl-eventtesting: it has learned to open the file dialog

but the system dialogs are not under our control

Change-Id: Icb4029b2447e8cddbe4e48137fdefc377ef50414
üst 7ba7a974
...@@ -1474,7 +1474,7 @@ int Desktop::Main() ...@@ -1474,7 +1474,7 @@ int Desktop::Main()
} }
} }
if ( rCmdLineArgs.IsHeadless() ) if ( rCmdLineArgs.IsHeadless() || rCmdLineArgs.IsEventTesting() )
{ {
// Ensure that we use not the system file dialogs as // Ensure that we use not the system file dialogs as
// headless mode relies on Application::EnableHeadlessMode() // headless mode relies on Application::EnableHeadlessMode()
...@@ -1645,7 +1645,7 @@ int Desktop::doShutdown() ...@@ -1645,7 +1645,7 @@ int Desktop::doShutdown()
delete pResMgr, pResMgr = NULL; delete pResMgr, pResMgr = NULL;
// Restore old value // Restore old value
const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs(); const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs();
if ( rCmdLineArgs.IsHeadless() ) if ( rCmdLineArgs.IsHeadless() || rCmdLineArgs.IsEventTesting() )
SvtMiscOptions().SetUseSystemFileDialog( pExecGlobals->bUseSystemFileDialog ); SvtMiscOptions().SetUseSystemFileDialog( pExecGlobals->bUseSystemFileDialog );
OUString pidfileName = rCmdLineArgs.GetPidfileName(); OUString pidfileName = rCmdLineArgs.GetPidfileName();
......
...@@ -185,6 +185,10 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) ...@@ -185,6 +185,10 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
{ {
setHeadless(); setHeadless();
} }
else if ( oArg == "eventtesting" )
{
m_eventtesting = true;
}
else if ( oArg == "cat" ) else if ( oArg == "cat" )
{ {
m_textcat = true; m_textcat = true;
...@@ -494,7 +498,6 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) ...@@ -494,7 +498,6 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
// vcl/unx/generic/app/sm.cxx: // vcl/unx/generic/app/sm.cxx:
oArg != "session=" && oArg != "session=" &&
#endif #endif
oArg != "eventtesting" &&
//ignore additional legacy options that don't do anything anymore //ignore additional legacy options that don't do anything anymore
oArg != "nocrashreport" && oArg != "nocrashreport" &&
m_unknown.isEmpty()) m_unknown.isEmpty())
...@@ -599,6 +602,7 @@ void CommandLineArgs::InitParamValues() ...@@ -599,6 +602,7 @@ void CommandLineArgs::InitParamValues()
m_invisible = false; m_invisible = false;
m_headless = false; m_headless = false;
#endif #endif
m_eventtesting = false;
m_quickstart = false; m_quickstart = false;
m_noquickstart = false; m_noquickstart = false;
m_terminateafterinit = false; m_terminateafterinit = false;
......
...@@ -61,6 +61,7 @@ class CommandLineArgs: private boost::noncopyable ...@@ -61,6 +61,7 @@ class CommandLineArgs: private boost::noncopyable
bool IsNoRestore() const { return m_norestore;} bool IsNoRestore() const { return m_norestore;}
bool IsNoDefault() const { return m_nodefault;} bool IsNoDefault() const { return m_nodefault;}
bool IsHeadless() const { return m_headless;} bool IsHeadless() const { return m_headless;}
bool IsEventTesting() const { return m_eventtesting;}
bool IsQuickstart() const { return m_quickstart;} bool IsQuickstart() const { return m_quickstart;}
bool IsNoQuickstart() const { return m_noquickstart;} bool IsNoQuickstart() const { return m_noquickstart;}
bool IsTerminateAfterInit() const { return m_terminateafterinit;} bool IsTerminateAfterInit() const { return m_terminateafterinit;}
...@@ -123,6 +124,7 @@ class CommandLineArgs: private boost::noncopyable ...@@ -123,6 +124,7 @@ class CommandLineArgs: private boost::noncopyable
bool m_invisible; bool m_invisible;
bool m_norestore; bool m_norestore;
bool m_headless; bool m_headless;
bool m_eventtesting;
bool m_quickstart; bool m_quickstart;
bool m_noquickstart; bool m_noquickstart;
bool m_terminateafterinit; bool m_terminateafterinit;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment