mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved fdo#46233 value >12 with AM/PM can't be clock time

Browse Source
This commit is contained in:
Eike Rathke
2012-05-10 16:19:44 +02:00
parent b43f5ccb6b
commit 803b5513ef
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
svl/source/numbers/zforfind.cxx
View File

@@ -860,11 +860,12 @@ inline bool ImpSvNumberInputScan::GetNextNumber( sal_uInt16& i, sal_uInt16& j )
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// GetTimeRef // GetTimeRef
void ImpSvNumberInputScan::GetTimeRef( bool ImpSvNumberInputScan::GetTimeRef(
double& fOutNumber, double& fOutNumber,
sal_uInt16 nIndex, // j-value of the first numeric time part of input, default 0 sal_uInt16 nIndex, // j-value of the first numeric time part of input, default 0
sal_uInt16 nAnz ) // count of numeric time parts sal_uInt16 nAnz ) // count of numeric time parts
{ {
bool bRet = true;
sal_uInt16 nHour; sal_uInt16 nHour;
sal_uInt16 nMinute = 0; sal_uInt16 nMinute = 0;
sal_uInt16 nSecond = 0; sal_uInt16 nSecond = 0;
@@ -893,6 +894,7 @@ void ImpSvNumberInputScan::GetTimeRef(
else else
{ {
nHour = 0; nHour = 0;
bRet = false;
SAL_WARN( "svl.items", "ImpSvNumberInputScan::GetTimeRef: bad number index"); SAL_WARN( "svl.items", "ImpSvNumberInputScan::GetTimeRef: bad number index");
} }
if (nDecPos == 2 && nAnz == 2) // 45.5 if (nDecPos == 2 && nAnz == 2) // 45.5
@@ -903,7 +905,9 @@ void ImpSvNumberInputScan::GetTimeRef(
nSecond = (sal_uInt16) sStrArray[nNums[nIndex++]].ToInt32(); nSecond = (sal_uInt16) sStrArray[nNums[nIndex++]].ToInt32();
if (nIndex - nStartIndex < nAnz) if (nIndex - nStartIndex < nAnz)
fSecond100 = StringToDouble( sStrArray[nNums[nIndex]], true ); fSecond100 = StringToDouble( sStrArray[nNums[nIndex]], true );
if (nAmPm == -1 && nHour != 12) // PM if (nAmPm && nHour > 12) // not a valid AM/PM clock time
bRet = false;
else if (nAmPm == -1 && nHour != 12) // PM
nHour += 12; nHour += 12;
else if (nAmPm == 1 && nHour == 12) // 12 AM else if (nAmPm == 1 && nHour == 12) // 12 AM
nHour = 0; nHour = 0;
@@ -912,6 +916,7 @@ void ImpSvNumberInputScan::GetTimeRef(
(double)nMinute*60 + (double)nMinute*60 +
(double)nSecond + (double)nSecond +
fSecond100)/86400.0; fSecond100)/86400.0;
return bRet;
} }
@@ -3171,7 +3176,7 @@ bool ImpSvNumberInputScan::IsNumberFormat(
break; break;
case NUMBERFORMAT_TIME: case NUMBERFORMAT_TIME:
GetTimeRef(fOutNumber, 0, nAnzNums); res = GetTimeRef(fOutNumber, 0, nAnzNums);
if ( nSign < 0 ) if ( nSign < 0 )
fOutNumber = -fOutNumber; fOutNumber = -fOutNumber;
break; break;
@@ -3190,7 +3195,7 @@ bool ImpSvNumberInputScan::IsNumberFormat(
if ( res ) if ( res )
{ {
double fTime; double fTime;
GetTimeRef( fTime, nCounter, nAnzNums - nCounter ); res = GetTimeRef( fTime, nCounter, nAnzNums - nCounter );
fOutNumber += fTime; fOutNumber += fTime;
} }
} }

6
svl/source/numbers/zforfind.hxx
View File

@@ -294,7 +294,11 @@ private:
sal_uInt16& i, sal_uInt16& i,
sal_uInt16& j ); sal_uInt16& j );
void GetTimeRef( // Converts time -> double (only decimals) /** Converts time -> double (only decimals)
@return TRUE if time, FALSE if not (e.g. hours >12 with AM/PM)
*/
bool GetTimeRef(
double& fOutNumber, // result as double double& fOutNumber, // result as double
sal_uInt16 nIndex, // Index of hour in input sal_uInt16 nIndex, // Index of hour in input
sal_uInt16 nAnz ); // Count of time substrings in input sal_uInt16 nAnz ); // Count of time substrings in input