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

[Caolán McNamara]

 sw/source/uibase/dochdl/swdtflvr.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0ea1ff986cae245ec0c17da03a5fa0a90b59b679
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 25 16:16:47 2016 +0100

    Resolves: rhbz#89554 Dragging table to other page causes crash
    
    Setting the Cursor pos causes a Calc which deletes the current page
    and everything blows up, so try a CalcLayout before setting cursor
    to avoid that.
    
    Change-Id: Ia7d132532f19e0164e125a240877caa9cf8bdc04

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 626781f..ab8d5f4 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -3496,6 +3496,7 @@ bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
             set cursor to the drop position. */
         if( &rSh == &rSrcSh && ( bTableSel || rSh.IsBlockMode() ) )
         {
+            rSrcSh.CalcLayout();
             rSrcSh.SwCursorShell::SetCursor(rDragPt);
             rSrcSh.GetSwCursor()->SetMark();
         }