diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-04-27 15:03:21 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-04-27 15:27:59 +0200 |
| commit | 99777c5a15df2d92bb8a9ddb6329fc3df1b2b8bf (patch) | |
| tree | eb1069988ab9e21a27e8c8fccfc51f1c21d0adc4 /sw | |
| parent | e24cd3818821971fe3c52820dafe0f5ccb4b023a (diff) | |
sw: fix always-true condition in lcl_DelHFFormat ...
... that prevents headers from being deleted if they have a client.
(regression from d4267231754c1e6b03c7723a6fecc46750e7c780)
Change-Id: I71f52f8806e59c97b81aa14144c700c14c5527b0
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 7661a0511948..c6521ae769f3 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -120,7 +120,7 @@ static void lcl_DelHFFormat( SwClient *pToRemove, SwFrameFormat *pFormat ) // It's suboptimal if the format is deleted beforehand. SwIterator<SwClient,SwFrameFormat> aIter(*pFormat); for(SwClient* pLast = aIter.First(); bDel && pLast; pLast = aIter.Next()) - if(dynamic_cast<const SwFrame*>( pLast ) == nullptr || !SwXHeadFootText::IsXHeadFootText(pLast)) + if (dynamic_cast<const SwFrame*>(pLast) == nullptr && !SwXHeadFootText::IsXHeadFootText(pLast)) bDel = false; } |