diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-01-24 19:00:10 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-01-25 08:15:54 +0100 |
| commit | f205e4530ef4245ee29b934d050c4ac5c2ce7257 (patch) | |
| tree | 19149c8da24b0f7acd56f763f862029a1dc42066 /vcl/source/outdev/text.cxx | |
| parent | 37f8ea642cd191e7bdbf3596f41e7bb28212472b (diff) | |
Change SalGraphics::GetTextLayout definition
* drop the unused ImplLayoutArgs argument
* return a std::unique_ptr<GenericSalLayout>
Change-Id: I150a2a46f67f1ffbbd3ba0ffa68f5bffb30206c8
Reviewed-on: https://gerrit.libreoffice.org/66884
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/source/outdev/text.cxx')
| -rw-r--r-- | vcl/source/outdev/text.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 9a1c92ced226..2082ce74fe17 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -1305,7 +1305,7 @@ std::unique_ptr<SalLayout> OutputDevice::ImplLayout(const OUString& rOrigStr, nPixelWidth, pDXPixelArray, flags, pLayoutCache); // get matching layout object for base font - std::unique_ptr<SalLayout> pSalLayout = mpGraphics->GetTextLayout( aLayoutArgs, 0 ); + std::unique_ptr<SalLayout> pSalLayout = mpGraphics->GetTextLayout(0); // layout text if( pSalLayout && !pSalLayout->LayoutText( aLayoutArgs, pGlyphs ) ) @@ -1350,16 +1350,11 @@ std::shared_ptr<vcl::TextLayoutCache> OutputDevice::CreateTextLayoutCache( { if (!mpGraphics) // can happen in e.g Insert Index/Table dialog return nullptr; - OUString copyBecausePrepareModifiesIt(rString); - ImplLayoutArgs aLayoutArgs = ImplPrepareLayoutArgs(copyBecausePrepareModifiesIt, - 0, rString.getLength(), 0, nullptr); - std::unique_ptr<SalLayout> pSalLayout = mpGraphics->GetTextLayout( aLayoutArgs, 0 ); + std::unique_ptr<GenericSalLayout> pSalLayout = mpGraphics->GetTextLayout(0); if (!pSalLayout) return nullptr; - std::shared_ptr<vcl::TextLayoutCache> const ret( - pSalLayout->CreateTextLayoutCache(copyBecausePrepareModifiesIt)); - return ret; + return pSalLayout->CreateTextLayoutCache(rString); } bool OutputDevice::GetTextIsRTL( const OUString& rString, sal_Int32 nIndex, sal_Int32 nLen ) const |