diff options
| author | Eike Rathke <erack@redhat.com> | 2020-08-06 01:40:04 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-08-06 09:52:00 +0200 |
| commit | 3115faaa72b25bdd3af140d275635b0f0cd06e3a (patch) | |
| tree | c3b81b59cceb112ceda6871312838c894d95181c /svl | |
| parent | ce10b3340c1b2e04a2ef9e0f454a64f898bff8cb (diff) | |
Resolves: tdf#135249 Duration input 0:123 or 0:0:123 or 0:123:59 is valid
Change-Id: Ie624b324822495192edc65d046945eb92356550b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100192
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 1616b53292cdc22c04d07bb21e71bf43dcd22299)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100212
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zforfind.cxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index e1b7c856f6e4..11a3e637157e 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -980,6 +980,9 @@ bool ImpSvNumberInputScan::GetTimeRef( double& fOutNumber, SAL_WARN( "svl.numbers", "ImpSvNumberInputScan::GetTimeRef: bad number index"); } + // 0:123 or 0:0:123 or 0:123:59 is valid + bool bAllowDuration = (nHour == 0 && !nAmPm); + if (nAmPm && nHour > 12) // not a valid AM/PM clock time { bRet = false; @@ -1000,16 +1003,18 @@ bool ImpSvNumberInputScan::GetTimeRef( double& fOutNumber, else if (nIndex - nStartIndex < nCnt) { nMinute = static_cast<sal_uInt16>(sStrArray[nNums[nIndex++]].toInt32()); - if (!(eInputOptions & SvNumInputOptions::LAX_TIME) + if (!(eInputOptions & SvNumInputOptions::LAX_TIME) && !bAllowDuration && nIndex > 1 && nMinute > 59) - bRet = false; // 1:60 or 1:123 is invalid, 123:1 is valid + bRet = false; // 1:60 or 1:123 is invalid, 123:1 or 0:123 is valid + if (bAllowDuration) + bAllowDuration = (nMinute == 0); } if (nIndex - nStartIndex < nCnt) { nSecond = static_cast<sal_uInt16>(sStrArray[nNums[nIndex++]].toInt32()); - if (!(eInputOptions & SvNumInputOptions::LAX_TIME) + if (!(eInputOptions & SvNumInputOptions::LAX_TIME) && !bAllowDuration && nIndex > 1 && nSecond > 59 && !(nHour == 23 && nMinute == 59 && nSecond == 60)) - bRet = false; // 1:60 or 1:123 or 1:1:123 is invalid, 123:1 or 123:1:1 is valid, or leap second + bRet = false; // 1:60 or 1:123 or 1:1:123 is invalid, 123:1 or 123:1:1 or 0:0:123 is valid, or leap second } if (nIndex - nStartIndex < nCnt) { |