summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-12 11:14:12 +0200
committerNoel Grandin <noel@peralex.com>2014-03-14 07:50:33 +0200
commitc2324940d384186ff02581e49a24ea8235cd584c (patch)
tree222ba3b7e545e0139cf7c4fe2ca7e95fbb73849f
parent4bdf7bf87cd2a48b0b8a77d6cbb6f77bdfc5a8a9 (diff)
sfx2: sal_Bool->bool
Change-Id: If960d94f867a1988ace83975cf16441c6f8866b0
-rw-r--r--cui/source/options/optgdlg.cxx2
-rw-r--r--include/sfx2/bindings.hxx30
-rw-r--r--include/sfx2/brokenpackageint.hxx4
-rw-r--r--sd/source/ui/animations/motionpathtag.cxx2
-rw-r--r--sd/source/ui/app/sdmod2.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx2
-rw-r--r--sd/source/ui/docshell/docshel4.cxx6
-rw-r--r--sd/source/ui/docshell/docshell.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshow.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx2
-rw-r--r--sd/source/ui/table/tablefunction.cxx2
-rw-r--r--sd/source/ui/view/drtxtob1.cxx16
-rw-r--r--sd/source/ui/view/drviews1.cxx12
-rw-r--r--sd/source/ui/view/drviews2.cxx4
-rw-r--r--sd/source/ui/view/drviews5.cxx2
-rw-r--r--sd/source/ui/view/drviewsf.cxx32
-rw-r--r--sd/source/ui/view/outlnvsh.cxx16
-rw-r--r--sd/source/ui/view/viewshe2.cxx2
-rw-r--r--sd/source/ui/view/viewshel.cxx6
-rw-r--r--sfx2/source/appl/appserv.cxx2
-rw-r--r--sfx2/source/appl/appuno.cxx2
-rw-r--r--sfx2/source/control/bindings.cxx48
-rw-r--r--sfx2/source/control/dispatch.cxx10
-rw-r--r--sfx2/source/control/shell.cxx8
-rw-r--r--sfx2/source/dialog/templdlg.cxx12
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx6
-rw-r--r--sfx2/source/view/viewfrm.cxx6
-rw-r--r--sfx2/source/view/viewsh.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx8
-rw-r--r--svx/source/form/fmview.cxx2
-rw-r--r--svx/source/form/navigatortree.cxx2
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx8
-rw-r--r--sw/source/core/uibase/docvw/SidebarTxtControl.cxx4
-rw-r--r--sw/source/core/uibase/docvw/edtdd.cxx2
-rw-r--r--sw/source/core/uibase/docvw/edtwin.cxx8
-rw-r--r--sw/source/core/uibase/shells/annotsh.cxx8
-rw-r--r--sw/source/core/uibase/shells/basesh.cxx2
-rw-r--r--sw/source/core/uibase/shells/drwbassh.cxx4
-rw-r--r--sw/source/core/uibase/shells/drwtxtex.cxx10
-rw-r--r--sw/source/core/uibase/shells/drwtxtsh.cxx4
-rw-r--r--sw/source/core/uibase/shells/textsh1.cxx12
-rw-r--r--sw/source/core/uibase/sidebar/PagePropertyPanel.cxx2
-rw-r--r--sw/source/core/uibase/uiview/srcview.cxx4
-rw-r--r--sw/source/core/uibase/uiview/view.cxx6
-rw-r--r--sw/source/core/uibase/uiview/viewstat.cxx4
-rw-r--r--sw/source/core/uibase/web/wview.cxx2
46 files changed, 167 insertions, 167 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ace7a3c5a40f..67cc8e44efcb 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1166,7 +1166,7 @@ static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBool
for(sal_Int16 i = 0; i < nCount; i++)
{
if(pCurrentFrm == pViewFrm)
- rBind.InvalidateAll(sal_False);
+ rBind.InvalidateAll(false);
rBind.SetState( *pInvalidItems[i] );
rBind.SetState( *pBoolItems[i] );
}
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index b68c484497a0..a45b7f52dfe8 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -106,7 +106,7 @@ friend class SfxBindings_Impl;
private:
SAL_DLLPRIVATE const SfxPoolItem* Execute_Impl( sal_uInt16 nSlot, const SfxPoolItem **pArgs, sal_uInt16 nModi,
- SfxCallMode nCall, const SfxPoolItem **pInternalArgs, sal_Bool bGlobalOnly=sal_False);
+ SfxCallMode nCall, const SfxPoolItem **pInternalArgs, bool bGlobalOnly=false);
SAL_DLLPRIVATE void SetSubBindings_Impl( SfxBindings* );
SAL_DLLPRIVATE void UpdateSlotServer_Impl(); // Update SlotServer
SAL_DLLPRIVATE SfxItemSet* CreateSet_Impl( SfxStateCache* &pCache,
@@ -134,19 +134,19 @@ public:
void Update( sal_uInt16 nId ); // For example, from Menu::Activate
void Update();
- SAL_DLLPRIVATE void StartUpdate_Impl(sal_Bool bComplete=sal_False);
+ SAL_DLLPRIVATE void StartUpdate_Impl(bool bComplete=false);
void Invalidate( sal_uInt16 nId );
void Invalidate( const sal_uInt16* pIds );
- void InvalidateShell( const SfxShell &rSh, sal_Bool bDeep = sal_False );
- void InvalidateAll( sal_Bool bWithMsg );
+ void InvalidateShell( const SfxShell &rSh, bool bDeep = false );
+ void InvalidateAll( bool bWithMsg );
void SetState( const SfxItemSet &rSet );
void SetState( const SfxPoolItem &rItem );
- void Invalidate( sal_uInt16 nId, sal_Bool bWithItem, sal_Bool bWithMsg=sal_False);
- void Invalidate( sal_uInt16 nId, sal_Bool bWithMsg);
- sal_Bool IsInUpdate() const;
- void SetVisibleState( sal_uInt16 nId, sal_Bool bShow );
+ void Invalidate( sal_uInt16 nId, bool bWithItem, bool bWithMsg=false);
+ void Invalidate( sal_uInt16 nId, bool bWithMsg);
+ bool IsInUpdate() const;
+ void SetVisibleState( sal_uInt16 nId, bool bShow );
- sal_Bool IsBound( sal_uInt16 nMsgId, sal_uInt16 nStartSearchAt = 0 );
+ bool IsBound( sal_uInt16 nMsgId, sal_uInt16 nStartSearchAt = 0 );
SfxStateCache* GetStateCache( sal_uInt16 nId);
SAL_DLLPRIVATE SfxStateCache* GetAnyStateCache_Impl( sal_uInt16 nId );
@@ -159,7 +159,7 @@ public:
const SfxPoolItem **pArgs = 0,
sal_uInt16 nModi = 0,
const SfxPoolItem **pInternalArgs = 0);
- sal_Bool Execute( sal_uInt16 nSlot,
+ bool Execute( sal_uInt16 nSlot,
const SfxPoolItem **pArgs = 0,
sal_uInt16 nModi = 0,
SfxCallMode nCall = SFX_CALLMODE_SLOT,
@@ -178,22 +178,22 @@ public:
{ return pDispatcher; }
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetRecorder() const;
com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >
- GetDispatch( const SfxSlot*, const com::sun::star::util::URL& aURL, sal_Bool bMasterCommand );
+ GetDispatch( const SfxSlot*, const com::sun::star::util::URL& aURL, bool bMasterCommand );
SAL_DLLPRIVATE void ContextChanged_Impl();
SAL_DLLPRIVATE void Execute_Impl( SfxRequest& rReq, const SfxSlot* pSlot, SfxShell* pShell );
SAL_DLLPRIVATE void DeleteControllers_Impl();
SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl() { return pDispatcher; }
SAL_DLLPRIVATE void ClearCache_Impl( sal_uInt16 nSlotId );
- SAL_DLLPRIVATE sal_Bool IsInUpdate_Impl() const{ return IsInUpdate(); }
+ SAL_DLLPRIVATE bool IsInUpdate_Impl() const{ return IsInUpdate(); }
SAL_DLLPRIVATE void RegisterInternal_Impl( SfxControllerItem& rBinding );
- SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, sal_Bool );
+ SAL_DLLPRIVATE void Register_Impl( SfxControllerItem& rBinding, bool );
SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl() const;
SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
- SAL_DLLPRIVATE SfxBindings* GetSubBindings_Impl( sal_Bool bTop = sal_False ) const;
+ SAL_DLLPRIVATE SfxBindings* GetSubBindings_Impl( bool bTop = false ) const;
SAL_DLLPRIVATE void InvalidateUnoControllers_Impl();
SAL_DLLPRIVATE void RegisterUnoController_Impl( SfxUnoControllerItem* );
SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
- SAL_DLLPRIVATE sal_Bool ExecuteCommand_Impl( const OUString& rCommand );
+ SAL_DLLPRIVATE bool ExecuteCommand_Impl( const OUString& rCommand );
SAL_DLLPRIVATE void SetRecorder_Impl( com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >& );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId );
diff --git a/include/sfx2/brokenpackageint.hxx b/include/sfx2/brokenpackageint.hxx
index 1047b300270e..ff78cd74a10f 100644
--- a/include/sfx2/brokenpackageint.hxx
+++ b/include/sfx2/brokenpackageint.hxx
@@ -30,7 +30,7 @@ class SFX2_DLLPUBLIC RequestPackageReparation
public:
RequestPackageReparation( const OUString& aName );
~RequestPackageReparation();
- sal_Bool isApproved();
+ bool isApproved();
com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
};
@@ -41,7 +41,7 @@ class SFX2_DLLPUBLIC NotifyBrokenPackage
public:
NotifyBrokenPackage( const OUString& aName );
~NotifyBrokenPackage();
- sal_Bool isAborted();
+ bool isAborted();
com::sun::star::uno::Reference < ::com::sun::star::task::XInteractionRequest > GetRequest();
};
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 1db7fa25fce2..7157451f7325 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -1104,7 +1104,7 @@ void MotionPathTag::selectionChanged()
if( mrView.GetViewShell() && mrView.GetViewShell()->GetViewFrame() )
{
SfxBindings& rBindings = mrView.GetViewShell()->GetViewFrame()->GetBindings();
- rBindings.InvalidateAll(sal_True);
+ rBindings.InvalidateAll(true);
}
}
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 10578a529c10..33e9d723da37 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -711,7 +711,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
}
if( pViewShell && pViewShell->GetViewFrame() )
- pViewShell->GetViewFrame()->GetBindings().InvalidateAll( sal_True );
+ pViewShell->GetViewFrame()->GetBindings().InvalidateAll( true );
}
SfxTabPage* SdModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet )
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 9753e01823f2..5adfe0321047 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -227,7 +227,7 @@ void SdNavigatorWin::InitTreeLB( const SdDrawDocument* pDoc )
SfxViewFrame* pViewFrame = ( ( pViewShell && pViewShell->GetViewFrame() ) ? pViewShell->GetViewFrame() : SfxViewFrame::Current() );
if( pViewFrame )
- pViewFrame->GetBindings().Invalidate(SID_NAVIGATOR_PAGENAME, sal_True, sal_True);
+ pViewFrame->GetBindings().Invalidate(SID_NAVIGATOR_PAGENAME, true, true);
}
/**
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index f90222a9d4f0..e1a9eea0a242 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -653,7 +653,7 @@ sal_Bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::
SfxViewFrame::Current();
if( pFrame )
- pFrame->GetBindings().Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False );
+ pFrame->GetBindings().Invalidate( SID_NAVIGATOR_STATE, true, false );
}
return bRet;
}
@@ -838,7 +838,7 @@ sal_Bool DrawDocShell::GotoBookmark(const OUString& rBookmark)
? pDrawViewShell->GetViewFrame()
: SfxViewFrame::Current() )->GetBindings();
- rBindings.Invalidate(SID_NAVIGATOR_STATE, sal_True, sal_False);
+ rBindings.Invalidate(SID_NAVIGATOR_STATE, true, false);
rBindings.Invalidate(SID_NAVIGATOR_PAGENAME);
}
@@ -1070,7 +1070,7 @@ sal_Bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark)
SfxBindings& rBindings = ( ( mpViewShell && mpViewShell->GetViewFrame() ) ?
mpViewShell->GetViewFrame() : SfxViewFrame::Current() )->GetBindings();
- rBindings.Invalidate(SID_NAVIGATOR_STATE, sal_True, sal_False);
+ rBindings.Invalidate(SID_NAVIGATOR_STATE, true, false);
rBindings.Invalidate(SID_NAVIGATOR_PAGENAME);
}
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index c25458dd5834..a838deaaac72 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -400,7 +400,7 @@ void DrawDocShell::ApplySlotFilter() const
pDispatcher->SetSlotFilter();
if( pDispatcher->GetBindings() )
- pDispatcher->GetBindings()->InvalidateAll( sal_True );
+ pDispatcher->GetBindings()->InvalidateAll( true );
}
pTestViewShell = SfxViewShell::GetNext( *pTestViewShell );
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 79943fb413d4..f59b9b90f740 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -758,7 +758,7 @@ void SAL_CALL SlideShow::end()
framework::FrameworkHelper::GetViewURL(ePreviousType),
framework::FrameworkHelper::msCenterPaneURL);
- pViewShell->GetViewFrame()->GetBindings().InvalidateAll( sal_True );
+ pViewShell->GetViewFrame()->GetBindings().InvalidateAll( true );
}
}
}
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index a19950e661b2..ef934866130d 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2748,7 +2748,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException, std::exception)
}
if( getBindings() )
- getBindings()->InvalidateAll(sal_True);
+ getBindings()->InvalidateAll(true);
mpShowWindow->GrabFocus();
}
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index cc07c595e5d1..49eb75300b3b 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -195,7 +195,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
SfxViewShell* pViewShell = GetViewShell();
OSL_ASSERT (pViewShell!=NULL);
SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings();
- rBindings.Invalidate( SID_INSERT_TABLE, sal_True, sal_False );
+ rBindings.Invalidate( SID_INSERT_TABLE, true, false );
break;
}
case SID_TABLEDESIGN:
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 3b7d956a2f7d..9605277102c0 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -223,7 +223,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
Invalidate();
// to refresh preview (in outline mode), slot has to be invalidated:
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, true, false );
}
break;
@@ -236,7 +236,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
// Ensure bold/italic etc. icon state updates
Invalidate();
// trigger preview refresh
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, true, false );
}
rReq.Done();
}
@@ -251,7 +251,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
// Ensure bold/italic etc. icon state updates
Invalidate();
// trigger preview refresh
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, true, false );
}
rReq.Done();
}
@@ -280,7 +280,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
pOLV->AdjustHeight( -1 );
// trigger preview refresh
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, true, false );
}
rReq.Done();
}
@@ -293,7 +293,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
pOLV->AdjustHeight( 1 );
// trigger preview refresh
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, true, false );
}
rReq.Done();
}
@@ -311,7 +311,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
rReq.Done( aAttr );
mpView->SetAttributes( aAttr );
Invalidate();
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, true, false );
}
break;
@@ -341,7 +341,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
}
Invalidate();
// to refresh preview (in outline mode), slot has to be invalidated:
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, true, false );
}
rReq.Done();
}
@@ -655,7 +655,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
Invalidate();
// to refresh preview (in outline mode), slot has to be invalidated:
- mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, sal_True, sal_False );
+ mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, true, false );
}
break;
}
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index dd24f970c39a..009288e5dba7 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1091,12 +1091,12 @@ sal_Bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage)
// so navigator (and effect window) notice that
SfxBindings& rBindings = GetViewFrame()->GetBindings();
- rBindings.Invalidate(SID_NAVIGATOR_PAGENAME, sal_True, sal_False);
- rBindings.Invalidate(SID_STATUS_PAGE, sal_True, sal_False);
- rBindings.Invalidate(SID_DELETE_MASTER_PAGE, sal_True, sal_False);
- rBindings.Invalidate(SID_DELETE_PAGE, sal_True, sal_False);
- rBindings.Invalidate(SID_ASSIGN_LAYOUT,sal_True,sal_False);
- rBindings.Invalidate(SID_INSERTPAGE,sal_True,sal_False);
+ rBindings.Invalidate(SID_NAVIGATOR_PAGENAME, true, false);
+ rBindings.Invalidate(SID_STATUS_PAGE, true, false);
+ rBindings.Invalidate(SID_DELETE_MASTER_PAGE, true, false);
+ rBindings.Invalidate(SID_DELETE_PAGE, true, false);
+ rBindings.Invalidate(SID_ASSIGN_LAYOUT, true, false);
+ rBindings.Invalidate(SID_INSERTPAGE, true, false);
UpdatePreview( mpActualPage );
mpDrawView->AdjustMarkHdl();
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index e985b2ac4703..c996d14deff2 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -2080,7 +2080,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
SfxBindings& rBindings = GetViewFrame()->GetBindings();
- rBindings.Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False );
+ rBindings.Invalidate( SID_NAVIGATOR_STATE, true, false );
rBindings.Invalidate( SID_CONTEXT );
Cancel();
@@ -2115,7 +2115,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
}
SfxBindings& rBindings = GetViewFrame()->GetBindings();
- rBindings.Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False );
+ rBindings.Invalidate( SID_NAVIGATOR_STATE, true, false );
rBindings.Invalidate( SID_CONTEXT );
Cancel();
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 2740a5279a68..ea3623b578d9 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -71,7 +71,7 @@ void DrawViewShell::ModelHasChanged()
{
Invalidate();
// that the navigator also gets an up to date state
- GetViewFrame()->GetBindings().Invalidate( SID_NAVIGATOR_STATE, sal_True, sal_False );
+ GetViewFrame()->GetBindings().Invalidate( SID_NAVIGATOR_STATE, true, false );
SfxBoolItem aItem( SID_3D_STATE, true );
GetViewFrame()->GetDispatcher()->Execute(
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index 18266633ed76..421a50b6457a 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -222,17 +222,17 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
SvtCJKOptions aCJKOptions;
if( !aCJKOptions.IsChangeCaseMapEnabled() )
{
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, sal_False );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, sal_False );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, sal_False );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, sal_False );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, false );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, false );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, false );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, false );
}
else
{
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, sal_True );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, sal_True );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, sal_True );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, sal_True );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, true );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, true );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, true );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, true );
}
rSet.DisableItem( SID_TRANSLITERATE_SENTENCE_CASE );
@@ -250,10 +250,10 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
SvtCJKOptions aCJKOptions;
if( !aCJKOptions.IsChangeCaseMapEnabled() )
{
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, sal_False );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, sal_False );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, sal_False );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, sal_False );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, false );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, false );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, false );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, false );
rSet.DisableItem( SID_TRANSLITERATE_HALFWIDTH );
rSet.DisableItem( SID_TRANSLITERATE_FULLWIDTH );
rSet.DisableItem( SID_TRANSLITERATE_HIRAGANA );
@@ -261,10 +261,10 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet)
}
else
{
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, sal_True );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, sal_True );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, sal_True );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, sal_True );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, true );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, true );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, true );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, true );
}
}
}
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 6e833dfbaaf3..5aff9af4bee9 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -434,10 +434,10 @@ void OutlineViewShell::GetCtrlState(SfxItemSet &rSet)
SvtCJKOptions aCJKOptions;
if( !aCJKOptions.IsChangeCaseMapEnabled() )
{
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, sal_False );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, sal_False );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, sal_False );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, sal_False );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, false );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, false );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, false );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, false );
rSet.DisableItem( SID_TRANSLITERATE_HALFWIDTH );
rSet.DisableItem( SID_TRANSLITERATE_FULLWIDTH );
rSet.DisableItem( SID_TRANSLITERATE_HIRAGANA );
@@ -445,10 +445,10 @@ void OutlineViewShell::GetCtrlState(SfxItemSet &rSet)
}
else
{
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, sal_True );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, sal_True );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, sal_True );
- GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, sal_True );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HALFWIDTH, true );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_FULLWIDTH, true );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_HIRAGANA, true );
+ GetViewFrame()->GetBindings().SetVisibleState( SID_TRANSLITERATE_KATAGANA, true );
}
}
}
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index d80b23c9e96c..01626f7192e8 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -883,7 +883,7 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
pSdClient->DoVerb(nVerb); // if necessary, ErrCode is outputted by Sfx
pViewShell->GetViewFrame()->GetBindings().Invalidate(
- SID_NAVIGATOR_STATE, sal_True, sal_False);
+ SID_NAVIGATOR_STATE, true, false);
}
GetDocSh()->SetWaitCursor( sal_False );
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index b3a020895b34..1770bc053b2b 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -331,7 +331,7 @@ void ViewShell::Activate(sal_Bool bIsMDIActivate)
SfxViewShell* pViewShell = GetViewShell();
OSL_ASSERT (pViewShell!=NULL);
SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings();
- rBindings.Invalidate( SID_3D_STATE, sal_True, sal_False );
+ rBindings.Invalidate( SID_3D_STATE, true, false );
rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) );
if(xSlideShow.is() && xSlideShow->isRunning() )
@@ -1196,7 +1196,7 @@ void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq)
// This one is corresponding to the default handling
// of SID_UNDO in sfx2
- GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ GetViewFrame()->GetBindings().InvalidateAll(false);
rReq.Done();
}
@@ -1245,7 +1245,7 @@ void ViewShell::ImpSidRedo(sal_Bool, SfxRequest& rReq)
// This one is corresponding to the default handling
// of SID_UNDO in sfx2
- GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ GetViewFrame()->GetBindings().InvalidateAll(false);
rReq.Done();
}
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);
}
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index bbf114779726..0f64fd941438 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -825,7 +825,7 @@ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw
comphelper::SolarMutex& rSolarSafety = Application::GetSolarMutex();
if (rSolarSafety.tryToAcquire())
{
- m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_RECORD_TOTAL , sal_True, sal_False);
+ m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_RECORD_TOTAL, true, false);
m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Update(SID_FM_RECORD_TOTAL);
rSolarSafety.release();
}
@@ -986,7 +986,7 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId )
else
{
OSL_ENSURE( _nId, "FmXFormShell::UpdateSlot: can't update the complete shell!" );
- m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate( _nId, sal_True, sal_True );
+ m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate( _nId, true, true );
m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Update( _nId );
}
}
@@ -1005,7 +1005,7 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
}
else
if (nId)
- m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(nId, sal_True, bWithId);
+ m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(nId, true, bWithId);
else
m_pShell->GetViewShell()->GetViewFrame()->GetBindings().InvalidateShell(*m_pShell);
}
@@ -1041,7 +1041,7 @@ IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots)
for (std::vector<InvalidSlotInfo>::const_iterator i = m_arrInvalidSlots.begin(); i < m_arrInvalidSlots.end(); ++i)
{
if (i->id)
- m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(i->id, sal_True, (i->flags & 0x01));
+ m_pShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(i->id, true, (i->flags & 0x01));
else
m_pShell->GetViewShell()->GetViewFrame()->GetBindings().InvalidateShell(*m_pShell);
}
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 9f00a6b42cb8..d9b5acd5f72d 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -341,7 +341,7 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
pFormShellImpl->UpdateForms( sal_True );
// damit der Formular-Navigator auf den Seitenwechsel reagieren kann
- pFormShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_FMEXPLORER_CONTROL , sal_True, sal_False);
+ pFormShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_FMEXPLORER_CONTROL, true, false);
pFormShellImpl->SetSelection(GetMarkedObjectList());
}
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 4f68afe508ab..aa5f631bb88c 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1373,7 +1373,7 @@ namespace svxform
aSelection.insert( xNewForm );
pFormShell->GetImpl()->setCurrentSelection( aSelection );
- pFormShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_PROPERTIES,sal_True,sal_True);
+ pFormShell->GetViewShell()->GetViewFrame()->GetBindings().Invalidate(SID_FM_PROPERTIES, true, true);
}
GetNavModel()->SetModified();
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index e964cd3cbb16..9091ce44f55c 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -1177,10 +1177,10 @@ void PosSizePropertyPanel::UpdateUIScale()
// The content of the position and size boxes is only updated when item changes are notified.
// Request such notifications without changing the actual item values.
- GetBindings()->Invalidate(SID_ATTR_TRANSFORM_POS_X, sal_True, sal_False);
- GetBindings()->Invalidate(SID_ATTR_TRANSFORM_POS_Y, sal_True, sal_False);
- GetBindings()->Invalidate(SID_ATTR_TRANSFORM_WIDTH, sal_True, sal_False);
- GetBindings()->Invalidate(SID_ATTR_TRANSFORM_HEIGHT, sal_True, sal_False);
+ GetBindings()->Invalidate(SID_ATTR_TRANSFORM_POS_X, true, false);
+ GetBindings()->Invalidate(SID_ATTR_TRANSFORM_POS_Y, true, false);
+ GetBindings()->Invalidate(SID_ATTR_TRANSFORM_WIDTH, true, false);
+ GetBindings()->Invalidate(SID_ATTR_TRANSFORM_HEIGHT, true, false);
}
}
diff --git a/sw/source/core/uibase/docvw/SidebarTxtControl.cxx b/sw/source/core/uibase/docvw/SidebarTxtControl.cxx
index 292950dd8c36..421bd0a8f3f0 100644
--- a/sw/source/core/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/core/uibase/docvw/SidebarTxtControl.cxx
@@ -218,7 +218,7 @@ void SidebarTxtControl::KeyInput( const KeyEvent& rKeyEvt )
}
}
- mrDocView.GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ mrDocView.GetViewFrame()->GetBindings().InvalidateAll(false);
}
void SidebarTxtControl::MouseMove( const MouseEvent& rMEvt )
@@ -284,7 +284,7 @@ void SidebarTxtControl::MouseButtonDown( const MouseEvent& rMEvt )
{
GetTextView()->MouseButtonDown( rMEvt );
}
- mrDocView.GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ mrDocView.GetViewFrame()->GetBindings().InvalidateAll(false);
}
void SidebarTxtControl::MouseButtonUp( const MouseEvent& rMEvt )
diff --git a/sw/source/core/uibase/docvw/edtdd.cxx b/sw/source/core/uibase/docvw/edtdd.cxx
index da9d0fb9cc4e..005af17dad00 100644
--- a/sw/source/core/uibase/docvw/edtdd.cxx
+++ b/sw/source/core/uibase/docvw/edtdd.cxx
@@ -74,7 +74,7 @@ void SwEditWin::StartDrag( sal_Int8 /*nAction*/, const Point& rPosPixel )
CommandEvent aDragEvent( rPosPixel, COMMAND_STARTDRAG, true );
if( rSh.GetDrawView()->Command( aDragEvent, this ) )
{
- m_rView.GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ m_rView.GetViewFrame()->GetBindings().InvalidateAll(false);
return; // Event evaluated by SdrView
}
}
diff --git a/sw/source/core/uibase/docvw/edtwin.cxx b/sw/source/core/uibase/docvw/edtwin.cxx
index 8f0b7ba08dbc..4891a191a8d7 100644
--- a/sw/source/core/uibase/docvw/edtwin.cxx
+++ b/sw/source/core/uibase/docvw/edtwin.cxx
@@ -1355,7 +1355,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
// OS:the DrawView also needs a readonly-Flag as well
if ( !bIsDocReadOnly && rSh.GetDrawView() && rSh.GetDrawView()->KeyInput( rKEvt, this ) )
{
- rSh.GetView().GetViewFrame()->GetBindings().InvalidateAll( sal_False );
+ rSh.GetView().GetViewFrame()->GetBindings().InvalidateAll( false );
rSh.SetModified();
return; // Event evaluated by SdrView
}
@@ -2930,7 +2930,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
{
if (pSdrView->MouseButtonDown( rMEvt, this ) )
{
- rSh.GetView().GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ rSh.GetView().GetViewFrame()->GetBindings().InvalidateAll(false);
return; // SdrView's event evaluated
}
}
@@ -4222,7 +4222,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
if ( pSdrView->MouseButtonUp( rMEvt,this ) )
{
- rSh.GetView().GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ rSh.GetView().GetViewFrame()->GetBindings().InvalidateAll(false);
return; // SdrView's event evaluated
}
}
@@ -5509,7 +5509,7 @@ sal_Bool SwEditWin::SelectMenuPosition(SwWrtShell& rSh, const Point& rMousePos )
if (pSdrView->MouseButtonDown( aMEvt, this ) )
{
pSdrView->MouseButtonUp( aMEvt, this );
- rSh.GetView().GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ rSh.GetView().GetViewFrame()->GetBindings().InvalidateAll(false);
return sal_True;
}
}
diff --git a/sw/source/core/uibase/shells/annotsh.cxx b/sw/source/core/uibase/shells/annotsh.cxx
index d1e69591744f..f2602b76d87b 100644
--- a/sw/source/core/uibase/shells/annotsh.cxx
+++ b/sw/source/core/uibase/shells/annotsh.cxx
@@ -594,7 +594,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
if (aNullRect != aOutRect)
pOLV->SetAttribs(aNewAttr);
- rView.GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ rView.GetViewFrame()->GetBindings().InvalidateAll(false);
if ( pOLV->GetOutliner()->IsModified() )
rView.GetWrtShell().SetModified();
@@ -1346,11 +1346,11 @@ void SwAnnotationShell::GetLinguState(SfxItemSet &rSet)
{
if (!SvtCJKOptions().IsAnyEnabled())
{
- rView.GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_False );
+ rView.GetViewFrame()->GetBindings().SetVisibleState( nWhich, false );
rSet.DisableItem(nWhich);
}
else
- rView.GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_True );
+ rView.GetViewFrame()->GetBindings().SetVisibleState( nWhich, true );
}
break;
}
@@ -1498,7 +1498,7 @@ void SwAnnotationShell::ExecUndo(SfxRequest &rReq)
}
}
- rView.GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ rView.GetViewFrame()->GetBindings().InvalidateAll(false);
if (rView.GetPostItMgr()->HasActiveSidebarWin())
rView.GetPostItMgr()->GetActiveSidebarWin()->ResizeIfNecessary(aOldHeight,rView.GetPostItMgr()->GetActiveSidebarWin()->GetPostItTextHeight());
diff --git a/sw/source/core/uibase/shells/basesh.cxx b/sw/source/core/uibase/shells/basesh.cxx
index 797f9dee8749..82f837c9bcd4 100644
--- a/sw/source/core/uibase/shells/basesh.cxx
+++ b/sw/source/core/uibase/shells/basesh.cxx
@@ -488,7 +488,7 @@ void SwBaseShell::ExecUndo(SfxRequest &rReq)
OSL_FAIL("wrong Dispatcher");
}
- if (pViewFrame) { pViewFrame->GetBindings().InvalidateAll(sal_False); }
+ if (pViewFrame) { pViewFrame->GetBindings().InvalidateAll(false); }
}
// State of undo
diff --git a/sw/source/core/uibase/shells/drwbassh.cxx b/sw/source/core/uibase/shells/drwbassh.cxx
index f6493b84aa1f..ef3aef3517aa 100644
--- a/sw/source/core/uibase/shells/drwbassh.cxx
+++ b/sw/source/core/uibase/shells/drwbassh.cxx
@@ -348,7 +348,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
if(aFrmAttrSet.Count())
pSh->SetDrawingAttr(aFrmAttrSet);
- rBind.InvalidateAll(sal_False);
+ rBind.InvalidateAll(false);
// #i30451#
pSh->EndUndo( UNDO_INSFMTATTR );
@@ -424,7 +424,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
if (pSh->IsGroupSelected())
{
pSdrView->EnterMarkedGroup();
- rBind.InvalidateAll(sal_False);
+ rBind.InvalidateAll(false);
}
break;
diff --git a/sw/source/core/uibase/shells/drwtxtex.cxx b/sw/source/core/uibase/shells/drwtxtex.cxx
index db2014b014e7..8511fe50a303 100644
--- a/sw/source/core/uibase/shells/drwtxtex.cxx
+++ b/sw/source/core/uibase/shells/drwtxtex.cxx
@@ -590,7 +590,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
SetAttrToMarked(aNewAttr);
- GetView().GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ GetView().GetViewFrame()->GetBindings().InvalidateAll(false);
if (IsTextEdit() && pOLV->GetOutliner()->IsModified())
rSh.SetModified();
@@ -757,11 +757,11 @@ ASK_ESCAPE:
{
if (!SvtCJKOptions().IsAnyEnabled())
{
- GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_False );
+ GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, false );
rSet.DisableItem(nWhich);
}
else
- GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_True );
+ GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, true );
}
break;
@@ -835,10 +835,10 @@ ASK_ESCAPE:
if(!aCJKOptions.IsChangeCaseMapEnabled())
{
rSet.DisableItem(nWhich);
- GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_False );
+ GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, false );
}
else
- GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_True );
+ GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, true );
}
break;
case SID_INSERT_RLM :
diff --git a/sw/source/core/uibase/shells/drwtxtsh.cxx b/sw/source/core/uibase/shells/drwtxtsh.cxx
index a5b158795ed7..27b7c1ffccc3 100644
--- a/sw/source/core/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/core/uibase/shells/drwtxtsh.cxx
@@ -501,7 +501,7 @@ void SwDrawTextShell::ExecDraw(SfxRequest &rReq)
return;
}
- GetView().GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ GetView().GetViewFrame()->GetBindings().InvalidateAll(false);
if (IsTextEdit() && pOLV->GetOutliner()->IsModified())
rSh.SetModified();
@@ -538,7 +538,7 @@ void SwDrawTextShell::ExecUndo(SfxRequest &rReq)
pUndoManager->Redo();
}
bCallBase = false;
- GetView().GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ GetView().GetViewFrame()->GetBindings().InvalidateAll(false);
}
break;
}
diff --git a/sw/source/core/uibase/shells/textsh1.cxx b/sw/source/core/uibase/shells/textsh1.cxx
index b346e8856bba..7cc793bed17d 100644
--- a/sw/source/core/uibase/shells/textsh1.cxx
+++ b/sw/source/core/uibase/shells/textsh1.cxx
@@ -746,7 +746,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
if( pVFrame->HasChildWindow( nId ) )
{
pVFrame->ToggleChildWindow( nId );
- pVFrame->GetBindings().InvalidateAll( sal_True );
+ pVFrame->GetBindings().InvalidateAll( true );
}
OUString sFormula(((const SfxStringItem*)pItem)->GetValue());
@@ -793,7 +793,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
rWrtSh.EndAllTblBoxEdit();
pVFrame->ToggleChildWindow( nId );
if( !pVFrame->HasChildWindow( nId ) )
- pVFrame->GetBindings().InvalidateAll( sal_True );
+ pVFrame->GetBindings().InvalidateAll( true );
rReq.Ignore();
}
}
@@ -1604,11 +1604,11 @@ void SwTextShell::GetState( SfxItemSet &rSet )
if( !aCJKOptions.IsRubyEnabled()
|| rSh.CrsrInsideInputFld() )
{
- GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_False );
+ GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, false );
rSet.DisableItem(nWhich);
}
else
- GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_True );
+ GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, true );
}
break;
@@ -1661,11 +1661,11 @@ void SwTextShell::GetState( SfxItemSet &rSet )
SvtCJKOptions aCJKOptions;
if(!aCJKOptions.IsChangeCaseMapEnabled())
{
- GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_False );
+ GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, false );
rSet.DisableItem(nWhich);
}
else
- GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_True );
+ GetView().GetViewFrame()->GetBindings().SetVisibleState( nWhich, true );
}
break;
case FN_READONLY_SELECTION_MODE :
diff --git a/sw/source/core/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/core/uibase/sidebar/PagePropertyPanel.cxx
index a5d02386cb52..982d82b6061d 100644
--- a/sw/source/core/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/core/uibase/sidebar/PagePropertyPanel.cxx
@@ -513,7 +513,7 @@ void PagePropertyPanel::NotifyItemUpdate(
case SID_ATTR_PAGE_SIZE:
if ( mbInvalidateSIDAttrPageOnSIDAttrPageSizeNotify )
{
- mpBindings->Invalidate( SID_ATTR_PAGE, sal_True, sal_False );
+ mpBindings->Invalidate( SID_ATTR_PAGE, true, false );
}
if ( eState >= SFX_ITEM_AVAILABLE &&
pState && pState->ISA(SvxSizeItem) )
diff --git a/sw/source/core/uibase/uiview/srcview.cxx b/sw/source/core/uibase/uiview/srcview.cxx
index c31d1111c41d..0c9931120376 100644
--- a/sw/source/core/uibase/uiview/srcview.cxx
+++ b/sw/source/core/uibase/uiview/srcview.cxx
@@ -387,11 +387,11 @@ void SwSrcView::Execute(SfxRequest& rReq)
break;
case SID_UNDO:
pTextView->Undo();
- GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ GetViewFrame()->GetBindings().InvalidateAll(false);
break;
case SID_REDO:
pTextView->Redo();
- GetViewFrame()->GetBindings().InvalidateAll(sal_False);
+ GetViewFrame()->GetBindings().InvalidateAll(false);
break;
case SID_REPEAT:
break;
diff --git a/sw/source/core/uibase/uiview/view.cxx b/sw/source/core/uibase/uiview/view.cxx
index a96f76dec036..965124e921dc 100644
--- a/sw/source/core/uibase/uiview/view.cxx
+++ b/sw/source/core/uibase/uiview/view.cxx
@@ -246,7 +246,7 @@ void SwView::SelectShell()
if ( nNewSelectionType == m_nSelectionType )
{
- GetViewFrame()->GetBindings().InvalidateAll( sal_False );
+ GetViewFrame()->GetBindings().InvalidateAll( false );
if ( m_nSelectionType & nsSelectionType::SEL_OLE ||
m_nSelectionType & nsSelectionType::SEL_GRF )
// For graphs and OLE the verb can be modified of course!
@@ -631,7 +631,7 @@ void SwView::_CheckReadonlyState()
rDis.SetSlotFilter();
}
if ( bChgd )
- GetViewFrame()->GetBindings().InvalidateAll(sal_True);
+ GetViewFrame()->GetBindings().InvalidateAll(true);
}
void SwView::_CheckReadonlySelection()
@@ -685,7 +685,7 @@ void SwView::_CheckReadonlySelection()
if( nDisableFlags != rDis.GetDisableFlags() )
{
rDis.SetDisableFlags( nDisableFlags );
- GetViewFrame()->GetBindings().InvalidateAll( sal_True );
+ GetViewFrame()->GetBindings().InvalidateAll( true );
}
}
diff --git a/sw/source/core/uibase/uiview/viewstat.cxx b/sw/source/core/uibase/uiview/viewstat.cxx
index 6314f4784007..7e5362e282b9 100644
--- a/sw/source/core/uibase/uiview/viewstat.cxx
+++ b/sw/source/core/uibase/uiview/viewstat.cxx
@@ -330,11 +330,11 @@ void SwView::GetState(SfxItemSet &rSet)
{
if (!SvtCJKOptions().IsAnyEnabled())
{
- GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_False );
+ GetViewFrame()->GetBindings().SetVisibleState( nWhich, false );
rSet.DisableItem(nWhich);
}
else
- GetViewFrame()->GetBindings().SetVisibleState( nWhich, sal_True );
+ GetViewFrame()->GetBindings().SetVisibleState( nWhich, true );
}
break;
case SID_MAIL_SCROLLBODY_PAGEDOWN:
diff --git a/sw/source/core/uibase/web/wview.cxx b/sw/source/core/uibase/web/wview.cxx
index 5e733721c280..db19b8b2f653 100644
--- a/sw/source/core/uibase/web/wview.cxx
+++ b/sw/source/core/uibase/web/wview.cxx
@@ -108,7 +108,7 @@ void SwWebView::SelectShell()
int _nSelectionType = GetSelectionType();
if ( nNewSelectionType == _nSelectionType )
{
- GetViewFrame()->GetBindings().InvalidateAll( sal_False );
+ GetViewFrame()->GetBindings().InvalidateAll( false );
if ( _nSelectionType & nsSelectionType::SEL_OLE ||
_nSelectionType & nsSelectionType::SEL_GRF )
//The verb may of course change for graphics and OLE!