diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2018-02-10 17:27:42 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-25 18:30:03 +0200 |
| commit | 27b208c5f945b06d308fede54523f77dbea5445b (patch) | |
| tree | 1819603106c66c27d6257387f01a4309bca735bc /sc/source/ui/docshell/impex.cxx | |
| parent | b871f33f85422640ec9a248c80935f18e4eadb57 (diff) | |
lok: allow libraries to pre-init themselves.
Populate static module references before entering a jail
containing no code.
Implement for scfilt, scui, swui, sdui.
Change-Id: I8fec2aa78e67053a7945926c818122bd4290103c
Reviewed-on: https://gerrit.libreoffice.org/49545
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit f215096c24429fe69e7e5ab37898d0f0beeff0ab)
Diffstat (limited to 'sc/source/ui/docshell/impex.cxx')
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 6d0d788c46ad..58c47e2cb1cf 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2308,7 +2308,9 @@ ScFormatFilterPlugin &ScFormatFilter::Get() #ifndef DISABLE_DYNLOADING OUString sFilterLib(SVLIBRARY("scfilt")); static ::osl::Module aModule; - bool bLoaded = aModule.loadRelative(&thisModule, sFilterLib); + bool bLoaded = aModule.is(); + if (!bLoaded) + bLoaded = aModule.loadRelative(&thisModule, sFilterLib); if (!bLoaded) bLoaded = aModule.load(sFilterLib); if (bLoaded) |