tdf#163948: fix crash when NotesPane is enabled on Tabbed UI
Pane shells (BottomImpressPane, LeftImpressPane etc.) do not implement any slot handling, so make sure they are not activated on the top of the shellstack. Another solution for this could have been getting ChildWindowPanes properly dispose instead of Hide() at BasicPaneFactory::releaseResource, and adapting the rest of the code which assumes these Panes are recycled. This is since ConfigurationUpdater::UpdateCore attempts at releasing via ConfigurationUpdater::CheckPureAnchors and ConfigurationControllerResourceManager::DeactivateResources calls. But in the end the ChildWindowPane is hidden on the DeactivateResource call instead of being diposed, so the "PureAnchor"'s Shell stays at the shellstack. Change-Id: I52788d350b66ae22875683f57d87326f4a9a77de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177686 Reviewed-by: Sarper Akdemir <sarper.akdemir@allotropia.de> Tested-by: Jenkins
This commit is contained in:
parent
264c333b05
commit
ae281b5145
3 changed files with 36 additions and 1 deletions
|
@ -48,7 +48,9 @@ ChildWindowPane::ChildWindowPane (
|
|||
mpShell(std::move(pShell)),
|
||||
mbHasBeenActivated(false)
|
||||
{
|
||||
mrViewShellBase.GetViewShellManager()->ActivateShell(mpShell.get());
|
||||
// ChildWindowPane shells don't implement dispatch slots, so activate them
|
||||
// at the bottom of the shellstack.
|
||||
mrViewShellBase.GetViewShellManager()->ActivateLowPriorityShell(mpShell.get());
|
||||
|
||||
SfxViewFrame& rViewFrame = mrViewShellBase.GetViewFrame();
|
||||
|
||||
|
|
|
@ -88,6 +88,11 @@ public:
|
|||
*/
|
||||
void ActivateShell(SfxShell* pShell);
|
||||
|
||||
/** Activate the given shell, putting it at the bottom of the stack instead of
|
||||
the top.
|
||||
*/
|
||||
void ActivateLowPriorityShell(SfxShell* pShell);
|
||||
|
||||
/** Deactivate the specified shell, i.e. take it and all of its
|
||||
object bars from the shell stack.
|
||||
@param pShell
|
||||
|
|
|
@ -108,8 +108,10 @@ public:
|
|||
ViewShell* pViewShell);
|
||||
void DeactivateViewShell (const ViewShell& rShell);
|
||||
void ActivateShell (SfxShell& rShell);
|
||||
void ActivateLowPriorityShell (SfxShell& rShell);
|
||||
void DeactivateShell (const SfxShell& rShell);
|
||||
void ActivateShell (const ShellDescriptor& rDescriptor);
|
||||
void ActivateLowPriorityShell (const ShellDescriptor& rDescriptor);
|
||||
void SetFormShell (const ViewShell* pViewShell, FmFormShell* pFormShell, bool bAbove);
|
||||
void ActivateSubShell (const SfxShell& rParentShell, ShellId nId);
|
||||
void DeactivateSubShell (const SfxShell& rParentShell, ShellId nId);
|
||||
|
@ -317,6 +319,12 @@ void ViewShellManager::ActivateShell (SfxShell* pShell)
|
|||
mpImpl->ActivateShell(*pShell);
|
||||
}
|
||||
|
||||
void ViewShellManager::ActivateLowPriorityShell (SfxShell* pShell)
|
||||
{
|
||||
if (mbValid && pShell!=nullptr)
|
||||
mpImpl->ActivateLowPriorityShell(*pShell);
|
||||
}
|
||||
|
||||
void ViewShellManager::DeactivateShell (const SfxShell* pShell)
|
||||
{
|
||||
if (mbValid && pShell!=nullptr)
|
||||
|
@ -498,6 +506,17 @@ void ViewShellManager::Implementation::ActivateShell (SfxShell& rShell)
|
|||
ActivateShell(aDescriptor);
|
||||
}
|
||||
|
||||
void ViewShellManager::Implementation::ActivateLowPriorityShell (SfxShell& rShell)
|
||||
{
|
||||
::osl::MutexGuard aGuard (maMutex);
|
||||
|
||||
// Create a new shell or recycle on in the cache.
|
||||
ShellDescriptor aDescriptor;
|
||||
aDescriptor.mpShell = &rShell;
|
||||
|
||||
ActivateLowPriorityShell(aDescriptor);
|
||||
}
|
||||
|
||||
void ViewShellManager::Implementation::ActivateShell (const ShellDescriptor& rDescriptor)
|
||||
{
|
||||
// Put shell on top of the active view shells.
|
||||
|
@ -507,6 +526,15 @@ void ViewShellManager::Implementation::ActivateShell (const ShellDescriptor& rDe
|
|||
}
|
||||
}
|
||||
|
||||
void ViewShellManager::Implementation::ActivateLowPriorityShell (const ShellDescriptor& rDescriptor)
|
||||
{
|
||||
// Put shell on bottom of the active view shells.
|
||||
if (rDescriptor.mpShell != nullptr)
|
||||
{
|
||||
maActiveViewShells.push_back( rDescriptor );
|
||||
}
|
||||
}
|
||||
|
||||
void ViewShellManager::Implementation::DeactivateShell (const SfxShell& rShell)
|
||||
{
|
||||
::osl::MutexGuard aGuard (maMutex);
|
||||
|
|
Loading…
Reference in a new issue