From a16aacd6474f02307341646ec08f9e1608a8615d Mon Sep 17 00:00:00 2001
From: Herbert Dürr <hdu@apache.org>
Date: Mon, 16 Dec 2013 16:07:41 +0000
Subject: 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
---
 vcl/inc/win/salgdi.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'vcl/inc/win/salgdi.h')

diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index bd9483a9e4db..58de36ad0f87 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -330,7 +330,7 @@ public:
     // as "undefined character"
     virtual sal_Bool            CreateFontSubset( const OUString& rToFile,
                                               const PhysicalFontFace*,
-                                              long* pGlyphIDs,
+                                              sal_GlyphId* pGlyphIDs,
                                               sal_uInt8* pEncoding,
                                               sal_Int32* pWidths,
                                               int nGlyphs,
@@ -366,8 +366,8 @@ public:
                                             Ucs2UIntMap& rUnicodeEnc );
     virtual int             GetMinKashidaWidth();
 
-    virtual sal_Bool                    GetGlyphBoundRect( sal_GlyphId nIndex, Rectangle& );
-    virtual sal_Bool                    GetGlyphOutline( sal_GlyphId nIndex, ::basegfx::B2DPolyPolygon& );
+    virtual bool            GetGlyphBoundRect( sal_GlyphId, Rectangle& );
+    virtual bool            GetGlyphOutline( sal_GlyphId, ::basegfx::B2DPolyPolygon& );
 
     virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
     virtual void                     DrawServerFontLayout( const ServerFontLayout& );
-- 
cgit