writerfilter/source/dmapper/DomainMapper_Impl.cxx | 31 +++++++++-------------
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 6 ++--
writerfilter/source/dmapper/PropertyMap.cxx | 12 ++++----
writerfilter/source/dmapper/PropertyMap.hxx | 14 ++++-----
4 files changed, 29 insertions(+), 34 deletions(-)
New commits:
commit 5888287530d41304e29dd39453b62003829b89b3
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.co.uk>
AuthorDate: Mon Oct 2 08:15:06 2023 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Nov 30 10:57:57 2023 +0100
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 <qui...@gmail.com>
(cherry picked from commit e3d09d2e525ef6d5b93c6646e3cadc3f01297ea0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160133
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 5b27c8c889af..ae02cd20d5ca 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3320,7 +3320,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));
@@ -3353,22 +3353,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)
@@ -3419,12 +3414,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);
}
@@ -9220,22 +9215,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:
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 7f39d99aed37..fc6518fd7d7e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -876,8 +876,8 @@ public:
/// Get the first pending shape, if there are any.
css::uno::Reference<css::drawing::XShape> PopPendingShape();
- void PushPageHeader(SectionPropertyMap::PageType eType);
- void PushPageFooter(SectionPropertyMap::PageType eType);
+ void PushPageHeader(PageType eType);
+ void PushPageFooter(PageType eType);
void PopPageHeaderFooter();
bool IsInHeaderFooter() const { return m_eInHeaderFooterImport !=
HeaderFooterImportState::none; }
@@ -1220,7 +1220,7 @@ public:
OUString ConvertTOCStyleName(OUString const&);
private:
- void PushPageHeaderFooter(PagePartType ePagePartType,
SectionPropertyMap::PageType eType);
+ void PushPageHeaderFooter(PagePartType ePagePartType, 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 ;
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index afd2d8637acf..d49551211f7e 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1847,9 +1847,9 @@ void SectionPropertyMap::ClearHeaderFooterLinkToPrevious(
bool bHeader, PageType
{
switch ( eType )
{
- case PAGE_FIRST: m_bFirstPageHeaderLinkToPrevious = false; break;
- case PAGE_LEFT: m_bEvenPageHeaderLinkToPrevious = false; break;
- case PAGE_RIGHT: m_bDefaultHeaderLinkToPrevious = false; break;
+ case PageType::FIRST: m_bFirstPageHeaderLinkToPrevious = false;
break;
+ case PageType::LEFT: m_bEvenPageHeaderLinkToPrevious = false;
break;
+ case PageType::RIGHT: m_bDefaultHeaderLinkToPrevious = false;
break;
// no default case as all enumeration values have been covered
}
}
@@ -1857,9 +1857,9 @@ void SectionPropertyMap::ClearHeaderFooterLinkToPrevious(
bool bHeader, PageType
{
switch ( eType )
{
- case PAGE_FIRST: m_bFirstPageFooterLinkToPrevious = false; break;
- case PAGE_LEFT: m_bEvenPageFooterLinkToPrevious = false; break;
- case PAGE_RIGHT: m_bDefaultFooterLinkToPrevious = false; break;
+ case PageType::FIRST: m_bFirstPageFooterLinkToPrevious = false;
break;
+ case PageType::LEFT: m_bEvenPageFooterLinkToPrevious = false;
break;
+ case PageType::RIGHT: m_bDefaultFooterLinkToPrevious = false;
break;
}
}
}
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx
b/writerfilter/source/dmapper/PropertyMap.hxx
index 34b40b89b49e..42a4dda1f267 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -202,6 +202,13 @@ protected:
}
};
+enum class PageType
+{
+ FIRST,
+ LEFT,
+ RIGHT
+};
+
class SectionPropertyMap : public PropertyMap
{
public:
@@ -328,13 +335,6 @@ private:
void HandleIncreasedAnchoredObjectSpacing(DomainMapper_Impl& rDM_Impl);
public:
- enum PageType
- {
- PAGE_FIRST,
- PAGE_LEFT,
- PAGE_RIGHT
- };
-
explicit SectionPropertyMap( bool bIsFirstSection );
bool IsFirstSection() const { return m_bIsFirstSection; }
