diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-08-17 18:57:37 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-09-19 10:08:55 +0200 |
| commit | ca07c508f6a99b66d5daa94d4b2c36d77049e65f (patch) | |
| tree | aa1c7d42aa37d7de32a089f0e4a9ff7edf2a096b | |
| parent | 2282ecb232763a5ba7e3d3cc60fe9fccbaa4ac7c (diff) | |
sw_redlinehide_2: quite the nuisance when it happens, better assert
... in SwFootnoteFrame::GetRef()
Change-Id: I5cef7c2cea41a5b246268a541afd47945603ffed
| -rw-r--r-- | sw/source/core/layout/ftnfrm.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index dc2f361fcd7d..1911206a5228 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -2809,18 +2809,20 @@ SwSaveFootnoteHeight::~SwSaveFootnoteHeight() const SwContentFrame* SwFootnoteFrame::GetRef() const { const SwContentFrame* pRefAttr = GetRefFromAttr(); - SAL_WARN_IF( mpReference != pRefAttr && !mpReference->IsAnFollow( pRefAttr ) - && !pRefAttr->IsAnFollow( mpReference ), - "sw.core", "access to deleted Frame? pRef != pAttr->GetRef()" ); + // check consistency: access to deleted frame? + assert(mpReference == pRefAttr || mpReference->IsAnFollow(pRefAttr) + || pRefAttr->IsAnFollow(mpReference)); + (void) pRefAttr; return mpReference; } SwContentFrame* SwFootnoteFrame::GetRef() { const SwContentFrame* pRefAttr = GetRefFromAttr(); - SAL_WARN_IF( mpReference != pRefAttr && !mpReference->IsAnFollow( pRefAttr ) - && !pRefAttr->IsAnFollow( mpReference ), - "sw.core", "access to deleted Frame? pRef != pAttr->GetRef()" ); + // check consistency: access to deleted frame? + assert(mpReference == pRefAttr || mpReference->IsAnFollow(pRefAttr) + || pRefAttr->IsAnFollow(mpReference)); + (void) pRefAttr; return mpReference; } #endif |