[Libreoffice-commits] core.git: sw/source

[Jim Raykowski (via logerrit)]

 sw/source/uibase/utlui/content.cxx |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit ccfbe8b478f3daa8b5ec07a7e48dd5fbf8556811
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Sat Oct 12 00:42:47 2019 -0800
Commit:     Jim Raykowski <raykowj at gmail.com>
CommitDate: Sun Oct 13 00:33:37 2019 +0200

    Put if around code for root mode multiselected outline DragFinished
    
    Missed in commit 7ae308e5cac31c64a6bf4892aac097dac3a054b7
    
    Change-Id: Id5001b09d36ad72841058d576ed9c976e279bb4a
    Reviewed-on: https://gerrit.libreoffice.org/80710
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 55c9e8e26f6a..f1d2f22cde72 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1128,12 +1128,15 @@ void SwContentTree::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
 
 void SwContentTree::DragFinished( sal_Int8 nAction )
 {
-    SwWrtShell *const pShell = GetWrtShell();
-    pShell->EndUndo();
-    pShell->EndAllAction();
-    m_aActiveContentArr[ContentTypeId::OUTLINE]->Invalidate();
-    Display(true);
-    m_aDndOutlinesSelected.clear();
+    if (m_bIsRoot && m_nRootType == ContentTypeId::OUTLINE)
+    {
+        SwWrtShell *const pShell = GetWrtShell();
+        pShell->EndUndo();
+        pShell->EndAllAction();
+        m_aActiveContentArr[ContentTypeId::OUTLINE]->Invalidate();
+        Display(true);
+        m_aDndOutlinesSelected.clear();
+    }
 
     // To prevent the removing of the selected entry in external drag and drop
     // the drag action mustn't be MOVE.