User: hr Date: 2006/08/15 03:43:19 Modified: dba/dbaccess/source/core/api/datasettings.cxx
Log: INTEGRATION: CWS dba30 (1.19.78); FILE MERGED 2006/07/19 12:11:23 fs 1.19.78.3: RESYNC: (1.20-1.22); FILE MERGED 2005/09/30 06:04:29 fs 1.19.78.2: RESYNC: (1.19-1.20); FILE MERGED 2005/04/06 07:14:58 fs 1.19.78.1: #i46768# getPropertyDefaultByHandle signature changed 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.22&r2=1.23 Delta lines: +43 -25 --------------------- --- datasettings.cxx 10 Jul 2006 15:05:13 -0000 1.22 +++ datasettings.cxx 15 Aug 2006 10:43:17 -0000 1.23 @@ -261,58 +261,76 @@ m_nFontRelief = _rSource.m_nFontRelief; } // ----------------------------------------------------------------------------- -Any ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const +void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) const { - Any aRet; static ::com::sun::star::awt::FontDescriptor aFD = ::comphelper::getDefaultFont(); switch( _nHandle ) { case PROPERTY_ID_FILTER: case PROPERTY_ID_ORDER: - aRet <<= ::rtl::OUString(); break; + _rDefault <<= ::rtl::OUString(); + break; case PROPERTY_ID_FONT: - aRet <<= aFD; break; + _rDefault <<= ::comphelper::getDefaultFont(); + break; case PROPERTY_ID_APPLYFILTER: - aRet <<= sal_False; break; + _rDefault <<= sal_False; + break; case PROPERTY_ID_TEXTRELIEF: - aRet <<= ::com::sun::star::awt::FontRelief::NONE; break; + _rDefault <<= ::com::sun::star::awt::FontRelief::NONE; + break; case PROPERTY_ID_TEXTEMPHASIS: - aRet <<= ::com::sun::star::awt::FontEmphasisMark::NONE; break; + _rDefault <<= ::com::sun::star::awt::FontEmphasisMark::NONE; + break; case PROPERTY_ID_FONTNAME: - aRet <<= aFD.Name; break; + _rDefault <<= aFD.Name; + break; case PROPERTY_ID_FONTHEIGHT: - aRet <<= aFD.Height;break; + _rDefault <<= aFD.Height; + break; case PROPERTY_ID_FONTWIDTH: - aRet <<= aFD.Width;break; + _rDefault <<= aFD.Width; + break; case PROPERTY_ID_FONTSTYLENAME: - aRet <<= aFD.StyleName;break; + _rDefault <<= aFD.StyleName; + break; case PROPERTY_ID_FONTFAMILY: - aRet <<= aFD.Family;break; + _rDefault <<= aFD.Family; + break; case PROPERTY_ID_FONTCHARSET: - aRet <<= aFD.CharSet;break; + _rDefault <<= aFD.CharSet; + break; case PROPERTY_ID_FONTPITCH: - aRet <<= aFD.Pitch;break; + _rDefault <<= aFD.Pitch; + break; case PROPERTY_ID_FONTCHARWIDTH: - aRet <<= aFD.CharacterWidth;break; + _rDefault <<= aFD.CharacterWidth; + break; case PROPERTY_ID_FONTWEIGHT: - aRet <<= aFD.Weight;break; + _rDefault <<= aFD.Weight; + break; case PROPERTY_ID_FONTSLANT: - aRet <<= aFD.Slant; break; + _rDefault <<= aFD.Slant; + break; case PROPERTY_ID_FONTUNDERLINE: - aRet <<= aFD.Underline;break; + _rDefault <<= aFD.Underline; + break; case PROPERTY_ID_FONTSTRIKEOUT: - aRet <<= aFD.Strikeout;break; + _rDefault <<= aFD.Strikeout; + break; case PROPERTY_ID_FONTORIENTATION: - aRet <<= aFD.Orientation;break; + _rDefault <<= aFD.Orientation; + break; case PROPERTY_ID_FONTKERNING: - aRet <<= aFD.Kerning;break; + _rDefault <<= aFD.Kerning; + break; case PROPERTY_ID_FONTWORDLINEMODE: - aRet <<= aFD.WordLineMode;break; + _rDefault <<= aFD.WordLineMode; + break; case PROPERTY_ID_FONTTYPE: - aRet <<= aFD.Type;break; + _rDefault <<= aFD.Type; + break; } - - return aRet; } //........................................................................ } // namespace dbaccess --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
