diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-08-08 13:29:44 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-09-19 10:18:23 +0200 |
| commit | 6386e5951c72d1ac4072a333e867bcf87fdd9c81 (patch) | |
| tree | 58e8297f9b36d507a41d81ee3dfdcca38be03ef2 /sw/source/core/draw | |
| parent | daa952ea70f3c577e495ab91ef0cc73515c809d3 (diff) | |
sw_redlinehide_2: adapt SwFlyFrameFormat::MakeFrames() ...
... and SwDrawFrameFormat::MakeFrames() to do nothing if anchored in
hidden redline.
Change-Id: Idb0668db81b20ee52cd9c0237c22f8fa72beb7b3
Diffstat (limited to 'sw/source/core/draw')
| -rw-r--r-- | sw/source/core/draw/dcontact.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 71a72a92d866..c3bb4ae61025 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1838,11 +1838,17 @@ void SwDrawContact::ConnectToLayout( const SwFormatAnchor* pAnch ) // (1) proposed anchor frame isn't a follow and // (2) drawing object isn't a control object to be anchored // in header/footer. - const bool bAdd = ( !pFrame->IsContentFrame() || + bool bAdd = ( !pFrame->IsContentFrame() || !static_cast<SwContentFrame*>(pFrame)->IsFollow() ) && ( !::CheckControlLayer( GetMaster() ) || !pFrame->FindFooterOrHeader() ); + if (bAdd && RndStdIds::FLY_AT_FLY != pAnch->GetAnchorId()) + { + assert(pFrame->IsTextFrame()); + bAdd = IsAnchoredObjShown(*static_cast<SwTextFrame*>(pFrame), *pAnch); + } + if( bAdd ) { if ( RndStdIds::FLY_AT_FLY == pAnch->GetAnchorId() && !pFrame->IsFlyFrame() ) |