Kaydet (Commit) d193f127 authored tarafından Luboš Luňák's avatar Luboš Luňák

docx OMathArg can actually be more than one element

üst dff36f4c
...@@ -88,36 +88,49 @@ OUString SmOoxmlImport::handleStream() ...@@ -88,36 +88,49 @@ OUString SmOoxmlImport::handleStream()
OUString SmOoxmlImport::readOMathArg() OUString SmOoxmlImport::readOMathArg()
{ {
OUString ret;
while( stream.currentToken() != CLOSING( stream.currentToken())) while( stream.currentToken() != CLOSING( stream.currentToken()))
{ {
if( !ret.isEmpty())
ret += STR( " " );
switch( stream.currentToken()) switch( stream.currentToken())
{ {
case OPENING( M_TOKEN( acc )): case OPENING( M_TOKEN( acc )):
return handleAcc(); ret += handleAcc();
break;
case OPENING( M_TOKEN( bar )): case OPENING( M_TOKEN( bar )):
return handleBar(); ret += handleBar();
break;
case OPENING( M_TOKEN( borderBox )): case OPENING( M_TOKEN( borderBox )):
return handleBorderBox(); ret += handleBorderBox();
break;
case OPENING( M_TOKEN( d )): case OPENING( M_TOKEN( d )):
return handleD(); ret += handleD();
break;
case OPENING( M_TOKEN( f )): case OPENING( M_TOKEN( f )):
return handleF(); ret += handleF();
break;
case OPENING( M_TOKEN( func )): case OPENING( M_TOKEN( func )):
return handleFunc(); ret += handleFunc();
break;
case OPENING( M_TOKEN( limLow )): case OPENING( M_TOKEN( limLow )):
return handleLimLowUpp( LimLow ); ret += handleLimLowUpp( LimLow );
break;
case OPENING( M_TOKEN( limUpp )): case OPENING( M_TOKEN( limUpp )):
return handleLimLowUpp( LimUpp ); ret += handleLimLowUpp( LimUpp );
break;
case OPENING( M_TOKEN( groupChr )): case OPENING( M_TOKEN( groupChr )):
return handleGroupChr(); ret += handleGroupChr();
break;
case OPENING( M_TOKEN( r )): case OPENING( M_TOKEN( r )):
return handleR(); ret += handleR();
break;
default: default:
stream.handleUnexpectedTag(); stream.handleUnexpectedTag();
break; break;
} }
} }
return OUString(); return ret;
} }
OUString SmOoxmlImport::handleAcc() OUString SmOoxmlImport::handleAcc()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment