diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2018-04-02 22:52:46 +0200 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2018-04-03 14:00:38 +0200 |
| commit | ecfd40a1bcc1fc8cdc40bdd27ea1f00ba652707e (patch) | |
| tree | e149af56e34badd83966d09fa743b37ca2ef29e7 /desktop/source/deployment | |
| parent | 86e54f2d757fe300ba634cdcbf0ee8a589dbc2ae (diff) | |
lok: Make the bundled dictionaries work.
Create the user directory temporary in the temp directory and
use that to load the dictionaries (bundled extensions).
Co-author; Jan Holesovsky <kendy@collabora.com>
Change-Id: I5c7c824b68571048ce870fd5218cb47a333f3ad8
Reviewed-on: https://gerrit.libreoffice.org/49495
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'desktop/source/deployment')
| -rw-r--r-- | desktop/source/deployment/registry/configuration/dp_configuration.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 5739d3f444c0..0393e934e343 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -38,6 +38,7 @@ #include <comphelper/anytostring.hxx> #include <comphelper/servicedecl.hxx> #include <xmlscript/xml_helper.hxx> +#include <comphelper/lok.hxx> #include <svl/inettype.hxx> #include <com/sun/star/configuration/Update.hpp> #include <com/sun/star/ucb/NameClash.hpp> @@ -708,8 +709,8 @@ void BackendImpl::PackageImpl::processPackage_( } //No need for live-deployment for bundled extension, because OOo //restarts after installation - if (that->m_eContext != Context::Bundled - && !startup) + if ((that->m_eContext != Context::Bundled && !startup) + || comphelper::LibreOfficeKit::isActive()) { if (m_isSchema) { |