Index: vcl/source/gdi/fontcfg.cxx =================================================================== RCS file: /cvs/gsl/vcl/source/gdi/fontcfg.cxx,v retrieving revision 1.18.20.2 diff -c -r1.18.20.2 fontcfg.cxx *** vcl/source/gdi/fontcfg.cxx 17 Sep 2003 08:35:19 -0000 1.18.20.2 --- vcl/source/gdi/fontcfg.cxx 17 Nov 2003 05:40:41 -0000 *************** *** 356,364 **** if( pLine->getLength() ) m_aDefaults[ nLanguageType ][ getKeyType( aKeys.getConstArray()[i] ) ] = *pLine; #if OSL_DEBUG_LEVEL > 1 ! fprintf( stderr, " \"%s\"=\"%.30s\"\n", OUStringToOString( aKeys.getConstArray()[i], RTL_TEXTENCODING_ASCII_US ).getStr(), ! OUStringToOString( *pLine, RTL_TEXTENCODING_ASCII_US ).getStr() ); #endif } --- 356,364 ---- if( pLine->getLength() ) m_aDefaults[ nLanguageType ][ getKeyType( aKeys.getConstArray()[i] ) ] = *pLine; #if OSL_DEBUG_LEVEL > 1 ! fprintf( stderr, " %20s = \"%s\"\n", OUStringToOString( aKeys.getConstArray()[i], RTL_TEXTENCODING_ASCII_US ).getStr(), ! OUStringToOString( *pLine, osl_getThreadTextEncoding() ).getStr() ); #endif } *************** *** 1395,1403 **** if( pLine->getLength() ) m_aSettings[ aKeyName ][ pFrom[i] ] = *pLine; #if OSL_DEBUG_LEVEL > 1 ! fprintf( stderr, " \"%s\"=\"%.30s\"\n", OUStringToOString( aKeys.getConstArray()[i], RTL_TEXTENCODING_ASCII_US ).getStr(), ! OUStringToOString( *pLine, RTL_TEXTENCODING_ASCII_US ).getStr() ); #endif } --- 1395,1403 ---- if( pLine->getLength() ) m_aSettings[ aKeyName ][ pFrom[i] ] = *pLine; #if OSL_DEBUG_LEVEL > 1 ! fprintf( stderr, " %20s = \"%s\"\n", OUStringToOString( aKeys.getConstArray()[i], RTL_TEXTENCODING_ASCII_US ).getStr(), ! OUStringToOString( *pLine, osl_getThreadTextEncoding() ).getStr() ); #endif } Index: vcl/source/gdi/outdev.cxx =================================================================== RCS file: /cvs/gsl/vcl/source/gdi/outdev.cxx,v retrieving revision 1.23 diff -c -r1.23 outdev.cxx *** vcl/source/gdi/outdev.cxx 24 Apr 2003 10:27:08 -0000 1.23 --- vcl/source/gdi/outdev.cxx 17 Nov 2003 05:40:42 -0000 *************** *** 153,160 **** #include DBG_NAME( OutputDevice ); ! DBG_NAMEEX( Polygon ); ! DBG_NAMEEX( PolyPolygon ); DBG_NAMEEX( Region ); // ----------------------------------------------------------------------- --- 153,160 ---- #include DBG_NAME( OutputDevice ); ! DBG_NAME( Polygon ); ! DBG_NAME( PolyPolygon ); DBG_NAMEEX( Region ); // ----------------------------------------------------------------------- Index: vcl/source/gdi/outdev3.cxx =================================================================== RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v retrieving revision 1.155.20.1 diff -c -r1.155.20.1 outdev3.cxx *** vcl/source/gdi/outdev3.cxx 15 Aug 2003 11:23:59 -0000 1.155.20.1 --- vcl/source/gdi/outdev3.cxx 17 Nov 2003 05:40:45 -0000 *************** *** 1031,1036 **** --- 1031,1038 ---- Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang, ULONG nFlags, const OutputDevice* pOutDev ) { + DBG_TRACE( "OutputDevice::GetDefaultFont()" ); + if( eLang == LANGUAGE_NONE || eLang == LANGUAGE_SYSTEM || eLang == LANGUAGE_DONTKNOW ) { eLang = Application::GetSettings().GetUILanguage(); *************** *** 1163,1168 **** --- 1165,1211 ---- aFont.SetName( aSearch ); } } + + #if OSL_DEBUG_LEVEL > 1 + const char* s = "DEFAULTFONT_SANS_UNKNOWN"; + switch ( nType ) + { + case DEFAULTFONT_SANS_UNICODE: s = "DEFAULTFONT_SANS_UNICODE"; break; + case DEFAULTFONT_UI_SANS: s = "DEFAULTFONT_UI_SANS"; break; + + case DEFAULTFONT_SANS: s = "DEFAULTFONT_SANS"; break; + case DEFAULTFONT_LATIN_HEADING: s = "DEFAULTFONT_LATIN_HEADING"; break; + case DEFAULTFONT_LATIN_SPREADSHEET: s = "DEFAULTFONT_LATIN_SPREADSHEET"; break; + case DEFAULTFONT_LATIN_DISPLAY: s = "DEFAULTFONT_LATIN_DISPLAY"; break; + + case DEFAULTFONT_SERIF: s = "DEFAULTFONT_SERIF"; break; + case DEFAULTFONT_LATIN_TEXT: s = "DEFAULTFONT_LATIN_TEXT"; break; + case DEFAULTFONT_LATIN_PRESENTATION: s = "DEFAULTFONT_LATIN_PRESENTATION"; break; + + case DEFAULTFONT_FIXED: s = "DEFAULTFONT_FIXED"; break; + case DEFAULTFONT_LATIN_FIXED: s = "DEFAULTFONT_LATIN_FIXED"; break; + case DEFAULTFONT_UI_FIXED: s = "DEFAULTFONT_UI_FIXED"; break; + + case DEFAULTFONT_SYMBOL: s = "DEFAULTFONT_SYMBOL"; break; + + case DEFAULTFONT_CJK_TEXT: s = "DEFAULTFONT_CJK_TEXT"; break; + case DEFAULTFONT_CJK_PRESENTATION: s = "DEFAULTFONT_CJK_PRESENTATION"; break; + case DEFAULTFONT_CJK_SPREADSHEET: s = "DEFAULTFONT_CJK_SPREADSHEET"; break; + case DEFAULTFONT_CJK_HEADING: s = "DEFAULTFONT_CJK_HEADING"; break; + case DEFAULTFONT_CJK_DISPLAY: s = "DEFAULTFONT_CJK_DISPLAY"; break; + + case DEFAULTFONT_CTL_TEXT: s = "DEFAULTFONT_CTL_TEXT"; break; + case DEFAULTFONT_CTL_PRESENTATION: s = "DEFAULTFONT_CTL_PRESENTATION"; break; + case DEFAULTFONT_CTL_SPREADSHEET: s = "DEFAULTFONT_CTL_SPREADSHEET"; break; + case DEFAULTFONT_CTL_HEADING: s = "DEFAULTFONT_CTL_HEADING"; break; + case DEFAULTFONT_CTL_DISPLAY: s = "DEFAULTFONT_CTL_DISPLAY"; break; + } + fprintf( stderr, " OutputDevice::GetDefaultFont() Type=\"%s\" FontName=\"%s\"\n", + s, + OUStringToOString( aFont.GetName(), osl_getThreadTextEncoding() ).getStr() + ); + #endif + return aFont; } *************** *** 4970,4975 **** --- 5013,5023 ---- mpMetaFile->AddAction( new MetaTextFillColorAction( aFont.GetFillColor(), !aFont.IsTransparent() ) ); } + #if OSL_DEBUG_LEVEL > 1 + fprintf( stderr, " OutputDevice::SetFont() FontName=\"%s\"\n", + OUStringToOString( aFont.GetName(), osl_getThreadTextEncoding() ).getStr() ); + #endif + if ( !maFont.IsSameInstance( aFont ) ) { if ( maFont.GetColor() != aFont.GetColor() ) *************** *** 5347,5352 **** --- 5395,5405 ---- DBG_TRACE( "OutputDevice::DrawText()" ); DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); + + #if OSL_DEBUG_LEVEL > 1 + fprintf( stderr, " OutputDevice::DrawText(\"%s\")\n", + OUStringToOString( rStr, osl_getThreadTextEncoding() ).getStr() ); + #endif if ( mpMetaFile ) mpMetaFile->AddAction( new MetaTextAction( rStartPt, rStr, nIndex, nLen ) );