diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-07-16 13:56:10 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-07-16 14:00:21 +0200 |
commit | 678c738b982a51978d9495019aea69b580747e0f (patch) | |
tree | 15fd45378d9d70f5dc49d345731653fdbd2a4bf1 /svx | |
parent | 6a6fad992ecbc90f8280e125a3680278559693b2 (diff) |
loplugin:simplifybool
Change-Id: Ibe187d7a2600c9f6a8524b5fc5665aa95099f512
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 2 | ||||
-rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/cellcursor.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/propertyset.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/tabledesign.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbxdrctl.cxx | 2 | ||||
-rw-r--r-- | svx/source/toolbars/extrusionbar.cxx | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index f69d1dacd29f..5a50175ff100 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -971,7 +971,7 @@ OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException, std::except sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) throw( RuntimeException, std::exception ) { Reference< ::com::sun::star::util::XModeSelector > xPeer(getPeer(), UNO_QUERY); - return xPeer.is() ? xPeer->supportsMode(Mode) : sal_False; + return xPeer.is() && xPeer->supportsMode(Mode); } // helper class which prevents that in the peer's header the FmGridListener must be known diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 08e39326caf8..9a5a28d1010a 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3744,7 +3744,7 @@ sal_Bool SAL_CALL FmXEditCell::isEditable() throw( RuntimeException, std::except { ::osl::MutexGuard aGuard( m_aMutex ); - return ( m_pEditImplementation && !m_pEditImplementation->IsReadOnly() && m_pEditImplementation->GetControl().IsEnabled() ) ? sal_True : sal_False; + return m_pEditImplementation && !m_pEditImplementation->IsReadOnly() && m_pEditImplementation->GetControl().IsEnabled(); } diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 830a88201c80..70a572c72ea8 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -550,7 +550,7 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No sal_Bool SAL_CALL CellCursor::isMergeable( ) throw (RuntimeException, std::exception) { CellPos aStart, aEnd; - return GetMergedSelection( aStart, aEnd ) ? sal_True : sal_False; + return GetMergedSelection( aStart, aEnd ); } diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index db14b3ae7c6b..25302611510d 100644 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx @@ -94,7 +94,7 @@ Property SAL_CALL FastPropertySetInfo::getPropertyByName( const OUString& aName sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName ) throw (RuntimeException, std::exception) { - return hasProperty( aName ) != 0 ? sal_True : sal_False; + return hasProperty( aName ) != 0; } FastPropertySet::FastPropertySet( const rtl::Reference< FastPropertySetInfo >& xInfo ) diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 66c05447861e..6480c729229f 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -321,7 +321,7 @@ sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName ) throw(Ru const CellStyleNameMap& rMap = getCellStyleNameMap(); CellStyleNameMap::const_iterator iter = rMap.find( rName ); - return ( iter != rMap.end() ) ? sal_True : sal_False; + return iter != rMap.end(); } @@ -563,7 +563,7 @@ sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException, std:: { SolarMutexGuard aGuard; - return maDesigns.empty() ? sal_False : sal_True; + return !maDesigns.empty(); } diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 37f18fd839d2..f70805cce61b 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -63,7 +63,7 @@ void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, Reference< XLayoutManager > xLayoutMgr = getLayoutManager(); if ( xLayoutMgr.is() ) GetToolBox().CheckItem( - GetId(), xLayoutMgr->isElementVisible( m_sToolboxName ) != sal_False ); + GetId(), xLayoutMgr->isElementVisible( m_sToolboxName ) ); } diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 79c0fdf7301d..21d84ba25374 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -307,7 +307,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem com::sun::star::beans::PropertyValue aPropValue; aPropValue.Name = sExtrusionColor; - aPropValue.Value <<= bAuto ? sal_False : sal_True; + aPropValue.Value <<= !bAuto; rGeometryItem.SetPropertyValue( sExtrusion, aPropValue ); if( bAuto ) |