Index: source/filter/excel/xistyle.cxx =================================================================== RCS file: /cvs/sc/sc/source/filter/excel/xistyle.cxx,v retrieving revision 1.2.4.1 diff -u -r1.2.4.1 xistyle.cxx --- source/filter/excel/xistyle.cxx 6 Feb 2003 11:37:49 -0000 1.2.4.1 +++ source/filter/excel/xistyle.cxx 13 Feb 2003 20:26:05 -0000 @@ -469,15 +469,7 @@ CharSet XclImpFont::GetScFontCharSet( sal_uInt8 nXclCharSet ) { - CharSet eScCharSet; - switch( nXclCharSet ) - { - case EXC_FONTCSET_MS_1252: eScCharSet = RTL_TEXTENCODING_MS_1252; break; - case EXC_FONTCSET_IBM_850: eScCharSet = RTL_TEXTENCODING_IBM_850; break; - case EXC_FONTCSET_SYMBOL: eScCharSet = RTL_TEXTENCODING_SYMBOL; break; - default: eScCharSet = ScfTools::GetSystemCharSet(); - } - return eScCharSet; + return rtl_getTextEncodingFromWindowsCharset(nXclCharSet); } FontItalic XclImpFont::GetScFontPosture( bool bXclItalic ) Index: source/filter/excel/xestyle.cxx =================================================================== RCS file: /cvs/sc/sc/source/filter/excel/xestyle.cxx,v retrieving revision 1.3.4.1 diff -u -r1.3.4.1 xestyle.cxx --- source/filter/excel/xestyle.cxx 6 Feb 2003 11:36:04 -0000 1.3.4.1 +++ source/filter/excel/xestyle.cxx 13 Feb 2003 20:26:46 -0000 @@ -94,6 +94,9 @@ #include "xehelper.hxx" #endif +#ifndef _RTL_TENCINFO_H +#include +#endif // PALETTE record - color information ========================================= @@ -683,21 +686,7 @@ sal_uInt8 XclExpFont::GetXclCharSet( rtl_TextEncoding eCharSet ) { - switch( eCharSet ) - { - case RTL_TEXTENCODING_DONTKNOW: return EXC_FONTCSET_DONTKNOW; - case RTL_TEXTENCODING_MS_1252: return EXC_FONTCSET_MS_1252; - case RTL_TEXTENCODING_APPLE_ROMAN: return EXC_FONTCSET_APPLE_ROMAN; - case RTL_TEXTENCODING_IBM_437: return EXC_FONTCSET_IBM_437; - case RTL_TEXTENCODING_IBM_850: return EXC_FONTCSET_IBM_850; - case RTL_TEXTENCODING_IBM_860: return EXC_FONTCSET_IBM_860; - case RTL_TEXTENCODING_IBM_861: return EXC_FONTCSET_IBM_861; - case RTL_TEXTENCODING_IBM_863: return EXC_FONTCSET_IBM_863; - case RTL_TEXTENCODING_IBM_865: return EXC_FONTCSET_IBM_865; - case (rtl_TextEncoding) 9: return EXC_FONTCSET_SYSTEM; - case RTL_TEXTENCODING_SYMBOL: return EXC_FONTCSET_SYMBOL; - } - return EXC_FONTCSET_DONTKNOW; + return rtl_getBestWindowsCharsetFromTextEncoding(eCharSet); } sal_uInt16 XclExpFont::GetXclWeight( FontWeight eWeight )