[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/app/apphdl.cxx |   21 ---------------------
 1 file changed, 21 deletions(-)

New commits:
commit 32b8d32e4b36684b14a53450cb16df7c3026852a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Mar 12 10:30:21 2020 +0000
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Thu Mar 19 17:54:43 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/+/90389
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

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: