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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Fri Jul 31 19:20:36 UTC 2020


 package/source/xstor/xstorage.cxx |   23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 50fd69dfe25d14c75f0dae7fa1bf276ea6deefd3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jul 31 17:06:41 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 31 21:19:52 2020 +0200

    ofz#23241 Revert "bff: terminate on SAXException on malformed input"
    
    This reverts commit 58a96d3ccedbade4f1a8bfbbc4b7d8f1615cfc69.
    
    Change-Id: I9d0459c10ece1d4a8e9efeae611cf29d15ca0885
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99893
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 8a13fd82b32d..d7c0ed9afd54 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -4744,28 +4744,7 @@ uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OStorage::getAllRel
     if ( m_pData->m_nStorageType != embed::StorageFormats::OFOPXML )
         throw uno::RuntimeException( THROW_WHERE );
 
-    uno::Sequence< uno::Sequence< beans::StringPair > > aRet;
-    try
-    {
-        aRet = m_pImpl->GetAllRelationshipsIfAny();
-    }
-    catch (const io::IOException&)
-    {
-        throw;
-    }
-    catch (const uno::RuntimeException&)
-    {
-        throw;
-    }
-    catch (const uno::Exception &)
-    {
-        uno::Any aCaught( ::cppu::getCaughtException() );
-        throw lang::WrappedTargetRuntimeException(THROW_WHERE "Can't getAllRelationships!",
-                                                 uno::Reference< uno::XInterface >(),
-                                                 aCaught);
-    }
-
-    return aRet;
+    return m_pImpl->GetAllRelationshipsIfAny();
 }
 
 void SAL_CALL OStorage::insertRelationshipByID(  const OUString& sID, const uno::Sequence< beans::StringPair >& aEntry, sal_Bool bReplace  )


More information about the Libreoffice-commits mailing list