writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 74723bbe6b860e54c26711c108f1e2d2388e8feb
Author: Justin Luth <justin_l...@sil.org>
AuthorDate: Sat Oct 23 13:02:24 2021 +0200
Commit: Justin Luth <justin_l...@sil.org>
CommitDate: Fri Nov 5 17:22:59 2021 +0100
NFC writerfilter: simplify logic
if (!A && !B || B) is the same as
if (!A || B)
and the ELSE is also by definition A && !B now.
Change-Id: Ie797976423bb910386a26e96692c43faf0344132
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124753
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_l...@sil.org>
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index dcec98ed59e0..e338664d6068 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2885,7 +2885,7 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool
bHeader, SectionPropertyMap::P
{
bool bLeft = eType == SectionPropertyMap::PAGE_LEFT;
bool bFirst = eType == SectionPropertyMap::PAGE_FIRST;
- if ((!bLeft && !GetSettingsTable()->GetEvenAndOddHeaders()) ||
(GetSettingsTable()->GetEvenAndOddHeaders()))
+ if (!bLeft || GetSettingsTable()->GetEvenAndOddHeaders())
{
//switch on header/footer use
xPageStyle->setPropertyValue(
@@ -2913,7 +2913,7 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool
bHeader, SectionPropertyMap::P
m_bDiscardHeaderFooter = false; // set only on success!
}
// If we have *hidden* header footer
- else if (bLeft && !GetSettingsTable()->GetEvenAndOddHeaders())
+ else
{
bool bIsShared = false;
// Turn on the headers
