diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 15:28:49 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 15:31:00 +0200 |
commit | 44642cbc558ba869c91a629ffc34c6867319069a (patch) | |
tree | 8ec216dbc4f76ac5e798a2af155b532b806f8344 /sd/source/filter/eppt | |
parent | 6c97d801203b277428e329d174c8650e5fae78ab (diff) |
More loplugin:simplifybool
Change-Id: I3bb156856ec6538168764c64dc768ba70c9bca88
Diffstat (limited to 'sd/source/filter/eppt')
-rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 4 | ||||
-rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 6 | ||||
-rw-r--r-- | sd/source/filter/eppt/pptx-epptbase.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index d4f0640f234e..b57b35e76b16 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -227,7 +227,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ if ( GetPropertyValue( aAny, mXPagePropSet, OUString( "LoopSound" ) ) ) aAny >>= bLoopSound; - bool bNeedsSSSlideInfoAtom = ( bVisible == false ) + bool bNeedsSSSlideInfoAtom = !bVisible || ( mnDiaMode == 2 ) || ( bIsSound ) || ( bStopSound ) @@ -260,7 +260,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_ nTransitionType = GetTransition( eFe, nDirection ); if ( mnDiaMode == 2 ) // automatic ? nBuildFlags |= 0x400; - if ( bVisible == false ) + if ( !bVisible ) nBuildFlags |= 4; if ( bIsSound ) nBuildFlags |= 16; diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 9885c0dc1fcf..ed18ae002de8 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -2583,7 +2583,7 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a { sal_uInt16 nSpType, nSpFlags; ::com::sun::star::awt::Rectangle aNewRect; - if ( aPropOpt.CreateConnectorProperties( mXShape, aSolverContainer, aNewRect, nSpType, nSpFlags ) == false ) + if ( !aPropOpt.CreateConnectorProperties( mXShape, aSolverContainer, aNewRect, nSpType, nSpFlags ) ) continue; maRect = MapRectangle( aNewRect ); @@ -3305,9 +3305,9 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a if ( !pClientTextBox ) pClientTextBox = new SvMemoryStream( 0x200, 0x200 ); - if ( mbEmptyPresObj == false ) + if ( !mbEmptyPresObj ) { - if ( ( ePageType == NORMAL ) && ( bMasterPage == false ) ) + if ( ( ePageType == NORMAL ) && !bMasterPage ) { sal_uInt32 nTextType = EPP_TEXTTYPE_Body; if ( mnTextStyle == EPP_TEXTSTYLE_BODY ) diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 2606fa3785a3..7a2eb7fb41c3 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -714,7 +714,7 @@ bool PPTWriterBase::GetShapeByIndex( sal_uInt32 nIndex, bool bGroup ) { while(true) { - if ( ( bGroup == false ) || ( GetCurrentGroupLevel() == 0 ) ) + if ( !bGroup || ( GetCurrentGroupLevel() == 0 ) ) { Any aAny( mXShapes->getByIndex( nIndex ) ); aAny >>= mXShape; @@ -972,7 +972,7 @@ bool PPTWriterBase::ContainsOtherShapeThanPlaceholders( bool bForOOMLX ) bool bOtherThanPlaceHolders = false; if ( nShapes ) - for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && ( bOtherThanPlaceHolders == false ); nIndex++ ) + for ( sal_uInt32 nIndex = 0; ( nIndex < nShapes ) && !bOtherThanPlaceHolders; nIndex++ ) { if ( GetShapeByIndex( nIndex ) && mType != "drawing.Page" ) { |