[Libreoffice-commits] core.git: writerfilter/source

[Mike Kaganski]

 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 13827ffa54268dc648e1b72ea574daea02598335
Author: Mike Kaganski <mike.kagan...@collabora.com>
Date:   Wed Jan 18 09:18:17 2017 +0300

    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 <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 32b25c3..f836cf8 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";;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits