diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index c27504b96de8..04905aed5567 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -556,6 +556,7 @@ public: {} using LEFontInstance::getFontTable; + virtual const void* getFontTable(LETag tableTag, size_t &length) const; virtual const void* getFontTable(LETag tableTag) const; virtual le_int32 getUnitsPerEM() const; virtual float getXPixelsPerEm() const; @@ -577,7 +578,7 @@ public: // ----------------------------------------------------------------------- -const void* IcuFontFromServerFont::getFontTable( LETag nICUTableTag ) const +const void* IcuFontFromServerFont::getFontTable( LETag nICUTableTag, size_t & rLength ) const { char pTagName[5]; pTagName[0] = (char)(nICUTableTag >> 24); @@ -586,9 +587,10 @@ const void* IcuFontFromServerFont::getFontTable( LETag nICUTableTag ) const pTagName[3] = (char)(nICUTableTag); pTagName[4] = 0; - sal_uLong nLength; + sal_uLong nLength = 0; const unsigned char* pBuffer = mrServerFont.GetTable( pTagName, &nLength ); - SAL_INFO("vcl", "IcuGetTable(\"" << pTagName << "\") => " << pBuffer); + rLength = static_cast(nLength); + SAL_INFO("vcl", "IcuGetTable(\"" << pTagName << "\") => " << pBuffer << ", len=" << rLength); SAL_INFO( "vcl", "font( h=" << mrServerFont.GetFontSelData().mnHeight << ", \"" @@ -596,6 +598,12 @@ const void* IcuFontFromServerFont::getFontTable( LETag nICUTableTag ) const return pBuffer; } +const void* IcuFontFromServerFont::getFontTable( LETag nICUTableTag ) const +{ + size_t nLength = 0; + return getFontTable( nICUTableTag, nLength); +} + // ----------------------------------------------------------------------- le_int32 IcuFontFromServerFont::getUnitsPerEM() const