--- sw/source/filter/ww8/ww8par.cxx +++ sw/source/filter/ww8/ww8par.cxx @@ -288,6 +288,9 @@ #define MM_250 1417 // WW-Default fuer Hor. Seitenraender: 2.5 cm #define MM_200 1134 // WW-Default fuer u.Seitenrand: 2.0 cm +#ifndef _SV_SVAPP_HXX +#include +#endif using namespace ::com::sun::star; using namespace sw::util; @@ -1851,7 +1854,7 @@ long SwWW8ImplReader::Read_And(WW8PLCFManResult* pRes) sAuthor = *pA; else sAuthor = String(pDescri->xstUsrInitl + 1, pDescri->xstUsrInitl[0], - RTL_TEXTENCODING_MS_1252); + Application::GetSettings().GetDefaultTextEncoding()); } else { @@ -2448,7 +2451,7 @@ CharSet SwWW8ImplReader::GetCurrentCharSet() eSrcCharSet = RTL_TEXTENCODING_MS_1250; break; default: - eSrcCharSet = RTL_TEXTENCODING_MS_1252; + eSrcCharSet = Application::GetSettings().GetDefaultTextEncoding(); break; } } @@ -2507,7 +2510,7 @@ sal_Unicode Custom8BitToUnicode(rtl_TextToUnicodeConverter hConverter, if (nInfo & RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_IGNORE) { rtl_TextToUnicodeConverter hCP1252Converter = - rtl_createTextToUnicodeConverter(RTL_TEXTENCODING_MS_1252); + rtl_createTextToUnicodeConverter(Application::GetSettings().GetDefaultTextEncoding()); nDestChars = rtl_convertTextToUnicode(hCP1252Converter, 0, &cChar, 1, &nConvChar, 1, nFlags, &nInfo, &nSrcBytes ); rtl_destroyTextToUnicodeConverter(hCP1252Converter); @@ -2550,7 +2553,7 @@ bool SwWW8ImplReader::ReadPlainChars(WW8_CP& rPos, long nEnd, long nCpOfs) return true; const CharSet eSrcCharSet = bVer67 ? GetCurrentCharSet() : - RTL_TEXTENCODING_MS_1252; + Application::GetSettings().GetDefaultTextEncoding(); // (re)alloc UniString data String sPlainCharsBuf; @@ -2890,7 +2893,7 @@ bool SwWW8ImplReader::ReadChar(long nPosCp, long nCpOfs) if( '\x0' != cInsert ) { String sInsert = ByteString::ConvertToUnicode(cInsert, - RTL_TEXTENCODING_MS_1252 ); + Application::GetSettings().GetDefaultTextEncoding()); AddTextToParagraph(sInsert); } if (!maApos.back()) //a para end in apo doesn't count diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 405d291..736f988 100644