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 /include/vcl | |
| parent | 9eeee5466fba5a3ff1de6d47b6341d83cf14c275 (diff) | |
Revert "tdf#89666: vcl: speed up HbLayoutEngine with cache in SwTxtFormatInfo"
This reverts commit 1efe5fe38031f7bc23150c35e4c68940621a1d5b.
which broke windows.
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/outdev.hxx | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 47c77ad4c47c..7911b662b285 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -140,7 +140,6 @@ namespace vcl class ExtOutDevData; class ITextLayout; struct FontCapabilities; - class TextLayoutCache; } // OutputDevice-Types @@ -1067,8 +1066,7 @@ public: See also GetTextBoundRect() for more explanation + code examples. */ - long GetTextWidth( const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - vcl::TextLayoutCache const* = nullptr) const; + long GetTextWidth( const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1 ) const; /** Height where any character of the current font fits; in logic coordinates. @@ -1083,8 +1081,7 @@ public: sal_Int32 nLen = -1, int flags = 0); long GetTextArray( const OUString& rStr, long* pDXAry = NULL, - sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - vcl::TextLayoutCache const* = nullptr) const; + sal_Int32 nIndex = 0, sal_Int32 nLen = -1 ) const; bool GetCaretPositions( const OUString&, long* pCaretXArray, sal_Int32 nIndex, sal_Int32 nLen, @@ -1095,14 +1092,11 @@ public: sal_Int32 nIndex = 0, sal_Int32 nLen = -1); sal_Int32 GetTextBreak( const OUString& rStr, long nTextWidth, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, - long nCharExtra = 0, - vcl::TextLayoutCache const* = nullptr) const; + long nCharExtra = 0 ) const; sal_Int32 GetTextBreak( const OUString& rStr, long nTextWidth, sal_Unicode nExtraChar, sal_Int32& rExtraCharPos, sal_Int32 nIndex, sal_Int32 nLen, - long nCharExtra = 0, - vcl::TextLayoutCache const* = nullptr) const; - std::shared_ptr<vcl::TextLayoutCache> CreateTextLayoutCache(OUString const&) const; + long nCharExtra = 0 ) const; private: SAL_DLLPRIVATE void ImplInitTextColor(); @@ -1253,11 +1247,9 @@ public: virtual bool HasMirroredGraphics() const; SAL_DLLPRIVATE SalLayout* ImplLayout( const OUString&, sal_Int32 nIndex, sal_Int32 nLen, const Point& rLogicPos = Point(0,0), long nLogicWidth=0, - const long* pLogicDXArray=NULL, int flags=0, - vcl::TextLayoutCache const* = nullptr) const; + const long* pLogicDXArray=NULL, int flags=0 ) const; SAL_DLLPRIVATE ImplLayoutArgs ImplPrepareLayoutArgs( OUString&, const sal_Int32 nIndex, const sal_Int32 nLen, - DeviceCoordinate nPixelWidth, const DeviceCoordinate* pPixelDXArray, int flags = 0, - vcl::TextLayoutCache const* = nullptr) const; + DeviceCoordinate nPixelWidth, const DeviceCoordinate* pPixelDXArray, int flags = 0 ) const; SAL_DLLPRIVATE SalLayout* ImplGlyphFallbackLayout( SalLayout*, ImplLayoutArgs& ) const; // tells whether this output device is RTL in an LTR UI or LTR in a RTL UI SAL_DLLPRIVATE SalLayout* getFallbackFont(ImplFontEntry &rFallbackFont, |