Attachment #4716 for issue #2394

View | Details | Raw Unified | Return to issue 2394
Collapse All | Expand All





CharSet XclImpFont::GetScFontCharSet( sal_uInt8 nXclCharSet )
{
    return rtl_getTextEncodingFromWindowsCharset(nXclCharSet);
    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;
}

FontItalic XclImpFont::GetScFontPosture( bool bXclItalic )




#include "xehelper.hxx"
#endif

#ifndef _RTL_TENCINFO_H
#include <rtl/tencinfo.h>
#endif

// PALETTE record - color information =========================================



sal_uInt8 XclExpFont::GetXclCharSet( rtl_TextEncoding eCharSet )
{
    return rtl_getBestWindowsCharsetFromTextEncoding(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;
}

sal_uInt16 XclExpFont::GetXclWeight( FontWeight eWeight )

Return to issue 2394

Lines 469-483 Link Here

(-)source/filter/excel/xistyle.cxx (-9 / +1 lines)
469		469
470	CharSet XclImpFont::GetScFontCharSet( sal_uInt8 nXclCharSet )	470	CharSet XclImpFont::GetScFontCharSet( sal_uInt8 nXclCharSet )
471	{	471	{
472	CharSet eScCharSet;	472	return rtl_getTextEncodingFromWindowsCharset(nXclCharSet);
473	switch( nXclCharSet )
474	{
475	case EXC_FONTCSET_MS_1252: eScCharSet = RTL_TEXTENCODING_MS_1252; break;
476	case EXC_FONTCSET_IBM_850: eScCharSet = RTL_TEXTENCODING_IBM_850; break;
477	case EXC_FONTCSET_SYMBOL: eScCharSet = RTL_TEXTENCODING_SYMBOL; break;
478	default: eScCharSet = ScfTools::GetSystemCharSet();
479	}
480	return eScCharSet;
481	}	473	}
482		474
483	FontItalic XclImpFont::GetScFontPosture( bool bXclItalic )	475	FontItalic XclImpFont::GetScFontPosture( bool bXclItalic )

Lines 94-99 Link Here

(-)source/filter/excel/xestyle.cxx (-15 / +4 lines)
94	#include "xehelper.hxx"	94	#include "xehelper.hxx"
95	#endif	95	#endif
96		96
		97	#ifndef _RTL_TENCINFO_H
		98	#include <rtl/tencinfo.h>
		99	#endif
97		100
98	// PALETTE record - color information =========================================	101	// PALETTE record - color information =========================================
99		102
Lines 683-703 Link Here
683		686
684	sal_uInt8 XclExpFont::GetXclCharSet( rtl_TextEncoding eCharSet )	687	sal_uInt8 XclExpFont::GetXclCharSet( rtl_TextEncoding eCharSet )
685	{	688	{
686	switch( eCharSet )	689	return rtl_getBestWindowsCharsetFromTextEncoding(eCharSet);
687	{
688	case RTL_TEXTENCODING_DONTKNOW: return EXC_FONTCSET_DONTKNOW;
689	case RTL_TEXTENCODING_MS_1252: return EXC_FONTCSET_MS_1252;
690	case RTL_TEXTENCODING_APPLE_ROMAN: return EXC_FONTCSET_APPLE_ROMAN;
691	case RTL_TEXTENCODING_IBM_437: return EXC_FONTCSET_IBM_437;
692	case RTL_TEXTENCODING_IBM_850: return EXC_FONTCSET_IBM_850;
693	case RTL_TEXTENCODING_IBM_860: return EXC_FONTCSET_IBM_860;
694	case RTL_TEXTENCODING_IBM_861: return EXC_FONTCSET_IBM_861;
695	case RTL_TEXTENCODING_IBM_863: return EXC_FONTCSET_IBM_863;
696	case RTL_TEXTENCODING_IBM_865: return EXC_FONTCSET_IBM_865;
697	case (rtl_TextEncoding) 9: return EXC_FONTCSET_SYSTEM;
698	case RTL_TEXTENCODING_SYMBOL: return EXC_FONTCSET_SYMBOL;
699	}
700	return EXC_FONTCSET_DONTKNOW;
701	}	690	}
702		691
703	sal_uInt16 XclExpFont::GetXclWeight( FontWeight eWeight )	692	sal_uInt16 XclExpFont::GetXclWeight( FontWeight eWeight )