--- sw/source/filter/ww8/ww8scan.cxx.MS_1252 2008-09-23 15:44:47 +0000 +++ sw/source/filter/ww8/ww8scan.cxx 2008-09-23 18:42:29 +0000 @@ -52,6 +52,10 @@ #include #include +#ifndef _SV_SVAPP_HXX +#include +#endif + #define ASSERT_RET_ON_FAIL( aCon, aError, aRet ) \ ASSERT(aCon, aError); \ if (!(aCon)) \ @@ -5984,7 +5988,7 @@ case 6: case 7: // lies Pascal-String - *pString = WW8ReadPString( rSt, RTL_TEXTENCODING_MS_1252 ); + *pString = WW8ReadPString( rSt, Application::GetSettings().GetDefaultTextEncoding()); // leading len and trailing zero --> 2 rSkip -= 2+ pString->Len(); break; @@ -6008,7 +6012,7 @@ they are not corrupt. If they are then we try them as 8bit ones */ - *pString = WW8ReadPString(rSt,RTL_TEXTENCODING_MS_1252); + *pString = WW8ReadPString(rSt,Application::GetSettings().GetDefaultTextEncoding()); // leading len and trailing zero --> 2 rSkip -= 2+ pString->Len(); } @@ -6200,7 +6204,7 @@ */ rtl_TextEncoding eEnc = WW8Fib::GetFIBCharset(p->chs); if ((eEnc == RTL_TEXTENCODING_SYMBOL) || (eEnc == RTL_TEXTENCODING_DONTKNOW)) - eEnc = RTL_TEXTENCODING_MS_1252; + eEnc = Application::GetSettings().GetDefaultTextEncoding(); p->sFontname = String(pVer6->szFfn, eEnc); if (p->ibszAlt) {