diff options
| author | Noel Grandin <noel@peralex.com> | 2014-05-06 12:37:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-05-06 12:38:16 +0200 |
| commit | c0d037a6ecbd4389abe3ca9e958d8a4ac9e0287e (patch) | |
| tree | 617f52ca3be4d2c2f6b5b21fc4ed9a3a8dd1fe77 /forms/source/helper | |
| parent | ae92e6e6d5dec81c2e22a51a89f463cae1ac1edb (diff) | |
forms: sal_Bool->bool
Change-Id: Ifa15f4ed3107b1075b504f09d2cae69ee38d347a
Diffstat (limited to 'forms/source/helper')
| -rw-r--r-- | forms/source/helper/formnavigation.cxx | 12 | ||||
| -rw-r--r-- | forms/source/helper/resettable.cxx | 2 | ||||
| -rw-r--r-- | forms/source/helper/windowstateguard.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx index fe0d93d45bf6..4cc99ddc4f6d 100644 --- a/forms/source/helper/formnavigation.cxx +++ b/forms/source/helper/formnavigation.cxx @@ -104,7 +104,7 @@ namespace frm { if ( aFeature->second.aURL.Main == _rState.FeatureURL.Main ) { - if ( ( aFeature->second.bCachedState != _rState.IsEnabled ) + if ( ( (aFeature->second.bCachedState ? 1 : 0) != _rState.IsEnabled ) || ( aFeature->second.aCachedAdditionalState != _rState.State ) ) { @@ -137,7 +137,7 @@ namespace frm { aFeature->second.xDispatcher->removeStatusListener( static_cast< XStatusListener* >( this ), aFeature->second.aURL ); aFeature->second.xDispatcher = NULL; - aFeature->second.bCachedState = sal_False; + aFeature->second.bCachedState = false; aFeature->second.aCachedAdditionalState.clear(); --m_nConnectedFeatures; @@ -186,7 +186,7 @@ namespace frm if ( xCurrentDispatcher.is() ) ++m_nConnectedFeatures; else - aFeature->second.bCachedState = sal_False; + aFeature->second.bCachedState = false; } // notify derivee that (potentially) all features changed their state @@ -211,7 +211,7 @@ namespace frm ++aFeature ) { - aFeature->second.bCachedState = sal_False; + aFeature->second.bCachedState = false; aFeature->second.aCachedAdditionalState.clear(); aFeature->second.xDispatcher = queryDispatch( aFeature->second.aURL ); if ( aFeature->second.xDispatcher.is() ) @@ -239,7 +239,7 @@ namespace frm aFeature->second.xDispatcher->removeStatusListener( static_cast< XStatusListener* >( this ), aFeature->second.aURL ); aFeature->second.xDispatcher = NULL; - aFeature->second.bCachedState = sal_False; + aFeature->second.bCachedState = false; aFeature->second.aCachedAdditionalState.clear(); } @@ -330,7 +330,7 @@ namespace frm bool OFormNavigationHelper::getBooleanState( sal_Int16 _nFeatureId ) const { - sal_Bool bState = sal_False; + bool bState = false; FeatureMap::const_iterator aInfo = m_aSupportedFeatures.find( _nFeatureId ); if ( m_aSupportedFeatures.end() != aInfo ) diff --git a/forms/source/helper/resettable.cxx b/forms/source/helper/resettable.cxx index 7a36cb6bb622..82dbde227487 100644 --- a/forms/source/helper/resettable.cxx +++ b/forms/source/helper/resettable.cxx @@ -61,7 +61,7 @@ namespace frm ::cppu::OInterfaceIteratorHelper aIter( m_aResetListeners ); EventObject aResetEvent( m_rParent ); - sal_Bool bContinue = sal_True; + bool bContinue = true; while ( aIter.hasMoreElements() && bContinue ) bContinue = static_cast< XResetListener* >( aIter.next() )->approveReset( aResetEvent ); diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx index ba1b59d7eea1..cde58ad99148 100644 --- a/forms/source/helper/windowstateguard.cxx +++ b/forms/source/helper/windowstateguard.cxx @@ -120,7 +120,7 @@ namespace frm { Reference< XWindow2 > xWindow; Reference< XPropertySet > xModelProps; - sal_Bool bShouldBeEnabled = sal_False; + bool bShouldBeEnabled = false; { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xWindow.is() || !m_xModelProps.is() ) |