mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The --nofirststartwizard option is a no-op

Browse Source 
Change-Id: Id481af38ebb51224f4f8493cccfb4eb4fd1e268f
This commit is contained in:
Tor Lillqvist
2015-03-29 23:23:46 +03:00
parent db255d5a4e
commit 00ab36a16d
6 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/benchmark-document-loading
View File

@@ -151,7 +151,7 @@ class OfficeConnection:
def bootstrap(self, soffice, userdir, socket): def bootstrap(self, soffice, userdir, socket):
argv = [ soffice, "--accept=" + socket + ";urp", argv = [ soffice, "--accept=" + socket + ";urp",
"-env:UserInstallation=" + userdir, "-env:UserInstallation=" + userdir,
"--quickstart=no", "--nofirststartwizard", "--quickstart=no",
"--norestore", "--nologo", "--headless" ] "--norestore", "--nologo", "--headless" ]
if "--valgrind" in self.args: if "--valgrind" in self.args:
argv.append("--valgrind") argv.append("--valgrind")

2
bin/convwatch.py
View File

@@ -93,7 +93,7 @@ class OfficeConnection:
def bootstrap(self, soffice, userdir, socket): def bootstrap(self, soffice, userdir, socket):
argv = [ soffice, "--accept=" + socket + ";urp", argv = [ soffice, "--accept=" + socket + ";urp",
"-env:UserInstallation=" + userdir, "-env:UserInstallation=" + userdir,
"--quickstart=no", "--nofirststartwizard", "--quickstart=no",
"--norestore", "--nologo", "--headless" ] "--norestore", "--nologo", "--headless" ]
if "--valgrind" in self.args: if "--valgrind" in self.args:
argv.append("--valgrind") argv.append("--valgrind")

2
odk/examples/cpp/custompanel/Makefile
View File

@@ -47,7 +47,7 @@ OUT_COMP_DEPLOY=$(OUT_DEPLOY)/$(COMP_NAME)
OUT_DEPLOY_DIR=$(subst /,$(PS),$(OUT_COMP_DEPLOY)) OUT_DEPLOY_DIR=$(subst /,$(PS),$(OUT_COMP_DEPLOY))
OUT_DEPLOY_URL=$(URLPREFIX)$(OUT_COMP_DEPLOY) OUT_DEPLOY_URL=$(URLPREFIX)$(OUT_COMP_DEPLOY)
ENV_USER_INSTALL=-env:"UserInstallation=$(OUT_DEPLOY_URL)" 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 OXT_DEPLOYEDFLAG=$(OUT_MISC)/cpp_$(COMP_NAME)_deployed_oxt.flag
CXXFILES = \ CXXFILES = \

3
unotest/source/cpp/officeconnection.cxx
View File

@@ -55,7 +55,6 @@ void OfficeConnection::setUp() {
if (argSoffice.match("path:")) { if (argSoffice.match("path:")) {
desc = "pipe,name=" + uniquePipeName(OUString("oootest")); desc = "pipe,name=" + uniquePipeName(OUString("oootest"));
OUString noquickArg("--quickstart=no"); OUString noquickArg("--quickstart=no");
OUString nofirstArg("--nofirststartwizard");
OUString norestoreArg("--norestore"); OUString norestoreArg("--norestore");
OUString nologoArg("--nologo"); OUString nologoArg("--nologo");
// disable use of the unix standalone splash screen app for the // 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"); "-env:UNO_JAVA_JFW_ENV_JREHOME=true");
OUString classpathArg("-env:UNO_JAVA_JFW_ENV_CLASSPATH=true"); OUString classpathArg("-env:UNO_JAVA_JFW_ENV_CLASSPATH=true");
rtl_uString * args[] = { rtl_uString * args[] = {
noquickArg.pData, nofirstArg.pData, norestoreArg.pData, noquickArg.pData, norestoreArg.pData,
nologoArg.pData, headlessArg.pData, acceptArg.pData, userArg.pData, nologoArg.pData, headlessArg.pData, acceptArg.pData, userArg.pData,
jreArg.pData, classpathArg.pData }; jreArg.pData, classpathArg.pData };
rtl_uString ** envs = 0; rtl_uString ** envs = 0;

2
unotest/source/java/org/openoffice/test/OfficeConnection.java
View File

@@ -51,7 +51,7 @@ public final class OfficeConnection {
description = "pipe,name=oootest" + UUID.randomUUID(); description = "pipe,name=oootest" + UUID.randomUUID();
ProcessBuilder pb = new ProcessBuilder( ProcessBuilder pb = new ProcessBuilder(
sofficeArg.substring("path:".length()), "--quickstart=no", sofficeArg.substring("path:".length()), "--quickstart=no",
"--nofirststartwizard", "--norestore", "--nologo", "--headless", "--norestore", "--nologo", "--headless",
"--accept=" + description + ";urp", "--accept=" + description + ";urp",
"-env:UserInstallation=" + Argument.get("user"), "-env:UserInstallation=" + Argument.get("user"),
"-env:UNO_JAVA_JFW_ENV_JREHOME=true"); "-env:UNO_JAVA_JFW_ENV_JREHOME=true");

2
unotest/source/python/org/libreoffice/unotest.py
View File

@@ -75,7 +75,7 @@ class OfficeConnection(object):
def bootstrap(self, soffice, userdir, channel): def bootstrap(self, soffice, userdir, channel):
argv = [ soffice, "--accept=" + channel + ";urp", argv = [ soffice, "--accept=" + channel + ";urp",
"-env:UserInstallation=" + userdir, "-env:UserInstallation=" + userdir,
"--quickstart=no", "--nofirststartwizard", "--quickstart=no",
"--norestore", "--nologo", "--headless"] "--norestore", "--nologo", "--headless"]
if "--valgrind" in self.args: if "--valgrind" in self.args:
argv.append("--valgrind") argv.append("--valgrind")