summaryrefslogtreecommitdiff
path: root/lingucomponent
diff options
context:
space:
mode:
authorMert Tumer <mert.tumer@collabora.com>2022-05-10 13:06:06 +0300
committerAndras Timar <andras.timar@collabora.com>2023-07-05 09:12:12 +0200
commit84bdf9e81a63a8bd308709c86b51bf3900a23c50 (patch)
tree8f213b626e71de6db468c41e3dc896db5667359a /lingucomponent
parent884fd220d0025a92510d3ff4710c8c517c8f271e (diff)
Load the locales from config file for languagetool
Locales needs to be read again in the Preferences/Writing Aids section and since this is a network operation it can cause a problem. Better to list all the supported locales in the xcu and load it right away. Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Change-Id: Ifff624334627f7be259b677f9b416d6ddedfb2c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135598 Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153959 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'lingucomponent')
-rw-r--r--lingucomponent/config/Linguistic-lingucomponent-grammarchecker.xcu30
-rw-r--r--lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx43
2 files changed, 44 insertions, 29 deletions
diff --git a/lingucomponent/config/Linguistic-lingucomponent-grammarchecker.xcu b/lingucomponent/config/Linguistic-lingucomponent-grammarchecker.xcu
new file mode 100644
index 000000000000..ce3d6033d0c2
--- /dev/null
+++ b/lingucomponent/config/Linguistic-lingucomponent-grammarchecker.xcu
@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+-->
+<oor:component-data oor:name="Linguistic" oor:package="org.openoffice.Office" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <node oor:name="ServiceManager">
+ <node oor:name="GrammarCheckers">
+ <node oor:name="org.openoffice.lingu.LanguageToolGrammarChecker" oor:op="fuse">
+ <prop oor:name="Locales" oor:type="oor:string-list">
+ <value>ar ast-ES be-BY br-FR ca-ES ca-ES-valencia zh-CN da-DK nl nl-BE en en-AU en-CA en-CA en-GB en-NZ en-ZA en-US fr gl-ES de de-AT de-DE de-DE de-CH el-GR ga-IE it ja-JP km-KH nb no fa pl-PL pt pt-AO pt-BR pt-MZ pt-PT ro-RO ru-RU de-DE-x-simple-language sk-SK sl-SI es es-AR sv tl-PH ta-IN uk-UA</value>
+ </prop>
+ </node>
+ </node>
+ </node>
+</oor:component-data>
+
diff --git a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
index 83ae5aada9ad..f7fe29edecca 100644
--- a/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
+++ b/lingucomponent/source/spellcheck/languagetool/languagetoolimp.cxx
@@ -35,7 +35,6 @@
#include <boost/property_tree/json_parser.hpp>
#include <algorithm>
#include <string_view>
-#include <sal/log.hxx>
#include <svtools/languagetoolcfg.hxx>
#include <tools/color.hxx>
#include <tools/long.hxx>
@@ -124,40 +123,26 @@ sal_Bool SAL_CALL LanguageToolGrammarChecker::hasLocale(const Locale& rLocale)
Sequence<Locale> SAL_CALL LanguageToolGrammarChecker::getLocales()
{
+ MutexGuard aGuard(GetLinguMutex());
+
if (m_aSuppLocales.hasElements())
return m_aSuppLocales;
- SvxLanguageToolOptions& rLanguageOpts = SvxLanguageToolOptions::Get();
- OString localeUrl = OUStringToOString(rLanguageOpts.getLocaleListURL(), RTL_TEXTENCODING_UTF8);
- if (localeUrl.isEmpty())
- {
- return m_aSuppLocales;
- }
- tools::Long statusCode = 0;
- std::string response = makeHttpRequest(localeUrl, HTTP_METHOD::HTTP_GET, OString(), statusCode);
- if (statusCode != 200)
- {
- return m_aSuppLocales;
- }
- if (response.empty())
- {
- return m_aSuppLocales;
- }
- boost::property_tree::ptree root;
- std::stringstream aStream(response);
- boost::property_tree::read_json(aStream, root);
- size_t length = root.size();
- m_aSuppLocales.realloc(length);
+ SvtLinguConfig aLinguCfg;
+ uno::Sequence<OUString> aLocaleList;
+ aLinguCfg.GetLocaleListFor("GrammarCheckers", "org.openoffice.lingu.LanguageToolGrammarChecker",
+ aLocaleList);
+
+ auto nLength = aLocaleList.getLength();
+ m_aSuppLocales.realloc(nLength);
auto pArray = m_aSuppLocales.getArray();
- int i = 0;
- for (auto it = root.begin(); it != root.end(); it++, i++)
+ auto pLocaleList = aLocaleList.getArray();
+
+ for (auto i = 0; i < nLength; i++)
{
- boost::property_tree::ptree& localeItem = it->second;
- const std::string longCode = localeItem.get<std::string>("longCode");
- Locale aLocale = LanguageTag::convertToLocale(
- OUString(longCode.c_str(), longCode.length(), RTL_TEXTENCODING_UTF8));
- pArray[i] = aLocale;
+ pArray[i] = LanguageTag::convertToLocale(pLocaleList[i]);
}
+
return m_aSuppLocales;
}