diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2011-11-30 15:09:11 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2011-11-30 16:11:45 +0100 |
| commit | 0ca8b2c7008694532d3135cc50fc4505ed2c5d64 (patch) | |
| tree | 718a87eef055eaa1bfc869f740b95e5f56623fc9 /starmath | |
| parent | 0f7fb6868011ea8f7b51a6a326d552254269a63c (diff) | |
do not ignore docx m:box contents (but m:box itself is not implemented)
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/source/ooxmlimport.cxx | 14 | ||||
| -rw-r--r-- | starmath/source/ooxmlimport.hxx | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 31a7a4057af8..c4298b996185 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -100,6 +100,9 @@ OUString SmOoxmlImport::readOMathArg() case OPENING( M_TOKEN( bar )): ret += handleBar(); break; + case OPENING( M_TOKEN( box )): + ret += handleBox(); + break; case OPENING( M_TOKEN( borderBox )): ret += handleBorderBox(); break; @@ -248,6 +251,17 @@ OUString SmOoxmlImport::handleBar() 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() { stream.ensureOpeningTag( M_TOKEN( borderBox )); diff --git a/starmath/source/ooxmlimport.hxx b/starmath/source/ooxmlimport.hxx index 08c357daf32a..5bea9758e2b7 100644 --- a/starmath/source/ooxmlimport.hxx +++ b/starmath/source/ooxmlimport.hxx @@ -46,6 +46,7 @@ private: rtl::OUString handleStream(); rtl::OUString handleAcc(); rtl::OUString handleBar(); + rtl::OUString handleBox(); rtl::OUString handleBorderBox(); rtl::OUString handleD(); rtl::OUString handleE(); |