[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source

[Michael Meeks]

 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |   45 +++++++----
 1 file changed, 31 insertions(+), 14 deletions(-)

New commits:
commit 2742842e3bd77d7572e8b9cdc9d83fa8701c3b33
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Fri May 11 20:33:23 2012 +0200

    avoid recursion that can mess up DND setup (fdo#41996)
    
    The way too smart ctor for the DND handler started drag immediately,
    causing a race condition that could recurse to setting a handler
    again before the first one was actually set, thus immediately again
    causing the DND to be stopped, and then possibly later again started,
    depending on how the race condition turned out. Use delayed initialization
    to avoid this.
    
    Change-Id: I528eddbdc7c52a19675997e4c866506c662cff19
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 8788db3..605749c 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -261,10 +261,11 @@ public:
     MultiSelectionModeHandler (
         SlideSorter& rSlideSorter,
         SelectionFunction& rSelectionFunction,
-        const Point& rMouseModelPosition,
-        const sal_uInt32 nEventCode);
+        const Point& rMouseModelPosition);
     virtual ~MultiSelectionModeHandler (void);
 
+    void Initialize(const sal_uInt32 nEventCode);
+
     virtual SelectionFunction::Mode GetMode (void) const;
     virtual void Abort (void);
     virtual void ProcessEvent (SelectionFunction::EventDescriptor& rDescriptor);
@@ -310,11 +311,10 @@ class DragAndDropModeHandler : public SelectionFunction::ModeHandler
 public:
     DragAndDropModeHandler (
         SlideSorter& rSlideSorter,
-        SelectionFunction& rSelectionFunction,
-        const Point& rMousePosition,
-        ::Window* pWindow);
+        SelectionFunction& rSelectionFunction);
     virtual ~DragAndDropModeHandler (void);
 
+    void Initialize(const Point& rMousePosition, ::Window* pWindow);
     virtual SelectionFunction::Mode GetMode (void) const;
     virtual void Abort (void);
 
@@ -827,8 +827,13 @@ void SelectionFunction::SwitchToDragAndDropMode (const Point aMousePosition)
 {
     if (mpModeHandler->GetMode() != DragAndDropMode)
     {
-        SwitchMode(::boost::shared_ptr<ModeHandler>(
-            new DragAndDropModeHandler(mrSlideSorter, *this, aMousePosition, mpWindow)));
+        ::boost::shared_ptr<DragAndDropModeHandler> handler(
+            new DragAndDropModeHandler(mrSlideSorter, *this));
+        SwitchMode(handler);
+        // Delayed initialization, only after mpModeHanler is set, otherwise DND initialization
+        // could already trigger DND events, which would recursively trigger this code again,
+        // and without mpModeHandler set it would again try to set a new handler.
+        handler->Initialize(aMousePosition, mpWindow);
     }
 }
 
@@ -840,8 +845,14 @@ void SelectionFunction::SwitchToMultiSelectionMode (
     const sal_uInt32 nEventCode)
 {
     if (mpModeHandler->GetMode() != MultiSelectionMode)
-        SwitchMode(::boost::shared_ptr<ModeHandler>(
-            new MultiSelectionModeHandler(mrSlideSorter, *this, aMousePosition, nEventCode)));
+    {
+        ::boost::shared_ptr<MultiSelectionModeHandler> handler(
+            new MultiSelectionModeHandler(mrSlideSorter, *this, aMousePosition));
+        SwitchMode(handler);
+        // Delayed initialization, only after mpModeHanler is set, the handle ctor
+        // is non-trivial, so it could possibly recurse just like the DND handler above.
+        handler->Initialize(nEventCode);
+    }
 }
 
 
@@ -1558,8 +1569,7 @@ void NormalModeHandler::ResetButtonDownLocation (void)
 MultiSelectionModeHandler::MultiSelectionModeHandler (
     SlideSorter& rSlideSorter,
     SelectionFunction& rSelectionFunction,
-    const Point& rMouseModelPosition,
-    const sal_uInt32 nEventCode)
+    const Point& rMouseModelPosition)
     : ModeHandler(rSlideSorter, rSelectionFunction, false),
       meSelectionMode(SM_Normal),
       maSecondCorner(rMouseModelPosition),
@@ -1568,6 +1578,11 @@ MultiSelectionModeHandler::MultiSelectionModeHandler (
       mnSecondIndex(-1),
       maButtonBarLock(rSlideSorter)
 {
+}
+
+
+void MultiSelectionModeHandler::Initialize(const sal_uInt32 nEventCode)
+{
     const Pointer aSelectionPointer (POINTER_TEXT);
     mrSlideSorter.GetContentWindow()->SetPointer(aSelectionPointer);
     SetSelectionModeFromModifier(nEventCode);
@@ -1807,11 +1822,13 @@ void MultiSelectionModeHandler::UpdateSelection (void)
 
 DragAndDropModeHandler::DragAndDropModeHandler (
     SlideSorter& rSlideSorter,
-    SelectionFunction& rSelectionFunction,
-    const Point& rMousePosition,
-    ::Window* pWindow)
+    SelectionFunction& rSelectionFunction)
     : ModeHandler(rSlideSorter, rSelectionFunction, false)
 {
+}
+
+void DragAndDropModeHandler::Initialize(const Point& rMousePosition, ::Window* pWindow)
+{
     SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
     if (pDragTransferable==NULL && mrSlideSorter.GetViewShell() != NULL)
     {