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

[Mike Kaganski]

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

New commits:
commit 5bc75ae6fe30a27037f91dfa26323602bf53e00c
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Tue Dec 13 11:03:05 2016 +0300

    Move DrawingML serializer setting out of DocxAttributeOutput::BulletDefinition
    
    ... for consistency, to avoid setting serializers in random places
    
    Change-Id: If4e438def86f5dd2cf285693628e876ba08ef05a
    Reviewed-on: https://gerrit.libreoffice.org/31940
    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 084247e..ff0c60c 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8570,7 +8570,6 @@ void DocxAttributeOutput::BulletDefinition(int nId, const Graphic& rGraphic, Siz
             FSNS(XML_o, XML_bullet), "t",
             FSEND);
 
-    m_rDrawingML.SetFS(m_pSerializer);
     OUString aRelId = m_rDrawingML.WriteImage(rGraphic);
     m_pSerializer->singleElementNS( XML_v, XML_imagedata,
             FSNS(XML_r, XML_id), OUStringToOString(aRelId, RTL_TEXTENCODING_UTF8),
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 00bbb83..ae1879f 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -673,6 +673,7 @@ void DocxExport::WriteNumbering()
 
     // switch the serializer to redirect the output to word/numbering.xml
     m_pAttrOutput->SetSerializer( pNumberingFS );
+    m_pDrawingML->SetFS( pNumberingFS );
 
     pNumberingFS->startElementNS( XML_w, XML_numbering,
             FSNS( XML_xmlns, XML_w ), "http://schemas.openxmlformats.org/wordprocessingml/2006/main",
@@ -690,6 +691,7 @@ void DocxExport::WriteNumbering()
     pNumberingFS->endElementNS( XML_w, XML_numbering );
 
     // switch the serializer back
+    m_pDrawingML->SetFS( m_pDocumentFS );
     m_pAttrOutput->SetSerializer( m_pDocumentFS );
 }