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:49:40 +0100 |
commit | 0acff1783abf132a9fc3481848b6b1a81559086a (patch) | |
tree | 3aba7f01a6be153aa428e6a17caee531d42821fb /oox/source/mathml | |
parent | b0604113bc35c17f84f952ec882c24d61eef30e3 (diff) |
skip unknown elements when reading multiple elements from docx mathml
Diffstat (limited to 'oox/source/mathml')
-rw-r--r-- | oox/source/mathml/importutils.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx index 2a7d19c9db07..4a71d5616729 100644 --- a/oox/source/mathml/importutils.cxx +++ b/oox/source/mathml/importutils.cxx @@ -233,14 +233,14 @@ XmlStream::Tag XmlStream::checkTag( int token, bool optional ) if( optional ) { // avoid printing debug messages about skipping tags if the optional one // will not be found and the position will be reset back - if( currentToken() != token && !recoverAndFindTagInternal( token, true )) + if( currentToken() != token && !findTagInternal( token, true )) { pos = savedPos; return Tag(); } } #endif - if( currentToken() == token || recoverAndFindTag( token )) + if( currentToken() == token || findTag( token )) { Tag ret = currentTag(); moveToNextTag(); @@ -255,12 +255,12 @@ XmlStream::Tag XmlStream::checkTag( int token, bool optional ) return Tag(); } -bool XmlStream::recoverAndFindTag( int token ) +bool XmlStream::findTag( int token ) { - return recoverAndFindTagInternal( token, false ); + return findTagInternal( token, false ); } -bool XmlStream::recoverAndFindTagInternal( int token, bool /*silent*/ ) +bool XmlStream::findTagInternal( int token, bool /*silent*/ ) { int depth = 0; for(; @@ -320,7 +320,7 @@ void XmlStream::skipElementInternal( int token, bool /*silent*/ ) // fprintf( stderr, "Skipping unexpected element %s\n", CSTR( tokenToString( currentToken()))); moveToNextTag(); // and just find the matching closing tag - if( recoverAndFindTag( closing )) + if( findTag( closing )) { // if( !silent ) // fprintf( stderr, "Skipped unexpected element %s\n", CSTR( tokenToString( token ))); |