diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 20:24:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 20:24:01 +0000 |
| commit | 0a37d1fc49f765ad56e85dbda6964b4e9f7af928 (patch) | |
| tree | ea3a41a595b0d04e9553d75a6f10359a94685d0f /svtools | |
| parent | b1ca455474e0c8da8618ce162543e5ef9827e910 (diff) | |
INTEGRATION: CWS warnings01 (1.38.14); FILE MERGED
2006/05/23 20:22:58 sb 1.38.14.3: RESYNC: (1.39-1.40); FILE MERGED
2006/04/07 19:16:01 sb 1.38.14.2: RESYNC: (1.38-1.39); FILE MERGED
2005/11/15 19:25:45 pl 1.38.14.1: #i55991# removed warnings
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/numbers/zforfind.cxx | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/svtools/source/numbers/zforfind.cxx b/svtools/source/numbers/zforfind.cxx index ec3791540c0f..e8344258dc64 100644 --- a/svtools/source/numbers/zforfind.cxx +++ b/svtools/source/numbers/zforfind.cxx @@ -4,9 +4,9 @@ * * $RCSfile: zforfind.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: vg $ $Date: 2006-04-07 16:02:15 $ + * last change: $Author: hr $ $Date: 2006-06-19 21:24:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -395,8 +395,8 @@ BOOL ImpSvNumberInputScan::SkipThousands( void ImpSvNumberInputScan::NumberStringDivision( const String& rString ) { - register const sal_Unicode* pStr = rString.GetBuffer(); - register const sal_Unicode* const pEnd = pStr + rString.Len(); + const sal_Unicode* pStr = rString.GetBuffer(); + const sal_Unicode* const pEnd = pStr + rString.Len(); while ( pStr < pEnd && nAnzStrings < SV_MAX_ANZ_INPUT_STRINGS ) { if ( NextNumberStringSymbol( pStr, sStrArray[nAnzStrings] ) ) @@ -788,14 +788,12 @@ short ImpSvNumberInputScan::GetSign( const String& rString, xub_StrLen& nPos ) case '+': nPos++; return 1; - break; case '(': // '(' aehnlich wie '-' ?!? nNegCheck = 1; //! fallthru case '-': nPos++; return -1; - break; default: break; } @@ -820,11 +818,9 @@ short ImpSvNumberInputScan::GetESign( const String& rString, xub_StrLen& nPos ) case '+': nPos++; return 1; - break; case '-': nPos++; return -1; - break; default: break; } @@ -1930,7 +1926,7 @@ BOOL ImpSvNumberInputScan::ScanEndString( const String& rString, SkipBlanks(rString, nPos); } - xub_StrLen nOldPos = nPos; + xub_StrLen nOrigPos = nPos; if (GetTimeAmPm(rString, nPos)) { if (eScannedType != NUMBERFORMAT_UNDEFINED && @@ -1942,7 +1938,7 @@ BOOL ImpSvNumberInputScan::ScanEndString( const String& rString, // If not already scanned as time, 6.78am does not result in 6 // seconds and 78 hundredths in the morning. Keep as suffix. if (eScannedType != NUMBERFORMAT_TIME && nDecPos == 2 && nAnzNums == 2) - nPos = nOldPos; // rewind am/pm + nPos = nOrigPos; // rewind am/pm else { SkipBlanks(rString, nPos); @@ -2109,7 +2105,7 @@ BOOL ImpSvNumberInputScan::ScanStringNumFor( BOOL ImpSvNumberInputScan::IsNumberFormatMain( const String& rString, // string to be analyzed - double& fOutNumber, // OUT: result as number, if possible + double& , // OUT: result as number, if possible const SvNumberformat* pFormat ) // maybe number format set to match against { Reset(); @@ -2428,14 +2424,14 @@ void ImpSvNumberInputScan::ChangeIntl() // ChangeNullDate void ImpSvNumberInputScan::ChangeNullDate( - const USHORT nDay, - const USHORT nMonth, - const USHORT nYear ) + const USHORT Day, + const USHORT Month, + const USHORT Year ) { if ( pNullDate ) - *pNullDate = Date(nDay, nMonth, nYear); + *pNullDate = Date(Day, Month, Year); else - pNullDate = new Date(nDay, nMonth, nYear); + pNullDate = new Date(Day, Month, Year); } |