diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-07-18 10:12:13 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-07-18 10:12:13 +0000 |
| commit | c661df1b10090d828bacf0845117a1ec30cc2a6e (patch) | |
| tree | ad843e025bfcb9f3654b02ecd5c73e03d963236e /sc/source/filter/excel/xeformula.cxx | |
| parent | c6f9cf83cf3dcd8e2aa24e68bf43a6d2224fa516 (diff) | |
INTEGRATION: CWS aw051 (1.17.4); FILE MERGED
2007/06/22 08:58:56 aw 1.17.4.1: changes after resync: warning free
Diffstat (limited to 'sc/source/filter/excel/xeformula.cxx')
| -rw-r--r-- | sc/source/filter/excel/xeformula.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 3805f23777eb..ca35a76f578d 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xeformula.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: rt $ $Date: 2007-07-03 15:50:20 $ + * last change: $Author: obo $ $Date: 2007-07-18 11:12:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -660,13 +660,13 @@ void XclExpFmlaCompImpl::AppendInlineArrays( ScfUInt8Vec & rExtensionTokens ) if( meBiff == EXC_BIFF8 ) { - rExtensionTokens.push_back( nMaxC - 1 ); + rExtensionTokens.push_back( sal_uInt8(nMaxC - 1) ); rExtensionTokens.resize( rExtensionTokens.size() + 2 ); - ShortToSVBT16( nMaxR - 1, &*(rExtensionTokens.end() - 2) ); + ShortToSVBT16( USHORT(nMaxR - 1), &*(rExtensionTokens.end() - 2) ); } else { - rExtensionTokens.push_back( nMaxC == 256 ? 0 : nMaxC ); + rExtensionTokens.push_back( nMaxC == 256 ? 0 : sal_uInt8(nMaxC) ); rExtensionTokens.resize( rExtensionTokens.size() + 2 ); ShortToSVBT16( USHORT( nMaxR ), &*(rExtensionTokens.end() - 2) ); } |