diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:33:42 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 09:33:42 +0000 |
| commit | 4f496ef8f45e0d328f3851baf9d7001dd36605fc (patch) | |
| tree | baab5745020c1f99b0d967c724576bc9e2b4ff4c /toolkit/source | |
| parent | 48878b074a8e713924cc61cc3fa28f39e5bc9ad2 (diff) | |
INTEGRATION: CWS sb59 (1.13.16); FILE MERGED
2006/07/21 07:59:27 sb 1.13.16.1: #i67487# Made code warning-free (wntmsci10).
Diffstat (limited to 'toolkit/source')
| -rw-r--r-- | toolkit/source/helper/vclunohelper.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 7d1463ba7d13..f59c47f663b8 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: vclunohelper.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: obo $ $Date: 2006-09-16 12:23:59 $ + * last change: $Author: obo $ $Date: 2006-10-12 10:33:42 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -361,14 +361,14 @@ FontWeight VCLUnoHelper::ConvertFontWeight( float f ) aFD.StyleName = rFont.GetStyleName(); aFD.Height = (sal_Int16)rFont.GetSize().Height(); aFD.Width = (sal_Int16)rFont.GetSize().Width(); - aFD.Family = rFont.GetFamily(); + aFD.Family = sal::static_int_cast< sal_Int16 >(rFont.GetFamily()); aFD.CharSet = rFont.GetCharSet(); - aFD.Pitch = rFont.GetPitch(); + aFD.Pitch = sal::static_int_cast< sal_Int16 >(rFont.GetPitch()); aFD.CharacterWidth = VCLUnoHelper::ConvertFontWidth( rFont.GetWidthType() ); aFD.Weight= VCLUnoHelper::ConvertFontWeight( rFont.GetWeight() ); aFD.Slant = (::com::sun::star::awt::FontSlant)rFont.GetItalic(); - aFD.Underline = rFont.GetUnderline(); - aFD.Strikeout = rFont.GetStrikeout(); + aFD.Underline = sal::static_int_cast< sal_Int16 >(rFont.GetUnderline()); + aFD.Strikeout = sal::static_int_cast< sal_Int16 >(rFont.GetStrikeout()); aFD.Orientation = rFont.GetOrientation(); aFD.Kerning = rFont.IsKerning(); aFD.WordLineMode = rFont.IsWordLineMode(); |