You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2018/08/22 16:58:51 UTC
svn commit: r1838664 - /openoffice/trunk/main/vcl/inc/glyphcache.hxx
Author: truckman
Date: Wed Aug 22 16:58:51 2018
New Revision: 1838664
URL: http://svn.apache.org/viewvc?rev=1838664&view=rev
Log:
Fix RemovingGlyph method parameter type mismatch between the base
and derived classes (int vs sal_GlyphId) and clean up a related
type mismatch involving this parameter in the base method implementation.
Modified:
openoffice/trunk/main/vcl/inc/glyphcache.hxx
Modified: openoffice/trunk/main/vcl/inc/glyphcache.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/glyphcache.hxx?rev=1838664&r1=1838663&r2=1838664&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/glyphcache.hxx (original)
+++ openoffice/trunk/main/vcl/inc/glyphcache.hxx Wed Aug 22 16:58:51 2018
@@ -221,7 +221,7 @@ protected:
virtual ServerFontLayoutEngine* GetLayoutEngine() { return NULL; }
private:
- typedef ::std::hash_map<int,GlyphData> GlyphList;
+ typedef ::std::hash_map<sal_GlyphId,GlyphData> GlyphList;
mutable GlyphList maGlyphList;
const ImplFontSelectData maFontSelData;
@@ -304,7 +304,7 @@ protected:
public:
sal_Int32 GetByteCount() const { return mnBytesUsed; }
virtual void RemovingFont( ServerFont& ) {}
- virtual void RemovingGlyph( ServerFont&, GlyphData&, int ) {}
+ virtual void RemovingGlyph( ServerFont&, GlyphData&, sal_GlyphId ) {}
protected:
sal_Int32 mnBytesUsed;