User: obo Date: 2006/07/10 08:05:15 Modified: dba/dbaccess/source/core/api/datasettings.cxx
Log: INTEGRATION: CWS qiq (1.21.2); FILE MERGED 2006/06/30 13:27:27 fs 1.21.2.1: during #i51143#: PROPERTY_ID_HY0000 superseded by StandardSQLState.SQL_GENERAL_ERROR File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: datasettings.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/datasettings.cxx?r1=1.21&r2=1.22 Delta lines: +4 -4 ------------------- --- datasettings.cxx 20 Jun 2006 02:39:03 -0000 1.21 +++ datasettings.cxx 10 Jul 2006 15:05:13 -0000 1.22 @@ -146,14 +146,14 @@ 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_Int16)rFont.GetFamily(); aFD.CharSet = rFont.GetCharSet(); - aFD.Pitch = rFont.GetPitch(); + aFD.Pitch = (sal_Int16)rFont.GetPitch(); aFD.CharacterWidth = ConvertFontWidth( rFont.GetWidthType() ); aFD.Weight = ConvertFontWeight( rFont.GetWeight() ); aFD.Slant = (::com::sun::star::awt::FontSlant)rFont.GetItalic(); - aFD.Underline = rFont.GetUnderline(); - aFD.Strikeout = rFont.GetStrikeout(); + aFD.Underline = (sal_Int16)rFont.GetUnderline(); + aFD.Strikeout = (sal_Int16)rFont.GetStrikeout(); aFD.Orientation = rFont.GetOrientation(); aFD.Kerning = rFont.IsKerning(); aFD.WordLineMode = rFont.IsWordLineMode(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
