Kaydet (Commit) 00ab36a1 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

The --nofirststartwizard option is a no-op

Change-Id: Id481af38ebb51224f4f8493cccfb4eb4fd1e268f
üst db255d5a
......@@ -151,7 +151,7 @@ class OfficeConnection:
def bootstrap(self, soffice, userdir, socket):
argv = [ soffice, "--accept=" + socket + ";urp",
"-env:UserInstallation=" + userdir,
"--quickstart=no", "--nofirststartwizard",
"--quickstart=no",
"--norestore", "--nologo", "--headless" ]
if "--valgrind" in self.args:
argv.append("--valgrind")
......
......@@ -93,7 +93,7 @@ class OfficeConnection:
def bootstrap(self, soffice, userdir, socket):
argv = [ soffice, "--accept=" + socket + ";urp",
"-env:UserInstallation=" + userdir,
"--quickstart=no", "--nofirststartwizard",
"--quickstart=no",
"--norestore", "--nologo", "--headless" ]
if "--valgrind" in self.args:
argv.append("--valgrind")
......
......@@ -47,7 +47,7 @@ OUT_COMP_DEPLOY=$(OUT_DEPLOY)/$(COMP_NAME)
OUT_DEPLOY_DIR=$(subst /,$(PS),$(OUT_COMP_DEPLOY))
OUT_DEPLOY_URL=$(URLPREFIX)$(OUT_COMP_DEPLOY)
ENV_USER_INSTALL=-env:"UserInstallation=$(OUT_DEPLOY_URL)"
OFFICE_START_OPTIONS=-nologo -nofirststartwizard -norestore -writer
OFFICE_START_OPTIONS=-nologo -norestore -writer
OXT_DEPLOYEDFLAG=$(OUT_MISC)/cpp_$(COMP_NAME)_deployed_oxt.flag
CXXFILES = \
......
......@@ -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;
......
......@@ -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");
......
......@@ -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")
......
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