diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-01-18 09:18:17 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-17 21:44:30 +0100 |
| commit | 1c67ec62f65c4180c3b6be2ded66b3183dbe9138 (patch) | |
| tree | c5578a04833a85d930c7a19fa8f9c03ada8ff7cd /writerfilter | |
| parent | e1b3492a9bea2f345f6852a3754ff4b71a152e02 (diff) | |
tdf#104181: don't throw on XRelationshipAccess query
The queries are followed by conditional blocks; so throwing is
unnecessary and erroneous (breaks parser internal state).
Change-Id: I49917a85e34866a326b4a2edd30e76f130b8ee27
Reviewed-on: https://gerrit.libreoffice.org/33244
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 13827ffa54268dc648e1b72ea574daea02598335)
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index f8d5bdc883df..45b23b5fbfbd 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -549,7 +549,7 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream) { // Resolving all item[n].xml files from CustomXml folder. uno::Reference<embed::XRelationshipAccess> xRelationshipAccess; - xRelationshipAccess.set((dynamic_cast<OOXMLStreamImpl&>(*mpStream.get())).accessDocumentStream(), uno::UNO_QUERY_THROW); + xRelationshipAccess.set((dynamic_cast<OOXMLStreamImpl&>(*mpStream.get())).accessDocumentStream(), uno::UNO_QUERY); if (xRelationshipAccess.is()) { static const char sCustomType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/customXml"; @@ -622,7 +622,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/) return; } uno::Reference<embed::XRelationshipAccess> xRelationshipAccess; - xRelationshipAccess.set((dynamic_cast<OOXMLStreamImpl&>(*pStream.get())).accessDocumentStream(), uno::UNO_QUERY_THROW); + xRelationshipAccess.set((dynamic_cast<OOXMLStreamImpl&>(*pStream.get())).accessDocumentStream(), uno::UNO_QUERY); if (xRelationshipAccess.is()) { @@ -709,7 +709,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/) void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pStream) { uno::Reference<embed::XRelationshipAccess> xRelationshipAccess; - xRelationshipAccess.set((dynamic_cast<OOXMLStreamImpl&>(*pStream.get())).accessDocumentStream(), uno::UNO_QUERY_THROW); + xRelationshipAccess.set((dynamic_cast<OOXMLStreamImpl&>(*pStream.get())).accessDocumentStream(), uno::UNO_QUERY); std::vector<css::beans::PropertyValue> aEmbeddings; if (xRelationshipAccess.is()) { @@ -802,7 +802,7 @@ void OOXMLDocumentImpl::resolveActiveXStream(Stream & rStream) { // Resolving all ActiveX[n].xml files from ActiveX folder. uno::Reference<embed::XRelationshipAccess> xRelationshipAccess; - xRelationshipAccess.set((dynamic_cast<OOXMLStreamImpl&>(*mpStream.get())).accessDocumentStream(), uno::UNO_QUERY_THROW); + xRelationshipAccess.set((dynamic_cast<OOXMLStreamImpl&>(*mpStream.get())).accessDocumentStream(), uno::UNO_QUERY); if (xRelationshipAccess.is()) { static const char sCustomType[] = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/control"; |