diff options
| author | Eike Rathke <erack@redhat.com> | 2018-02-16 12:18:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-28 10:21:47 +0100 |
| commit | 51ab84a1e413d90a89dfc733e650d922a5dedd26 (patch) | |
| tree | 6cfe105865e3a651f9605d397bceb88981a4b943 | |
| parent | ea68707c2fed39eb00fdc8c24b0360005b1f1c0e (diff) | |
Resolves: tdf#114833 do not officiously force Y-M-D if D-M-Y is applicable
(cherry picked from commit 2448e6cfeb787ae37cdadd7d6181e723b7024d27)
Conflicts:
svl/source/numbers/zforfind.cxx
Change-Id: Idbfecf0ff08843db9970a301ab3c3a7317c08cda
Reviewed-on: https://gerrit.libreoffice.org/49851
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | svl/source/numbers/zforfind.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index d161d6171ae8..50e0fc047a84 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -1073,7 +1073,9 @@ bool ImpSvNumberInputScan::CanForceToIso8601( DateOrder eDateOrder ) { // As if any of the cases below can be applied, but only if a // locale dependent date pattern was not matched. - return (GetDatePatternNumbers() != nAnzNums) || !IsDatePatternNumberOfType(0,'Y'); + if ((GetDatePatternNumbers() == nAnzNums) && IsDatePatternNumberOfType(0,'Y')) + return false; + eDateOrder = GetDateOrder(); } nCanForceToIso8601 = 1; |