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

Miklos Vajna vmiklos at collabora.co.uk
Wed Oct 29 00:33:00 PDT 2014


 sw/source/filter/ww8/docxexport.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7344923ffdf751646396b38af6a23be93b53a06a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Oct 29 08:13:06 2014 +0100

    sw: convert last usage of switchHeaderFooter() to DocxTableExportContext
    
    Change-Id: I47c5c60b0ffef3923c1d2830de992e1a67eb76ff

diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 67540eb..1150463 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -716,10 +716,11 @@ void DocxExport::WriteHeaderFooter( const SwFmt& rFmt, bool bHeader, const char*
     bool bStartedParaSdt = m_pAttrOutput->IsStartedParaSdt();
     m_pAttrOutput->SetStartedParaSdt(false);
 
-    m_pAttrOutput->switchHeaderFooter(true, m_nHeadersFootersInSection++);
+    DocxTableExportContext aTableExportContext;
+    m_pAttrOutput->pushToTableExportContext(aTableExportContext);
     // do the work
     WriteHeaderFooterText( rFmt, bHeader );
-    m_pAttrOutput->switchHeaderFooter(false, -1);
+    m_pAttrOutput->popFromTableExportContext(aTableExportContext);
     m_pAttrOutput->EndParaSdtBlock();
 
     //When the stream changes the cache which is maintained for the graphics in case of alternate content is not cleared.


More information about the Libreoffice-commits mailing list