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 /include | |
| 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 'include')
| -rw-r--r-- | include/vcl/glyphitem.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/vcllayout.hxx | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/vcl/glyphitem.hxx b/include/vcl/glyphitem.hxx index 39d99bf69744..306466b67723 100644 --- a/include/vcl/glyphitem.hxx +++ b/include/vcl/glyphitem.hxx @@ -41,10 +41,10 @@ struct VCL_DLLPUBLIC GlyphItem sal_GlyphId m_aGlyphId; Point m_aLinearPos; // absolute position of non rotated string - int m_nFallbackLevel; + LogicalFontInstance* m_pFontInstance; GlyphItem(int nCharPos, int nCharCount, sal_GlyphId aGlyphId, const Point& rLinearPos, - long nFlags, int nOrigWidth, int nXOffset) + long nFlags, int nOrigWidth, int nXOffset, LogicalFontInstance* pFontInstance) : m_nFlags(nFlags) , m_nCharPos(nCharPos) , m_nCharCount(nCharCount) @@ -53,7 +53,7 @@ struct VCL_DLLPUBLIC GlyphItem , m_nXOffset(nXOffset) , m_aGlyphId(aGlyphId) , m_aLinearPos(rLinearPos) - , m_nFallbackLevel(0) + , m_pFontInstance(pFontInstance) { } diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx index 81cb7be614fb..3237973e9ffc 100644 --- a/include/vcl/vcllayout.hxx +++ b/include/vcl/vcllayout.hxx @@ -96,8 +96,9 @@ public: virtual bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594 // methods using glyph indexing - virtual bool GetNextGlyph(const GlyphItem** pGlyph, Point& rPos, int&, - const PhysicalFontFace** pFallbackFont = nullptr) const = 0; + virtual bool GetNextGlyph(const GlyphItem** pGlyph, Point& rPos, int& nStart, + const PhysicalFontFace** pFallbackFont = nullptr, + int* const pFallbackLevel = nullptr) const = 0; virtual bool GetOutline( SalGraphics&, basegfx::B2DPolyPolygonVector& ) const; virtual bool GetBoundRect( SalGraphics&, tools::Rectangle& ) const; |