--- sw/source/filter/ww1.orig/w1filter.cxx	2007-08-10 21:17:52.000000000 +0400

+++ sw/source/filter/ww1/w1filter.cxx	2007-08-22 17:18:49.000000000 +0400

@@ -154,6 +154,9 @@

 #if OSL_DEBUG_LEVEL > 1

 #include <stdio.h>

 #endif

+#ifndef _SV_SVAPP_HXX

+#include <vcl/svapp.hxx>

+#endif

 #define MAX_FIELDLEN 64000

@@ -1433,7 +1436,7 @@

 		 eFamily = FAMILY_ROMAN;

 		 aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Tms Rmn" ));

 		 ePitch = PITCH_VARIABLE;

-		 eCharSet = RTL_TEXTENCODING_MS_1252;

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

 	break;

 	case 1:

 		 aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Symbol" ));

@@ -1444,7 +1447,7 @@

 		 eFamily = FAMILY_SWISS;

 		 aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Helv" ));

 		 ePitch = PITCH_VARIABLE;

-		 eCharSet = RTL_TEXTENCODING_MS_1252;

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

 	break;

 	default:

 	{

@@ -1453,7 +1456,7 @@

 		{

 		// Fontname .........................................

 			aName = String( (sal_Char*)pF->szFfnGet(),

-							RTL_TEXTENCODING_MS_1252 );

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

 		// Pitch .............................................

 			static FontPitch ePitchA[] =

 			{

@@ -1461,7 +1464,7 @@

 			};

 			ePitch = ePitchA[pF->prgGet()];

 		// CharSet ...........................................

-			eCharSet = RTL_TEXTENCODING_MS_1252;

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

 			if (aName.EqualsIgnoreCaseAscii("Symbol")

 			 || aName.EqualsIgnoreCaseAscii("Symbol Set")

 			 || aName.EqualsIgnoreCaseAscii("Wingdings")

@@ -1483,7 +1486,7 @@

 			eFamily = FAMILY_SWISS;

 		 	aName.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "Helv" ));

 			ePitch = PITCH_VARIABLE;

-			eCharSet = RTL_TEXTENCODING_MS_1252;

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

 		}

 	}

 	break;

@@ -2004,7 +2007,7 @@

 	{

 		String aDir( (sal_Char*)pPic->rgbGet(),

 				(USHORT)(pPic->lcbGet() - (sizeof(*pPic)-sizeof(pPic->rgb))),

-				RTL_TEXTENCODING_MS_1252 );

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

 		//SvFileStream aOut(aDir, STREAM_READ|STREAM_WRITE|STREAM_TRUNC);

 		rOut.AddGraphic( aDir );

 	}