summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2023-09-20 21:22:54 +0200
committerTomaž Vajngerl <quikee@gmail.com>2023-09-25 20:26:31 +0200
commitc90de36ede6d35e2cf1ebea195e0ff28f618f319 (patch)
treed9618fe64eaad8c2e53ebf269d68274b8976080a /writerfilter
parent33c347fb3b0fbbae9c1005b1ca7a6105284a6d31 (diff)
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 <quikee@gmail.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx19
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx8
2 files changed, 17 insertions, 10 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 72b35d7d544d..13836906c53e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3460,21 +3460,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);
@@ -3560,12 +3561,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 c19de5a5c4b9..676a0d3196d9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -426,6 +426,12 @@ struct SymbolData
{ }
};
+enum class PagePartType
+{
+ Header,
+ Footer
+};
+
class DomainMapper;
class DomainMapper_Impl final
{
@@ -1194,7 +1200,7 @@ public:
OUString getFontNameForTheme(const Id id);
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 ;