diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-15 21:25:14 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-16 17:06:07 +0100 |
| commit | 5090267eada3d68a618769c5dbae8b2ee8d6dab5 (patch) | |
| tree | 270ce908ed828abfecd66ebfbda364b7e6f3f591 | |
| parent | a0d852b2ade42289af1e9b066a48c97aedeff3b1 (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
| -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 d0cb58f35c3b..9eb6026ea6f7 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1120,10 +1120,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 ) ); |