diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 14:52:02 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-01 14:52:02 +0000 |
| commit | aa771e35102b8358582ca4f1c757dee46e8f35a1 (patch) | |
| tree | e32401d500c53df86f50d2505538f800358a9f89 /svtools | |
| parent | 50e7bf2191a7670334319a3208b91e0b2fedb211 (diff) | |
INTEGRATION: CWS numberx204 (1.69.60); FILE MERGED
2006/07/25 15:03:49 er 1.69.60.1: GetExactDateOrder: it got unnoticed all the time that the 3rd shift was 16 instead of 8 bits, it wasn't used yet in ImpSvNumberInputScan::GetDateRef()
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/numbers/zformat.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/svtools/source/numbers/zformat.cxx b/svtools/source/numbers/zformat.cxx index a18f77b64535..5df73a688ae3 100644 --- a/svtools/source/numbers/zformat.cxx +++ b/svtools/source/numbers/zformat.cxx @@ -4,9 +4,9 @@ * * $RCSfile: zformat.cxx,v $ * - * $Revision: 1.69 $ + * $Revision: 1.70 $ * - * last change: $Author: hr $ $Date: 2006-06-19 21:24:37 $ + * last change: $Author: ihi $ $Date: 2006-08-01 15:52:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3946,23 +3946,23 @@ sal_uInt32 SvNumberformat::GetExactDateOrder() const } short const * const pType = NumFor[0].Info().nTypeArray; USHORT nAnz = NumFor[0].GetnAnz(); - sal_uInt32 nShift = 0; - for ( USHORT j=0; j<nAnz && nShift < 24; j++ ) + int nShift = 0; + for ( USHORT j=0; j<nAnz && nShift < 3; j++ ) { switch ( pType[j] ) { case NF_KEY_D : case NF_KEY_DD : - nRet = (nRet << nShift) | 'D'; - nShift += 8; + nRet = (nRet << 8) | 'D'; + ++nShift; break; case NF_KEY_M : case NF_KEY_MM : case NF_KEY_MMM : case NF_KEY_MMMM : case NF_KEY_MMMMM : - nRet = (nRet << nShift) | 'M'; - nShift += 8; + nRet = (nRet << 8) | 'M'; + ++nShift; break; case NF_KEY_YY : case NF_KEY_YYYY : @@ -3970,8 +3970,8 @@ sal_uInt32 SvNumberformat::GetExactDateOrder() const case NF_KEY_EEC : case NF_KEY_R : case NF_KEY_RR : - nRet = (nRet << nShift) | 'Y'; - nShift += 8; + nRet = (nRet << 8) | 'Y'; + ++nShift; break; } } |