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

[Thomas Beck]

 writerfilter/source/rtftok/rtfdispatchdestination.cxx |   24 +++---------------
 writerfilter/source/rtftok/rtfdocumentimpl.cxx        |    2 -
 2 files changed, 4 insertions(+), 22 deletions(-)

New commits:
commit c1cf755afefec033377b8a693afed73d837a1387
Author: Thomas Beck <thomas.beck at cib.de>
Date:   Tue Oct 24 11:57:36 2017 +0200

    tdf#108947 - Fixed regression
    
    Handled Header/Footer that are specifically for Left/Right pages the old
    way again. Fix done previously was too much.
    
    Change-Id: I0f9e8d23022300a06bd3fb45054cca1b03cf096f
    Reviewed-on: https://gerrit.libreoffice.org/43749
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>

diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index 2aa635e13488..ed5748ab0c85 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -216,18 +216,10 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
                     }
                     break;
                 case RTF_HEADERL:
-                    if (!m_hasLHeader)
-                    {
-                        nId = NS_ooxml::LN_headerl;
-                        m_hasLHeader = true;
-                    }
+                    nId = NS_ooxml::LN_headerl;
                     break;
                 case RTF_HEADERR:
-                    if (!m_hasRHeader)
-                    {
-                        nId = NS_ooxml::LN_headerr;
-                        m_hasRHeader = true;
-                    }
+                    nId = NS_ooxml::LN_headerr;
                     break;
                 case RTF_HEADERF:
                     if (!m_hasFHeader)
@@ -237,18 +229,10 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
                     }
                     break;
                 case RTF_FOOTERL:
-                    if (!m_hasLFooter)
-                    {
-                        nId = NS_ooxml::LN_footerl;
-                        m_hasLFooter = true;
-                    }
+                    nId = NS_ooxml::LN_footerl;
                     break;
                 case RTF_FOOTERR:
-                    if (!m_hasRFooter)
-                    {
-                        nId = NS_ooxml::LN_footerr;
-                        m_hasRFooter = true;
-                    }
+                    nId = NS_ooxml::LN_footerr;
                     break;
                 case RTF_FOOTERF:
                     if (!m_hasFFooter)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 8780abc8ce66..386d3085d903 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -630,8 +630,6 @@ void RTFDocumentImpl::sectBreak(bool bFinal)
     {
         m_hasFHeader = false;
         m_hasRHeader = false;
-        m_hasLHeader = false;
-        m_hasLFooter = false;
         m_hasRFooter = false;
         m_hasFFooter = false;
         Mapper().endSectionGroup();