writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit a2d322c02af05db1b785633ea398fe0b62b67605
Author: Justin Luth <justin_l...@sil.org>
AuthorDate: Sat Oct 23 13:25:41 2021 +0200
Commit: Justin Luth <justin_l...@sil.org>
CommitDate: Sat Nov 6 05:06:00 2021 +0100
NFC writerfilter: m_bDiscardHeaderFooter = false in both cases
Change-Id: Ie16100c10fce6366659be17261a97795d372ff11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124754
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 e338664d6068..8887a79d65a2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2910,7 +2910,6 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool
bHeader, SectionPropertyMap::P
? uno::Reference<text::XTextCursor>()
: xText->createTextCursorByRange(xText->getStart())),
bHeader));
- m_bDiscardHeaderFooter = false; // set only on success!
}
// If we have *hidden* header footer
else
@@ -2931,11 +2930,10 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool
bHeader, SectionPropertyMap::P
TextAppendContext(uno::Reference<text::XTextAppend>(xText,
uno::UNO_QUERY_THROW),
m_bIsNewDoc ?
uno::Reference<text::XTextCursor>()
:
xText->createTextCursorByRange(xText->getStart())));
- m_bDiscardHeaderFooter = false; // set only on success!
// Restore the original state of the shared prop after we stored
the necessary values.
xPageStyle->setPropertyValue(getPropertyName(ePropShared),
uno::makeAny(bIsShared));
}
-
+ m_bDiscardHeaderFooter = false; // set only on success!
}
catch( const uno::Exception& )
{
