Kaydet (Commit) 87fe6ee8 authored tarafından Julien Nabet's avatar Julien Nabet

Reduce scope + convert sal_Bool to bool

Change-Id: Ib7262a046479faba355c447ebc6bdce008268804
üst 026de9b0
......@@ -3875,9 +3875,8 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
ImplSVData* pSVData = ImplGetSVData();
Window* pNewRealWindow;
Window* pOldRealWindow;
Window* pLastRealWindow;
sal_Bool bCallActivate = sal_True;
sal_Bool bCallDeactivate = sal_True;
bool bCallActivate = true;
bool bCallDeactivate = true;
pOldRealWindow = pOldOverlapWindow->ImplGetWindow();
pNewRealWindow = pNewOverlapWindow->ImplGetWindow();
......@@ -3888,7 +3887,7 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
!pNewRealWindow->GetActivateMode() )
{
pSVData->maWinData.mpLastDeacWin = pOldOverlapWindow;
bCallDeactivate = sal_False;
bCallDeactivate = false;
}
}
else if ( (pNewRealWindow->GetType() != WINDOW_FLOATINGWINDOW) ||
......@@ -3897,10 +3896,10 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
if ( pSVData->maWinData.mpLastDeacWin )
{
if ( pSVData->maWinData.mpLastDeacWin == pNewOverlapWindow )
bCallActivate = sal_False;
bCallActivate = false;
else
{
pLastRealWindow = pSVData->maWinData.mpLastDeacWin->ImplGetWindow();
Window* pLastRealWindow = pSVData->maWinData.mpLastDeacWin->ImplGetWindow();
pSVData->maWinData.mpLastDeacWin->mpWindowImpl->mbActive = sal_False;
pSVData->maWinData.mpLastDeacWin->Deactivate();
if ( pLastRealWindow != pSVData->maWinData.mpLastDeacWin )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment