mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: fix loplugin:defaultparams

Browse Source 
Change-Id: Ic947d1a4a341a778c88d1225b1a2ea66df697084
This commit is contained in:
Miklos Vajna
2016-03-16 10:53:30 +01:00
parent e8826d814e
commit 042f16a19e
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vcl/source/window/toolbox.cxx
View File

@@ -3131,8 +3131,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
} }
else else
bClip = false; bClip = false;
rRenderContext.DrawCtrlText( aPos, pItem->maText, 0, pItem->maText.getLength(), DrawTextFlags::Mnemonic, rRenderContext.DrawCtrlText( aPos, pItem->maText, 0, pItem->maText.getLength() );
nullptr, nullptr );
if (bClip) if (bClip)
rRenderContext.SetClipRegion(); rRenderContext.SetClipRegion();
rRenderContext.SetFont(aOldFont); rRenderContext.SetFont(aOldFont);
@@ -3286,7 +3285,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext& rRenderContext, sal_uInt16 nPos,
if ( !pItem->mbEnabled ) if ( !pItem->mbEnabled )
nTextStyle |= DrawTextFlags::Disable; nTextStyle |= DrawTextFlags::Disable;
rRenderContext.DrawCtrlText( Point( nTextOffX, nTextOffY ), pItem->maText, rRenderContext.DrawCtrlText( Point( nTextOffX, nTextOffY ), pItem->maText,
0, pItem->maText.getLength(), nTextStyle, nullptr, nullptr ); 0, pItem->maText.getLength(), nTextStyle );
if ( bRotate ) if ( bRotate )
SetFont( aOldFont ); SetFont( aOldFont );
} }

8
vcl/source/window/window.cxx
View File

@@ -2582,7 +2582,7 @@ void Window::EnableInput( bool bEnable, bool bChild )
void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow ) void Window::EnableInput( bool bEnable, const vcl::Window* pExcludeWindow )
{ {
EnableInput( bEnable, true/*bChild*/ ); EnableInput( bEnable );
// pExecuteWindow is the first Overlap-Frame --> if this // pExecuteWindow is the first Overlap-Frame --> if this
// shouldn't be the case, than this must be changed in dialog.cxx // 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 // Is Window not in the exclude window path or not the
// exclude window, than change the status // exclude window, than change the status
if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pSysWin, true ) ) if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pSysWin, true ) )
pSysWin->EnableInput( bEnable, true/*bChild*/ ); pSysWin->EnableInput( bEnable );
} }
pSysWin = pSysWin->mpWindowImpl->mpNextOverlap; 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 // Is Window not in the exclude window path or not the
// exclude window, than change the status // exclude window, than change the status
if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pFrameWin, true ) ) if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( pFrameWin, true ) )
pFrameWin->EnableInput( bEnable, true/*bChild*/ ); pFrameWin->EnableInput( bEnable );
} }
} }
pFrameWin = pFrameWin->mpWindowImpl->mpFrameData->mpNextFrame; 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 // Is Window not in the exclude window path or not the
// exclude window, than change the status // exclude window, than change the status
if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( (*p), true ) ) if ( !pExcludeWindow || !pExcludeWindow->ImplIsWindowOrChild( (*p), true ) )
(*p)->EnableInput( bEnable, true/*bChild*/ ); (*p)->EnableInput( bEnable );
} }
++p; ++p;
} }