diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-08 05:57:40 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-11 00:22:05 +0000 |
| commit | a597dc833966aba23d4b677e5bcd6f74b979fc9d (patch) | |
| tree | 1d726a37763038278a9117628388dc55c1c969d1 /vcl/quartz | |
| parent | 0fb0a564bf9cb0f721e812ac4bfa70e951827bdd (diff) | |
sal_GlyphId is a simple glyph id now
No more cleverness.
Change-Id: I760c602802961b37728c6987c4ade14fb02ca034
Reviewed-on: https://gerrit.libreoffice.org/31819
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/ctfonts.cxx | 4 | ||||
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 2 | ||||
| -rw-r--r-- | vcl/quartz/salgdicommon.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 52062eb86e21..f5ea6dbc45e2 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -154,7 +154,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP bool CoreTextStyle::GetGlyphBoundRect(const GlyphItem& rGlyph, Rectangle& rRect ) const { - CGGlyph nCGGlyph = rGlyph.maGlyphId & GF_IDXMASK; + CGGlyph nCGGlyph = rGlyph.maGlyphId; CTFontRef aCTFontRef = static_cast<CTFontRef>(CFDictionaryGetValue( mpStyleDict, kCTFontAttributeName )); SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.11 kCTFontDefaultOrientation @@ -229,7 +229,7 @@ bool CoreTextStyle::GetGlyphOutline(const GlyphItem& rGlyph, basegfx::B2DPolyPol { rResult.clear(); - CGGlyph nCGGlyph = rGlyph.maGlyphId & GF_IDXMASK; + CGGlyph nCGGlyph = rGlyph.maGlyphId; CTFontRef pCTFont = static_cast<CTFontRef>(CFDictionaryGetValue( mpStyleDict, kCTFontAttributeName )); CGPathRef xPath = CTFontCreatePathForGlyph( pCTFont, nCGGlyph, nullptr ); if (!xPath) diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index 0df8955fd404..e38f5d29f9e0 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -442,7 +442,7 @@ void AquaSalGraphics::DrawTextLayout(const CommonSalLayout& rLayout) } } - aGlyphIds.push_back(pGlyph->maGlyphId & GF_IDXMASK); + aGlyphIds.push_back(pGlyph->maGlyphId); aGlyphPos.push_back(aGCPos); aGlyphOrientation.push_back(bUprightGlyph); } diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 57a930ab4a41..2222e062b54e 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -274,7 +274,7 @@ bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile, { aTempEncs[i] = pEncoding[i]; - sal_GlyphId aGlyphId(pGlyphIds[i] & GF_IDXMASK); + sal_GlyphId aGlyphId(pGlyphIds[i]); aShortIDs[i] = static_cast<sal_uInt16>( aGlyphId ); if( !aGlyphId && nNotDef < 0 ) { |