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

Rephrase comparisons between bool and sal_Bool

Browse Source 
...to cater for forthcoming loplugin:implicitboolconversion improvements

Change-Id: I88c0c4681137022005c3a4c418e91cb17bc17148
This commit is contained in:
Stephan Bergmann
2015-05-08 09:19:03 +02:00
parent 61b44da9fb
commit 1cb0b37ad0
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
animations/source/animcore/animcore.cxx
View File

@@ -1199,7 +1199,7 @@ sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException, std::
void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception) void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception)
{ {
Guard< Mutex > aGuard( maMutex ); Guard< Mutex > aGuard( maMutex );
if( _autoreverse != (mbAutoReverse ? 1 : 0) ) if( bool(_autoreverse) != mbAutoReverse )
{ {
mbAutoReverse = _autoreverse; mbAutoReverse = _autoreverse;
fireChangeListener(); fireChangeListener();
@@ -1466,7 +1466,7 @@ void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate )
throw (RuntimeException, std::exception) throw (RuntimeException, std::exception)
{ {
Guard< Mutex > aGuard( maMutex ); Guard< Mutex > aGuard( maMutex );
if( _accumulate != (mbAccumulate ? 1 : 0) ) if( bool(_accumulate) != mbAccumulate )
{ {
mbAccumulate = _accumulate; mbAccumulate = _accumulate;
fireChangeListener(); fireChangeListener();
@@ -1647,7 +1647,7 @@ sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException, std::ex
void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeException, std::exception) void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeException, std::exception)
{ {
Guard< Mutex > aGuard( maMutex ); Guard< Mutex > aGuard( maMutex );
if( _direction != (mbDirection ? 1 : 0) ) if( bool(_direction) != mbDirection )
{ {
mbDirection = _direction; mbDirection = _direction;
fireChangeListener(); fireChangeListener();
@@ -1773,7 +1773,7 @@ sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException, std::excepti
void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException, std::exception) void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException, std::exception)
{ {
Guard< Mutex > aGuard( maMutex ); Guard< Mutex > aGuard( maMutex );
if( _mode != (mbMode ? 1 : 0) ) if( bool(_mode) != mbMode )
{ {
mbMode = _mode; mbMode = _mode;
fireChangeListener(); fireChangeListener();

2
avmedia/source/gstreamer/gstplayer.cxx
View File

@@ -541,7 +541,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
DBG( "set mute: %d muted: %d unmuted volume: %lf", bSet, mbMuted, mnUnmutedVolume ); DBG( "set mute: %d muted: %d unmuted volume: %lf", bSet, mbMuted, mnUnmutedVolume );
// change the volume to 0 or the unmuted volume // change the volume to 0 or the unmuted volume
if( mpPlaybin && (mbMuted ? 1 : 0) != bSet ) if( mpPlaybin && mbMuted != bool(bSet) )
{ {
double nVolume = mnUnmutedVolume; double nVolume = mnUnmutedVolume;
if( bSet ) if( bSet )

2
package/source/xstor/xstorage.cxx
View File

@@ -4124,7 +4124,7 @@ void SAL_CALL OStorage::setModified( sal_Bool bModified )
if ( m_pData->m_bReadOnlyWrap ) if ( m_pData->m_bReadOnlyWrap )
throw beans::PropertyVetoException( THROW_WHERE ); // TODO: access denied throw beans::PropertyVetoException( THROW_WHERE ); // TODO: access denied
if ( (m_pImpl->m_bIsModified ? 1 : 0) != bModified ) if ( m_pImpl->m_bIsModified != bool(bModified) )
m_pImpl->m_bIsModified = bModified; m_pImpl->m_bIsModified = bModified;
aGuard.clear(); aGuard.clear();

2
svx/source/form/formfeaturedispatcher.cxx
View File

@@ -68,7 +68,7 @@ namespace svx
FeatureStateEvent aUnoState; FeatureStateEvent aUnoState;
getUnoState( aUnoState ); getUnoState( aUnoState );
if ( ( m_aLastKnownState == aUnoState.State ) && ( (m_bLastKnownEnabled ? 1 : 0) == aUnoState.IsEnabled ) ) if ( ( m_aLastKnownState == aUnoState.State ) && ( m_bLastKnownEnabled == bool(aUnoState.IsEnabled) ) )
return; return;
m_aLastKnownState = aUnoState.State; m_aLastKnownState = aUnoState.State;