impress211: #i88880# Fixed dragging of slides from navigator to slide sorter.

Conflicts:
sd/source/ui/app/sdxfer.cxx
sd/source/ui/dlg/sdtreelb.cxx
sd/source/ui/slidesorter/controller/SlsClipboard.cxx
sd/source/ui/slidesorter/controller/makefile.mk
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx

6 files changed, 225 insertions, 44 deletions

diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index a28b3a838b1d..3fca80732987 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -42,7 +42,7 @@
 #include "controller/SlsScrollBarManager.hxx"
 #include "controller/SlsSelectionManager.hxx"
 #include "controller/SlsSlotManager.hxx"
-#include "controller/SlsTransferable.hxx"
+#include "controller/SlsTransferableData.hxx"
 #include "controller/SlsVisibleAreaManager.hxx"
 #include "model/SlideSorterModel.hxx"
 #include "model/SlsPageEnumerationProvider.hxx"
@@ -424,8 +424,7 @@ bool SlideSorterController::Command (
                 // indicator so that the user knows where a page insertion
                 // would take place.
                 mpInsertionIndicatorHandler->Start(false);
-                mpInsertionIndicatorHandler->UpdateIndicatorIcon(
-                    dynamic_cast<Transferable*>(SD_MOD()->pTransferClip));
+                mpInsertionIndicatorHandler->UpdateIndicatorIcon(SD_MOD()->pTransferClip);
                 mpInsertionIndicatorHandler->UpdatePosition(
                     pWindow->PixelToLogic(rEvent.GetMousePosPixel()),
                     InsertionIndicatorHandler::MoveMode);
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index a41d5d0e3f08..f852d1e8c0d3 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -44,12 +44,13 @@
 #include "controller/SlsScrollBarManager.hxx"
 #include "controller/SlsFocusManager.hxx"
 #include "controller/SlsSelectionManager.hxx"
-#include "controller/SlsTransferable.hxx"
+#include "controller/SlsTransferableData.hxx"
 #include "controller/SlsSelectionObserver.hxx"
 #include "controller/SlsVisibleAreaManager.hxx"
 #include "cache/SlsPageCache.hxx"
 
 #include "ViewShellBase.hxx"
+#include "View.hxx"
 #include "DrawViewShell.hxx"
 #include "Window.hxx"
 #include "fupoor.hxx"
@@ -68,6 +69,7 @@
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
 #include "sdpage.hxx"
+#include "sdtreelb.hxx"
 
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 #include <sfx2/request.hxx>
@@ -81,6 +83,8 @@
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
+#include <boost/bind.hpp>
+
 
 namespace sd { namespace slidesorter { namespace controller {
 
@@ -114,7 +118,6 @@ private:
 };
 } // end of anonymous namespace
 
-
 class Clipboard::UndoContext
 {
 public:
@@ -439,7 +442,7 @@ void Clipboard::CreateSlideTransferable (
     // previews are included into the transferable so that an insertion
     // indicator can be rendered.
     aSelectedPages.Rewind();
-    ::std::vector<Transferable::Representative> aRepresentatives;
+    ::std::vector<TransferableData::Representative> aRepresentatives;
     aRepresentatives.reserve(3);
     ::boost::shared_ptr<cache::PageCache> pPreviewCache (
         mrSlideSorter.GetView().GetPreviewCache());
@@ -449,7 +452,7 @@ void Clipboard::CreateSlideTransferable (
         if ( ! pDescriptor || pDescriptor->GetPage()==NULL)
             continue;
         Bitmap aPreview (pPreviewCache->GetPreviewBitmap(pDescriptor->GetPage(), false));
-        aRepresentatives.push_back(Transferable::Representative(
+        aRepresentatives.push_back(TransferableData::Representative(
             aPreview,
             pDescriptor->HasState(model::PageDescriptor::ST_Excluded)));
         if (aRepresentatives.size() >= 3)
@@ -460,7 +463,7 @@ void Clipboard::CreateSlideTransferable (
     {
         mrSlideSorter.GetView().BrkAction();
         SdDrawDocument* pDocument = mrSlideSorter.GetModel().GetDocument();
-        SdTransferable* pTransferable = new Transferable (
+        SdTransferable* pTransferable = TransferableData::CreateTransferable (
             pDocument,
             NULL,
             sal_False,
@@ -519,6 +522,95 @@ void Clipboard::CreateSlideTransferable (
 
 
 
+::boost::shared_ptr<SdTransferable::UserData> Clipboard::CreateTransferableUserData (SdTransferable* pTransferable)
+{
+    do
+    {
+        SdPageObjsTLB::SdPageObjsTransferable* pTreeListBoxTransferable
+            = dynamic_cast<SdPageObjsTLB::SdPageObjsTransferable*>(pTransferable);
+        if (pTreeListBoxTransferable == NULL)
+            break;
+
+        // Find view shell for the document of the transferable.
+        ::sd::ViewShell* pViewShell
+              = SdPageObjsTLB::GetViewShellForDocShell(pTreeListBoxTransferable->GetDocShell());
+        if (pViewShell == NULL)
+            break;
+
+        // Find slide sorter for the document of the transferable.
+        SlideSorterViewShell* pSlideSorterViewShell
+            = SlideSorterViewShell::GetSlideSorter(pViewShell->GetViewShellBase());
+        if (pSlideSorterViewShell == NULL)
+            break;
+        SlideSorter& rSlideSorter (pSlideSorterViewShell->GetSlideSorter());
+
+        // Get bookmark from transferable.
+        TransferableDataHelper  aDataHelper (pTransferable);
+        INetBookmark aINetBookmark;
+        if ( ! aDataHelper.GetINetBookmark(SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark))
+            break;
+        const rtl::OUString sURL (aINetBookmark.GetURL());
+        const sal_Int32 nIndex (sURL.indexOf((sal_Unicode)'#'));
+        if (nIndex == -1)
+            break;
+        String sBookmark (sURL.copy(nIndex+1));
+
+        // Make sure that the bookmark points to a page.
+        SdDrawDocument* pTransferableDocument = rSlideSorter.GetModel().GetDocument();
+        if (pTransferableDocument == NULL)
+            break;
+        BOOL bIsMasterPage;
+        const USHORT nPageIndex (pTransferableDocument->GetPageByName(sBookmark, bIsMasterPage));
+        if (nPageIndex == SDRPAGE_NOTFOUND)
+            break;
+
+        // Create preview.
+        ::std::vector<TransferableData::Representative> aRepresentatives;
+        aRepresentatives.reserve(1);
+        ::boost::shared_ptr<cache::PageCache> pPreviewCache (
+            rSlideSorter.GetView().GetPreviewCache());
+        model::SharedPageDescriptor pDescriptor (rSlideSorter.GetModel().GetPageDescriptor((nPageIndex-1)/2));
+        if ( ! pDescriptor || pDescriptor->GetPage()==NULL)
+            break;
+        Bitmap aPreview (pPreviewCache->GetPreviewBitmap(pDescriptor->GetPage(), false));
+        aRepresentatives.push_back(TransferableData::Representative(
+                aPreview,
+                pDescriptor->HasState(model::PageDescriptor::ST_Excluded)));
+
+        // Remember the page in maPagesToRemove so that it can be removed
+        // when drag and drop action is "move".
+        Clipboard& rOtherClipboard (pSlideSorterViewShell->GetSlideSorter().GetController().GetClipboard());
+        rOtherClipboard.maPagesToRemove.clear();
+        rOtherClipboard.maPagesToRemove.push_back(pDescriptor->GetPage());
+
+        // Create the new transferable.
+        ::boost::shared_ptr<SdTransferable::UserData> pNewTransferable (
+            new TransferableData(
+                pSlideSorterViewShell,
+                aRepresentatives));
+        pTransferable->SetWorkDocument( dynamic_cast<SdDrawDocument*>(
+                pTreeListBoxTransferable->GetSourceDoc()->AllocModel()));
+        //        pTransferable->SetView(&mrSlideSorter.GetView());
+
+        // Set page bookmark list.
+        std::vector<rtl::OUString> aPageBookmarks;
+        aPageBookmarks.push_back(sBookmark);
+        pTransferable->SetPageBookmarks(aPageBookmarks, false);
+
+        // Replace the view referenced by the transferable with the
+        // corresponding slide sorter view.
+        pTransferable->SetView(&pSlideSorterViewShell->GetSlideSorter().GetView());
+
+        return pNewTransferable;
+    }
+    while (false);
+
+    return ::boost::shared_ptr<SdTransferable::UserData>();
+}
+
+
+
+
 void Clipboard::StartDrag (
     const Point& rPosition,
     ::Window* pWindow)
@@ -539,8 +631,6 @@ void Clipboard::StartDrag (
 void Clipboard::DragFinished (sal_Int8 nDropAction)
 {
     SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
-    if (pDragTransferable != NULL)
-        pDragTransferable->SetView (NULL);
 
     if (mnDragFinishedUserEventId == 0)
     {
@@ -602,11 +692,12 @@ sal_Int8 Clipboard::AcceptDrop (
 {
     sal_Int8 nAction (DND_ACTION_NONE);
 
-    const Clipboard::DropType eDropType (IsDropAccepted());
+    const Clipboard::DropType eDropType (IsDropAccepted(rTargetHelper));
 
     switch (eDropType)
     {
         case DT_PAGE:
+        case DT_PAGE_FROM_NAVIGATOR:
         {
             // Accept a drop.
             nAction = rEvent.mnAction;
@@ -614,7 +705,7 @@ sal_Int8 Clipboard::AcceptDrop (
             // Use the copy action when the drop action is the default, i.e. not
             // explicitly set to move or link, and when the source and
             // target models are not the same.
-            const SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
+            SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
             if (pDragTransferable != NULL
                 && pDragTransferable->IsPageTransferable()
                 && ((rEvent.maDragEvent.DropAction
@@ -624,7 +715,7 @@ sal_Int8 Clipboard::AcceptDrop (
             {
                 nAction = DND_ACTION_COPY;
             }
-            else if (mrController.GetInsertionIndicatorHandler()->IsInsertionTrivial(nAction))
+            else if (IsInsertionTrivial(pDragTransferable, nAction))
             {
                 nAction = DND_ACTION_NONE;
             }
@@ -652,6 +743,7 @@ sal_Int8 Clipboard::AcceptDrop (
             break;
 
         default:
+        case DT_NONE:
             nAction = DND_ACTION_NONE;
             break;
     }
@@ -671,12 +763,14 @@ sal_Int8 Clipboard::ExecuteDrop (
 {
     sal_Int8 nResult = DND_ACTION_NONE;
     mpUndoContext.reset();
+    const Clipboard::DropType eDropType (IsDropAccepted(rTargetHelper));
 
-    switch (IsDropAccepted())
+    switch (eDropType)
     {
         case DT_PAGE:
+        case DT_PAGE_FROM_NAVIGATOR:
         {
-            const SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
+            SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
             const Point aEventModelPosition (
                 pTargetWindow->PixelToLogic (rEvent.maPosPixel));
             const sal_Int32 nXOffset (labs (pDragTransferable->GetStartPos().X()
@@ -695,7 +789,7 @@ sal_Int8 Clipboard::ExecuteDrop (
 
             // Do not process the insertion when it is trivial,
             // i.e. would insert pages at their original place.
-            if (pInsertionIndicatorHandler->IsInsertionTrivial(rEvent.mnAction))
+            if (IsInsertionTrivial(pDragTransferable, rEvent.mnAction))
                 bContinue = false;
 
             // Tell the insertion indicator handler to hide before the model
@@ -723,6 +817,19 @@ sal_Int8 Clipboard::ExecuteDrop (
                 // well as the ones above.
             }
 
+            // When the pages originated in another slide sorter then
+            // only that is notified automatically about the drag
+            // operation being finished.  Because the target slide sorter
+            // has be notified, too, add a callback for that.
+            ::boost::shared_ptr<TransferableData> pSlideSorterTransferable (
+                TransferableData::GetFromTransferable(pDragTransferable));
+            BOOST_ASSERT(pSlideSorterTransferable);
+            if (pSlideSorterTransferable
+                && pSlideSorterTransferable->GetSourceViewShell() != mrSlideSorter.GetViewShell())
+            {
+                DragFinished(nResult);
+            }
+
             // Notify the receiving selection function that drag-and-drop is
             // finished and the substitution handler can be released.
             ::rtl::Reference<SelectionFunction> pFunction (
@@ -742,7 +849,9 @@ sal_Int8 Clipboard::ExecuteDrop (
                 nPage,
                 nLayer);
             break;
+
         default:
+        case DT_NONE:
             break;
     }
 
@@ -752,6 +861,21 @@ sal_Int8 Clipboard::ExecuteDrop (
 
 
 
+bool Clipboard::IsInsertionTrivial (
+    SdTransferable* pTransferable,
+    const sal_Int8 nDndAction) const
+{
+    ::boost::shared_ptr<TransferableData> pSlideSorterTransferable (
+        TransferableData::GetFromTransferable(pTransferable));
+    if (pSlideSorterTransferable
+        && pSlideSorterTransferable->GetSourceViewShell() != mrSlideSorter.GetViewShell())
+        return false;
+    return mrController.GetInsertionIndicatorHandler()->IsInsertionTrivial(nDndAction);
+}
+
+
+
+
 void Clipboard::Abort (void)
 {
     if (mpSelectionObserverContext)
@@ -807,25 +931,26 @@ sal_uInt16 Clipboard::InsertSlides (
 
 
 
-Clipboard::DropType Clipboard::IsDropAccepted (void) const
+Clipboard::DropType Clipboard::IsDropAccepted (DropTargetHelper& rTargetHelper) const
 {
-    DropType eResult (DT_NONE);
-
     const SdTransferable* pDragTransferable = SD_MOD()->pTransferDrag;
-    if (pDragTransferable != NULL)
+    if (pDragTransferable == NULL)
+        return DT_NONE;
+
+    if (pDragTransferable->IsPageTransferable())
     {
-        if (pDragTransferable->IsPageTransferable())
-        {
-            if (mrSlideSorter.GetModel().GetEditMode() != EM_MASTERPAGE)
-                eResult = DT_PAGE;
-        }
+        if (mrSlideSorter.GetModel().GetEditMode() != EM_MASTERPAGE)
+            return DT_PAGE;
         else
-        {
-            eResult = DT_SHAPE;
-        }
+            return DT_NONE;
     }
 
-    return eResult;
+    const SdPageObjsTLB::SdPageObjsTransferable* pPageObjsTransferable
+        = dynamic_cast<const SdPageObjsTLB::SdPageObjsTransferable*>(pDragTransferable);
+    if (pPageObjsTransferable != NULL)
+        return DT_PAGE_FROM_NAVIGATOR;
+
+    return DT_SHAPE;
 }
 
 
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index c1bf497ee080..56930335b87a 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -39,10 +39,12 @@
 #include "controller/SlsProperties.hxx"
 #include "controller/SlsSelectionFunction.hxx"
 #include "controller/SlsSelectionManager.hxx"
-#include "controller/SlsTransferable.hxx"
+#include "controller/SlsClipboard.hxx"
+#include "controller/SlsTransferableData.hxx"
 #include "DrawDocShell.hxx"
 #include "drawdoc.hxx"
 #include "app.hrc"
+#include "sdtreelb.hxx"
 #include <sfx2/bindings.hxx>
 #include <boost/bind.hpp>
 
@@ -58,8 +60,19 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter)
     if (rSlideSorter.GetModel().GetEditMode() != EM_PAGE)
         return;
 
-    rSlideSorter.GetController().GetInsertionIndicatorHandler()->UpdateIndicatorIcon(
-        dynamic_cast<Transferable*>(SD_MOD()->pTransferDrag));
+    // For poperly handling transferables created by the navigator we
+    // need additional information.  For this a user data object is
+    // created that contains the necessary information.
+    SdTransferable* pTransferable = SD_MOD()->pTransferDrag;
+    SdPageObjsTLB::SdPageObjsTransferable* pTreeListBoxTransferable
+        = dynamic_cast<SdPageObjsTLB::SdPageObjsTransferable*>(pTransferable);
+    if (pTreeListBoxTransferable!=NULL && !TransferableData::GetFromTransferable(pTransferable))
+    {
+        pTransferable->AddUserData(
+            rSlideSorter.GetController().GetClipboard().CreateTransferableUserData(pTransferable));
+    }
+
+    rSlideSorter.GetController().GetInsertionIndicatorHandler()->UpdateIndicatorIcon(pTransferable);
 }
 
 
diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
index 165ff8ff49b0..6b079f70370b 100644
--- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx
@@ -120,7 +120,7 @@ void InsertionIndicatorHandler::ForceEnd (void)
 
 
 
-void InsertionIndicatorHandler::UpdateIndicatorIcon (const Transferable* pTransferable)
+void InsertionIndicatorHandler::UpdateIndicatorIcon (const SdTransferable* pTransferable)
 {
     mpInsertionIndicatorOverlay->Create(pTransferable);
     maIconSize = mpInsertionIndicatorOverlay->GetSize();
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 516ba9811b15..c6f7a3faf216 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -32,7 +32,7 @@
 #include "SlideSorter.hxx"
 #include "SlideSorterViewShell.hxx"
 #include "SlsDragAndDropContext.hxx"
-#include "controller/SlsTransferable.hxx"
+#include "controller/SlsTransferableData.hxx"
 #include "controller/SlideSorterController.hxx"
 #include "controller/SlsPageSelector.hxx"
 #include "controller/SlsFocusManager.hxx"
diff --git a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
index faf4a088c8a7..f12e9491f3aa 100644
--- a/sd/source/ui/slidesorter/controller/SlsTransferable.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
@@ -27,21 +27,48 @@
  ************************************************************************/
 
 
-#include "controller/SlsTransferable.hxx"
+#include "controller/SlsTransferableData.hxx"
 
 #include "SlideSorterViewShell.hxx"
 #include "View.hxx"
 
 namespace sd { namespace slidesorter { namespace controller {
 
-Transferable::Transferable (
+SdTransferable* TransferableData::CreateTransferable (
     SdDrawDocument* pSrcDoc,
     ::sd::View* pWorkView,
     sal_Bool bInitOnGetData,
     SlideSorterViewShell* pViewShell,
     const ::std::vector<Representative>& rRepresentatives)
-    : SdTransferable (pSrcDoc, pWorkView, bInitOnGetData),
-      mpViewShell(pViewShell),
+{
+    SdTransferable* pTransferable = new SdTransferable (pSrcDoc, pWorkView, bInitOnGetData);
+    ::boost::shared_ptr<TransferableData> pData (new TransferableData(pViewShell, rRepresentatives));
+    pTransferable->AddUserData(pData);
+    return pTransferable;
+}
+
+
+
+
+::boost::shared_ptr<TransferableData> TransferableData::GetFromTransferable (const SdTransferable* pTransferable)
+{
+    ::boost::shared_ptr<TransferableData> pData;
+    for (sal_Int32 nIndex=0,nCount=pTransferable->GetUserDataCount(); nIndex<nCount; ++nIndex)
+    {
+        pData = ::boost::dynamic_pointer_cast<TransferableData>(pTransferable->GetUserData(nIndex));
+        if (pData)
+            return pData;
+    }
+    return ::boost::shared_ptr<TransferableData>();
+}
+
+
+
+
+TransferableData::TransferableData (
+    SlideSorterViewShell* pViewShell,
+    const ::std::vector<Representative>& rRepresentatives)
+    : mpViewShell(pViewShell),
       maRepresentatives(rRepresentatives)
 {
     if (mpViewShell != NULL)
@@ -51,7 +78,7 @@ Transferable::Transferable (
 
 
 
-Transferable::~Transferable (void)
+TransferableData::~TransferableData (void)
 {
     if (mpViewShell != NULL)
         EndListening(*mpViewShell);
@@ -60,16 +87,28 @@ Transferable::~Transferable (void)
 
 
 
-void Transferable::DragFinished (sal_Int8 nDropAction)
+void TransferableData::DragFinished (sal_Int8 nDropAction)
 {
     if (mpViewShell != NULL)
         mpViewShell->DragFinished(nDropAction);
+    /*
+    for (CallbackContainer::const_iterator
+             iCallback(maDragFinishCallbacks.begin()),
+             iEnd(maDragFinishCallbacks.end());
+         iCallback!=iEnd;
+         ++iCallback)
+    {
+        if (*iCallback)
+            (*iCallback)(nDropAction);
+    }
+    maDragFinishCallbacks.clear();
+    */
 }
 
 
 
 
-void Transferable::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint)
+void TransferableData::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint)
 {
     if (rHint.ISA(SfxSimpleHint) && mpViewShell!=NULL)
     {
@@ -84,19 +123,24 @@ void Transferable::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint)
             mpViewShell = NULL;
         }
     }
-
-    SdTransferable::Notify(rBroadcaster, rHint);
 }
 
 
 
 
-const ::std::vector<Transferable::Representative>& Transferable::GetRepresentatives (void) const
+const ::std::vector<TransferableData::Representative>& TransferableData::GetRepresentatives (void) const
 {
     return maRepresentatives;
 }
 
 
+
+
+SlideSorterViewShell* TransferableData::GetSourceViewShell (void) const
+{
+    return mpViewShell;
+}
+
 } } } // end of namespace ::sd::slidesorter::controller
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */