diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-19 09:07:27 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-30 10:49:51 +0200 |
commit | d6c32cffb5cc81989b4bb4a221a152bbe607bd98 (patch) | |
tree | 2c4ef9ec2a201ffcfea145ed5a0b901f2b6853ea /writerfilter/source/rtftok/rtfdocumentimpl.cxx | |
parent | 9ab64dc48a6a61edce6ff3724093162ca1cf8331 (diff) |
loplugin:simplifybool extend to expression like !(a < b || c > d)
mostly to catch stuff from the flatten work, but I think this looks good
in general
Change-Id: I7be5b7bcf1f3d9f980c748ba20793965cef957e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92493
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter/source/rtftok/rtfdocumentimpl.cxx')
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 481c8fd9db75..3c7de5226a1d 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -3497,9 +3497,8 @@ RTFError RTFDocumentImpl::popState() { // \par means an empty paragraph at the end of footnotes/endnotes, but // not in case of other substreams, like headers. - if (m_bNeedCr - && !(m_nStreamType == NS_ooxml::LN_footnote || m_nStreamType == NS_ooxml::LN_endnote) - && m_bIsNewDoc) + if (m_bNeedCr && m_nStreamType != NS_ooxml::LN_footnote + && m_nStreamType != NS_ooxml::LN_endnote && m_bIsNewDoc) dispatchSymbol(RTF_PAR); if (m_bNeedSect) // may be set by dispatchSymbol above! sectBreak(true); |