[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - oox/source

Caolán McNamara caolanm at redhat.com
Tue Jan 12 01:01:54 PST 2016


 oox/source/export/shapes.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4442e602e9b12be86f8a403230a2c7741c9da373
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 23 19:10:34 2015 +0000

    crashtesting: export of ooo40765-1.sxw to docx fails
    
    Change-Id: I57d5e085e612908e7a22f444c771ec9fa45485ce
    (cherry picked from commit 0b901a9760a22bdc6f83829b077c30ec08613e17)
    Reviewed-on: https://gerrit.libreoffice.org/21357
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 64944af..beb79c3 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -306,11 +306,11 @@ uno::Reference<io::XInputStream> GetOLEObjectStream(
     try
     {
         uno::Reference<document::XStorageBasedDocument> const xParent(
-            uno::Reference<container::XChild>(xObj, uno::UNO_QUERY)->getParent(),
-            uno::UNO_QUERY);
+            uno::Reference<container::XChild>(xObj, uno::UNO_QUERY_THROW)->getParent(),
+            uno::UNO_QUERY_THROW);
         uno::Reference<embed::XStorage> const xParentStorage(xParent->getDocumentStorage());
         OUString const entryName(
-            uno::Reference<embed::XEmbedPersist>(xObj, uno::UNO_QUERY)->getEntryName());
+            uno::Reference<embed::XEmbedPersist>(xObj, uno::UNO_QUERY_THROW)->getEntryName());
 
         if (xParentStorage->isStreamElement(entryName))
         {


More information about the Libreoffice-commits mailing list