summaryrefslogtreecommitdiff
path: root/desktop/source/app
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-06-06 10:03:25 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-06-06 14:37:06 +0200
commita1a4787a4014f70b00f73fab56996e285e5ed1d0 (patch)
treec9490b0da77dcccc6cb0525cfaf22042faf62bfe /desktop/source/app
parenta2f4bdb191d8d11824a0292880377dd4a20ac145 (diff)
loplugin:data (macOS)
Change-Id: I404a8364a4c7f8d48533fb3c7757a5b7798de9d8 Reviewed-on: https://gerrit.libreoffice.org/73588 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop/source/app')
-rw-r--r--desktop/source/app/app.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c761938b3d50..3874b39270e5 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1103,11 +1103,11 @@ void restartOnMac(bool passArguments) {
argPtrs.push_back(elem.getStr());
}
argPtrs.push_back(nullptr);
- execv(execPath8.getStr(), const_cast< char ** >(&argPtrs[0]));
+ execv(execPath8.getStr(), const_cast< char ** >(argPtrs.data()));
if (errno == ENOTSUP) { // happens when multithreaded on macOS < 10.6
pid_t pid = fork();
if (pid == 0) {
- execv(execPath8.getStr(), const_cast< char ** >(&argPtrs[0]));
+ execv(execPath8.getStr(), const_cast< char ** >(argPtrs.data()));
} else if (pid > 0) {
// Two simultaneously running soffice processes lead to two dock
// icons, so avoid waiting here unless it must be assumed that the