svl/source/numbers/zforlist.cxx | 7 +++++++ 1 file changed, 7 insertions(+)
New commits: commit 16a8d9f45449d0ef7efbdbff8ae29d97441eb044 Author: Eike Rathke <er...@redhat.com> Date: Thu May 3 14:31:08 2018 +0200 Avoid number scanner overhead for all General formats Change-Id: If28276a1f707c3eb462a013b5604a92ce56038d2 Reviewed-on: https://gerrit.libreoffice.org/53792 Reviewed-by: Eike Rathke <er...@redhat.com> Tested-by: Eike Rathke <er...@redhat.com> diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 178c3e853d71..de7a808324e0 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -1095,6 +1095,13 @@ bool SvNumberFormatter::IsNumberFormat(const OUString& sString, FType = SvNumFormatType::DEFINED; } ChangeIntl(pFormat->GetLanguage()); + // Avoid scanner overhead with the General format of any locale. + // These are never substituded above so safe to ignore. + if ((F_Index % SV_COUNTRY_LANGUAGE_OFFSET) == 0) + { + assert(FType == SvNumFormatType::NUMBER); + pFormat = nullptr; + } } bool res; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits