diff options
| author | Herbert Duerr <hdu@openoffice.org> | 2002-09-04 16:50:38 +0000 |
|---|---|---|
| committer | Herbert Duerr <hdu@openoffice.org> | 2002-09-04 16:50:38 +0000 |
| commit | 76924e28f42d91ad56f3c06f5ce16ce83ce098cd (patch) | |
| tree | 2a7196706add5dd9b888dfe2a2f802e08c9d6722 | |
| parent | d6c0a05bc23fba0c081dd73487b32978dbf79f51 (diff) | |
#100194# use SalLayout's glyph conventions
| -rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index b041074242ff..3371423aca1c 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: salgdi3.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: ssa $ $Date: 2002-08-29 15:40:59 $ + * last change: $Author: hdu $ $Date: 2002-09-04 17:50:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1611,6 +1611,7 @@ BOOL SalGraphics::GetGlyphBoundRect( long nIndex, bool bIsGlyphIndex, Rectangle& UINT nGGOFlags = GGO_METRICS; if( bIsGlyphIndex ) nGGOFlags |= GGO_GLYPH_INDEX; + nIndex &= GF_IDXMASK; GLYPHMETRICS aGM; DWORD nSize = GDI_ERROR; @@ -1647,6 +1648,7 @@ BOOL SalGraphics::GetGlyphOutline( long nIndex, bool bIsGlyphIndex, PolyPolygon& UINT nGGOFlags = GGO_NATIVE; if( bIsGlyphIndex ) nGGOFlags |= GGO_GLYPH_INDEX; + nIndex &= GF_IDXMASK; GLYPHMETRICS aGlyphMetrics; DWORD nSize1 = GDI_ERROR; @@ -1809,8 +1811,6 @@ BOOL SalGraphics::GetGlyphOutline( long nIndex, bool bIsGlyphIndex, PolyPolygon& // ----------------------------------------------------------------------- -namespace { - // TODO: Replace this class with boost::scoped_array class ScopedCharArray { @@ -1883,8 +1883,6 @@ int ScopedTrueTypeFont::open(void * pBuffer, sal_uInt32 nLen, return OpenTTFont(pBuffer, nLen, nFaceNum, &m_pFont); } -} - BOOL SalGraphics::CreateFontSubset( const rtl::OUString& rToFile, ImplFontData* pFont, long* pGlyphIDs, sal_uInt8* pEncoding, sal_Int32* pWidths, int nGlyphs, FontSubsetInfo& rInfo ) |