diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-01 20:12:50 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-06-14 16:19:04 +0200 |
commit | bc8d88ffd795b77acd4cde3c111b74c4c678d8ef (patch) | |
tree | 38499b2c50b1a2d1f4aa70adcbc2b90d108f106d /sw | |
parent | 3a74b3d80d61c85f549cb07fa0aca301f8699194 (diff) |
sw_redlinehide: trivial GetNode() in atrfrm.cxx,fly.cxx,flylay.cxx
Change-Id: Id15b867e8a275529822bab8ce82da5eb2eeb484b
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/layout/fly.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/layout/flylay.cxx | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 8d9599e84789..09acf60b2c9e 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -55,6 +55,7 @@ #include <pagefrm.hxx> #include <rootfrm.hxx> #include <cntfrm.hxx> +#include <notxtfrm.hxx> #include <crsrsh.hxx> #include <dflyobj.hxx> #include <dcontact.hxx> @@ -3438,7 +3439,7 @@ IMapObject* SwFrameFormat::GetIMapObject( const Point& rPoint, if( pFly->Lower() && pFly->Lower()->IsNoTextFrame() ) { pRef = pFly->Lower(); - pNd = static_cast<const SwContentFrame*>(pRef)->GetNode()->GetNoTextNode(); + pNd = static_cast<const SwNoTextFrame*>(pRef)->GetNode()->GetNoTextNode(); aOrigSz = pNd->GetTwipSize(); } else diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 8fdbcf9c0efc..faba4d0e1aa4 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -723,7 +723,7 @@ void SwFlyFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew, if ( Lower() && Lower()->IsNoTextFrame() && !GetFormat()->GetSurround().IsContour() ) { - SwNoTextNode *pNd = static_cast<SwNoTextNode*>(static_cast<SwContentFrame*>(Lower())->GetNode()); + SwNoTextNode *pNd = static_cast<SwNoTextNode*>(static_cast<SwNoTextFrame*>(Lower())->GetNode()); if ( pNd->HasContour() ) pNd->SetContour( nullptr ); } @@ -841,7 +841,7 @@ void SwFlyFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew, if( Lower()->IsNoTextFrame() && !GetFormat()->GetSurround().IsContour() ) { - SwNoTextNode *pNd = static_cast<SwNoTextNode*>(static_cast<SwContentFrame*>(Lower())->GetNode()); + SwNoTextNode *pNd = static_cast<SwNoTextNode*>(static_cast<SwNoTextFrame*>(Lower())->GetNode()); if ( pNd->HasContour() ) pNd->SetContour( nullptr ); } @@ -2469,7 +2469,7 @@ bool SwFlyFrame::GetContour( tools::PolyPolygon& rContour, { if(GetFormat()->GetSurround().IsContour()) { - SwNoTextNode *pNd = const_cast<SwNoTextNode*>(static_cast<const SwNoTextNode*>(static_cast<const SwContentFrame*>(Lower())->GetNode())); + SwNoTextNode *pNd = const_cast<SwNoTextNode*>(static_cast<const SwNoTextNode*>(static_cast<const SwNoTextFrame*>(Lower())->GetNode())); // OD 16.04.2003 #i13147# - determine <GraphicObject> instead of <Graphic> // in order to avoid load of graphic, if <SwNoTextNode> contains a graphic // node and method is called for paint. diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index 2a20c9c70e9d..8ae2ec3903fa 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -598,7 +598,7 @@ void SwFlyFreeFrame::CheckClip( const SwFormatFrameSize &rSz ) // Note: section frames seems to be not critical - didn't found // any critical layout situation so far. if ( Lower() && Lower()->IsNoTextFrame() && - ( static_cast<SwContentFrame*>(Lower())->GetNode()->GetOLENode() || + (static_cast<SwNoTextFrame*>(Lower())->GetNode()->GetOLENode() || !HasEnvironmentAutoSize() ) ) { // If width and height got adjusted, then the bigger @@ -638,7 +638,7 @@ void SwFlyFreeFrame::CheckClip( const SwFormatFrameSize &rSz ) // attributes permanently. Maybe one day somebody dares to remove // this code. if ( aFrameRect.HasArea() && - static_cast<SwContentFrame*>(Lower())->GetNode()->GetOLENode() && + static_cast<SwNoTextFrame*>(Lower())->GetNode()->GetOLENode() && ( m_bWidthClipped || m_bHeightClipped ) ) { SwFlyFrameFormat *pFormat = GetFormat(); |