diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-30 16:07:16 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-25 19:53:22 +0200 |
| commit | e194f597ae5882e1cda2cac2925577fff609f101 (patch) | |
| tree | 5607412d62d9f40415992255e849b8425e4cd6a3 /vcl/quartz | |
| parent | b5a6865a67dc6223dc164d2fe68dfdaf4dab5c39 (diff) | |
Change GlyphItem::nFallbackLevel to font instance
No need for a real reference, as GlyphItems are bound to their
GenericSalLayout, which holds the valid reference and doesn't
allow font change.
Change-Id: I8e1129ef99f576e43d55f39aee040ceeb635d51d
Reviewed-on: https://gerrit.libreoffice.org/62359
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index bd7800d02f28..639f54a74144 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -372,24 +372,12 @@ bool AquaSalGraphics::AddTempDevFont( PhysicalFontCollection*, bool AquaSalGraphics::GetGlyphOutline(const GlyphItem& rGlyph, basegfx::B2DPolyPolygon& rPolyPoly) { - const int nFallbackLevel = rGlyph.m_nFallbackLevel; - if (nFallbackLevel < MAX_FALLBACK && mpTextStyle[nFallbackLevel]) - { - const bool bRC = mpTextStyle[nFallbackLevel]->GetGlyphOutline(rGlyph, rPolyPoly); - return bRC; - } - return false; + return static_cast<CoreTextStyle*>(rGlyph.m_pFontInstance)->GetGlyphOutline(rGlyph, rPolyPoly); } bool AquaSalGraphics::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle& rRect ) { - const int nFallbackLevel = rGlyph.m_nFallbackLevel; - if (nFallbackLevel < MAX_FALLBACK && mpTextStyle[nFallbackLevel]) - { - const bool bRC = mpTextStyle[nFallbackLevel]->GetGlyphBoundRect(rGlyph, rRect); - return bRC; - } - return false; + return static_cast<CoreTextStyle*>(rGlyph.m_pFontInstance)->GetGlyphBoundRect(rGlyph, rRect); } void AquaSalGraphics::DrawTextLayout(const GenericSalLayout& rLayout) |