diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-04-20 18:42:56 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-04-23 12:21:03 +0200 |
| commit | dff3d8ca4c17a649d2ac6ced448df9c784497d41 (patch) | |
| tree | ab5d6c22691bbed5d6bb7f57a61b563e009e1a82 /writerfilter/source | |
| parent | 5f62b97ae7891b8c601f6093a1ec5358feb20790 (diff) | |
AutoText: importing docx content
- passing "ReadGlossaries" flag to the WriterFilter
- if set - WriterFilter reads glossary document
instead of the main content
- updated model.xml to read docParts and docPart nodes
- SwDOCXReader adds document content as an AutoText
entry
Change-Id: I9a0cc91c793d6accc8461e1c3aca791c5997d497
Reviewed-on: https://gerrit.libreoffice.org/36753
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/model.xml | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index f3baab8429f3..b700f3087d56 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -437,6 +437,12 @@ void OOXMLDocumentImpl::resolveFooter(Stream & rStream, void OOXMLDocumentImpl::resolve(Stream & rStream) { + if (utl::MediaDescriptor(maMediaDescriptor).getUnpackedValueOrDefault("ReadGlossaries", false)) + { + resolveFastSubStream(rStream, OOXMLStream::GLOSSARY); + return; + } + uno::Reference< xml::sax::XFastParser > xParser (mpStream->getFastParser()); diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 771d2114296a..f241efc7c291 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -19057,6 +19057,8 @@ </resource> <resource name="CT_Document" resource="Stream"/> <resource name="CT_GlossaryDocument" resource="Stream"/> + <resource name="CT_DocParts" resource="Stream"/> + <resource name="CT_DocPart" resource="Stream"/> <resource name="document" resource="Stream"/> <resource name="glossaryDocument" resource="Stream"/> <resource name="CT_TxbxContent" resource="Stream"> |