diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2022-06-13 17:12:10 +1000 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2022-07-07 17:51:40 +0200 |
| commit | 09a3e24a8e4c0f11c62f104b0bfa9d31180003fd (patch) | |
| tree | 203749de66db8f7d7154ebb1472c59a5ec8f5ad0 | |
| parent | e03cd0893eb2031d775764b4696b838dd09fb474 (diff) | |
i18nlangtag: replace tools::Long with long
Revert to long as originally used in commit e81359a9a324:
"added registerImpl() re-entered warning" and then apparently
accidentally broken in the mass conversion commit
e25fd7782ad04: "long->tools::Long in hwpfilter..oox".
Change-Id: I39c983ddec83c84953bc3db167793944c671894b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135714
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | i18nlangtag/source/languagetag/languagetag.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index 7d881dd37de3..6d20c7304639 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -18,7 +18,6 @@ #include <sal/log.hxx> #include <osl/file.hxx> #include <rtl/locale.h> -#include <tools/long.hxx> #include <o3tl/string_view.hxx> #include <algorithm> #include <map> @@ -853,7 +852,7 @@ LanguageTag::ImplPtr LanguageTag::registerImpl() const std::unique_lock aGuard( theMutex()); #if OSL_DEBUG_LEVEL > 0 - static tools::Long nRunning = 0; + static long nRunning = 0; // Entering twice here is ok, which is needed for fallback init in // getKnowns() in canonicalize() via pImpl->convertBcp47ToLocale() below, // everything else is suspicious. |