diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-16 12:08:23 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-16 20:17:26 +0100 |
commit | 6f248073aae4e5c0208c19ad2ad15f4ab953246a (patch) | |
tree | b9a7bd76b1fefa0328e84a0aa1323d42d6790aad | |
parent | 78949ca9a24820e347d241b16c0ad01a030be159 (diff) |
Remove HDU_DEBUG
OSL_DEBUG_LEVEL > 2 isn't activated anyway so I removed it at this point.
-rw-r--r-- | vcl/source/gdi/outdev3.cxx | 38 | ||||
-rw-r--r-- | vcl/source/glyphs/gcach_ftyp.cxx | 5 | ||||
-rw-r--r-- | vcl/unx/source/gdi/salgdi3.cxx | 15 | ||||
-rw-r--r-- | vcl/unx/source/gdi/xfont.cxx | 3 |
4 files changed, 0 insertions, 61 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 0d214859bbaa..e92ac016d916 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -1392,16 +1392,6 @@ void ImplDevFontList::InitGenericGlyphFallback( void ) const pFallbackList[ j+1 ] = pTestFont; } -#if defined(HDU_DEBUG) - for( int i = 0; i < nMaxLevel; ++i ) - { - ImplDevFontListData* pFont = pFallbackList[ i ]; - ByteString aFontName( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ); - fprintf( stderr, "GlyphFallbackFont[%d] (quality=%05d): \"%s\"\n", - i, pFont->GetMinQuality(), aFontName.GetBuffer() ); - } -#endif - mnFallbackCount = nMaxLevel; mpFallbackList = pFallbackList; } @@ -5032,12 +5022,6 @@ void OutputDevice::SetFont( const Font& rNewFont ) mpMetaFile->AddAction( new MetaTextFillColorAction( aFont.GetFillColor(), !aFont.IsTransparent() ) ); } -#if (OSL_DEBUG_LEVEL > 2) || defined (HDU_DEBUG) - fprintf( stderr, " OutputDevice::SetFont( name=\"%s\", h=%ld)\n", - OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), - aFont.GetSize().Height() ); -#endif - if ( !maFont.IsSameInstance( aFont ) ) { // Optimization MT/HDU: COL_TRANSPARENT means SetFont should ignore the font color, @@ -6029,17 +6013,6 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay rLayoutArgs.PrepareFallback(); rLayoutArgs.mnFlags |= SAL_LAYOUT_FOR_FALLBACK; -#if defined(HDU_DEBUG) - { - int nCharPos = -1; - bool bRTL = false; - fprintf(stderr,"OD:ImplLayout Glyph Fallback for"); - for( int i=0; i<8 && rLayoutArgs.GetNextPos( &nCharPos, &bRTL); ++i ) - fprintf(stderr," U+%04X", rLayoutArgs.mpStr[ nCharPos ] ); - fprintf(stderr,"\n"); - rLayoutArgs.ResetPos(); - } -#endif // get list of unicodes that need glyph fallback int nCharPos = -1; bool bRTL = false; @@ -6087,17 +6060,6 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay } } -#if defined(HDU_DEBUG) - { - ByteString aOrigFontName( maFont.GetName(), RTL_TEXTENCODING_UTF8); - ByteString aFallbackName( aFontSelData.mpFontData->GetFamilyName(), - RTL_TEXTENCODING_UTF8); - fprintf(stderr,"\tGlyphFallback[lvl=%d] \"%s\" -> \"%s\" (q=%d)\n", - nFallbackLevel, aOrigFontName.GetBuffer(), aFallbackName.GetBuffer(), - aFontSelData.mpFontData->GetQuality()); - } -#endif - ImplFontMetricData aSubstituteMetric(aFontSelData); pFallbackFont->mnSetFontFlags = mpGraphics->SetFont( &aFontSelData, nFallbackLevel ); mpGraphics->GetFontMetric(&aSubstituteMetric, nFallbackLevel); diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index 0539e199905c..0f338c5bb7cd 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -710,11 +710,6 @@ FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontIn { maFaceFT = pFI->GetFaceFT(); -#ifdef HDU_DEBUG - fprintf( stderr, "FTSF::FTSF(\"%s\", h=%d, w=%d, sy=%d) => %d\n", - pFI->GetFontFileName()->getStr(), rFSD.mnHeight, rFSD.mnWidth, pFI->IsSymbolFont(), maFaceFT!=0 ); -#endif - if( !maFaceFT ) return; diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx index fcc60964d101..cf91257dd9e5 100644 --- a/vcl/unx/source/gdi/salgdi3.cxx +++ b/vcl/unx/source/gdi/salgdi3.cxx @@ -575,21 +575,6 @@ X11SalGraphics::SelectFont() bool X11SalGraphics::setFont( const ImplFontSelectData *pEntry, int nFallbackLevel ) { -#ifdef HDU_DEBUG - ByteString aReqName( "NULL" ); - if( pEntry ) - aReqName = ByteString( pEntry->maName, RTL_TEXTENCODING_UTF8 ); - ByteString aUseName( "NULL" ); - if( pEntry && 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?-1:pEntry->mnWidth, !pEntry?-1:pEntry->mnHeight, - !pEntry?-1:pEntry->mbNonAntialiased, - !pEntry?-1:pEntry->meWeight, !pEntry?-1:pEntry->meItalic, - aUseName.GetBuffer() ); -#endif - // release all no longer needed font resources for( int i = nFallbackLevel; i < MAX_FALLBACK; ++i ) { diff --git a/vcl/unx/source/gdi/xfont.cxx b/vcl/unx/source/gdi/xfont.cxx index 8a14e693f8df..0408a4ab7511 100644 --- a/vcl/unx/source/gdi/xfont.cxx +++ b/vcl/unx/source/gdi/xfont.cxx @@ -127,9 +127,6 @@ LoadXFont (Display* pDisplay, const char* pFontName) if ((pFont != NULL) && (pFont->fid == 0)) pFont->fid = XLoadFont(pDisplay, pFontName); -#ifdef HDU_DEBUG - fprintf( stderr, "XLoadFont \"%s\" => %d\n", pFontName, (pFont!= NULL) ); -#endif return pFont; } |