diff options
| -rw-r--r-- | include/sfx2/dispatch.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/dispatch.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 971082db02ee..c6c2425c302c 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -185,7 +185,7 @@ public: SAL_DLLPRIVATE void SetMenu_Impl(); SAL_DLLPRIVATE void Update_Impl( bool bForce = false ); // ObjectBars etc. SAL_DLLPRIVATE bool IsUpdated_Impl() const; - SAL_DLLPRIVATE int GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot, + SAL_DLLPRIVATE bool GetShellAndSlot_Impl( sal_uInt16 nSlot, SfxShell **ppShell, const SfxSlot **ppSlot, bool bOwnShellsOnly, bool bModal, bool bRealSlot=true ); SAL_DLLPRIVATE void SetReadOnly_Impl( bool bOn ); SAL_DLLPRIVATE bool GetReadOnly_Impl() const; diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index f04c968d4dc2..a7a4f22bd839 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -784,7 +784,7 @@ void SfxDispatcher::DoParentDeactivate_Impl() sal_False The SfxShell was not found, ppShell and ppSlot are invalid. */ -int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell, +bool SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell, const SfxSlot** ppSlot, bool bOwnShellsOnly, bool bModal, bool bRealSlot) { SFX_STACK(SfxDispatcher::GetShellAndSlot_Impl); @@ -794,7 +794,7 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell, if ( _FindServer(nSlot, aSvr, bModal) ) { if ( bOwnShellsOnly && aSvr.GetShellLevel() >= xImp->aStack.size() ) - return sal_False; + return false; *ppShell = GetShell(aSvr.GetShellLevel()); *ppSlot = aSvr.GetSlot(); @@ -802,12 +802,12 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell, *ppSlot = (*ppShell)->GetInterface()->GetRealSlot(*ppSlot); // Check only real slots as enum slots don't have an execute function! if ( bRealSlot && ((0 == *ppSlot) || (0 == (*ppSlot)->GetExecFnc()) )) - return sal_False; + return false; - return sal_True; + return true; } - return sal_False; + return false; } /** This method performs a request for a cached <Slot-Server>. |