--- sw/source/filter/ww8/wrtw8sty.cxx.orig	2008-02-08 18:08:58 +0300

+++ sw/source/filter/ww8/wrtw8sty.cxx	2008-05-18 10:16:17 +0400

@@ -165,6 +165,10 @@

 #include "ww8par.hxx"

 #endif

+#ifndef _SV_SVAPP_HXX

+#include <vcl/svapp.hxx>

+#endif

+

 using namespace sw::util;

 using namespace nsHdFtFlags;

@@ -434,7 +438,7 @@

     else

     {

         pO->Insert( (BYTE)rName.Len(), pO->Count() );       // Laenge

-        SwWW8Writer::InsAsString8( *pO, rName, RTL_TEXTENCODING_MS_1252 );

+        SwWW8Writer::InsAsString8( *pO, rName, Application::GetSettings().GetDefaultTextEncoding());

     }

     pO->Insert( (BYTE)0, pO->Count() );             // Trotz P-String 0 am Ende!

 }

@@ -726,11 +730,11 @@

     else

     {

         SwWW8Writer::WriteString8(*pTableStrm, msFamilyNm, true,

-            RTL_TEXTENCODING_MS_1252);

+            Application::GetSettings().GetDefaultTextEncoding());

         if (mbAlt)

         {

             SwWW8Writer::WriteString8( *pTableStrm, msAltNm, true,

-                RTL_TEXTENCODING_MS_1252);

+                Application::GetSettings().GetDefaultTextEncoding());

         }

     }

     return true;

@@ -769,13 +773,13 @@

     mbWrtWW8 = bWrtWW8;

     GetId(wwFont(CREATE_CONST_ASC("Times New Roman"), PITCH_VARIABLE,

-        FAMILY_ROMAN, RTL_TEXTENCODING_MS_1252,bWrtWW8));

+        FAMILY_ROMAN, Application::GetSettings().GetDefaultTextEncoding(),bWrtWW8));

     GetId(wwFont(CREATE_CONST_ASC("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN,

         RTL_TEXTENCODING_SYMBOL,bWrtWW8));

     GetId(wwFont(CREATE_CONST_ASC("Arial"), PITCH_VARIABLE, FAMILY_SWISS,

-        RTL_TEXTENCODING_MS_1252,bWrtWW8));

+        Application::GetSettings().GetDefaultTextEncoding(),bWrtWW8));

     const SvxFontItem* pFont = (const SvxFontItem*)GetDfltAttr(RES_CHRATR_FONT);

@@ -1907,7 +1911,7 @@

                         const String& rStr = aStrArr[i];

                         *rWrt.pTableStrm << (BYTE)rStr.Len();

                         SwWW8Writer::WriteString8(*rWrt.pTableStrm, rStr, false,

-                            RTL_TEXTENCODING_MS_1252);

+                            Application::GetSettings().GetDefaultTextEncoding());

                     }

                 }

@@ -2010,7 +2014,7 @@

                     {

                         *rWrt.pTableStrm << nNameLen;

                         SwWW8Writer::WriteString8(*rWrt.pTableStrm, sAuthor,

-                                        false, RTL_TEXTENCODING_MS_1252);

+                                        false, Application::GetSettings().GetDefaultTextEncoding());

                         SwWW8Writer::FillCount(*rWrt.pTableStrm, 9 - nNameLen);

                     }