diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2017-06-11 00:24:36 +0200 |
|---|---|---|
| committer | Tamás Bunth <btomi96@gmail.com> | 2017-06-12 11:58:58 +0200 |
| commit | 3b05c3b4b4b6c3891b4b7e88d91889cf327a34a8 (patch) | |
| tree | 2ddd80983fe3affc1d2bd15b82b237b3865d4730 /include | |
| parent | 23cf6dbe4d35d0d9beeaa2193247c6f67a869c66 (diff) | |
Refactor create layout cache in status bar
Create SalLayout in StatusBar instead of getting cache through output
parameter.
Pass cache as a constant to the output device afterwards.
Results in a more readable code, with more evident memory management.
Change-Id: I4f949ea8f390b31379f661d611a183ceb3d91c25
Reviewed-on: https://gerrit.libreoffice.org/38651
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index cf44ac9c3811..b4fb7f019081 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -972,7 +972,7 @@ public: void DrawText( const Point& rStartPt, const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, MetricVector* pVector = nullptr, OUString* pDisplayText = nullptr, - SalLayout** pLayoutCache = nullptr ); + SalLayout* pLayoutCache = nullptr ); void DrawText( const tools::Rectangle& rRect, const OUString& rStr, DrawTextFlags nStyle = DrawTextFlags::NONE, @@ -1134,7 +1134,7 @@ public: */ long GetTextWidth( const OUString& rStr, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, vcl::TextLayoutCache const* = nullptr, - SalLayout** pLayoutCache = nullptr) const; + SalLayout const*const pLayoutCache = nullptr) const; /** Height where any character of the current font fits; in logic coordinates. @@ -1151,7 +1151,7 @@ public: long GetTextArray( const OUString& rStr, long* pDXAry, sal_Int32 nIndex = 0, sal_Int32 nLen = -1, vcl::TextLayoutCache const* = nullptr, - SalLayout** pLayoutCache = nullptr) const; + SalLayout const*const pLayoutCache = nullptr) const; bool GetCaretPositions( const OUString&, long* pCaretXArray, sal_Int32 nIndex, sal_Int32 nLen ) const; |