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 | |
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>
-rw-r--r-- | vcl/headless/svptext.cxx | 4 | ||||
-rw-r--r-- | vcl/inc/headless/svpgdi.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/qt5/Qt5Graphics.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/quartz/salgdi.h | 4 | ||||
-rw-r--r-- | vcl/inc/salgdi.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/textrender.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/unx/cairotextrender.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/unx/genpspgraphics.h | 4 | ||||
-rw-r--r-- | vcl/inc/unx/salgdi.h | 4 | ||||
-rw-r--r-- | vcl/inc/win/salgdi.h | 4 | ||||
-rw-r--r-- | vcl/qt5/Qt5Graphics_Text.cxx | 2 | ||||
-rw-r--r-- | vcl/quartz/salgdi.cxx | 2 | ||||
-rw-r--r-- | vcl/source/outdev/font.cxx | 2 | ||||
-rw-r--r-- | vcl/source/outdev/text.cxx | 11 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/cairotextrender.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/font.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/generic/print/genpspgraphics.cxx | 2 | ||||
-rw-r--r-- | vcl/win/gdi/winlayout.cxx | 2 |
18 files changed, 30 insertions, 35 deletions
diff --git a/vcl/headless/svptext.cxx b/vcl/headless/svptext.cxx index aead84a1467b..d81dfa19649a 100644 --- a/vcl/headless/svptext.cxx +++ b/vcl/headless/svptext.cxx @@ -92,11 +92,11 @@ void SvpSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont, m_aTextRenderImpl.GetGlyphWidths(pFont, bVertical, rWidths, rUnicodeEnc); } -std::unique_ptr<SalLayout> SvpSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) +std::unique_ptr<GenericSalLayout> SvpSalGraphics::GetTextLayout(int nFallbackLevel) { if (utl::ConfigManager::IsFuzzing()) return nullptr; - return m_aTextRenderImpl.GetTextLayout(rArgs, nFallbackLevel); + return m_aTextRenderImpl.GetTextLayout(nFallbackLevel); } void SvpSalGraphics::DrawTextLayout(const GenericSalLayout& rLayout) diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index e62c508d0863..89e141b78d21 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -190,8 +190,8 @@ public: bool bVertical, std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) override; - virtual std::unique_ptr<SalLayout> - GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override; + virtual std::unique_ptr<GenericSalLayout> + GetTextLayout(int nFallbackLevel) override; virtual void DrawTextLayout( const GenericSalLayout& ) override; virtual bool supportsOperation( OutDevSupportType ) const override; virtual void drawPixel( long nX, long nY ) override; diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/Qt5Graphics.hxx index 9430be94a112..b11f926f72bb 100644 --- a/vcl/inc/qt5/Qt5Graphics.hxx +++ b/vcl/inc/qt5/Qt5Graphics.hxx @@ -195,7 +195,7 @@ public: virtual void GetGlyphWidths(const PhysicalFontFace*, bool bVertical, std::vector<sal_Int32>& rWidths, Ucs2UIntMap& rUnicodeEnc) override; - virtual std::unique_ptr<SalLayout> GetTextLayout(ImplLayoutArgs&, int nFallbackLevel) override; + virtual std::unique_ptr<GenericSalLayout> GetTextLayout(int nFallbackLevel) override; virtual void DrawTextLayout(const GenericSalLayout&) override; // Native control support diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index cacf56dcb84f..63bf71090c21 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -373,8 +373,8 @@ public: std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) override; - virtual std::unique_ptr<SalLayout> - GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override; + virtual std::unique_ptr<GenericSalLayout> + GetTextLayout(int nFallbackLevel) override; virtual void DrawTextLayout( const GenericSalLayout& ) override; virtual bool supportsOperation( OutDevSupportType ) const override; diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index d3d459d058fe..5313f24c73b8 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -191,8 +191,8 @@ public: std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) = 0; - virtual std::unique_ptr<SalLayout> - GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) = 0; + virtual std::unique_ptr<GenericSalLayout> + GetTextLayout(int nFallbackLevel) = 0; virtual void DrawTextLayout( const GenericSalLayout& ) = 0; virtual bool supportsOperation( OutDevSupportType ) const = 0; diff --git a/vcl/inc/textrender.hxx b/vcl/inc/textrender.hxx index 31bcb04c7628..063b5d4462b2 100644 --- a/vcl/inc/textrender.hxx +++ b/vcl/inc/textrender.hxx @@ -59,8 +59,8 @@ public: std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) = 0; - virtual std::unique_ptr<SalLayout> - GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) = 0; + virtual std::unique_ptr<GenericSalLayout> + GetTextLayout(int nFallbackLevel) = 0; virtual void DrawTextLayout(const GenericSalLayout&, const SalGraphics&) = 0; #if ENABLE_CAIRO_CANVAS virtual SystemFontData GetSysFontData( int nFallbackLevel ) const = 0; diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx index 25272b92637e..ca9cfcd8da80 100644 --- a/vcl/inc/unx/cairotextrender.hxx +++ b/vcl/inc/unx/cairotextrender.hxx @@ -75,8 +75,8 @@ public: std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) override; - virtual std::unique_ptr<SalLayout> - GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override; + virtual std::unique_ptr<GenericSalLayout> + GetTextLayout(int nFallbackLevel) override; virtual void DrawTextLayout(const GenericSalLayout&, const SalGraphics&) override; #if ENABLE_CAIRO_CANVAS virtual SystemFontData GetSysFontData( int nFallbackLevel ) const override; diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h index efe1bc7bfa3f..b3fff8b8c05d 100644 --- a/vcl/inc/unx/genpspgraphics.h +++ b/vcl/inc/unx/genpspgraphics.h @@ -111,8 +111,8 @@ public: bool bVertical, std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) override; - virtual std::unique_ptr<SalLayout> - GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override; + virtual std::unique_ptr<GenericSalLayout> + GetTextLayout(int nFallbackLevel) override; virtual void DrawTextLayout( const GenericSalLayout& ) override; virtual bool supportsOperation( OutDevSupportType ) const override; virtual void drawPixel( long nX, long nY ) override; diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 97be62230a68..7bc0e1934994 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -141,8 +141,8 @@ public: std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) override; - virtual std::unique_ptr<SalLayout> - GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override; + virtual std::unique_ptr<GenericSalLayout> + GetTextLayout(int nFallbackLevel) override; virtual void DrawTextLayout( const GenericSalLayout& ) override; virtual bool supportsOperation( OutDevSupportType ) const override; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index cc59322b3098..1d0f2d51204f 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -373,8 +373,8 @@ public: std::vector< sal_Int32 >& rWidths, Ucs2UIntMap& rUnicodeEnc ) override; - virtual std::unique_ptr<SalLayout> - GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) override; + virtual std::unique_ptr<GenericSalLayout> + GetTextLayout(int nFallbackLevel) override; virtual void DrawTextLayout( const GenericSalLayout& ) override; virtual bool supportsOperation( OutDevSupportType ) const override; diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx index 986547254579..81302a86b233 100644 --- a/vcl/qt5/Qt5Graphics_Text.cxx +++ b/vcl/qt5/Qt5Graphics_Text.cxx @@ -169,7 +169,7 @@ public: void SetOrientation(int nOrientation) { mnOrientation = nOrientation; } }; -std::unique_ptr<SalLayout> Qt5Graphics::GetTextLayout(ImplLayoutArgs&, int nFallbackLevel) +std::unique_ptr<GenericSalLayout> Qt5Graphics::GetTextLayout(int nFallbackLevel) { if (!m_pTextStyle[nFallbackLevel]) return nullptr; diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index d64fc8677ce7..b17c17e3c676 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -506,7 +506,7 @@ void AquaSalGraphics::SetFont(LogicalFontInstance* pReqFont, int nFallbackLevel) mpTextStyle[nFallbackLevel] = static_cast<CoreTextStyle*>(pReqFont); } -std::unique_ptr<SalLayout> AquaSalGraphics::GetTextLayout(ImplLayoutArgs& /*rArgs*/, int nFallbackLevel) +std::unique_ptr<GenericSalLayout> AquaSalGraphics::GetTextLayout(int nFallbackLevel) { if (!mpTextStyle[nFallbackLevel]) return nullptr; diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 082c9e4084bf..e43516f49c49 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -1323,7 +1323,7 @@ std::unique_ptr<SalLayout> OutputDevice::getFallbackLayout( mpGraphics->SetFont( pLogicalFont, nFallbackLevel ); rLayoutArgs.ResetPos(); - std::unique_ptr<SalLayout> pFallback = mpGraphics->GetTextLayout( rLayoutArgs, nFallbackLevel ); + std::unique_ptr<GenericSalLayout> pFallback = mpGraphics->GetTextLayout(nFallbackLevel); if (!pFallback) return nullptr; 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 diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index c8956d02226b..bac446d76dbe 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -442,7 +442,7 @@ void CairoTextRender::GetFontMetric( ImplFontMetricDataRef& rxFontMetric, int nF mpFreetypeFont[nFallbackLevel]->GetFontMetric(rxFontMetric); } -std::unique_ptr<SalLayout> CairoTextRender::GetTextLayout(ImplLayoutArgs& /*rArgs*/, int nFallbackLevel) +std::unique_ptr<GenericSalLayout> CairoTextRender::GetTextLayout(int nFallbackLevel) { if (!mpFreetypeFont[nFallbackLevel]) return nullptr; diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx index 85ad6600dd99..9dbcd5e3e101 100644 --- a/vcl/unx/generic/gdi/font.cxx +++ b/vcl/unx/generic/gdi/font.cxx @@ -105,9 +105,9 @@ X11SalGraphics::GetFontMetric( ImplFontMetricDataRef &rxFontMetric, int nFallbac mxTextRenderImpl->GetFontMetric(rxFontMetric, nFallbackLevel); } -std::unique_ptr<SalLayout> X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) +std::unique_ptr<GenericSalLayout> X11SalGraphics::GetTextLayout(int nFallbackLevel) { - return mxTextRenderImpl->GetTextLayout(rArgs, nFallbackLevel); + return mxTextRenderImpl->GetTextLayout(nFallbackLevel); } #if ENABLE_CAIRO_CANVAS diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 7bbe59575b36..bb27e1efcf2f 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -733,7 +733,7 @@ void GenPspGraphics::GetFontMetric(ImplFontMetricDataRef& rxFontMetric, int nFal m_pFreetypeFont[nFallbackLevel]->GetFontMetric(rxFontMetric); } -std::unique_ptr<SalLayout> GenPspGraphics::GetTextLayout(ImplLayoutArgs& /*rArgs*/, int nFallbackLevel) +std::unique_ptr<GenericSalLayout> GenPspGraphics::GetTextLayout(int nFallbackLevel) { if (!m_pFreetypeFont[nFallbackLevel]) return nullptr; diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 120f6bb65e22..35ceee40ca2e 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -286,7 +286,7 @@ bool ExTextOutRenderer::operator ()(GenericSalLayout const &rLayout, return true; } -std::unique_ptr<SalLayout> WinSalGraphics::GetTextLayout(ImplLayoutArgs& /*rArgs*/, int nFallbackLevel) +std::unique_ptr<GenericSalLayout> WinSalGraphics::GetTextLayout(int nFallbackLevel) { if (!mpWinFontEntry[nFallbackLevel]) return nullptr; |