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

cppcheck: redundantAssignment

Browse Source 
Change-Id: I43ae91f0b91479fb279b0efbeb0cb4195e7b083a
This commit is contained in:
Julien Nabet
2013-09-27 23:18:21 +02:00
parent 97da89451c
commit bf5db198e1
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sfx2/source/view/viewfrm.cxx
View File

@@ -3085,9 +3085,8 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
return; return;
Reference < XFrame > xFrame = GetFrame().GetTopFrame().GetFrameInterface(); Reference < XFrame > xFrame = GetFrame().GetTopFrame().GetFrameInterface();
Reference < XFrame > xBeamer( xFrame->findFrame( "_beamer", FrameSearchFlag::CHILDREN ) ); Reference < XFrame > xBeamer( xFrame->findFrame( "_beamer", FrameSearchFlag::CHILDREN ) );
sal_Bool bShow = sal_False;
sal_Bool bHasChild = xBeamer.is(); sal_Bool bHasChild = xBeamer.is();
bShow = pShowItem ? pShowItem->GetValue() : !bHasChild; sal_Bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
if ( pShowItem ) if ( pShowItem )
{ {
if( bShow == bHasChild ) if( bShow == bHasChild )
@@ -3127,9 +3126,8 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
return; return;
} }
sal_Bool bShow = sal_False;
sal_Bool bHasChild = HasChildWindow(nSID); sal_Bool bHasChild = HasChildWindow(nSID);
bShow = pShowItem ? pShowItem->GetValue() : !bHasChild; sal_Bool bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
// Perform action. // Perform action.
if ( !pShowItem || bShow != bHasChild ) if ( !pShowItem || bShow != bHasChild )