diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 07:27:17 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-07 07:27:17 +0000 |
| commit | d2e2ba01bef1452c12e47da4fa607d2eab2b433a (patch) | |
| tree | 42fc1eb83be748d4b2e52bf6844a32e43084a0db /sc | |
| parent | 69c156e0e9a653560e47e7a92e09855b379a6590 (diff) | |
INTEGRATION: CWS sixtyfour04 (1.18.112); FILE MERGED
2006/03/29 11:42:12 pjanik 1.18.112.2: RESYNC: (1.18-1.19); FILE MERGED
2006/03/15 16:14:05 cmc 1.18.112.1: #i63168# make sc 64bit happy
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xlstyle.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index f52459fd654e..933065bf3473 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -4,9 +4,9 @@ * * $RCSfile: xlstyle.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: obo $ $Date: 2006-03-22 12:04:50 $ + * last change: $Author: vg $ $Date: 2006-04-07 08:27:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -329,7 +329,7 @@ FontStrikeout XclFontData::GetScStrikeout() const void XclFontData::SetScHeight( sal_Int32 nTwips ) { - mnHeight = static_cast< sal_uInt16 >( ::std::min( nTwips, 0x7FFFL ) ); + mnHeight = static_cast< sal_uInt16 >( ::std::min( nTwips, static_cast<sal_Int32>(0x7FFFL) ) ); } void XclFontData::SetScFamily( FontFamily eScFamily ) |