diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-07 15:52:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-08 07:37:53 +0100 |
| commit | 906f8e89370cc71215ade869d7bfc2d489343f64 (patch) | |
| tree | 9c7ec037cf04eaebc462666df2e3e8215b582f0e /vcl/source | |
| parent | 7f48fa8152bd3320af7276d811b752c5a762dcce (diff) | |
loplugin:constantparam
Change-Id: I593ccc2fb43321caf3ff64d0c348b1bac742ad18
Reviewed-on: https://gerrit.libreoffice.org/63025
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/outdev/text.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/stacking.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 853ba065f7c7..c6dbedddbe5c 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -924,7 +924,6 @@ float OutputDevice::approximate_digit_width() const void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr, const long* pDXAry, sal_Int32 nIndex, sal_Int32 nLen, SalLayoutFlags flags, - vcl::TextLayoutCache const*const pLayoutCache, const SalLayoutGlyphs* pSalLayoutCache ) { assert(!is_double_buffered_window()); @@ -945,7 +944,7 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const OUString& rStr, if( mbOutputClipped ) return; - std::unique_ptr<SalLayout> pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, 0, pDXAry, flags, pLayoutCache, pSalLayoutCache); + std::unique_ptr<SalLayout> pSalLayout = ImplLayout(rStr, nIndex, nLen, rStartPt, 0, pDXAry, flags, nullptr, pSalLayoutCache); if( pSalLayout ) { ImplDrawText( *pSalLayout ); diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index b268f14960e0..d00ad9f9b5ef 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -1111,11 +1111,11 @@ vcl::Window* Window::GetWindow( GetWindowType nType ) const return nullptr; } -bool Window::IsChild( const vcl::Window* pWindow, bool bSystemWindow ) const +bool Window::IsChild( const vcl::Window* pWindow ) const { do { - if ( !bSystemWindow && pWindow->ImplIsOverlapWindow() ) + if ( pWindow->ImplIsOverlapWindow() ) break; pWindow = pWindow->ImplGetParent(); |