summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-05-25 16:16:47 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-05-25 16:16:51 +0100
commit0ea1ff986cae245ec0c17da03a5fa0a90b59b679 (patch)
treee052b390723f8d698462e6ea76a39f04a4e1052a
parent86ac0bd31464bd802d4367f2152e7f8e0e9506e9 (diff)
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
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 626781f31fbd..ab8d5f476290 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();
}