diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-01 18:58:35 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-06-12 18:55:18 +0200 |
| commit | c48bb1b33665cdcfbbb2d667f5d9bc0ebe1624a4 (patch) | |
| tree | 506259ebef1a94d0b70136a8f089b0e3154f0ac5 | |
| parent | sw_redlinehide: trivial GetNode() in docfld.cxx,docfly.cxx,doclay.cxx (diff) | |
| download | core-c48bb1b33665cdcfbbb2d667f5d9bc0ebe1624a4.tar.gz core-c48bb1b33665cdcfbbb2d667f5d9bc0ebe1624a4.zip | |
sw_redlinehide: trivial GetNode() conversion in draw/
Change-Id: I660953a6e101aae0f6dad38b74d0a5fa8f254221
| -rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 9 | ||||
| -rw-r--r-- | sw/source/core/draw/dview.cxx | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index eeebd9531207..af64373ee478 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -362,14 +362,11 @@ bool SwVirtFlyDrawObj::ContainsSwGrfNode() const if(nullptr != pFlyFrame && pFlyFrame->Lower() && pFlyFrame->Lower()->IsNoTextFrame()) { - const SwContentFrame* pCntFr(static_cast<const SwContentFrame*>(pFlyFrame->Lower())); + const SwNoTextFrame *const pNTF(static_cast<const SwNoTextFrame*>(pFlyFrame->Lower())); - if(nullptr != pCntFr) - { - const SwGrfNode* pGrfNd(pCntFr->GetNode()->GetGrfNode()); + const SwGrfNode *const pGrfNd(pNTF->GetNode()->GetGrfNode()); - return nullptr != pGrfNd; - } + return nullptr != pGrfNd; } return false; diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 255163443a96..169febf96934 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -31,6 +31,7 @@ #include <pagefrm.hxx> #include <rootfrm.hxx> #include <cntfrm.hxx> +#include <notxtfrm.hxx> #include <flyfrm.hxx> #include <frmfmt.hxx> #include <dflyobj.hxx> @@ -832,9 +833,9 @@ void SwDrawView::CheckPossibilities() pFrame = pFly->GetAnchorFrame(); if ( pFly->Lower() && pFly->Lower()->IsNoTextFrame() ) { - const SwContentFrame* pCntFr(static_cast<const SwContentFrame*>(pFly->Lower())); - const SwOLENode* pOLENd = pCntFr->GetNode()->GetOLENode(); - const SwGrfNode* pGrfNd = pCntFr->GetNode()->GetGrfNode(); + const SwNoTextFrame *const pNTF(static_cast<const SwNoTextFrame*>(pFly->Lower())); + const SwOLENode *const pOLENd = pNTF->GetNode()->GetOLENode(); + const SwGrfNode *const pGrfNd = pNTF->GetNode()->GetGrfNode(); if ( pOLENd ) { |