bin/benchmark-document-loading | 2 +-
bin/convwatch.py | 2 +-
desktop/source/app/cmdlineargs.cxx | 3 +--
desktop/source/app/cmdlineargs.hxx | 1 -
odk/examples/cpp/custompanel/Makefile | 2 +-
sysui/desktop/man/README | 2 ++
unotest/source/cpp/officeconnection.cxx | 3 +--
unotest/source/java/org/openoffice/test/OfficeConnection.java | 2 +-
unotest/source/python/org/libreoffice/unotest.py | 2 +-
9 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit 1da98a2fb1954a45a583197efb4f87ddedae2e1b
Author: Tor Lillqvist <t...@collabora.com>
Date: Sun Mar 29 23:35:04 2015 +0300
Think aloud
Change-Id: I26d18571bba41b66d64a6b1be6f2cbc45b1b71d2
diff --git a/sysui/desktop/man/README b/sysui/desktop/man/README
index 1536ae5..8c18447 100644
--- a/sysui/desktop/man/README
+++ b/sysui/desktop/man/README
@@ -1 +1,3 @@
FIXME: These man pages are used for distro packaging using "make
distro-pack-install"
+
+(And what is it that needs fixing in that?)
commit 00ab36a16db3ed0cac6206a233722b4c7efb8cb6
Author: Tor Lillqvist <t...@collabora.com>
Date: Sun Mar 29 23:23:46 2015 +0300
The --nofirststartwizard option is a no-op
Change-Id: Id481af38ebb51224f4f8493cccfb4eb4fd1e268f
diff --git a/bin/benchmark-document-loading b/bin/benchmark-document-loading
index 07dc459..6d06580 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 c60c0fa..9d05511 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 95268db..c696e46 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 0c9f045..e86a883 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 6a6d15b..8dc5232 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 28f5eca..eb13d37 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")
commit db255d5a4e35f38c4bb4755970506d841c98edb2
Author: Tor Lillqvist <t...@collabora.com>
Date: Sun Mar 29 23:20:59 2015 +0300
m_nofirststartwizard was never tested
Change-Id: Ibd74eae829eb6bf5366a474628c1bf5ff6b4e839
diff --git a/desktop/source/app/cmdlineargs.cxx
b/desktop/source/app/cmdlineargs.cxx
index dd77aaf..9bbc36f 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -210,7 +210,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier&
supplier )
}
else if ( oArg == "nofirststartwizard" )
{
- m_nofirststartwizard = true;
+ // Do nothing, accept only for backward compatibility
}
else if ( oArg == "nologo" )
{
@@ -600,7 +600,6 @@ void CommandLineArgs::InitParamValues()
m_quickstart = false;
m_noquickstart = false;
m_terminateafterinit = false;
- m_nofirststartwizard = false;
m_nologo = false;
m_nolockcheck = false;
m_nodefault = false;
diff --git a/desktop/source/app/cmdlineargs.hxx
b/desktop/source/app/cmdlineargs.hxx
index 580466f5..7b8c0da 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -126,7 +126,6 @@ class CommandLineArgs: private boost::noncopyable
bool m_quickstart;
bool m_noquickstart;
bool m_terminateafterinit;
- bool m_nofirststartwizard;
bool m_nologo;
bool m_nolockcheck;
bool m_nodefault;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
