From b8ad0fc55baa69724e90dc3bb7d96fbd7149b163 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 3 Oct 2017 10:48:26 +0200 Subject: lok: Fix declaration of ‘xContext’ shadows a global declaration. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iab3c142cd85ca54bf3c37a0710ce7da7a5d77a35 Reviewed-on: https://gerrit.libreoffice.org/43067 Reviewed-by: Andras Timar Tested-by: Andras Timar --- desktop/source/lib/init.cxx | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 65d5b43ce14b..3bbb7b98043d 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2364,11 +2364,20 @@ static void doc_resetSelection(LibreOfficeKitDocument* pThis) static char* getLanguages(const char* pCommand) { - css::uno::Reference< css::uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext(); - css::uno::Reference< css::linguistic2::XLinguServiceManager2 > xLangSrv = css::linguistic2::LinguServiceManager::create(xContext); - css::uno::Reference< css::linguistic2::XSpellChecker > xSpell(xLangSrv.is() ? xLangSrv->getSpellChecker() : nullptr, css::uno::UNO_QUERY); - css::uno::Reference< css::linguistic2::XSupportedLocales > xLocales(xSpell, css::uno::UNO_QUERY); - css::uno::Sequence< css::lang::Locale > aLocales(xLocales.is() ? xLocales->getLocales() : css::uno::Sequence< css::lang::Locale >()); + css::uno::Sequence< css::lang::Locale > aLocales; + + if (xContext.is()) + { + css::uno::Reference xLangSrv = css::linguistic2::LinguServiceManager::create(xContext); + if (xLangSrv.is()) + { + css::uno::Reference xSpell(xLangSrv->getSpellChecker(), css::uno::UNO_QUERY); + css::uno::Reference xLocales(xSpell, css::uno::UNO_QUERY); + + if (xLocales.is()) + aLocales = xLocales->getLocales(); + } + } boost::property_tree::ptree aTree; aTree.put("commandName", pCommand); -- cgit v1.2.3