diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-09-06 14:55:13 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-09-06 16:18:47 +0200 |
commit | bcb9be395cd7e382777b041fc90869883f726850 (patch) | |
tree | d47b73dfed123ff067fd56735d836533270aeb52 /vcl | |
parent | e75c8384c4663b0603a30f66d0d8e390d03a3bf6 (diff) |
svtools: less text layout calls in Ruler
Number of GenericSalLayout::LayoutText() calls during Writer startup: 2603 ->
1616 (18 -> 1 layouts / included number).
Change-Id: I9a1a1131707bb6bc31683bbf609319f4bc22de92
Reviewed-on: https://gerrit.libreoffice.org/60087
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/outdev/text.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index e6b63a0a4286..820df543bc5d 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -2344,7 +2344,8 @@ SystemTextLayoutData OutputDevice::GetSysTextLayoutData(const Point& rStartPt, c bool OutputDevice::GetTextBoundRect( tools::Rectangle& rRect, const OUString& rStr, sal_Int32 nBase, sal_Int32 nIndex, sal_Int32 nLen, - sal_uLong nLayoutWidth, const long* pDXAry ) const + sal_uLong nLayoutWidth, const long* pDXAry, + const SalLayoutGlyphs* pGlyphs ) const { bool bRet = false; rRect.SetEmpty(); @@ -2368,7 +2369,8 @@ bool OutputDevice::GetTextBoundRect( tools::Rectangle& rRect, } } - pSalLayout = ImplLayout( rStr, nIndex, nLen, aPoint, nLayoutWidth, pDXAry ); + pSalLayout = ImplLayout(rStr, nIndex, nLen, aPoint, nLayoutWidth, pDXAry, SalLayoutFlags::NONE, + nullptr, pGlyphs); tools::Rectangle aPixelRect; if( pSalLayout ) { |