User: obo Date: 2006/10/12 06:40:06 Modified: dba/dbaccess/source/ui/misc/UITools.cxx
Log: INTEGRATION: CWS sb59 (1.62.2); FILE MERGED 2006/08/29 11:44:29 sb 1.62.2.1: #i67487# Made code warning-free (wntmsci10). File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: UITools.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/UITools.cxx?r1=1.65&r2=1.66 Delta lines: +7 -6 ------------------- --- UITools.cxx 5 Oct 2006 13:07:15 -0000 1.65 +++ UITools.cxx 12 Oct 2006 13:40:04 -0000 1.66 @@ -1056,14 +1056,16 @@ 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 = 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::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(); @@ -1930,8 +1932,7 @@ aValue.Value <<= _xContent; aArguments[2] <<= aValue; - ::rtl::OUString sServiceName = - (_bCollection ? ((_bForm) ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION); + ::rtl::OUString sServiceName(_bCollection ? ((_bForm) ? SERVICE_NAME_FORM_COLLECTION : SERVICE_NAME_REPORT_COLLECTION) : SERVICE_SDB_DOCUMENTDEFINITION); Reference<XContent > xNew(xORB->createInstanceWithArguments(sServiceName,aArguments),UNO_QUERY); Reference<XNameContainer> xNameContainer(xNameAccess,UNO_QUERY); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
