[PATCH] Change in core[libreoffice-4-0]: fdo#58893: Revert "Resolves: rhbz#818557 crash with NULL she...

[Michael Stahl (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1721

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/1721/1

fdo#58893: Revert "Resolves: rhbz#818557 crash with NULL shell..."

This reverts commit a1d265be484f1c70f57ab3de9b2d8c27d2fd3aa4.

This commit causes the crash, because apparently it causes some event to
be delayed via SfxHintPoster which refers to some SfxRequest that is
then deleted too early.

Change-Id: I301f3b52001c1d8b1b60f5b1cfb3b093c9f81607
(cherry picked from commit 5090267eada3d68a618769c5dbae8b2ee8d6dab5)
---
M sfx2/source/doc/sfxbasemodel.cxx
1 file changed, 0 insertions(+), 3 deletions(-)



diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 5dd7d63..540c190 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1119,10 +1119,7 @@
     {
         SfxViewFrame* pViewFrame = SfxViewFrame::Get( xController, GetObjectShell() );
         ENSURE_OR_THROW( pViewFrame, "SFX document without SFX view!?" );
-        bool bOldLock = pViewFrame->GetDispatcher()->IsLocked();
-        pViewFrame->GetDispatcher()->Lock(sal_True);
         pViewFrame->UpdateDocument_Impl();
-        pViewFrame->GetDispatcher()->Lock(bOldLock);
         const String sDocumentURL = GetObjectShell()->GetMedium()->GetName();
         if ( sDocumentURL.Len() )
             SFX_APP()->Broadcast( SfxStringHint( SID_OPENURL, sDocumentURL ) );

-- 
To view, visit https://gerrit.libreoffice.org/1721
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I301f3b52001c1d8b1b60f5b1cfb3b093c9f81607
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl <mstahl at redhat.com>