diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-30 16:10:58 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-25 14:02:32 +0200 |
| commit | dd16804e52984ded1ee739a22822daa068a13707 (patch) | |
| tree | 9e005e8bdc9d438cbcf7190f9440e60fc0769de0 /include/vcl | |
| parent | 655e3bd9a880a8bf3a1f9d3514e64d0da3d36b8a (diff) | |
Drop duplicate PhysicalFontFace reference
A LogicalFontInstance has a pointer to its parent font face.
And don't pretend we can actually nest MultiSalLayout, so
store the GenericSalLayout internally.
Change-Id: I801acbc34497fc57e8e185eee34c1a1162dbea93
Reviewed-on: https://gerrit.libreoffice.org/62314
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/vcllayout.hxx | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 04bd178ed300..fe7507213256 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1345,7 +1345,7 @@ public: ImplGlyphFallbackLayout( std::unique_ptr<SalLayout>, ImplLayoutArgs& ) const; // tells whether this output device is RTL in an LTR UI or LTR in a RTL UI SAL_DLLPRIVATE std::unique_ptr<SalLayout> - getFallbackFont( + getFallbackLayout( LogicalFontInstance* pLogicalFont, int nFallbackLevel, ImplLayoutArgs& rLayoutArgs) const; diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx index fad06ef4646c..ebd8c24ea401 100644 --- a/include/vcl/vcllayout.hxx +++ b/include/vcl/vcllayout.hxx @@ -152,11 +152,6 @@ public: virtual bool GetOutline( SalGraphics&, basegfx::B2DPolyPolygonVector& ) const; virtual bool GetBoundRect( SalGraphics&, tools::Rectangle& ) const; - // used by glyph+font+script fallback - virtual void MoveGlyph( int nStart, long nNewXPos ) = 0; - virtual void DropGlyph( int nStart ) = 0; - virtual void Simplify( bool bIsBase ) = 0; - virtual std::shared_ptr<vcl::TextLayoutCache> CreateTextLayoutCache(OUString const&) const; virtual const SalLayoutGlyphs* GetGlyphs() const; |