diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 10:11:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 10:11:56 +0000 |
| commit | 293d1536e4434627f94a909686cc3e7fe804ac19 (patch) | |
| tree | 79ca3c9320941eb33fe20533162a89df425e2749 /forms/source/component/Grid.cxx | |
| parent | INTEGRATION: CWS sb59 (1.15.28); FILE MERGED (diff) | |
| download | core-293d1536e4434627f94a909686cc3e7fe804ac19.tar.gz core-293d1536e4434627f94a909686cc3e7fe804ac19.zip | |
INTEGRATION: CWS sb59 (1.39.8); FILE MERGED
2006/08/29 16:10:59 sb 1.39.8.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'forms/source/component/Grid.cxx')
| -rw-r--r-- | forms/source/component/Grid.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index 42c4837ae6f0..3922ca9dc13f 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -4,9 +4,9 @@ * * $RCSfile: Grid.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: obo $ $Date: 2006-09-16 23:50:43 $ + * last change: $Author: obo $ $Date: 2006-10-12 11:11:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -981,8 +981,8 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream if ( nAnyMask & FONTDESCRIPTOR ) { // Attrib - _rxOutStream->writeShort( VCLUnoHelper::ConvertFontWeight( aFont.Weight ) ); - _rxOutStream->writeShort( aFont.Slant ); + _rxOutStream->writeShort( sal::static_int_cast< sal_Int16 >( VCLUnoHelper::ConvertFontWeight( aFont.Weight ) ) ); + _rxOutStream->writeShort( sal::static_int_cast< sal_Int16 >( aFont.Slant ) ); _rxOutStream->writeShort( aFont.Underline ); _rxOutStream->writeShort( aFont.Strikeout ); _rxOutStream->writeShort( sal_Int16(aFont.Orientation * 10) ); @@ -992,7 +992,7 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream // Size _rxOutStream->writeLong( aFont.Width ); _rxOutStream->writeLong( aFont.Height ); - _rxOutStream->writeShort( VCLUnoHelper::ConvertFontWidth( aFont.CharacterWidth ) ); + _rxOutStream->writeShort( sal::static_int_cast< sal_Int16 >( VCLUnoHelper::ConvertFontWidth( aFont.CharacterWidth ) ) ); // Type _rxOutStream->writeUTF( aFont.Name ); |