diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-15 21:25:14 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-17 08:19:35 +0000 |
| commit | b2c076455cb911863a954e3d7d6d2aabe3723978 (patch) | |
| tree | 285aa7aeeb07cb47c61b02d2dfc8544a293e0a0d | |
| parent | 1c43325d953a409ec9566c318e62a01a1523ad77 (diff) | |
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)
Reviewed-on: https://gerrit.libreoffice.org/1723
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
| -rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 5bddcfe7ce9a..d7d525068b17 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1198,10 +1198,7 @@ void SAL_CALL SfxBaseModel::connectController( const uno::Reference< frame::XCon { 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 ) ); |