summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-12-19 12:45:20 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-12-19 12:45:20 +0100
commit0b5e05815cc498663cbf3281f17c5e3651cb06aa (patch)
treef06faf6ae8a50087ea9e434f922360a5240103b8
parent9147b9eac084080f4d37a11545689ae4bfaff71a (diff)
sw: fix assert in SwViewShell::FillPrtDoc()
The point node isn't necessarily the start node; this will assert in SwTextFrame::MapModelToView: Assertion `SwFrame::GetDep() == pNode' failed when selecting a table and then File->Print->Print Selection. Thanks Samuel for the hint. (regression from 067a53bbcd209d7458b04142f989e1ff7ec1f785) Change-Id: I7f58b79e068e8b7817261e81f999721ebfcfdcf1
-rw-r--r--sw/source/core/view/vprint.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 9fe798916ceb..c70574c85933 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -358,7 +358,8 @@ void SwViewShell::FillPrtDoc( SwDoc *pPrtDoc, const SfxPrinter* pPrt)
{
SwShellTableCursor* pShellTableCursor = pFESh->GetTableCursor();
- const SwContentNode* pContentNode = pShellTableCursor->GetNode().GetContentNode();
+ const SwContentNode *const pContentNode =
+ pShellTableCursor->Start()->nNode.GetNode().GetContentNode();
const SwContentFrame *const pContentFrame = pContentNode ? pContentNode->getLayoutFrame(GetLayout(), pShellTableCursor->Start()) : nullptr;
if( pContentFrame )
{