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 /desktop/source/app | |
| 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 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/sofficemain.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 805c4f07602e..2a692fdae8d4 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -32,6 +32,7 @@ #include <osl/file.hxx> #include <rtl/bootstrap.hxx> #include <sal/log.hxx> +#include <sal/main.h> #include <tools/extendapplicationenvironment.hxx> #include <vcl/glxtestprocess.hxx> #include <vcl/svmain.hxx> @@ -108,6 +109,8 @@ static bool dumpCallback(const wchar_t* path, const wchar_t* id, #endif extern "C" int DESKTOP_DLLPUBLIC soffice_main() { + sal_detail_initialize(sal::detail::InitializeSoffice, nullptr); + #if HAVE_FEATURE_BREAKPAD #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID |