diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-12 11:14:12 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-14 07:50:33 +0200 |
commit | c2324940d384186ff02581e49a24ea8235cd584c (patch) | |
tree | 222ba3b7e545e0139cf7c4fe2ca7e95fbb73849f /sfx2 | |
parent | 4bdf7bf87cd2a48b0b8a77d6cbb6f77bdfc5a8a9 (diff) |
sfx2: sal_Bool->bool
Change-Id: If960d94f867a1988ace83975cf16441c6f8866b0
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appuno.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/bindings.cxx | 48 | ||||
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/control/shell.cxx | 8 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/view/sfxbasecontroller.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/view/viewsh.cxx | 2 |
9 files changed, 48 insertions, 48 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index d1f01865bb73..91ebed71fd69 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -1028,7 +1028,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) if (pObjSh) pObjSh->SetConfigOptionsChecked(false); } - pView->GetBindings().InvalidateAll(sal_False); + pView->GetBindings().InvalidateAll(false); pView = SfxViewFrame::GetNext( *pView ); } } diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index fa7d91d9a3ea..22f3624aa68d 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -1771,7 +1771,7 @@ RequestPackageReparation::~RequestPackageReparation() pImp->release(); } -sal_Bool RequestPackageReparation::isApproved() +bool RequestPackageReparation::isApproved() { return pImp->isApproved(); } diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 5f0ac2f278aa..b1f3440c16ff 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -672,8 +672,8 @@ SfxStateCache* SfxBindings::GetStateCache void SfxBindings::InvalidateAll ( - sal_Bool bWithMsg /* sal_True Mark Slot Server as invalid - sal_False Slot Server remains valid */ + bool bWithMsg /* true Mark Slot Server as invalid + false Slot Server remains valid */ ) { DBG_PROFSTART(SfxBindingsInvalidateAll); @@ -771,10 +771,10 @@ void SfxBindings::InvalidateShell ( const SfxShell& rSh, /* <SfxShell>, which Slot-Ids should be invalidated */ - sal_Bool bDeep /* sal_True + bool bDeep /* true also inherited slot IDs of SfxShell are invalidert - sal_False + false the inherited and not overloaded Slot-Ids were invalidiert */ // for now always bDeep @@ -868,8 +868,8 @@ void SfxBindings::Invalidate void SfxBindings::Invalidate ( sal_uInt16 nId, // Status value to be set - sal_Bool bWithItem, // Clear StateCache? - sal_Bool bWithMsg // Get new SlotServer? + bool bWithItem, // Clear StateCache? + bool bWithMsg // Get new SlotServer? ) { DBG_ASSERT( !pImp->bInUpdate, "SfxBindings::Invalidate while in update" ); @@ -902,7 +902,7 @@ void SfxBindings::Invalidate -sal_Bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt ) +bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt ) { DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" ); return GetStateCache(nSlotId, &nStartSearchAt ) != 0; @@ -983,16 +983,16 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt ) void SfxBindings::RegisterInternal_Impl( SfxControllerItem& rItem ) { - Register_Impl( rItem, sal_True ); + Register_Impl( rItem, true ); } void SfxBindings::Register( SfxControllerItem& rItem ) { - Register_Impl( rItem, sal_False ); + Register_Impl( rItem, false ); } -void SfxBindings::Register_Impl( SfxControllerItem& rItem, sal_Bool bInternal ) +void SfxBindings::Register_Impl( SfxControllerItem& rItem, bool bInternal ) { // DBG_ASSERT( nRegLevel > 0, "registration without EnterRegistrations" ); DBG_ASSERT( !pImp->bInNextJob, "SfxBindings::Register while status-updating" ); @@ -1084,20 +1084,20 @@ const SfxPoolItem* SfxBindings::ExecuteSynchron( sal_uInt16 nId, const SfxPoolIt return Execute_Impl( nId, ppItems, nModi, SFX_CALLMODE_SYNCHRON, ppInternalArgs ); } -sal_Bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, SfxCallMode nCallMode, +bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, SfxCallMode nCallMode, const SfxPoolItem **ppInternalArgs ) { DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" ); if( !nId || !pDispatcher ) - return sal_False; + return false; const SfxPoolItem* pRet = Execute_Impl( nId, ppItems, nModi, nCallMode, ppInternalArgs ); return ( pRet != 0 ); } const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, SfxCallMode nCallMode, - const SfxPoolItem **ppInternalArgs, sal_Bool bGlobalOnly ) + const SfxPoolItem **ppInternalArgs, bool bGlobalOnly ) { SfxStateCache *pCache = GetStateCache( nId ); if ( !pCache ) @@ -1853,7 +1853,7 @@ void SfxBindings::SetDispatcher( SfxDispatcher *pDisp ) ( pDisp->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY ); SetDispatchProvider_Impl( xProv ); - InvalidateAll( sal_True ); + InvalidateAll( true ); InvalidateUnoControllers_Impl(); if ( pDispatcher && !pOldDispat ) @@ -1905,7 +1905,7 @@ void SfxBindings::ClearCache_Impl( sal_uInt16 nSlotId ) } -void SfxBindings::StartUpdate_Impl( sal_Bool bComplete ) +void SfxBindings::StartUpdate_Impl( bool bComplete ) { if ( pImp->pSubBindings ) pImp->pSubBindings->StartUpdate_Impl( bComplete ); @@ -2051,7 +2051,7 @@ void SfxBindings::SetSubBindings_Impl( SfxBindings *pSub ) } } -SfxBindings* SfxBindings::GetSubBindings_Impl( sal_Bool bTop ) const +SfxBindings* SfxBindings::GetSubBindings_Impl( bool bTop ) const { SfxBindings *pRet = pImp->pSubBindings; if ( bTop ) @@ -2115,7 +2115,7 @@ void SfxBindings::InvalidateUnoControllers_Impl() pImp->pSubBindings->InvalidateUnoControllers_Impl(); } -sal_Bool SfxBindings::IsInUpdate() const +bool SfxBindings::IsInUpdate() const { sal_Bool bInUpdate = pImp->bInUpdate; if ( !bInUpdate && pImp->pSubBindings ) @@ -2123,7 +2123,7 @@ sal_Bool SfxBindings::IsInUpdate() const return bInUpdate; } -void SfxBindings::SetVisibleState( sal_uInt16 nId, sal_Bool bShow ) +void SfxBindings::SetVisibleState( sal_uInt16 nId, bool bShow ) { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDisp; SfxStateCache *pCache = GetStateCache( nId ); @@ -2155,7 +2155,7 @@ void SfxBindings::SetDispatchProvider_Impl( const ::com::sun::star::uno::Referen if ( bInvalidate ) { pImp->xProv = rProv; - InvalidateAll( sal_True ); + InvalidateAll( true ); InvalidateUnoControllers_Impl(); } @@ -2163,7 +2163,7 @@ void SfxBindings::SetDispatchProvider_Impl( const ::com::sun::star::uno::Referen pImp->pSubBindings->SetDispatchProvider_Impl( pImp->xProv ); } -sal_Bool SfxBindings::ExecuteCommand_Impl( const OUString& rCommand ) +bool SfxBindings::ExecuteCommand_Impl( const OUString& rCommand ) { ::com::sun::star::util::URL aURL; aURL.Complete = rCommand; @@ -2173,10 +2173,10 @@ sal_Bool SfxBindings::ExecuteCommand_Impl( const OUString& rCommand ) if ( xDisp.is() ) { new SfxAsyncExec_Impl( aURL, xDisp ); - return sal_True; + return true; } - return sal_False; + return false; } com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxBindings::GetRecorder() const @@ -2193,11 +2193,11 @@ void SfxBindings::ContextChanged_Impl() { if ( !pImp->bInUpdate && ( !pImp->bContextChanged || !pImp->bAllMsgDirty ) ) { - InvalidateAll( sal_True ); + InvalidateAll( true ); } } -uno::Reference < frame::XDispatch > SfxBindings::GetDispatch( const SfxSlot* pSlot, const util::URL& aURL, sal_Bool bMasterCommand ) +uno::Reference < frame::XDispatch > SfxBindings::GetDispatch( const SfxSlot* pSlot, const util::URL& aURL, bool bMasterCommand ) { uno::Reference < frame::XDispatch > xRet; SfxStateCache* pCache = GetStateCache( pSlot->nSlotId ); diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 042b4d2db709..4c6619d90c17 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -566,7 +566,7 @@ IMPL_LINK_INLINE_START( SfxDispatcher, EventHdl_Impl, void *, pvoid ) Update_Impl(); SfxBindings* pBindings = GetBindings(); if ( pBindings ) - pBindings->StartUpdate_Impl(sal_False); + pBindings->StartUpdate_Impl(false); return 0; } IMPL_LINK_INLINE_END( SfxDispatcher, EventHdl_Impl, void *, pvoid ) @@ -1800,7 +1800,7 @@ void SfxDispatcher::SetSlotFilter pImp->nFilterCount = nCount; pImp->pFilterSIDs = pSIDs; - GetBindings()->InvalidateAll(sal_True); + GetBindings()->InvalidateAll(true); } @@ -2204,11 +2204,11 @@ void SfxDispatcher::Lock( sal_Bool bLock ) if ( !bLock && pImp->bLocked && pImp->bInvalidateOnUnlock ) { if ( pBindings ) - pBindings->InvalidateAll(sal_True); + pBindings->InvalidateAll(true); pImp->bInvalidateOnUnlock = sal_False; } else if ( pBindings ) - pBindings->InvalidateAll(sal_False); + pBindings->InvalidateAll(false); pImp->bLocked = bLock; if ( !bLock ) { @@ -2276,7 +2276,7 @@ void SfxDispatcher::SetQuietMode_Impl( sal_Bool bOn ) pImp->bQuiet = bOn; SfxBindings* pBindings = GetBindings(); if ( pBindings ) - pBindings->InvalidateAll(sal_True); + pBindings->InvalidateAll(true); } SfxItemState SfxDispatcher::QueryState( sal_uInt16 nSlot, const SfxPoolItem* &rpState ) diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 30e8fb1dea59..215d3d1861dc 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -511,7 +511,7 @@ void SfxShell::Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId ) { if ( nId == 0 ) { - rBindings.InvalidateShell( *this, sal_False ); + rBindings.InvalidateShell( *this, false ); } else { @@ -979,7 +979,7 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em for (sal_uInt16 n1=0; n1<nCount ; n1++) { sal_uInt16 nId = SID_VERB_START + n1; - pBindings->Invalidate(nId, sal_False, sal_True); + pBindings->Invalidate(nId, false, true); } } @@ -1029,7 +1029,7 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em // the Shell, it is thus enough to encourage a new status update SfxBindings *pBindings = pViewSh->GetViewFrame()->GetDispatcher()-> GetBindings(); - pBindings->Invalidate( SID_OBJECT, sal_True, sal_True ); + pBindings->Invalidate( SID_OBJECT, true, true ); } } @@ -1126,7 +1126,7 @@ sal_Bool SfxShell::HasUIFeature( sal_uInt32 ) long DispatcherUpdate_Impl( void*, void* pArg ) { ((SfxDispatcher*) pArg)->Update_Impl( sal_True ); - ((SfxDispatcher*) pArg)->GetBindings()->InvalidateAll(sal_False); + ((SfxDispatcher*) pArg)->GetBindings()->InvalidateAll(false); return 0; } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 61c847daa2e5..d5387ae632f9 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2369,7 +2369,7 @@ PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void ) { if ( bBindingUpdate ) { - pBindings->Invalidate( SID_STYLE_NEW, sal_True, sal_False ); + pBindings->Invalidate( SID_STYLE_NEW, true, false ); pBindings->Update( SID_STYLE_NEW ); bBindingUpdate = sal_False; } @@ -2501,15 +2501,15 @@ void SfxTemplateDialog_Impl::ClearFamilyList() void SfxCommonTemplateDialog_Impl::InvalidateBindings() { - pBindings->Invalidate(SID_STYLE_NEW_BY_EXAMPLE, sal_True, sal_False); + pBindings->Invalidate(SID_STYLE_NEW_BY_EXAMPLE, true, false); pBindings->Update( SID_STYLE_NEW_BY_EXAMPLE ); - pBindings->Invalidate(SID_STYLE_UPDATE_BY_EXAMPLE, sal_True, sal_False); + pBindings->Invalidate(SID_STYLE_UPDATE_BY_EXAMPLE, true, false); pBindings->Update( SID_STYLE_UPDATE_BY_EXAMPLE ); - pBindings->Invalidate( SID_STYLE_WATERCAN, sal_True, sal_False); + pBindings->Invalidate( SID_STYLE_WATERCAN, true, false); pBindings->Update( SID_STYLE_WATERCAN ); - pBindings->Invalidate( SID_STYLE_NEW, sal_True, sal_False ); + pBindings->Invalidate( SID_STYLE_NEW, true, false ); pBindings->Update( SID_STYLE_NEW ); - pBindings->Invalidate( SID_STYLE_DRAGHIERARCHIE, sal_True, sal_False ); + pBindings->Invalidate( SID_STYLE_DRAGHIERARCHIE, true, false ); pBindings->Update( SID_STYLE_DRAGHIERARCHIE ); } diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 4ddb95815a2e..be5ac571a965 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -805,13 +805,13 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const { const SfxSlot* pSlot = m_pData->m_pViewShell->GetVerbSlot_Impl(nId); if ( pSlot ) - return pAct->GetBindings().GetDispatch( pSlot, aURL, sal_False ); + return pAct->GetBindings().GetDispatch( pSlot, aURL, false ); } SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool( pAct ); const SfxSlot* pSlot = rSlotPool.GetSlot( nId ); if ( pSlot && ( !pAct->GetFrame().IsInPlace() || !pSlot->IsMode( SFX_SLOT_CONTAINER ) ) ) - return pAct->GetBindings().GetDispatch( pSlot, aURL, sal_False ); + return pAct->GetBindings().GetDispatch( pSlot, aURL, false ); else { // try to find parent SfxViewFrame @@ -843,7 +843,7 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch( const SfxSlotPool& rSlotPool2 = SfxSlotPool::GetSlotPool( pParentFrame ); const SfxSlot* pSlot2 = rSlotPool2.GetUnoSlot( aURL.Path ); if ( pSlot2 ) - return pParentFrame->GetBindings().GetDispatch( pSlot2, aURL, sal_False ); + return pParentFrame->GetBindings().GetDispatch( pSlot2, aURL, false ); } } } diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 87a791515c42..521c66932b40 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -948,13 +948,13 @@ void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq ) case SID_UNDO: pShUndoMgr->Undo(); - GetBindings().InvalidateAll(sal_False); + GetBindings().InvalidateAll(false); bOK = sal_True; break; case SID_REDO: pShUndoMgr->Redo(); - GetBindings().InvalidateAll(sal_False); + GetBindings().InvalidateAll(false); bOK = sal_True; break; @@ -1295,7 +1295,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) rBind.Invalidate( SID_DOCINFO_TITLE ); rBind.Invalidate( SID_EDITDOC ); - pDispat->GetBindings()->InvalidateAll(sal_True); + pDispat->GetBindings()->InvalidateAll(true); pDispat->SetReadOnly_Impl( bIsReadOnly ); // Only force and Dispatcher-Update, if it is done next diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 2caad242dafc..8708688ee738 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -912,7 +912,7 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ ) pFrame->GetDispatcher()->Update_Impl( sal_True ); pFrame->GetBindings().HidePopups(false); - pFrame->GetBindings().InvalidateAll(sal_True); + pFrame->GetBindings().InvalidateAll(true); } |