Resolves: #i123840# add and use the sal_GlyphId type

Using the central definition adds consistency and cleans up many ad hoc
declarations. The type sal_GlyphId will become a class in the future so
that its bitfield operations etc. can then be isolated into nice methods.

(cherry picked from commit c0a84ad10964fb7a65b6239cbe1cef8698b5d17b)

Conflicts:
vcl/aqua/source/gdi/salatslayout.cxx
vcl/aqua/source/gdi/salgdi.cxx
vcl/generic/glyphs/gcach_ftyp.cxx
vcl/generic/print/genpspgraphics.cxx
vcl/generic/print/glyphset.cxx
vcl/generic/print/glyphset.hxx
vcl/headless/svptext.cxx
vcl/inc/generic/genpspgraphics.h
vcl/inc/generic/glyphcache.hxx
vcl/inc/os2/salgdi.h
vcl/inc/quartz/salgdi.h
vcl/inc/salgdi.hxx
vcl/inc/sallayout.hxx
vcl/inc/unx/salgdi.h
vcl/inc/vcl/fontmanager.hxx
vcl/inc/win/salgdi.h
vcl/os2/source/gdi/os2layout.cxx
vcl/os2/source/gdi/salgdi3.cxx
vcl/source/gdi/pdfwriter_impl.cxx
vcl/source/gdi/sallayout.cxx
vcl/source/glyphs/gcach_ftyp.hxx
vcl/source/glyphs/gcach_layout.cxx
vcl/source/glyphs/glyphcache.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/unx/generic/fontmanager/fontmanager.cxx
vcl/unx/generic/gdi/gcach_xpeer.cxx
vcl/unx/generic/gdi/gcach_xpeer.hxx
vcl/unx/generic/gdi/salgdi3.cxx
vcl/unx/generic/gdi/xrender_peer.hxx
vcl/unx/headless/svpgdi.hxx
vcl/unx/headless/svppspgraphics.cxx
vcl/unx/headless/svppspgraphics.hxx
vcl/win/source/gdi/salgdi3.cxx
vcl/win/source/gdi/winlayout.cxx

Change-Id: Ic629131950360e2df4c15db30d6a5362193c6330

1 files changed, 8 insertions, 6 deletions

diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index 6695fc9e59d1..3ea71a3af5e9 100644
--- a/vcl/unx/generic/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
@@ -28,6 +28,8 @@ struct _XTrap; // on some older systems this is not declared within Xrender.h
 #include <vcl/salgtype.hxx>
 #include <osl/module.h>
 
+typedef Glyph XRenderGlyph;
+
 class XRenderPeer
 {
 public:
@@ -60,9 +62,9 @@ public:
 
     GlyphSet    CreateGlyphSet() const;
     void        FreeGlyphSet( GlyphSet ) const;
-    void        AddGlyph( GlyphSet, Glyph nGlyphId, const XGlyphInfo&,
+    void        AddGlyph( GlyphSet, XRenderGlyph nXRGlyph, const XGlyphInfo&,
                     const char* pBuffer, int nBufSize ) const;
-    void        FreeGlyph( GlyphSet, Glyph nGlyphId ) const;
+    void        FreeGlyph( GlyphSet, XRenderGlyph nXRGlyphId ) const;
     void        CompositeString32( Picture aSrc, Picture aDst, GlyphSet,
                     int nDstX, int nDstY, const unsigned* pText, int nTextLen ) const;
     void        FillRectangle( int nOp, Picture aDst, const XRenderColor*,
@@ -141,16 +143,16 @@ inline void XRenderPeer::FreeGlyphSet( GlyphSet aGS ) const
     XRenderFreeGlyphSet( mpDisplay, aGS );
 }
 
-inline void XRenderPeer::AddGlyph( GlyphSet aGS, Glyph nGlyphId,
+inline void XRenderPeer::AddGlyph( GlyphSet aGS, XRenderGlyph nXRGlyph,
     const XGlyphInfo& rGI, const char* pBuffer, int nBufSize ) const
 {
-    XRenderAddGlyphs( mpDisplay, aGS, &nGlyphId, &rGI, 1,
+    XRenderAddGlyphs( mpDisplay, aGS, &nXRGlyph, &rGI, 1,
                       const_cast<char*>(pBuffer), nBufSize );
 }
 
-inline void XRenderPeer::FreeGlyph( GlyphSet aGS, Glyph nGlyphId ) const
+inline void XRenderPeer::FreeGlyph( GlyphSet aGS, XRenderGlyph nXRGlyph ) const
 {
-    (void)aGS; (void)nGlyphId;
+    (void)aGS; (void)nXRGlyph;
 
     // XRenderFreeGlyphs not implemented yet for version<=0.2
     // #108209# disabled because of crash potential,