diff options
| author | Andrés Maldonado <amaldonado@linagora.com> | 2019-07-12 11:57:41 +0200 |
|---|---|---|
| committer | Andrés Maldonado <amaldonado@linagora.com> | 2019-07-12 11:57:41 +0200 |
| commit | 7f36d6e73e61e9edc59f0ab7bf525307e81b8172 (patch) | |
| tree | 60ef7516ec8e8cc929e039869352a2221ce220c7 | |
| parent | c3172bc8c35b92f263c4368358ef4de88de7e5b0 (diff) | |
Revert "tdf#121607 defer other requests until password dialog is dismissed"
This reverts commit cbf3e0d241f9fa3a9ffddd52acdbe03958be83da.
| -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 5ffb6f06c4ca..5dba045e6063 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -217,27 +217,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 || @@ -251,9 +233,6 @@ void SwModule::StateOther(SfxItemSet &rSet) { rSet.DisableItem(nWhich); } - - if (bUnLockDispatcher) - pDispatcher->Lock(false); } break; default: |