Kaydet (Commit) db72475a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

SfxDispatcher::GetShellAndSlot_Impl return type wants to be bool

Change-Id: I7897ce11621a7aac991ea64897d8fdeb06c3d2d7
üst d6690c1c
...@@ -185,7 +185,7 @@ public: ...@@ -185,7 +185,7 @@ public:
SAL_DLLPRIVATE void SetMenu_Impl(); SAL_DLLPRIVATE void SetMenu_Impl();
SAL_DLLPRIVATE void Update_Impl( bool bForce = false ); // ObjectBars etc. SAL_DLLPRIVATE void Update_Impl( bool bForce = false ); // ObjectBars etc.
SAL_DLLPRIVATE bool IsUpdated_Impl() const; 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 ); bool bOwnShellsOnly, bool bModal, bool bRealSlot=true );
SAL_DLLPRIVATE void SetReadOnly_Impl( bool bOn ); SAL_DLLPRIVATE void SetReadOnly_Impl( bool bOn );
SAL_DLLPRIVATE bool GetReadOnly_Impl() const; SAL_DLLPRIVATE bool GetReadOnly_Impl() const;
......
...@@ -784,7 +784,7 @@ void SfxDispatcher::DoParentDeactivate_Impl() ...@@ -784,7 +784,7 @@ void SfxDispatcher::DoParentDeactivate_Impl()
sal_False sal_False
The SfxShell was not found, ppShell and ppSlot are invalid. 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) const SfxSlot** ppSlot, bool bOwnShellsOnly, bool bModal, bool bRealSlot)
{ {
SFX_STACK(SfxDispatcher::GetShellAndSlot_Impl); SFX_STACK(SfxDispatcher::GetShellAndSlot_Impl);
...@@ -794,7 +794,7 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell, ...@@ -794,7 +794,7 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
if ( _FindServer(nSlot, aSvr, bModal) ) if ( _FindServer(nSlot, aSvr, bModal) )
{ {
if ( bOwnShellsOnly && aSvr.GetShellLevel() >= xImp->aStack.size() ) if ( bOwnShellsOnly && aSvr.GetShellLevel() >= xImp->aStack.size() )
return sal_False; return false;
*ppShell = GetShell(aSvr.GetShellLevel()); *ppShell = GetShell(aSvr.GetShellLevel());
*ppSlot = aSvr.GetSlot(); *ppSlot = aSvr.GetSlot();
...@@ -802,12 +802,12 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell, ...@@ -802,12 +802,12 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
*ppSlot = (*ppShell)->GetInterface()->GetRealSlot(*ppSlot); *ppSlot = (*ppShell)->GetInterface()->GetRealSlot(*ppSlot);
// Check only real slots as enum slots don't have an execute function! // Check only real slots as enum slots don't have an execute function!
if ( bRealSlot && ((0 == *ppSlot) || (0 == (*ppSlot)->GetExecFnc()) )) 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>. /** This method performs a request for a cached <Slot-Server>.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment