diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 12:32:36 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 12:32:36 +0000 |
| commit | 5e55dad317638ce48ea7da2e302258a12bb61925 (patch) | |
| tree | 0ff5c7fe6e56e3193b3190a649b2d62e5385f85a /sc/source/filter/excel/xepage.cxx | |
| parent | 3fee47c7c3abd9c2ae3f554bf86c5e17c6d77ae6 (diff) | |
INTEGRATION: CWS dr48 (1.10.176); FILE MERGED
2006/05/22 16:33:53 dr 1.10.176.1: type correctness for stream related code in Excel filters (sal_Size vs. ULONG vs. sal_uInt32)
Diffstat (limited to 'sc/source/filter/excel/xepage.cxx')
| -rw-r--r-- | sc/source/filter/excel/xepage.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 465f5286d3b9..33b6645204b8 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xepage.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:01:11 $ + * last change: $Author: obo $ $Date: 2006-07-10 13:32:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -197,10 +197,10 @@ void XclExpBitmap::Save( XclExpStream& rStrm ) { sal_Int32 nWidth = ::std::min< sal_Int32 >( pAccess->Width(), 0xFFFF ); sal_Int32 nHeight = ::std::min< sal_Int32 >( pAccess->Height(), 0xFFFF ); - if( (0 < nWidth) && (nWidth <= 0xFFFF) && (0 < nHeight) && (nHeight <= 0xFFFF) ) + if( (nWidth > 0) && (nHeight > 0) ) { sal_uInt8 nPadding = static_cast< sal_uInt8 >( nWidth & 0x03 ); - sal_uInt32 nTmpSize = (nWidth * 3UL + nPadding) * nHeight + 12; + sal_uInt32 nTmpSize = static_cast< sal_uInt32 >( (nWidth * 3 + nPadding) * nHeight + 12 ); rStrm.StartRecord( EXC_ID_BITMAP, nTmpSize + 4 ); |