diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2016-09-11 10:25:46 +0200 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-10-18 20:41:31 +0200 |
commit | 15f6a97d9f23124c19471b9d8dd38f14f53829b3 (patch) | |
tree | cbcb1cdf11821749d465b726ce2d4957a06fca05 /vcl/inc/sallayout.hxx | |
parent | 66104ff9856ff1c81ec8c776a0467796f85efc01 (diff) |
Fix applying DX adjustments in CommonSalLayout
By overriding GetCharWidths() and ApplyDXArray() with a simpler and
saner implementation.
This fixes rendering of Awami Nastaliq, as well as subtending marks in
Amiri and potentially other bugs.
Breaks Kashida justification, will need to rewrite that one as well.
Change-Id: I843679e937f2881e77df61f5cbd9516b6df1b3b6
Diffstat (limited to 'vcl/inc/sallayout.hxx')
-rw-r--r-- | vcl/inc/sallayout.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index cfb29306cdb9..1050943c2e77 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -326,7 +326,7 @@ public: void AppendGlyph( const GlyphItem& ); void Reserve(int size) { m_GlyphItems.reserve(size + 1); } virtual void AdjustLayout( ImplLayoutArgs& ) override; - void ApplyDXArray( ImplLayoutArgs& ); + virtual void ApplyDXArray( ImplLayoutArgs& ); void Justify( DeviceCoordinate nNewWidth ); void KashidaJustify( long nIndex, int nWidth ); void ApplyAsianKerning(const OUString& rStr); @@ -352,7 +352,7 @@ protected: virtual void DropGlyph( int nStart ) override; virtual void Simplify( bool bIsBase ) override; - bool GetCharWidths( DeviceCoordinate* pCharWidths ) const; + virtual bool GetCharWidths( DeviceCoordinate* pCharWidths ) const; std::vector<GlyphItem> m_GlyphItems; |