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

do not ignore docx m:box contents (but m:box itself is not implemented)

üst 0f7fb686
...@@ -100,6 +100,9 @@ OUString SmOoxmlImport::readOMathArg() ...@@ -100,6 +100,9 @@ OUString SmOoxmlImport::readOMathArg()
case OPENING( M_TOKEN( bar )): case OPENING( M_TOKEN( bar )):
ret += handleBar(); ret += handleBar();
break; break;
case OPENING( M_TOKEN( box )):
ret += handleBox();
break;
case OPENING( M_TOKEN( borderBox )): case OPENING( M_TOKEN( borderBox )):
ret += handleBorderBox(); ret += handleBorderBox();
break; break;
...@@ -248,6 +251,17 @@ OUString SmOoxmlImport::handleBar() ...@@ -248,6 +251,17 @@ OUString SmOoxmlImport::handleBar()
return STR( "underline { " ) + e + STR( " }" ); return STR( "underline { " ) + e + STR( " }" );
} }
OUString SmOoxmlImport::handleBox()
{
// there does not seem to be functionality in LO to actually implement this
// (or is there), but at least read in the contents instead of ignoring them
stream.ensureOpeningTag( M_TOKEN( box ));
OUString e = readOMathArgInElement( M_TOKEN( e ));
stream.ensureClosingTag( M_TOKEN( box ));
return e;
}
OUString SmOoxmlImport::handleBorderBox() OUString SmOoxmlImport::handleBorderBox()
{ {
stream.ensureOpeningTag( M_TOKEN( borderBox )); stream.ensureOpeningTag( M_TOKEN( borderBox ));
......
...@@ -46,6 +46,7 @@ private: ...@@ -46,6 +46,7 @@ private:
rtl::OUString handleStream(); rtl::OUString handleStream();
rtl::OUString handleAcc(); rtl::OUString handleAcc();
rtl::OUString handleBar(); rtl::OUString handleBar();
rtl::OUString handleBox();
rtl::OUString handleBorderBox(); rtl::OUString handleBorderBox();
rtl::OUString handleD(); rtl::OUString handleD();
rtl::OUString handleE(); rtl::OUString handleE();
......
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