diff options
| author | Eike Rathke <er@openoffice.org> | 2000-11-18 20:46:43 +0000 |
|---|---|---|
| committer | Eike Rathke <er@openoffice.org> | 2000-11-18 20:46:43 +0000 |
| commit | 2ac5bf9c5a4ba2caa7eed6cc8830571427a4685b (patch) | |
| tree | 779cee5fcb27eb0eb8337ac9ae62f4f56af60720 /svtools/source/numbers/zforscan.cxx | |
| parent | 4eca0934c2b8e65651dce9020d1b074abcf53cc2 (diff) | |
use CalendarWrapper; class International eliminated except of CompareEqual calls
Diffstat (limited to 'svtools/source/numbers/zforscan.cxx')
| -rw-r--r-- | svtools/source/numbers/zforscan.cxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/svtools/source/numbers/zforscan.cxx b/svtools/source/numbers/zforscan.cxx index 9d4116d5d76a..041c451db01e 100644 --- a/svtools/source/numbers/zforscan.cxx +++ b/svtools/source/numbers/zforscan.cxx @@ -2,9 +2,9 @@ * * $RCSfile: zforscan.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: er $ $Date: 2000-11-04 21:51:34 $ + * last change: $Author: er $ $Date: 2000-11-18 21:46:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -181,9 +181,6 @@ void ImpSvNumberformatScan::SetDependentKeywords() sKeyword[NF_KEY_TTTT].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "TTTT" ) ); sKeyword[NF_KEY_JJ].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "JJ" ) ); sKeyword[NF_KEY_JJJJ].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "JJJJ" ) ); - sKeyword[NF_KEY_QUARTER].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Quartal" ) ); - sKeyword[NF_KEY_TRUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "WAHR" ) ); - sKeyword[NF_KEY_FALSE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "FALSCH" ) ); sKeyword[NF_KEY_BOOLEAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "LOGISCH" ) ); sKeyword[NF_KEY_COLOR].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "FARBE" ) ); sKeyword[NF_KEY_BLACK].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "SCHWARZ" ) ); @@ -319,8 +316,6 @@ void ImpSvNumberformatScan::SetDependentKeywords() sKeyword[NF_KEY_H].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "H" ) ); sKeyword[NF_KEY_HH].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "HH" ) ); } - // Quartal - sKeyword[NF_KEY_QUARTER].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Quarter" ) ); // Logisch sKeyword[NF_KEY_BOOLEAN].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "BOOLEAN" ) ); // Farbe @@ -352,6 +347,13 @@ void ImpSvNumberformatScan::SetDependentKeywords() DBG_ERRORFILE( "SetDependentKeywords: FALSE_WORD?" ); sKeyword[NF_KEY_FALSE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "FALSE" ) ); } + // quarter + sKeyword[NF_KEY_QUARTER] = pLocaleData->getQuarterWord(); + if ( !sKeyword[NF_KEY_QUARTER].Len() ) + { + DBG_ERRORFILE( "SetDependentKeywords: QUARTER_WORD?" ); + sKeyword[NF_KEY_QUARTER].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "quarter" ) ); + } // currency symbol sCurString = pCharClass->upper( pLocaleData->getCurrSymbol() ); @@ -360,8 +362,10 @@ void ImpSvNumberformatScan::SetDependentKeywords() void ImpSvNumberformatScan::ChangeNullDate(USHORT nDay, USHORT nMonth, USHORT nYear) { - delete pNullDate; - pNullDate = new Date(nDay, nMonth, nYear); + if ( pNullDate ) + *pNullDate = Date(nDay, nMonth, nYear); + else + pNullDate = new Date(nDay, nMonth, nYear); } void ImpSvNumberformatScan::ChangeStandardPrec(short nPrec) |