--- sc/source/filter/excel/xistyle.cxx +++ sc/source/filter/excel/xistyle.cxx @@ -142,6 +142,9 @@ #include #include #include +#ifndef _SV_SVAPP_HXX +#include +#endif using namespace ::com::sun::star; typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE; @@ -282,8 +285,8 @@ rtl_TextEncoding XclImpFont::GetFontEncoding() const { // #i63105# use text encoding from FONT record // #i67768# BIFF2-BIFF4 FONT records do not contain character set - rtl_TextEncoding eFontEnc = mbHasCharSet ? maData.GetFontEncoding() : GetTextEncoding(); - return (eFontEnc == RTL_TEXTENCODING_DONTKNOW) ? GetTextEncoding() : eFontEnc; + rtl_TextEncoding eFontEnc = mbHasCharSet ? maData.GetFontEncoding() : Application::GetSettings().GetDefaultTextEncoding(); + return (eFontEnc == RTL_TEXTENCODING_DONTKNOW || (eFontEnc == RTL_TEXTENCODING_MS_1252 && GetBiff() == EXC_BIFF5 ) /* FoxPro generates CP1252 always */ ) ? Application::GetSettings().GetDefaultTextEncoding() : eFontEnc; } void XclImpFont::ReadFont( XclImpStream& rStrm )