summaryrefslogtreecommitdiff
path: root/svl/source
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2015-06-01 16:25:06 +0200
committerEike Rathke <erack@redhat.com>2015-06-01 17:07:45 +0200
commit4e7a17ad3a0c0f30d70bd4166f075e6c253debad (patch)
treea46fc103d50ec4f04d959e11a53e3079cddd1a63 /svl/source
parentcee2ca155f7eb68d242307cbbbcd96b12722d3ff (diff)
Resolves: tdf#91420 "Jan1, 2015" is a valid date
Regression introduced with 43624d9370c4384f71c6b13fed900eaec222cf64 that fixed tdf#34724 Change-Id: I44b5eac6e4ce5a38855148efecea5f2a987ed213 (cherry picked from commit fe2c7b25152df4c89e44c6516081d43d68075736)
Diffstat (limited to 'svl/source')
-rw-r--r--svl/source/numbers/zforfind.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 97948c56cc48..36dd18e607d7 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -2102,7 +2102,9 @@ bool ImpSvNumberInputScan::ScanStartString( const OUString& rString,
short nTempMonth = GetMonth(rString, nPos);
if ( nTempMonth ) // month (Jan 1)?
{
- if (nPos < rString.getLength()) // Jan1 without separator is not a date
+ // Jan1 without separator is not a date, unless it is followed by a
+ // separator and a (year) number.
+ if (nPos < rString.getLength() || (nAnzStrings >= 4 && nAnzNums >= 2))
{
eScannedType = css::util::NumberFormat::DATE; // !!! it IS a date !!!
nMonth = nTempMonth;
@@ -2145,7 +2147,9 @@ bool ImpSvNumberInputScan::ScanStartString( const OUString& rString,
nTempMonth = GetMonth(rString, nPos);
if ( nTempMonth ) // month (Jan 1)?
{
- if (nPos < rString.getLength()) // Jan1 without separator is not a date
+ // Jan1 without separator is not a date, unless it is followed by a
+ // separator and a (year) number.
+ if (nPos < rString.getLength() || (nAnzStrings >= 4 && nAnzNums >= 2))
{
nMonth = nTempMonth;
nMonthPos = 1; // month a the beginning