From 80b55dcfc9754553e42625d0d6e9ebbb728200eb Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 14 Jan 2016 22:40:52 +0100 Subject: starmath: only use WordProcessingML elements in DOCX files Change-Id: I1b0f6d67bd0db0796756fd920ab92303a7ee7d79 --- starmath/source/ooxmlexport.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'starmath/source/ooxmlexport.cxx') diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx index 5a72ee11784b..277fb2511914 100644 --- a/starmath/source/ooxmlexport.cxx +++ b/starmath/source/ooxmlexport.cxx @@ -16,9 +16,11 @@ using namespace oox; using namespace oox::core; -SmOoxmlExport::SmOoxmlExport( const SmNode* pIn, OoxmlVersion v ) +SmOoxmlExport::SmOoxmlExport(const SmNode *const pIn, OoxmlVersion const v, + drawingml::DocumentType const documentType) : SmWordExportBase( pIn ) , version( v ) +, m_DocumentType(documentType) { } @@ -63,7 +65,7 @@ void SmOoxmlExport::HandleText( const SmNode* pNode, int /*nLevel*/) m_pSerializer->singleElementNS( XML_m, XML_nor, FSEND ); m_pSerializer->endElementNS( XML_m, XML_rPr ); } - if( version == ECMA_DIALECT ) + if (drawingml::DOCUMENT_DOCX == m_DocumentType && ECMA_DIALECT == version) { // HACK: MSOffice2007 does not import characters properly unless this font is explicitly given m_pSerializer->startElementNS( XML_w, XML_rPr, FSEND ); m_pSerializer->singleElementNS( XML_w, XML_rFonts, FSNS( XML_w, XML_ascii ), "Cambria Math", -- cgit