diff options
| -rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 14 | ||||
| -rw-r--r-- | desktop/source/app/cmdlinehelp.cxx | 3 | ||||
| -rw-r--r-- | desktop/unx/source/args.c | 13 | ||||
| -rw-r--r-- | uitest/libreoffice/connection.py | 2 |
4 files changed, 2 insertions, 30 deletions
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 46395ae87133..381147cd534e 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -42,11 +42,6 @@ #include <osl/file.hxx> #include <sal/log.hxx> -#ifdef LINUX -#include <sys/prctl.h> -#include <signal.h> -#endif - using namespace com::sun::star::lang; using namespace com::sun::star::uri; using namespace com::sun::star::uno; @@ -367,15 +362,6 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) { // Do nothing, accept only for backward compatibility } - else if ( oArg == "dont-survive-parent" ) - { -// only supported on linux for now -#ifdef LINUX - prctl(PR_SET_PDEATHSIG, SIGKILL); -#else - fprintf(stderr, "Warning: dont-survive-parent is not supported on this platform (yet).\n"); -#endif - } else if ( oArg == "nologo" ) { m_nologo = true; diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index b6afe63fe57a..bdb04bb9d4d8 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -112,8 +112,7 @@ namespace desktop "Developer arguments: \n" " --terminate_after_init \n" " Exit after initialization complete (no documents loaded)\n" - " --eventtesting Exit after loading documents. \n" - " --dont-survive-parent Exit when the parent exits (linux only) \n\n" + " --eventtesting Exit after loading documents. \n\n" "New document creation arguments: \n" "The arguments create an empty document of specified kind. Only one of them may \n" "be used in one command line. If filenames are specified after an argument, \n" diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c index 81a8dbca4bb5..199b58a8e50e 100644 --- a/desktop/unx/source/args.c +++ b/desktop/unx/source/args.c @@ -9,10 +9,6 @@ #include <stdlib.h> #include <string.h> #include <osl/process.h> -#ifdef LINUX -#include <sys/prctl.h> -#include <signal.h> -#endif #include "args.h" @@ -125,15 +121,6 @@ Args *args_parse (void) args->pPageinType = pArgDescr[j].pPageinType; break; } - if (rtl_ustr_ascii_compare_WithLength( - arg, length, "dont-survive-parent") - == 0) - { -#ifdef LINUX - prctl(PR_SET_PDEATHSIG, SIGKILL); -#endif - break; - } } } diff --git a/uitest/libreoffice/connection.py b/uitest/libreoffice/connection.py index 12917555a2fe..cb3ae1a0128e 100644 --- a/uitest/libreoffice/connection.py +++ b/uitest/libreoffice/connection.py @@ -66,7 +66,7 @@ class OfficeConnection: argv = [soffice, "--accept=" + socket + ";urp", "-env:UserInstallation=" + userdir, "--quickstart=no", "--nofirststartwizard", - "--norestore", "--nologo", "--dont-survive-parent"] + "--norestore", "--nologo"] if "--valgrind" in self.args: argv.append("--valgrind") |