diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2017-01-02 01:22:32 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2017-01-08 02:48:19 +0000 |
| commit | d1bad9c12d61c9f662abe6439b87a057bb54c8ca (patch) | |
| tree | 52260e4651283f5a7d58fd280ccb4fee170f7d1a /vcl/inc | |
| parent | 9aea56370ae78a43c3543159571ea0454c1619eb (diff) | |
Simplify setting Kashida width on Windows
This should also make sure we are getting it from the current font, which
the old, convoluted way does not seem to guarantee.
Change-Id: If0a4cf18e472b1489115eeb7b1b2bdbb5f13abb0
Reviewed-on: https://gerrit.libreoffice.org/32595
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/win/salgdi.h | 1 | ||||
| -rw-r--r-- | vcl/inc/win/winlayout.hxx | 16 |
2 files changed, 0 insertions, 17 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index d974e7650805..f6faf4aa7631 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -376,7 +376,6 @@ public: bool bVertical, std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) override; - int GetMinKashidaWidth(); virtual bool GetGlyphBoundRect(const GlyphItem&, Rectangle&) override; virtual bool GetGlyphOutline(const GlyphItem&, basegfx::B2DPolyPolygon&) override; diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx index d339df3847cb..ecd257467e5d 100644 --- a/vcl/inc/win/winlayout.hxx +++ b/vcl/inc/win/winlayout.hxx @@ -157,18 +157,6 @@ public: private: // TODO: also add HFONT??? Watch out for issues with too many active fonts... -public: - SCRIPT_CACHE& GetScriptCache() const - { return maScriptCache; } -private: - mutable SCRIPT_CACHE maScriptCache; - -public: - bool InitKashidaHandling( HDC ); - int GetMinKashidaWidth() const { return mnMinKashidaWidth; } - int GetMinKashidaGlyph() const { return mnMinKashidaGlyph; } - -private: GlyphCache maGlyphCache; public: bool CacheGlyphToAtlas(HDC hDC, HFONT hFont, int nGlyphIndex, SalGraphics& rGraphics); @@ -177,10 +165,6 @@ public: { return maGlyphCache; } - -private: - mutable int mnMinKashidaWidth; - mutable int mnMinKashidaGlyph; }; class TextOutRenderer |