From 8fea9039e5df0626541ce603d18d86edce89f76c Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 8 Sep 2004 14:58:06 +0000
Subject: [PATCH] INTEGRATION: CWS vcl26 (1.120.24); FILE MERGED 2004/08/19
 14:19:53 hdu 1.120.24.1: #117097# improved debugging info for font name
 related issues

---
 vcl/unx/source/gdi/salgdi3.cxx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx
index 9f5e59363f14..7a5b6dd7d281 100644
--- a/vcl/unx/source/gdi/salgdi3.cxx
+++ b/vcl/unx/source/gdi/salgdi3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salgdi3.cxx,v $
  *
- *  $Revision: 1.121 $
+ *  $Revision: 1.122 $
  *
- *  last change: $Author: rt $ $Date: 2004-09-08 15:13:25 $
+ *  last change: $Author: hr $ $Date: 2004-09-08 15:58:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -621,8 +621,14 @@ bool X11SalGraphics::setFont( const ImplFontSelectData *pEntry, int nFallbackLev
     bFontVertical_      = pEntry->mbVertical;
 
 #ifdef HDU_DEBUG
-    ByteString aName( pEntry->maName, osl_getThreadTextEncoding() );
-    fprintf( stderr, "SetFont(lvl=%d,\"%s\", %d*%d, naa=%d,b=%d,i=%d)\n", nFallbackLevel, aName.GetBuffer(), pEntry->mnWidth, pEntry->mnHeight, pEntry->mbNonAntialiased, pEntry->meWeight, pEntry->meItalic );
+    ByteString aReqName( pEntry->maName, RTL_TEXTENCODING_UTF8 );
+    ByteString aUseName( "UNKNOWN" );
+    if( pEntry->mpFontData )
+        aUseName = ByteString( pEntry->mpFontData->GetFamilyName(), RTL_TEXTENCODING_UTF8 );
+    fprintf( stderr, "SetFont(lvl=%d,\"%s\", %d*%d, naa=%d,b=%d,i=%d) => \"%s\"\n",
+        nFallbackLevel, aReqName.GetBuffer(), pEntry->mnWidth, pEntry->mnHeight,
+        pEntry->mbNonAntialiased, pEntry->meWeight, pEntry->meItalic,
+        aUseName.GetBuffer() );
 #endif
 
     for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i )