diff options
| -rw-r--r-- | bin/benchmark-document-loading | 2 | ||||
| -rw-r--r-- | bin/convwatch.py | 2 | ||||
| -rw-r--r-- | odk/examples/cpp/custompanel/Makefile | 2 | ||||
| -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 |
6 files changed, 6 insertions, 7 deletions
diff --git a/bin/benchmark-document-loading b/bin/benchmark-document-loading index 07dc45978ac9..6d06580929c8 100644 --- a/bin/benchmark-document-loading +++ b/bin/benchmark-document-loading @@ -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") diff --git a/bin/convwatch.py b/bin/convwatch.py index c60c0fad5b98..9d055115d324 100644 --- a/bin/convwatch.py +++ b/bin/convwatch.py @@ -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") diff --git a/odk/examples/cpp/custompanel/Makefile b/odk/examples/cpp/custompanel/Makefile index 95268db6ddea..c696e46ce353 100644 --- a/odk/examples/cpp/custompanel/Makefile +++ b/odk/examples/cpp/custompanel/Makefile @@ -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 = \ 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") |