diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-23 08:00:31 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-23 08:00:31 +0000 |
| commit | 4628d6de2a4b2e52683d3adb352cd5299cdc4b4c (patch) | |
| tree | b5cadeb7703ac1d1f9dc6bf959025e64a3d13dca /vcl | |
| parent | dfbf0cabfa8310502e19642d56c746cc0d454d27 (diff) | |
adapt DEBUG code
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/generic/fontmanager/fontsubst.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx index 3e1cafc7c90b..26076681a99d 100644 --- a/vcl/generic/fontmanager/fontsubst.cxx +++ b/vcl/generic/fontmanager/fontsubst.cxx @@ -163,15 +163,17 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut ); #ifdef DEBUG - const ByteString aOrigName( rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); - const ByteString aSubstName( aOut.maSearchName, RTL_TEXTENCODING_UTF8 ); + const rtl::OString aOrigName(rtl::OUStringToOString(rFontSelData.maTargetName, + RTL_TEXTENCODING_UTF8)); + const rtl::OString aSubstName(rtl::OUStringToOString(aOut.maSearchName, + RTL_TEXTENCODING_UTF8)); printf( "FcPreMatchSubstititution \"%s\" bipw=%d%d%d%d -> ", - aOrigName.GetBuffer(), rFontSelData.meWeight, rFontSelData.meItalic, + aOrigName.getStr(), rFontSelData.meWeight, rFontSelData.meItalic, rFontSelData.mePitch, rFontSelData.meWidthType ); if( !bHaveSubstitute ) printf( "no substitute available\n" ); else - printf( "\"%s\" bipw=%d%d%d%d\n", aSubstName.GetBuffer(), + printf( "\"%s\" bipw=%d%d%d%d\n", aSubstName.getStr(), aOut.meWeight, aOut.meItalic, aOut.mePitch, aOut.meWidthType ); #endif @@ -205,15 +207,17 @@ bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFont const bool bHaveSubstitute = !uselessmatch( rFontSelData, aOut ); #ifdef DEBUG - const ByteString aOrigName( rFontSelData.maTargetName, RTL_TEXTENCODING_UTF8 ); - const ByteString aSubstName( aOut.maSearchName, RTL_TEXTENCODING_UTF8 ); + const rtl::OString aOrigName(rtl::OUStringToOString(rFontSelData.maTargetName, + RTL_TEXTENCODING_UTF8)); + const rtl::OString aSubstName(rtl::OUStringToOString(aOut.maSearchName, + RTL_TEXTENCODING_UTF8)); printf( "FcGFSubstititution \"%s\" bipw=%d%d%d%d ->", - aOrigName.GetBuffer(), rFontSelData.meWeight, rFontSelData.meItalic, + aOrigName.getStr(), rFontSelData.meWeight, rFontSelData.meItalic, rFontSelData.mePitch, rFontSelData.meWidthType ); if( !bHaveSubstitute ) printf( "no substitute available\n" ); else - printf( "\"%s\" bipw=%d%d%d%d\n", aSubstName.GetBuffer(), + printf( "\"%s\" bipw=%d%d%d%d\n", aSubstName.getStr(), aOut.meWeight, aOut.meItalic, aOut.mePitch, aOut.meWidthType ); #endif |