summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2018-02-16 12:18:05 +0100
committerEike Rathke <erack@redhat.com>2018-02-16 12:19:09 +0100
commit2448e6cfeb787ae37cdadd7d6181e723b7024d27 (patch)
tree8ba7724f4e9f1e8614bba955cb060aef60ce70df
parentbcdaaf62d41728eb757ff2b9cb95c2df2791e2f4 (diff)
Resolves: tdf#114833 do not officiously force Y-M-D if D-M-Y is applicable
Change-Id: Idbfecf0ff08843db9970a301ab3c3a7317c08cda
-rw-r--r--svl/source/numbers/zforfind.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 241bfc76e4be..85b27797d204 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1068,7 +1068,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;