diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-03-26 16:07:52 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-26 17:30:38 +0000 |
| commit | fb2875a26a1a842c6a7e44f85a1655e6f9092e7b (patch) | |
| tree | a07bdb7b9373703873ce0767e2c623ac09356cdb /starmath | |
| parent | 40c5c4590ac1e6e58bd2f4b16603706b37c0d0b3 (diff) | |
m:nor and m:lit math docx tags lead to quoting
The meaning should not be exactly the same, but it looks like there's
no better way to express this (or rather quoting means both).
Change-Id: I024ce6c89667a69f685bb84d768095100b0090b1
Reviewed-on: https://gerrit.libreoffice.org/3060
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/ooxmlimport.cxx | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index e3a48ca93a65..648f80895ebc 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -570,11 +570,21 @@ OUString SmOoxmlImport::handleNary() OUString SmOoxmlImport::handleR() { stream.ensureOpeningTag( M_TOKEN( r )); - if( XmlStream::Tag rPr = stream.checkOpeningTag( OOX_TOKEN( doc, rPr ))) - { // TODO -// stream.checkOpeningTag( OOX_TOKEN( doc, rFonts )); -// stream.ensureClosingTag( OOX_TOKEN( doc, rFonts )); - stream.ensureClosingTag( OOX_TOKEN( doc, rPr )); + bool normal = false; + bool literal = false; + if( XmlStream::Tag rPr = stream.checkOpeningTag( M_TOKEN( rPr ))) + { + if( XmlStream::Tag litTag = stream.checkOpeningTag( M_TOKEN( lit ))) + { + literal = litTag.attribute( M_TOKEN( val ), true ); + stream.ensureClosingTag( M_TOKEN( lit )); + } + if( XmlStream::Tag norTag = stream.checkOpeningTag( M_TOKEN( nor ))) + { + normal = norTag.attribute( M_TOKEN( val ), true ); + stream.ensureClosingTag( M_TOKEN( nor )); + } + stream.ensureClosingTag( M_TOKEN( rPr )); } OUString text; while( !stream.atEnd() && stream.currentToken() != CLOSING( stream.currentToken())) @@ -597,6 +607,8 @@ OUString SmOoxmlImport::handleR() } } stream.ensureClosingTag( M_TOKEN( r )); + if( normal || literal ) + text = "\"" + text + "\""; return text.replaceAll("{", "\\{").replaceAll("}", "\\}"); } |