sw/source/core/view/vprint.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e31e53b627541f4cb674d2d9cdbcd1982c47bc5c
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Wed Dec 19 12:45:20 2018 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Thu Dec 20 00:10:05 2018 +0100
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
Reviewed-on: https://gerrit.libreoffice.org/65421
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
(cherry picked from commit 6996cddfb8b1aa45c77caf6cdc973b1e548cfe86)
Reviewed-on: https://gerrit.libreoffice.org/65447
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index b68ef540b980..faa9ab2ad439 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 )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
