sc/source/filter/excel/xistyle.cxx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
New commits: commit b1d3dcb406c9abbebb0fd0a4a036c45910ef1d62 Author: Herbert Dürr <h...@apache.org> Date: Wed Oct 17 11:39:14 2012 +0000 Resolves: #i121215# fix the spreadsheet font family Patch-by: Tan Li <litan.t...@gmail.com> Review-by: h...@apache.org (cherry picked from commit 3258f70090ffb706d7dcfb66b16b404d86f8cfbf) Conflicts: sc/source/filter/excel/xistyle.cxx Change-Id: Id50781e163ac33d3cd1b670808824c7c9b8718d3 diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 8dfbad4..8158652 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -307,8 +307,18 @@ void XclImpFont::FillToItemSet( SfxItemSet& rItemSet, XclFontItemType eType, boo rtl_TextEncoding eTempTextEnc = (bEE && (eFontEnc == GetTextEncoding())) ? ScfTools::GetSystemTextEncoding() : eFontEnc; - SvxFontItem aFontItem( maData.GetScFamily( GetTextEncoding() ), maData.maName, EMPTY_STRING, - PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT ); + //add corresponding pitch for FontFamily + FontPitch ePitch = PITCH_DONTKNOW; + FontFamily eFtFamily = maData.GetScFamily( GetTextEncoding() ); + switch( eFtFamily ) //refer http://msdn.microsoft.com/en-us/library/aa246306(v=VS.60).aspx + { + case FAMILY_ROMAN: ePitch = PITCH_VARIABLE; break; + case FAMILY_SWISS: ePitch = PITCH_VARIABLE; break; + case FAMILY_MODERN: ePitch = PITCH_FIXED; break; + default: break; + } + SvxFontItem aFontItem( eFtFamily , maData.maName, EMPTY_STRING, ePitch, eTempTextEnc, ATTR_FONT ); + // set only for valid script types if( mbHasWstrn ) PUTITEM( aFontItem, ATTR_FONT, EE_CHAR_FONTINFO );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits