diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-08-30 09:16:55 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-08-30 14:48:26 +0200 |
| commit | 629dfff3c7289f185268c7088e67931f6bbd9ce0 (patch) | |
| tree | fac587a2334338b6466a7e46f7ae3e949e9d7edb /sal/osl/w32 | |
| parent | 760a377f7148e623e9e16d24e66f54a401ecb946 (diff) | |
Replace is_soffice_Impl hack with a better(?) hack
...that involves adding a second, one-off special meaning to the existing
sal_detail_initialize function. This at least gets rid of the
"osl_getExecutableFile contains 'soffice' substring" guesswork (and of the
osl_systemPathGetFileNameOrLastDirectoryPart call there, which is what I'm
actually after, for a different change to come).
Change-Id: I4dd6eef1fd0411bf66943ffea415876c92d08526
Reviewed-on: https://gerrit.libreoffice.org/78291
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal/osl/w32')
| -rw-r--r-- | sal/osl/w32/salinit.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx index 77cb5da781e5..9b89cebc20ab 100644 --- a/sal/osl/w32/salinit.cxx +++ b/sal/osl/w32/salinit.cxx @@ -32,6 +32,10 @@ extern "C" { void sal_detail_initialize(int argc, char ** argv) { + if (argc == sal::detail::InitializeSoffice) + { + return; + } sal_initGlobalTimer(); #ifndef _WIN64 SetProcessDEPPolicy(PROCESS_DEP_ENABLE); |