diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-27 16:08:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-28 10:21:01 +0200 |
| commit | e19cd844be171097dddf6319a037b7503ad2c922 (patch) | |
| tree | 64ed67787f118d2b97036cc687242002e7bda5ce /forms | |
| parent | d0e9aa6a2b07cb183dd7f8b06399b28f67588a83 (diff) | |
Rephrase comparisons between bool and sal_Bool
...to cater for forthcoming loplugin:implicitboolconversion improvements
Change-Id: I801b6b73648715448198d582a087cc834f6e20c8
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/FormComponent.cxx | 2 | ||||
| -rw-r--r-- | forms/source/helper/formnavigation.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 33f584a9dec3..0e3a00b7ef49 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -374,7 +374,7 @@ sal_Bool SAL_CALL OBoundControl::getLock() throw(RuntimeException, std::exceptio void SAL_CALL OBoundControl::setLock(sal_Bool _bLock) throw(RuntimeException, std::exception) { - if ((m_bLocked ? 1 : 0) == _bLock) + if (m_bLocked == bool(_bLock)) return; osl::MutexGuard aGuard(m_aMutex); diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx index b3ad06581eef..994574ee6170 100644 --- a/forms/source/helper/formnavigation.cxx +++ b/forms/source/helper/formnavigation.cxx @@ -100,7 +100,7 @@ namespace frm { if ( aFeature->second.aURL.Main == _rState.FeatureURL.Main ) { - if ( ( (aFeature->second.bCachedState ? 1 : 0) != _rState.IsEnabled ) + if ( ( aFeature->second.bCachedState != bool(_rState.IsEnabled) ) || ( aFeature->second.aCachedAdditionalState != _rState.State ) ) { |