[Libreoffice-commits] core.git: writerfilter/source

[Justin Luth]

 writerfilter/source/dmapper/PropertyMap.cxx |   24 ------------------------
 1 file changed, 24 deletions(-)

New commits:
commit 11351e9a2e8f417772c33d36e5756c5e63d94984
Author: Justin Luth <justin_luth at sil.org>
Date:   Mon Aug 29 19:21:59 2016 +0300

    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 at libreoffice.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index f36c150..6897104 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();