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 /include/vcl/outdev.hxx | |
| 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 'include/vcl/outdev.hxx')
| -rw-r--r-- | include/vcl/outdev.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 6a91fd2527e8..553baf20e591 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -976,7 +976,7 @@ public: void DrawText( const Point& rStartPt, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, MetricVector* pVector = nullptr, OUString* pDisplayText = nullptr, - SalLayout* pLayoutCache = nullptr ); + const SalLayoutGlyphs* pLayoutCache = nullptr ); void DrawText( const tools::Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle = DrawTextFlags::NONE, @@ -1138,7 +1138,7 @@ public: */ long GetTextWidth( const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, vcl::TextLayoutCache const* = nullptr, - SalLayout const*const pLayoutCache = nullptr) const; + SalLayoutGlyphs const*const pLayoutCache = nullptr) const; /** Height where any character of the current font fits; in logic coordinates. @@ -1154,11 +1154,11 @@ public: sal_Int32 nLen = -1, SalLayoutFlags flags = SalLayoutFlags::NONE, vcl::TextLayoutCache const* = nullptr, - SalLayout* pLayoutCache = nullptr); + const SalLayoutGlyphs* pLayoutCache = nullptr); long GetTextArray( const OUString& rStr, long* pDXAry, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, vcl::TextLayoutCache const* = nullptr, - SalLayout const*const pLayoutCache = nullptr) const; + SalLayoutGlyphs const*const pLayoutCache = nullptr) const; void GetCaretPositions( const OUString&, long* pCaretXArray, sal_Int32 nIndex, sal_Int32 nLen ) const; |