sfx2/source/doc/sfxbasemodel.cxx | 3 --- 1 file changed, 3 deletions(-)
New commits: commit b2c076455cb911863a954e3d7d6d2aabe3723978 Author: Michael Stahl <[email protected]> Date: Tue Jan 15 21:25:14 2013 +0100 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 <[email protected]> Tested-by: Miklos Vajna <[email protected]> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 5bddcfe..d7d5250 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 ) ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
