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

[Mike Kaganski]

 sw/source/filter/ww8/docxattributeoutput.cxx |    2 --
 sw/source/filter/ww8/docxexport.cxx          |    6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 644bddc80a6c4d3bec2f32d6dcbbc0f450582511
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Tue Dec 13 10:05:04 2016 +0300

    tdf#99227 follow-up: synchronize setting serializers
    
    Change-Id: I90afb2ffeaefedd080e48cb94a3e9c0c113a6263
    Reviewed-on: https://gerrit.libreoffice.org/31938
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2324039..084247e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4269,8 +4269,6 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
         CharGrabBag(*pGrabBag);
     }
 
-    //  tdf#99227: to be sure that we write to the right stream
-    m_rExport.SdrExporter().setSerializer(m_pSerializer);
     m_rExport.SdrExporter().startDMLAnchorInline(pFrameFormat, rSize);
 
     // picture description (used for pic:cNvPr later too)
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 5f41a53..00bbb83 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -603,11 +603,14 @@ void DocxExport::WriteFootnotesEndnotes()
 
         // switch the serializer to redirect the output to word/footnotes.xml
         m_pAttrOutput->SetSerializer( pFootnotesFS );
+        // tdf#99227
+        m_pSdrExport->setSerializer( pFootnotesFS );
 
         // do the work
         m_pAttrOutput->FootnotesEndnotes( true );
 
         // switch the serializer back
+        m_pSdrExport->setSerializer( m_pDocumentFS );
         m_pAttrOutput->SetSerializer( m_pDocumentFS );
     }
 
@@ -624,11 +627,14 @@ void DocxExport::WriteFootnotesEndnotes()
 
         // switch the serializer to redirect the output to word/endnotes.xml
         m_pAttrOutput->SetSerializer( pEndnotesFS );
+        // tdf#99227
+        m_pSdrExport->setSerializer( pEndnotesFS );
 
         // do the work
         m_pAttrOutput->FootnotesEndnotes( false );
 
         // switch the serializer back
+        m_pSdrExport->setSerializer( m_pDocumentFS );
         m_pAttrOutput->SetSerializer( m_pDocumentFS );
     }
 }