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 /include/sal | |
| 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 'include/sal')
| -rw-r--r-- | include/sal/main.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/sal/main.h b/include/sal/main.h index 9b5ba2b8d69b..d8a87c3e7f61 100644 --- a/include/sal/main.h +++ b/include/sal/main.h @@ -33,6 +33,13 @@ extern "C" { #endif +#if defined LIBO_INTERNAL_ONLY && defined __cplusplus +// Special token for sal_detail_initialize argc parameter, used by the soffice.bin process to tell +// SAL that it is running as part of that process (see sal/osl/unx/soffice.hxx); argv should be null +// in such a sal_detail_initialize call: +namespace sal::detail { constexpr int InitializeSoffice = -1; } +#endif + SAL_DLLPUBLIC void SAL_CALL sal_detail_initialize(int argc, char ** argv); SAL_DLLPUBLIC void SAL_CALL sal_detail_deinitialize(void); |