diff options
author | Eike Rathke <erack@redhat.com> | 2019-07-12 11:16:07 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-07-18 17:21:35 +0200 |
commit | 7af89de46ff4a40a8161fd629584d54cfdeadee1 (patch) | |
tree | eb14ec5b83ea4a219f0e7e12c359823ad34657e0 | |
parent | 38bf835b48efa2e32d917538cabc4fa2e1dec56d (diff) |
Resolves: tdf#126342 obtain date particle order from pattern match
... if there was any. In the NF_EVALDATEFORMAT_FORMAT_INTL case
the input may match a current locale's pattern instead of a
format's locale's pattern and patterns' (format locale + current
locale) date orders may be different from the format's date order.
Change-Id: I3aeaa6c361f98fe80f69c4f5d975fca892dac6ea
Reviewed-on: https://gerrit.libreoffice.org/75481
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 7de96e9f7b69354fd5b15e1276678000bc386568)
Reviewed-on: https://gerrit.libreoffice.org/75491
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | svl/source/numbers/zforfind.cxx | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index 0ec1cd812418..dfb66e3de235 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -1699,7 +1699,26 @@ bool ImpSvNumberInputScan::GetDateRef( double& fDays, sal_uInt16& nCounter ) else { bFormatTurn = true; - DateFmt = mpFormat->GetDateOrder(); + // Even if the format pattern is to be preferred, the input may + // have matched a pattern of the current locale, which then + // again is to be preferred. Both date orders can be different + // so we need to obtain the actual match. For example ISO + // YYYY-MM-DD format vs locale's DD.MM.YY input. + if (!GetDatePatternOrder()) + { + // No pattern match => format match. + DateFmt = mpFormat->GetDateOrder(); + } + else + { + // Pattern match. Note that patterns may have been + // constructed from the format's locale and prepended to + // the current locale's patterns, it doesn't necessarily + // mean a current locale's pattern was matched, but may if + // the format's locale's patterns didn't match, which were + // tried first. + DateFmt = GetDateOrder(); + } } break; default: |