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

#102371# ScanStartString: match against format string only if start string is not a sign character

Browse Source
This commit is contained in:
Eike Rathke
2002-09-09 11:56:10 +00:00
parent 043a9aca77
commit 0d4d86b8f4
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
svtools/source/numbers/zforfind.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: zforfind.cxx,v $ * $RCSfile: zforfind.cxx,v $
* *
* $Revision: 1.25 $ * $Revision: 1.26 $
* *
* last change: $Author: er $ $Date: 2002-09-05 18:00:42 $ * last change: $Author: er $ $Date: 2002-09-09 12:56:10 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -1379,9 +1379,10 @@ BOOL ImpSvNumberInputScan::ScanStartString( const String& rString,
if ( nSign = GetSign(rString, nPos) ) // sign? if ( nSign = GetSign(rString, nPos) ) // sign?
SkipBlanks(rString, nPos); SkipBlanks(rString, nPos);
if ( nMatchedAllStrings ) // #102371# match against format string only if start string is not a sign character
{ // Match against format in any case, so later on for a "1-2-3-4" input if ( nMatchedAllStrings && !(nSign && rString.Len() == 1) )
// we may distinguish between a y-m-d (or similar) date and a 0-0-0-0 { // Match against format in any case, so later on for a "x1-2-3" input
// we may distinguish between a xy-m-d (or similar) date and a x0-0-0
// format. No sign detection here! // format. No sign detection here!
if ( ScanStringNumFor( rString, nPos, pFormat, 0, TRUE ) ) if ( ScanStringNumFor( rString, nPos, pFormat, 0, TRUE ) )
nMatchedAllStrings |= nMatchedStartString; nMatchedAllStrings |= nMatchedStartString;
@@ -2456,6 +2457,7 @@ BOOL ImpSvNumberInputScan::IsNumberFormat(
case NUMBERFORMAT_CURRENCY: case NUMBERFORMAT_CURRENCY:
case NUMBERFORMAT_NUMBER: case NUMBERFORMAT_NUMBER:
case NUMBERFORMAT_SCIENTIFIC: case NUMBERFORMAT_SCIENTIFIC:
case NUMBERFORMAT_DEFINED: // if no category detected handle as number
{ {
if ( nDecPos == 1 ) // . at start if ( nDecPos == 1 ) // . at start
sResString.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "0." ) ); sResString.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "0." ) );
@@ -2590,6 +2592,8 @@ BOOL ImpSvNumberInputScan::IsNumberFormat(
break; break;
default: default:
DBG_ERRORFILE( "Some number recognized but what's it?" );
fOutNumber = 0.0;
break; break;
} }
} }