sw/source/uibase/app/apphdl.cxx | 21 ---------------------
1 file changed, 21 deletions(-)
New commits:
commit 22225256e8e2c64978fdcd87c5390764a3ac7b6b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Mar 12 10:30:21 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Mar 12 12:31:56 2020 +0100
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/+/90375
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index aa8111004ab4..09ff2872f3a3 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -204,27 +204,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 ||
@@ -238,9 +220,6 @@ void SwModule::StateOther(SfxItemSet &rSet)
{
rSet.DisableItem(nWhich);
}
-
- if (bUnLockDispatcher)
- pDispatcher->Lock(false);
}
break;
default:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
