[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4b' - sw/source

[Libreoffice Gerrit user]

 sw/source/core/view/vprint.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0b5e05815cc498663cbf3281f17c5e3651cb06aa
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Wed Dec 19 12:45:20 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Dec 19 12:45:20 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

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 )
         {