Репозитории ALT
5.1: | 3.2.0.7-alt0.M51.1 |
4.1: | 3.0.0.10-alt1.M41.1 |
4.0: | 2.4.1.7-alt0.M40.1 |
3.0: | 1.1.5-alt1 |
Группа :: Офис
Пакет: openoffice.org
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: openoffice.org-2.4.0-infra-417-sc_source_filter_excel_xistyle_cxx.diff
Скачать
Скачать
--- sc/source/filter/excel/xistyle.cxx
+++ sc/source/filter/excel/xistyle.cxx
@@ -142,6 +142,9 @@
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#ifndef _SV_SVAPP_HXX
+#include <vcl/svapp.hxx>
+#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 )