diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-12-20 10:42:30 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-12-20 10:54:07 +0100 |
| commit | 54c83fa349620d178d3d4802be43dc4e100a9c3d (patch) | |
| tree | 01c9a98f67abff532ea3f9c3dca61779a1f20cf3 /starmath | |
| parent | f38f354e830c60c60eb35cdfaf9f4e62dee54c51 (diff) | |
skip unknown elements when reading multiple elements from docx mathml
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/ooxmlimport.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 73f0ea50b7dd..8a763a2caeb4 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -346,7 +346,7 @@ OUString SmOoxmlImport::handleD() OUStringBuffer ret; ret.append( opening ); bool first = true; - while( stream.currentToken() == OPENING( M_TOKEN( e ))) + while( stream.findTag( OPENING( M_TOKEN( e )))) { if( !first ) ret.append( separator ); @@ -464,12 +464,12 @@ OUString SmOoxmlImport::handleM() if( !row.isEmpty()) row += STR( " # " ); row += readOMathArgInElement( M_TOKEN( e )); - } while( !stream.atEnd() && stream.currentToken() == OPENING( M_TOKEN( e ))); + } while( !stream.atEnd() && stream.findTag( OPENING( M_TOKEN( e )))); if( !allrows.isEmpty()) allrows += STR( " ## " ); allrows += row; stream.ensureClosingTag( M_TOKEN( mr )); - } while( !stream.atEnd() && stream.currentToken() == OPENING( M_TOKEN( mr ))); + } while( !stream.atEnd() && stream.findTag( OPENING( M_TOKEN( mr )))); stream.ensureClosingTag( M_TOKEN( m )); return STR( "matrix {" ) + allrows + STR( "}" ); } |