diff options
| author | Norbert Thiebaud <nthieabaud@gmail.com> | 2015-03-28 20:38:22 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthieabaud@gmail.com> | 2015-03-28 20:38:22 -0500 |
| commit | 3c6fd5a59b08cec8705a31d17a60204acf6b7173 (patch) | |
| tree | 9c98cc5549f08082045f8d80f5c95cc4f99e0d03 /vcl/source/gdi/sallayout.cxx | |
| parent | 9eeee5466fba5a3ff1de6d47b6341d83cf14c275 (diff) | |
Revert "tdf#89666: vcl: speed up HbLayoutEngine with cache in SwTxtFormatInfo"
This reverts commit 1efe5fe38031f7bc23150c35e4c68940621a1d5b.
which broke windows.
Diffstat (limited to 'vcl/source/gdi/sallayout.cxx')
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 82d87c322caf..e83264765bd0 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -486,8 +486,7 @@ bool ImplLayoutRuns::GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRightToLef } ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen, - int nMinCharPos, int nEndCharPos, int nFlags, const LanguageTag& rLanguageTag, - vcl::TextLayoutCache const*const pLayoutCache) + int nMinCharPos, int nEndCharPos, int nFlags, const LanguageTag& rLanguageTag ) : maLanguageTag( rLanguageTag ), mnFlags( nFlags ), @@ -495,7 +494,6 @@ ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen, mnMinCharPos( nMinCharPos ), mnEndCharPos( nEndCharPos ), mpStr( pStr ), - m_pTextLayoutCache(pLayoutCache), mpDXArray( NULL ), mnLayoutWidth( 0 ), mnOrientation( 0 ) @@ -2130,10 +2128,4 @@ bool MultiSalLayout::GetOutline( SalGraphics& rGraphics, return bRet; } -std::shared_ptr<vcl::TextLayoutCache> SalLayout::CreateTextLayoutCache( - OUString const&) const -{ - return 0; // by default, nothing to cache -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |