--- sw/source/filter/ww8/dump/dump8a.cxx.MS_1252	2008-04-10 21:28:45 +0400

+++ sw/source/filter/ww8/dump/dump8a.cxx	2008-09-25 21:01:43 +0400

@@ -45,6 +45,10 @@

 #include "ww8darr.hxx"

 #include "ww8dout.hxx"

+#ifndef _SV_SVAPP_HXX

+#include <vcl/svapp.hxx>

+#endif

+

 #define ASSERT( a, b ) ( (a)?(void)0:(void)(*pOut<<endl1<<"ASSERTION failed "<< __FILE__<<__LINE__<< b <<endl1) )

@@ -388,7 +392,7 @@ static void DumpBookHigh()

 		*pOut << ( ( aBook.GetIsEnd() ) ? " Ende  " : " Anfang" );

 		*pOut << " Handle: " << aBook.GetHandle();

 //		*pOut << " Len: " << hex4 << aBook.GetLen() << dec;

-		ByteString sName( *aBook.GetName(), RTL_TEXTENCODING_MS_1252 );

+		ByteString sName( *aBook.GetName(), Application::GetSettings().GetDefaultTextEncoding() );

 		if( sName.Len() )

 			*pOut << " Name: " << sName.GetBuffer() << endl1;

 		else

@@ -529,12 +533,12 @@ static void DumpFonts()

 		// const

 		WW8_FFN* p = (WW8_FFN*)aFonts.GetFont( i );

-		sOut = ByteString( p->sFontname, RTL_TEXTENCODING_MS_1252 );

+		sOut = ByteString( p->sFontname, Application::GetSettings().GetDefaultTextEncoding() );

 		*pOut << "Id:" << i << " Name:\"" << sOut.GetBuffer() << '"';    // Name

 		if( p->ibszAlt )					// gibt es einen alternativen Font ?

 		{

 			sOut = ByteString( p->sFontname.Copy( p->ibszAlt ),

-								RTL_TEXTENCODING_MS_1252 );

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

 			*pOut << ", Alternativ:" << '"' << sOut.GetBuffer() << '"';

 		}

 		*pOut << ", PitchRequest:" << (short)p->prg << ", TrueType:" << (short)p->fTrueType;

@@ -2520,7 +2524,7 @@ void DStyle::Dump1Style( USHORT nNr )

 		*pOut << c << "-Style Nr:" << nNr << ' ';

 		*pOut << "ID:"; PrintStyleId( pStd->sti );

 		*pOut << "BasedOn:"; PrintStyleId( pStd->istdBase );

-		ByteString sName( aStr, RTL_TEXTENCODING_MS_1252 );

+		ByteString sName( aStr, Application::GetSettings().GetDefaultTextEncoding() );

 		*pOut << "Next:" << pStd->istdNext << " Name:\"" << sName.GetBuffer() << "\"";

 		*pOut << endl1 << "                       ";

 		*pOut << "cbStd:" << cbStd << ' ';

@@ -2594,7 +2598,7 @@ int PrepareConvert( String& rName, Strin

 	}

 	xStrm->Seek( 0 );

-	ByteString sOutName( rOutName, RTL_TEXTENCODING_MS_1252 );

+	ByteString sOutName( rOutName, Application::GetSettings().GetDefaultTextEncoding() );

 	pOut = new fstream( sOutName.GetBuffer(), ios::out );

 	if ( !pOut )

 	{

@@ -2663,7 +2667,7 @@ int DoConvert( const String& rName, BYTE

 	// dann erstmal den Dateinamen schreiben:

 	{

-		ByteString sName( rName, RTL_TEXTENCODING_MS_1252 );

+		ByteString sName( rName, Application::GetSettings().GetDefaultTextEncoding() );

 		*pOut << "Datei: " << sName.GetBuffer() << endl;

 	}

 	pSBase = new WW8ScannerBase( &xStrm, &xTableStream, &xDataStream, pWwFib );

--- sw/source/filter/ww8/dump/ww8scan.cxx.MS_1252	2008-04-10 21:31:06 +0400

+++ sw/source/filter/ww8/dump/ww8scan.cxx	2008-09-25 21:06:10 +0400

@@ -59,6 +59,10 @@

 #include <tools/debug.hxx>

 #include "ww8scan.hxx"

+#ifndef _SV_SVAPP_HXX

+#include <vcl/svapp.hxx>

+#endif

+

 #define ASSERT_RET_ON_FAIL( aCon, aError, aRet ) \

     ASSERT(aCon, aError); \

     if (!(aCon)) \

@@ -5681,7 +5685,7 @@ WW8_STD* WW8Style::Read1Style( short& rS

                 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;

@@ -5705,7 +5709,7 @@ WW8_STD* WW8Style::Read1Style( short& rS

                         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();

                     }