[Libreoffice-commits] .: vcl/generic vcl/inc

[Stephan Bergmann]

 vcl/generic/glyphs/gcach_ftyp.cxx   |    5 ++++-
 vcl/generic/glyphs/gcach_layout.cxx |   26 +++++++-------------------
 vcl/inc/generic/glyphcache.hxx      |    1 -
 3 files changed, 11 insertions(+), 21 deletions(-)

New commits:
commit 776abbb83e867ac5336d9da2097d91ad8152ef55
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 11 15:52:51 2012 +0200

    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

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 93935e6..7c4bc21 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -913,7 +913,10 @@ boost::shared_ptr<ImplFontOptions> ServerFont::GetFontOptions() const
     return mpFontOptions;
 }
 
-// -----------------------------------------------------------------------
+const ::rtl::OString* ServerFont::GetFontFileName() const
+{
+    return mpFontInfo->GetFontFileName();
+}
 
 bool ServerFont::TestFont() const
 {
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index 40c7a33..2e41c70 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;
 }
 
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 4b3286f..90551a6 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -192,7 +192,6 @@ public:
     virtual ~ServerFont();
 
     const ::rtl::OString* GetFontFileName() const;
-    int                 GetFontFaceNumber() const;
     bool                TestFont() const;
     FT_Face             GetFtFace() const;
     int                 GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); }