diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-06-11 15:52:51 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-11 15:59:07 +0200 |
| commit | 776abbb83e867ac5336d9da2097d91ad8152ef55 (patch) | |
| tree | a295dec4ec287cc5c4f474f4adc5c6071e81b959 /vcl/generic/glyphs/gcach_layout.cxx | |
| parent | 8f5629fd5aafc85e509a4160a11a285b0a66e7c0 (diff) | |
Adapt gcach_layout.cxx to SAL_INFO
* ServerFont::GetFontFileName definition seems to inadvertently got lost with
8e64e571f23f969590efbf7246c464c352d8b9ec "Merge FreetypeServerFont and
ServerFont now its split out into unx"
* Likewise, ServerFont::GetFontFaceNumber is unused, so remove declaration (that
also has no corresponding definition)
Change-Id: Ia8919d4248243c434c5cdbda548f5303a468f2d3
Diffstat (limited to 'vcl/generic/glyphs/gcach_layout.cxx')
| -rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 40c7a330ad25..2e41c70a6a1b 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -35,10 +35,6 @@ #include <vcl/svapp.hxx> #include <sal/alloca.h> - -#if OSL_DEBUG_LEVEL > 1 -#include <cstdio> -#endif #include <rtl/instance.hxx> namespace { struct SimpleLayoutEngine : public rtl::Static< ServerFontLayoutEngine, SimpleLayoutEngine > {}; } @@ -231,12 +227,11 @@ const void* IcuFontFromServerFont::getFontTable( LETag nICUTableTag ) const sal_uLong nLength; const unsigned char* pBuffer = mrServerFont.GetTable( pTagName, &nLength ); -#if OSL_DEBUG_LEVEL > 1 - fprintf(stderr,"IcuGetTable(\"%s\") => %p\n", pTagName, pBuffer); - int mnHeight = mrServerFont.GetFontSelData().mnHeight; - const char* pName = mrServerFont.GetFontFileName()->getStr(); - fprintf(stderr,"font( h=%d, \"%s\" )\n", mnHeight, pName ); -#endif + SAL_INFO("vcl", "IcuGetTable(\"" << pTagName << "\") => " << pBuffer); + SAL_INFO( + "vcl", + "font( h=" << mrServerFont.GetFontSelData().mnHeight << ", \"" + << mrServerFont.GetFontFileName()->getStr() << "\" )"); return (const void*)pBuffer; } @@ -336,17 +331,10 @@ void IcuFontFromServerFont::getGlyphAdvance( LEGlyphID nGlyphIndex, // ----------------------------------------------------------------------- le_bool IcuFontFromServerFont::getGlyphPoint( LEGlyphID, - le_int32 -#if OSL_DEBUG_LEVEL > 1 -pointNumber -#endif - , - LEPoint& ) const + le_int32 pointNumber, LEPoint& ) const { //TODO: replace dummy implementation -#if OSL_DEBUG_LEVEL > 1 - fprintf(stderr,"getGlyphPoint(%d)\n", pointNumber ); -#endif + SAL_INFO("vcl", "getGlyphPoint(" << pointNumber << ")"); return false; } |