[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - writerfilter/source

[Tomaž Vajngerl (via logerrit)]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   19 ++++++++++---------
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |    8 +++++++-
 2 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 836eb425bb000acdb05125e64e3f8ecdb166f875
Author:     Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Wed Sep 20 21:22:54 2023 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Nov 30 10:56:03 2023 +0100

    change bool header or footer parameter to use enum type instead
    
    Is much more readable.
    
    Change-Id: Ie81aaf344758182915796b18efbe25d3f45df4b6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157236
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
    (cherry picked from commit c90de36ede6d35e2cf1ebea195e0ff28f618f319)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160132
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 722b616ac4d2..5b27c8c889af 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3320,21 +3320,22 @@ void 
DomainMapper_Impl::ConvertHeaderFooterToTextFrame(bool bDynamicHeightTop, b
     }
 }
 
-void DomainMapper_Impl::PushPageHeaderFooter(bool bHeader, 
SectionPropertyMap::PageType eType)
+void DomainMapper_Impl::PushPageHeaderFooter(PagePartType ePagePartType, 
SectionPropertyMap::PageType eType)
 {
     m_bSaveParaHadField = m_bParaHadField;
     m_aHeaderFooterStack.push(HeaderFooterContext(m_bTextInserted, 
m_nTableDepth));
     m_bTextInserted = false;
     m_nTableDepth = 0;
 
-    const PropertyIds ePropIsOn = bHeader? PROP_HEADER_IS_ON: 
PROP_FOOTER_IS_ON;
-    const PropertyIds ePropShared = bHeader? PROP_HEADER_IS_SHARED: 
PROP_FOOTER_IS_SHARED;
-    const PropertyIds ePropTextLeft = bHeader? PROP_HEADER_TEXT_LEFT: 
PROP_FOOTER_TEXT_LEFT;
-    const PropertyIds ePropText = bHeader? PROP_HEADER_TEXT: PROP_FOOTER_TEXT;
+    bool bHeader = ePagePartType == PagePartType::Header;
+
+    const PropertyIds ePropIsOn = bHeader ? PROP_HEADER_IS_ON: 
PROP_FOOTER_IS_ON;
+    const PropertyIds ePropShared = bHeader ? PROP_HEADER_IS_SHARED: 
PROP_FOOTER_IS_SHARED;
+    const PropertyIds ePropTextLeft = bHeader ? PROP_HEADER_TEXT_LEFT: 
PROP_FOOTER_TEXT_LEFT;
+    const PropertyIds ePropText = bHeader ? PROP_HEADER_TEXT: PROP_FOOTER_TEXT;
 
     m_bDiscardHeaderFooter = true;
-    m_eInHeaderFooterImport
-        = bHeader ? HeaderFooterImportState::header : 
HeaderFooterImportState::footer;
+    m_eInHeaderFooterImport = bHeader ? HeaderFooterImportState::header : 
HeaderFooterImportState::footer;
 
     //get the section context
     PropertyMapPtr pContext = 
DomainMapper_Impl::GetTopContextOfType(CONTEXT_SECTION);
@@ -3420,12 +3421,12 @@ void DomainMapper_Impl::PushPageHeaderFooter(bool 
bHeader, SectionPropertyMap::P
 
 void DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType)
 {
-    PushPageHeaderFooter(/* bHeader = */ true, eType);
+    PushPageHeaderFooter(PagePartType::Header, eType);
 }
 
 void DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType)
 {
-    PushPageHeaderFooter(/* bHeader = */ false, eType);
+    PushPageHeaderFooter(PagePartType::Footer, eType);
 }
 
 void DomainMapper_Impl::PopPageHeaderFooter()
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 5c2a128a2b11..7f39d99aed37 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -447,6 +447,12 @@ struct SymbolData
     { }
 };
 
+enum class PagePartType
+{
+    Header,
+    Footer
+};
+
 class DomainMapper;
 class DomainMapper_Impl final
 {
@@ -1214,7 +1220,7 @@ public:
     OUString ConvertTOCStyleName(OUString const&);
 
 private:
-    void PushPageHeaderFooter(bool bHeader, SectionPropertyMap::PageType 
eType);
+    void PushPageHeaderFooter(PagePartType ePagePartType, 
SectionPropertyMap::PageType eType);
     // Start a new index section; if needed, finish current paragraph
     css::uno::Reference<css::beans::XPropertySet> 
StartIndexSectionChecked(const OUString& sServiceName);
     std::vector<css::uno::Reference< css::drawing::XShape > > 
m_vTextFramesForChaining ;