diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-16 17:34:49 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-08-16 23:39:04 +0200 |
commit | c5dc042219e9872937f9fe1cb68f2f03423f398e (patch) | |
tree | 422d1bd4981541c086f6d1dcb4de214a7792a47a /vcl/source/gdi/CommonSalLayout.cxx | |
parent | 24a30e5bde07cf168c30adadb417ba002818970b (diff) |
vcl: use SalLayoutGlyphs, not SalLayout for pre-computed layout
This means that the pre-computed glyph ids and positions are usable with
multiple dx array or draw base.
So the amount of cached data is smaller, but it can be used in more
situations, most importantly Writer's SwFntObj::DrawText() use-case
(which does GetTextArray() followed by a DrawTextArray(), with different
dx array arguments).
Change-Id: I3bcd1b7a015c2cf9921efa0f3f355f2c627fb652
Reviewed-on: https://gerrit.libreoffice.org/59207
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins
Diffstat (limited to 'vcl/source/gdi/CommonSalLayout.cxx')
-rw-r--r-- | vcl/source/gdi/CommonSalLayout.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index fc38b33437e1..e4312847d72b 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -169,9 +169,9 @@ std::shared_ptr<vcl::TextLayoutCache> GenericSalLayout::CreateTextLayoutCache(OU return std::make_shared<vcl::TextLayoutCache>(rString.getStr(), rString.getLength()); } -SalLayoutGlyphs GenericSalLayout::GetGlyphs() const +const SalLayoutGlyphs* GenericSalLayout::GetGlyphs() const { - return m_GlyphItems; + return &m_GlyphItems; } void GenericSalLayout::SetNeedFallback(ImplLayoutArgs& rArgs, sal_Int32 nCharPos, bool bRightToLeft) |