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 | |
parent | 6c97d801203b277428e329d174c8650e5fae78ab (diff) |
More loplugin:simplifybool
Change-Id: I3bb156856ec6538168764c64dc768ba70c9bca88
Diffstat (limited to 'sd/source')
-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 | ||||
-rw-r--r-- | sd/source/filter/ppt/pptin.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/filedlg.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/unoidl/unopage.cxx | 4 |
9 files changed, 15 insertions, 15 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" ) { diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 4d8b2f610649..4f405760780e 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -721,7 +721,7 @@ bool ImplSdPPTImport::Import() static_cast<SdPage*>(pNotesClone)->SetLayoutName( aLayoutName ); } } - else if ( pPersist->bStarDrawFiller == false ) + else if ( !pPersist->bStarDrawFiller ) { PptSlidePersistEntry* pE = pPersist; while( ( pE->aSlideAtom.nFlags & 4 ) && pE->aSlideAtom.nMasterId ) @@ -1761,7 +1761,7 @@ void ImplSdPPTImport::ImportPageEffect( SdPage* pPage, const bool bNewAnimations } aHd.SeekToEndOfRecord( rStCtrl ); } - if ( bTryTwice && ( bSSSlideInfoAtom == false ) ) + if ( bTryTwice && !bSSSlideInfoAtom ) { bTryTwice = false; if ( HasMasterPage( nAktPageNum, eAktPageKind ) ) diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 015c5a457570..b856cb1e0b89 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -374,7 +374,7 @@ void AnnotationManagerImpl::InsertAnnotation() } } - if( bFree == false) + if( !bFree ) { x += width; if( x > page_width ) diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index a749a5bd6d7b..ae7c5da3b28d 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -249,7 +249,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, #endif } } - else if( mbUsableSelection != true ) + else if( !mbUsableSelection ) { try { diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 1dccec07aa7e..596edba3a0d6 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1054,7 +1054,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsSlideshowRespectZOrder() ); aProperties.push_back( beans::PropertyValue( "DisableAnimationZOrder" , - -1, Any( bZOrderEnabled == false ), + -1, Any( !bZOrderEnabled ), beans::PropertyState_DIRECT_VALUE ) ); aProperties.push_back( diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index 63f25e5ca932..19fbc99cb769 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -119,7 +119,7 @@ void RequestQueue::AddRequest ( Request aRequest (aKey, nPriority, eRequestClass); std::pair<Container::iterator,bool> ret = mpRequestQueue->insert(aRequest); - bool bInserted = ret.second == true; + bool bInserted = ret.second; if (bInserted) { diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index d3d8384f556b..e43f4e94134b 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -732,7 +732,7 @@ void SAL_CALL SdGenericDrawPage::setPropertyValue( const OUString& aPropertyName bool bVisible = false; if( ! ( aValue >>= bVisible ) ) throw lang::IllegalArgumentException(); - GetPage()->SetExcluded( bVisible == false ); + GetPage()->SetExcluded( !bVisible ); break; } case WID_PAGE_SOUNDFILE : @@ -1162,7 +1162,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) case WID_PAGE_VISIBLE : { - bool bVisible = GetPage()->IsExcluded() == false; + bool bVisible = !GetPage()->IsExcluded(); aAny <<= bVisible; break; } |