Resolves: #i124096# avoid unlock of dispatcher by...

recursive Lock-Unlock-pattern

(cherry picked from commit 8d769be834186ae6aa05e64d88b95a6b9d874c2e)

Conflicts:
sw/inc/docsh.hxx
sw/inc/swwait.hxx
sw/source/core/doc/docdesc.cxx
sw/source/core/edit/autofmt.cxx
sw/source/core/edit/edtab.cxx
sw/source/ui/app/docsh.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/app/docshini.cxx
sw/source/ui/app/swwait.cxx
sw/source/ui/dbui/dbinsdlg.cxx
sw/source/ui/dbui/dbmgr.cxx
sw/source/ui/dochdl/swdtflvr.cxx
sw/source/ui/lingu/hyp.cxx
sw/source/ui/misc/glossary.cxx
sw/source/ui/misc/redlndlg.cxx
sw/source/ui/shells/annotsh.cxx
sw/source/ui/shells/drawsh.cxx
sw/source/ui/shells/drwtxtex.cxx
sw/source/ui/shells/frmsh.cxx
sw/source/ui/shells/textsh1.cxx
sw/source/ui/uiview/view2.cxx
sw/source/ui/uiview/viewsrch.cxx

Change-Id: I332d9ef6c3ce3205608850f9caccfa7b83a54ef3

1 files changed, 16 insertions, 3 deletions

diff --git a/sw/inc/swwait.hxx b/sw/inc/swwait.hxx
index 6e4f42201463..bdf620ff3c66 100644
--- a/sw/inc/swwait.hxx
+++ b/sw/inc/swwait.hxx
@@ -21,15 +21,28 @@
 
 #include "swdllapi.h"
 
+#include <boost/unordered_set.hpp>
+
 class SwDocShell;
+class SfxDispatcher;
 
 class SW_DLLPUBLIC SwWait
 {
-    SwDocShell &rDoc;
-    bool        bLock;
 public:
-    SwWait( SwDocShell &rDocShell, bool bLockDispatcher );
+    // Activate wait cursor for all windows of given document <rDocShell>
+    // Optional all dispatcher could be Locked
+    SwWait(
+        SwDocShell &rDocShell,
+        const bool bLockUnlockDispatcher );
     ~SwWait();
+
+private:
+    void EnterWaitAndLockDispatcher();
+    void LeaveWaitAndUnlockDispatcher();
+
+    SwDocShell& mrDoc;
+    const bool mbLockUnlockDispatcher;
+    boost::unordered_set< SfxDispatcher* > mpLockedDispatchers;
 };
 
 #endif