diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-03-29 23:23:46 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-03-29 23:51:03 +0300 |
| commit | 00ab36a16db3ed0cac6206a233722b4c7efb8cb6 (patch) | |
| tree | a821eee49562192e78dcefdaef56e73fce61fd60 /unotest | |
| parent | db255d5a4e35f38c4bb4755970506d841c98edb2 (diff) | |
The --nofirststartwizard option is a no-op
Change-Id: Id481af38ebb51224f4f8493cccfb4eb4fd1e268f
Diffstat (limited to 'unotest')
| -rw-r--r-- | unotest/source/cpp/officeconnection.cxx | 3 | ||||
| -rw-r--r-- | unotest/source/java/org/openoffice/test/OfficeConnection.java | 2 | ||||
| -rw-r--r-- | unotest/source/python/org/libreoffice/unotest.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index 0c9f045b23a2..e86a883dd5b4 100644 --- a/unotest/source/cpp/officeconnection.cxx +++ b/unotest/source/cpp/officeconnection.cxx @@ -55,7 +55,6 @@ void OfficeConnection::setUp() { if (argSoffice.match("path:")) { desc = "pipe,name=" + uniquePipeName(OUString("oootest")); OUString noquickArg("--quickstart=no"); - OUString nofirstArg("--nofirststartwizard"); OUString norestoreArg("--norestore"); OUString nologoArg("--nologo"); // disable use of the unix standalone splash screen app for the @@ -70,7 +69,7 @@ void OfficeConnection::setUp() { "-env:UNO_JAVA_JFW_ENV_JREHOME=true"); OUString classpathArg("-env:UNO_JAVA_JFW_ENV_CLASSPATH=true"); rtl_uString * args[] = { - noquickArg.pData, nofirstArg.pData, norestoreArg.pData, + noquickArg.pData, norestoreArg.pData, nologoArg.pData, headlessArg.pData, acceptArg.pData, userArg.pData, jreArg.pData, classpathArg.pData }; rtl_uString ** envs = 0; diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java b/unotest/source/java/org/openoffice/test/OfficeConnection.java index 6a6d15bf4e7f..8dc523251e00 100644 --- a/unotest/source/java/org/openoffice/test/OfficeConnection.java +++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java @@ -51,7 +51,7 @@ public final class OfficeConnection { description = "pipe,name=oootest" + UUID.randomUUID(); ProcessBuilder pb = new ProcessBuilder( sofficeArg.substring("path:".length()), "--quickstart=no", - "--nofirststartwizard", "--norestore", "--nologo", "--headless", + "--norestore", "--nologo", "--headless", "--accept=" + description + ";urp", "-env:UserInstallation=" + Argument.get("user"), "-env:UNO_JAVA_JFW_ENV_JREHOME=true"); diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py index 28f5eca0c16f..eb13d374e83c 100644 --- a/unotest/source/python/org/libreoffice/unotest.py +++ b/unotest/source/python/org/libreoffice/unotest.py @@ -75,7 +75,7 @@ class OfficeConnection(object): def bootstrap(self, soffice, userdir, channel): argv = [ soffice, "--accept=" + channel + ";urp", "-env:UserInstallation=" + userdir, - "--quickstart=no", "--nofirststartwizard", + "--quickstart=no", "--norestore", "--nologo", "--headless"] if "--valgrind" in self.args: argv.append("--valgrind") |