diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-08-29 19:21:59 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2016-08-30 04:30:23 +0000 |
| commit | 11351e9a2e8f417772c33d36e5756c5e63d94984 (patch) | |
| tree | dda4185130b7b4ecdb378f46dc63693eff8fd83a /writerfilter | |
| parent | 1f46cbf32a668e80f520d27093f56d6b61550852 (diff) | |
treat even/odd header/footer enabled documents the same as others
This doesn't have to do with even/odd section-breaks like I
originally thought, so I'm comfortable removing the fail-safe
exception that I originally included.
Change-Id: I3eef867d275501615a502f76b71a16e3ecc7b58e
Reviewed-on: https://gerrit.libreoffice.org/28464
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index f36c150d5fb6..6897104b259d 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1097,30 +1097,6 @@ throw ( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) { - // don't mess with even/odd headers. - // just replicate what was done before to avoid causing any regressions - if( rDM_Impl.GetSettingsTable()->GetEvenAndOddHeaders() ) - { - if( m_nBreakType != static_cast<sal_Int32>(NS_ooxml::LN_Value_ST_SectionMark_nextColumn) ) - { - OUString aName = m_bTitlePage ? m_sFirstPageStyleName : m_sFollowPageStyleName; - if( !aName.isEmpty() ) - { - HandleMarginsHeaderFooter( /*bFirstPage=*/false, rDM_Impl ); - if( m_bTitlePage ) - HandleMarginsHeaderFooter( /*bFirstPage=*/true, rDM_Impl ); - uno::Reference<beans::XPropertySet> xPageStyle( rDM_Impl.GetPageStyles()->getByName(aName), uno::UNO_QUERY_THROW ); - if( rDM_Impl.IsNewDoc() ) - { - ApplyProperties_( xPageStyle ); - if( m_bTitlePage && m_aFollowPageStyle.is() ) - ApplyProperties_( m_aFollowPageStyle ); - } - } - } - return; - } - const uno::Reference< container::XNameContainer >& xPageStyles = rDM_Impl.GetPageStyles(); const uno::Reference < lang::XMultiServiceFactory >& xTextFactory = rDM_Impl.GetTextFactory(); |