diff options
| author | Noel Grandin <noel@peralex.com> | 2014-03-18 14:54:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-03-19 09:21:24 +0200 |
| commit | 16752a8a773cf8096e28628237238a562016c4e5 (patch) | |
| tree | d871056db97706bdb66dfca046aeb68500c5e565 /sfx2/source/control | |
| parent | be878d7cc54cbe3dc1de410e9ff760fe353ce56a (diff) | |
sfx2: sal_Bool->bool
Change-Id: Ief810c49b821e2e60ee2c8b14187dd8d7d81c461
Diffstat (limited to 'sfx2/source/control')
| -rw-r--r-- | sfx2/source/control/unoctitm.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 5961757dcde9..15f09b423bc7 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -398,19 +398,16 @@ void SfxOfficeDispatch::SetFrame(const ::com::sun::star::uno::Reference< ::com:: pControllerItem->SetFrame( xFrame ); } -void SfxOfficeDispatch::SetMasterUnoCommand( sal_Bool bSet ) +void SfxOfficeDispatch::SetMasterUnoCommand( bool bSet ) { if ( pControllerItem ) pControllerItem->setMasterSlaveCommand( bSet ); } // Determine if URL contains a master/slave command which must be handled a little bit different -sal_Bool SfxOfficeDispatch::IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL ) +bool SfxOfficeDispatch::IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL ) { - if ( aURL.Protocol == ".uno:" && ( aURL.Path.indexOf( '.' ) > 0 )) - return sal_True; - - return sal_False; + return aURL.Protocol == ".uno:" && ( aURL.Path.indexOf( '.' ) > 0 ); } OUString SfxOfficeDispatch::GetMasterUnoCommand( const ::com::sun::star::util::URL& aURL ) @@ -438,8 +435,8 @@ SfxDispatchController_Impl::SfxDispatchController_Impl( , pLastState( 0 ) , nSlot( pSlot->GetSlotId() ) , pDispatch( pDisp ) - , bMasterSlave( sal_False ) - , bVisible( sal_True ) + , bMasterSlave( false ) + , bVisible( true ) , pUnoName( pSlot->pUnoName ) { if ( aDispatchURL.Protocol == "slot:" && pUnoName ) @@ -484,7 +481,7 @@ void SfxDispatchController_Impl::SetFrame(const ::com::sun::star::uno::Reference xFrame = _xFrame; } -void SfxDispatchController_Impl::setMasterSlaveCommand( sal_Bool bSet ) +void SfxDispatchController_Impl::setMasterSlaveCommand( bool bSet ) { bMasterSlave = bSet; } @@ -862,7 +859,7 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt if ( pLastState && !IsInvalidItem( pLastState ) ) delete pLastState; pLastState = !IsInvalidItem(pState) ? pState->Clone() : pState; - bVisible = sal_True; + bVisible = true; } else bVisible = ((SfxVisibilityItem *)pState)->GetValue(); |