diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-10-02 08:15:06 +0200 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-10-12 03:33:53 +0200 |
commit | e3d09d2e525ef6d5b93c6646e3cadc3f01297ea0 (patch) | |
tree | a2f58ac5578fa3bacbb6cd8aeadd27230641980a /writerfilter/source/dmapper/DomainMapper_Impl.cxx | |
parent | c108089ef4b58da819fb0acd372cd66e9684f3b8 (diff) |
change PageType (first, left, right) enum to enum class
Change-Id: I45bb7947266de1e18028c7ed460149c609e430b4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157834
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index cddf8c6f6127..f9f6dbd52d65 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3456,7 +3456,7 @@ void DomainMapper_Impl::ConvertHeaderFooterToTextFrame(bool bDynamicHeightTop, b } } -void DomainMapper_Impl::PushPageHeaderFooter(PagePartType ePagePartType, SectionPropertyMap::PageType eType) +void DomainMapper_Impl::PushPageHeaderFooter(PagePartType ePagePartType, PageType eType) { m_bSaveParaHadField = m_bParaHadField; m_aHeaderFooterStack.push(HeaderFooterContext(m_bTextInserted, m_nTableDepth)); @@ -3489,22 +3489,17 @@ void DomainMapper_Impl::PushPageHeaderFooter(PagePartType ePagePartType, Section return; // TODO sw cannot Undo insert header/footer without crashing } - uno::Reference< beans::XPropertySet > xPageStyle = - pSectionContext->GetPageStyle( - *this, - eType == SectionPropertyMap::PAGE_FIRST ); + uno::Reference<beans::XPropertySet> xPageStyle = pSectionContext->GetPageStyle(*this, eType == PageType::FIRST); if (!xPageStyle.is()) return; try { - bool bLeft = eType == SectionPropertyMap::PAGE_LEFT; - bool bFirst = eType == SectionPropertyMap::PAGE_FIRST; + bool bLeft = eType == PageType::LEFT; + bool bFirst = eType == PageType::FIRST; if (!bLeft || GetSettingsTable()->GetEvenAndOddHeaders()) { //switch on header/footer use - xPageStyle->setPropertyValue( - getPropertyName(ePropIsOn), - uno::Any(true)); + xPageStyle->setPropertyValue(getPropertyName(ePropIsOn), uno::Any(true)); // If the 'Different Even & Odd Pages' flag is turned on - do not ignore it // Even if the 'Even' header/footer is blank - the flag should be imported (so it would look in LO like in Word) @@ -3555,12 +3550,12 @@ void DomainMapper_Impl::PushPageHeaderFooter(PagePartType ePagePartType, Section } } -void DomainMapper_Impl::PushPageHeader(SectionPropertyMap::PageType eType) +void DomainMapper_Impl::PushPageHeader(PageType eType) { PushPageHeaderFooter(PagePartType::Header, eType); } -void DomainMapper_Impl::PushPageFooter(SectionPropertyMap::PageType eType) +void DomainMapper_Impl::PushPageFooter(PageType eType) { PushPageHeaderFooter(PagePartType::Footer, eType); } @@ -9291,22 +9286,22 @@ void DomainMapper_Impl::substream(Id rName, switch( rName ) { case NS_ooxml::LN_headerl: - PushPageHeader(SectionPropertyMap::PAGE_LEFT); + PushPageHeader(PageType::LEFT); break; case NS_ooxml::LN_headerr: - PushPageHeader(SectionPropertyMap::PAGE_RIGHT); + PushPageHeader(PageType::RIGHT); break; case NS_ooxml::LN_headerf: - PushPageHeader(SectionPropertyMap::PAGE_FIRST); + PushPageHeader(PageType::FIRST); break; case NS_ooxml::LN_footerl: - PushPageFooter(SectionPropertyMap::PAGE_LEFT); + PushPageFooter(PageType::LEFT); break; case NS_ooxml::LN_footerr: - PushPageFooter(SectionPropertyMap::PAGE_RIGHT); + PushPageFooter(PageType::RIGHT); break; case NS_ooxml::LN_footerf: - PushPageFooter(SectionPropertyMap::PAGE_FIRST); + PushPageFooter(PageType::FIRST); break; case NS_ooxml::LN_footnote: case NS_ooxml::LN_endnote: |