mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move DrawingML serializer setting out of DocxAttributeOutput::BulletDefinition

Browse Source 
... for consistency, to avoid setting serializers in random places

Change-Id: If4e438def86f5dd2cf285693628e876ba08ef05a
Reviewed-on: https://gerrit.libreoffice.org/31940
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
This commit is contained in:
Mike Kaganski
2016-12-13 11:03:05 +03:00
committed by Miklos Vajna
parent 5a20df55ff
commit 5bc75ae6fe
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sw/source/filter/ww8/docxattributeoutput.cxx
View File

@@ -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),

2
sw/source/filter/ww8/docxexport.cxx
View File

@@ -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 );
}