[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - oox/source

Caolán McNamara caolanm at redhat.com
Fri Sep 26 04:21:01 PDT 2014


 oox/source/docprop/ooxmldocpropimport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3d468017ababdf4d2bb96c662373c96ec06c6c0c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 26 11:16:18 2014 +0100

    Resolves: fdo#84261 unexpected exception -> clang builds terminate
    
    Change-Id: I545ed112b54fb3d81e67b0f42230811cd48de626
    (cherry picked from commit 4652700776666e385946c47235363c1120846d5d)
    Reviewed-on: https://gerrit.libreoffice.org/11653
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index 4253498..8b60efa 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -63,7 +63,7 @@ Reference< XInterface > SAL_CALL DocumentPropertiesImport_createInstance( const
 
 namespace {
 
-Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& rxStorage, const OUString& rStreamType ) throw (RuntimeException)
+Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& rxStorage, const OUString& rStreamType ) throw (RuntimeException, css::io::IOException)
 {
     Reference< XRelationshipAccess > xRelation( rxStorage, UNO_QUERY_THROW );
     Reference< XHierarchicalStorageAccess > xHierarchy( rxStorage, UNO_QUERY_THROW );


More information about the Libreoffice-commits mailing list