strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i18nlangtag: replace tools::Long with long

Browse source 
Revert to long as originally used in commit e81359a9a3:
"added registerImpl() re-entered warning" and then apparently
accidentally broken in the mass conversion commit
e25fd7782a: "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>
This commit is contained in:
Chris Sherlock 2022-06-13 17:12:10 +10:00 committed by Stephan Bergmann
parent e03cd0893e
commit 09a3e24a8e
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
i18nlangtag/source/languagetag/languagetag.cxx
View file

@ -18,7 +18,6 @@
#include <sal/log.hxx> #include <sal/log.hxx>
#include <osl/file.hxx> #include <osl/file.hxx>
#include <rtl/locale.h> #include <rtl/locale.h>
#include <tools/long.hxx>
#include <o3tl/string_view.hxx> #include <o3tl/string_view.hxx>
#include <algorithm> #include <algorithm>
#include <map> #include <map>
@ -853,7 +852,7 @@ LanguageTag::ImplPtr LanguageTag::registerImpl() const
std::unique_lock aGuard( theMutex()); std::unique_lock aGuard( theMutex());
#if OSL_DEBUG_LEVEL > 0 #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 // Entering twice here is ok, which is needed for fallback init in
// getKnowns() in canonicalize() via pImpl->convertBcp47ToLocale() below, // getKnowns() in canonicalize() via pImpl->convertBcp47ToLocale() below,
// everything else is suspicious. // everything else is suspicious.