summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-03-16 10:53:30 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-03-16 10:53:50 +0100
commit042f16a19e3d5f884759dae71264433b988df0e6 (patch)
tree31e3fcdb810354c6de170097a569bae232fee4a5 /vcl/source/window
parente8826d814e4067724b53420c06a79005ad28c943 (diff)
vcl: fix loplugin:defaultparams
Change-Id: Ic947d1a4a341a778c88d1225b1a2ea66df697084
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/toolbox.cxx5
-rw-r--r--vcl/source/window/window.cxx8
2 files changed, 6 insertions, 7 deletions
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 03388b3f3616..94cd082b7ed2 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -3131,8 +3131,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
}
else
bClip = false;
- rRenderContext.DrawCtrlText( aPos, pItem->maText, 0, pItem->maText.getLength(), DrawTextFlags::Mnemonic,
- nullptr, nullptr );
+ rRenderContext.DrawCtrlText( aPos, pItem->maText, 0, pItem->maText.getLength() );
if (bClip)
rRenderContext.SetClipRegion();
rRenderContext.SetFont(aOldFont);
@@ -3286,7 +3285,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
if ( !pItem->mbEnabled )
nTextStyle |= DrawTextFlags::Disable;
rRenderContext.DrawCtrlText( Point( nTextOffX, nTextOffY ), pItem->maText,
- 0, pItem->maText.getLength(), nTextStyle, nullptr, nullptr );
+ 0, pItem->maText.getLength(), nTextStyle );
if ( bRotate )
SetFont( aOldFont );
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 6ff708118a9e..a5acdafc4ce7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2582,7 +2582,7 @@ void Window::EnableInput( bool bEnable, bool bChild )
void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
{
- EnableInput( bEnable, true/*bChild*/ );
+ EnableInput( bEnable );
// pExecuteWindow is the first Overlap-Frame --> if this
// shouldn't be the case, than this must be changed in dialog.cxx
@@ -2597,7 +2597,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
// Is Window not in the exclude window path or not the
// exclude window, than change the status
if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pSysWin, true ) )
- pSysWin->EnableInput( bEnable, true/*bChild*/ );
+ pSysWin->EnableInput( bEnable );
}
pSysWin = pSysWin->mpWindowImpl->mpNextOverlap;
}
@@ -2614,7 +2614,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
// Is Window not in the exclude window path or not the
// exclude window, than change the status
if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pFrameWin, true ) )
- pFrameWin->EnableInput( bEnable, true/*bChild*/ );
+ pFrameWin->EnableInput( bEnable );
}
}
pFrameWin = pFrameWin->mpWindowImpl->mpFrameData->mpNextFrame;
@@ -2633,7 +2633,7 @@ void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
// Is Window not in the exclude window path or not the
// exclude window, than change the status
if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( (*p), true ) )
- (*p)->EnableInput( bEnable, true/*bChild*/ );
+ (*p)->EnableInput( bEnable );
}
++p;
}