diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-03-12 10:30:21 +0000 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-03-19 17:54:43 +0100 |
| commit | 32b8d32e4b36684b14a53450cb16df7c3026852a (patch) | |
| tree | 2006a6fa97fbe380554dd9836d2efa78961ea62f | |
| parent | b05c87f00433987b10542866696f0b4aaad015cc (diff) | |
Resolves: tdf#126366 revert use of SfxDispatcher::Lock
Revert "tdf#121607 defer other requests until password dialog is dismissed"
This reverts commit 205aeffda1a29865576fb865f23dfb6761ebfab1
as far as I can see the original problem doesn't reappear anyway
Change-Id: If5fd3383f3473662bc87a367fad2c1febe1c6a23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90389
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
| -rw-r--r-- | sw/source/uibase/app/apphdl.cxx | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx index 98a53fa710f5..b86c94658f4b 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -194,27 +194,9 @@ void SwModule::StateOther(SfxItemSet &rSet) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem; - bool bUnLockDispatcher = false; - SfxDispatcher* pDispatcher = nullptr; if (pView) - { xConfigItem = pView->EnsureMailMergeConfigItem(); - // tdf#121607 lock the dispatcher while processing - // this request, and release it afterwards, - // that means that if this request pops up a dialog - // any other pending requests will be deferred - // until this request is finished, i.e. they won't - // be dispatched by the dispatcher timeout until - // unlock is called, serializing the password dialogs - pDispatcher = pView->GetViewFrame()->GetDispatcher(); - if (!pDispatcher->IsLocked()) - { - pDispatcher->Lock(true); - bUnLockDispatcher = true; - } - } - // #i51949# hide e-Mail option if e-Mail is not supported // #i63267# printing might be disabled if (!xConfigItem || @@ -228,9 +210,6 @@ void SwModule::StateOther(SfxItemSet &rSet) { rSet.DisableItem(nWhich); } - - if (bUnLockDispatcher) - pDispatcher->Lock(false); } break; default: |