commit d1a4f50d686054b757320c0ef3f3dc4c724c685c
author Eike Rathke <erack@redhat.com> Fri Feb 16 12:18:05 2018 +0100
committer Caolán McNamara <caolanm@redhat.com> Wed Feb 21 21:35:29 2018 +0100
tree 3403912d7edfd98bb56061d46d8a123b0273a27d
parent f8a7d0426729b1982f1a03b933bc148acab12bd9

Resolves: tdf#114833 do not officiously force Y-M-D if D-M-Y is applicable

Change-Id: Idbfecf0ff08843db9970a301ab3c3a7317c08cda
(cherry picked from commit 2448e6cfeb787ae37cdadd7d6181e723b7024d27)
Reviewed-on: https://gerrit.libreoffice.org/49849
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

svl/source/numbers/zforfind.cxx

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 7e4f3f6..2e65531 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1070,7 +1070,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() != nNumericsCnt) || !IsDatePatternNumberOfType(0,'Y');
            if ((GetDatePatternNumbers() == nNumericsCnt) && IsDatePatternNumberOfType(0,'Y'))
                return false;
            eDateOrder = GetDateOrder();
        }

        nCanForceToIso8601 = 1;