diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-27 15:24:37 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2014-08-27 11:09:16 -0500 |
| commit | 2c7333edf0b0fef2ee4f6757012196cf99a83ca5 (patch) | |
| tree | b8f1e36db57962b367db29584e2de9de3a82468f /include | |
| parent | f29c5f742e8be13b5ee7d03ebf1bcaf2a4adfef9 (diff) | |
DOCX import: fix handling of embedded DOCX files
The problem was that SwXTextEmbeddedObject::getEmbeddedObject() returned
an empty reference for those embedded objects, so the HTML filter
couldn't extract their content when it wanted to do so.
It turns out the reason for this was that the DOCX importer only handled
the replacement image + raw native data for the object. Fix this by
creating the embedded object with the correct CLSID and import the
raw data into the empty embedded document model.
This is similar to what is done for XLSX-in-PPTX in
oox::drawingml::ShapeExport::WriteOLE2Shape(), just for the import part.
(cherry picked from commit 41aa970b3120837ca9cadb12997a53ad322145a4)
Conflicts:
writerfilter/source/dmapper/OLEHandler.cxx
writerfilter/source/dmapper/OLEHandler.hxx
Also squash in 3 fixes on top of that in the HTML filter which are
relevant only after the embedded DOCX import is fixed:
1) sw HTML export: don't crash on embedded object without native data
(cherry picked from commit 35e954149d976e0e69a9f8b382fc67f5abc5eaa7)
2) sw HTML export: handle embedded text documents
(cherry picked from commit 8d670c9452e930460be600212d73e22acd61cc0f)
3) sw HTML export: avoid invalid output for embedded documents
When an sw document is embedded inside an sw one, then the inner sw HTML export
should just write what's inside the <body>. Add a filter option for that in sw,
similar to the one already existing in sc.
(cherry picked from commit 8760b2b05c23e5fdf8ad7ad3f447a7489c2ddeac)
Conflicts:
sw/source/filter/html/wrthtml.cxx
Change-Id: Id2cef966c1022ba45a3540bff234029c1d396778
Reviewed-on: https://gerrit.libreoffice.org/11151
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sal/log-areas.dox | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 0fb8193eb4ce..62525e49bc8d 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -415,6 +415,7 @@ certain functionality. @li @c sw.uno - Writer UNO interfaces @li @c sw.ww8 - .doc/.docx export filter, .doc import filter (not writerfilter) @li @c sw.ww8.level2 - further info for sw.ww8 +@li @c sw.html - Writer HTML import/export @section writerfilter |