diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-01 18:53:30 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-06-12 18:55:16 +0200 |
| commit | e5cba3beaad410bdabc5c4a97b633548e001f106 (patch) | |
| tree | f50dcc3494b2903c876fcc29d1be2c9b133eef2b | |
| parent | 6123843003b55b02012ad68a40b51916d5fdb58c (diff) | |
sw_redlinehide: trivial GetNode() conversion in access
Change-Id: I5e1e18ee4033d9c5776d856aaa61ead9dde3e702
| -rw-r--r-- | sw/source/core/access/accembedded.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/access/accframebase.cxx | 5 | ||||
| -rw-r--r-- | sw/source/core/access/accnotextframe.cxx | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 4aae73f4993a..156b6da296b6 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -25,6 +25,7 @@ #include <flyfrm.hxx> #include "accembedded.hxx" #include <cntfrm.hxx> +#include <notxtfrm.hxx> #include <ndole.hxx> #include <doc.hxx> #include <docsh.hxx> @@ -111,7 +112,8 @@ css::uno::Any SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes() pCFrame = pFFrame->ContainsContent(); if( pCFrame ) { - SwContentNode* pCNode = pCFrame->GetNode(); + assert(pCFrame->IsNoTextFrame()); + SwContentNode *const pCNode = static_cast<SwNoTextFrame*>(pCFrame)->GetNode(); if( pCNode ) { style += static_cast<SwOLENode*>(pCNode)->GetOLEObj().GetStyleString(); diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index 88ae7c5aa087..d173c1166ecb 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -36,6 +36,7 @@ #include <crsrsh.hxx> #include <txtfrm.hxx> +#include <notxtfrm.hxx> #include <ndtxt.hxx> #include <dcontact.hxx> #include <fmtanchr.hxx> @@ -100,8 +101,8 @@ SwNodeType SwAccessibleFrameBase::GetNodeType( const SwFlyFrame *pFlyFrame ) { if( pFlyFrame->Lower()->IsNoTextFrame() ) { - const SwContentFrame *pContentFrame = - static_cast<const SwContentFrame *>( pFlyFrame->Lower() ); + const SwNoTextFrame *const pContentFrame = + static_cast<const SwNoTextFrame *>(pFlyFrame->Lower()); nType = pContentFrame->GetNode()->GetNodeType(); } } diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 8abe5e18208c..804eb3b3893d 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -24,6 +24,7 @@ #include <ndnotxt.hxx> #include <flyfrm.hxx> #include <cntfrm.hxx> +#include <notxtfrm.hxx> #include <hints.hxx> #include "accnotextframe.hxx" #include <fmturl.hxx> @@ -43,8 +44,8 @@ const SwNoTextNode *SwAccessibleNoTextFrame::GetNoTextNode() const const SwFlyFrame *pFlyFrame = static_cast< const SwFlyFrame *>( GetFrame() ); if( pFlyFrame->Lower() && pFlyFrame->Lower()->IsNoTextFrame() ) { - const SwContentFrame *pContentFrame = - static_cast<const SwContentFrame *>( pFlyFrame->Lower() ); + const SwNoTextFrame *pContentFrame = + static_cast<const SwNoTextFrame *>(pFlyFrame->Lower()); const SwContentNode* pSwContentNode = pContentFrame->GetNode(); if(pSwContentNode != nullptr) { |