Tag: cws_src680_dba30 User: fs Date: 2006/07/19 05:11:26 Modified: dba/dbaccess/source/core/api/datasettings.cxx
Log: RESYNC: (1.20-1.22); FILE MERGED 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.19.78.2&r2=1.19.78.3 Delta lines: +7 -7 ------------------- --- datasettings.cxx 30 Sep 2005 06:04:29 -0000 1.19.78.2 +++ datasettings.cxx 19 Jul 2006 12:11:23 -0000 1.19.78.3 @@ -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(); @@ -166,7 +166,7 @@ //= ODataSettings //========================================================================== //-------------------------------------------------------------------------- -void ODataSettings::registerProperties(ODataSettings_Base* _pItem) +void ODataSettings::registerPropertiesFor(ODataSettings_Base* _pItem) { if ( m_bQuery ) { @@ -238,8 +238,8 @@ //-------------------------------------------------------------------------- ODataSettings_Base::ODataSettings_Base() - :m_aFont(::comphelper::getDefaultFont()) - ,m_bApplyFilter(sal_False) + :m_bApplyFilter(sal_False) + ,m_aFont(::comphelper::getDefaultFont()) ,m_nFontEmphasis(::com::sun::star::awt::FontEmphasisMark::NONE) ,m_nFontRelief(::com::sun::star::awt::FontRelief::NONE) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
