Improve re-throwing of UNO exceptions

(*) if we are already throwing a Wrapped*Exception, get the
exception using cppu::getCaughtexception.

(*) when catching and then immediately throwing UNO exceptions,
use cppu::getCaughtException to prevent exception slicing

(*) if we are going to catch an exception and then
immediately throw a RuntimeException, rather throw a
WrappedTargetRuntimeException and preserve the original exception information.

Change-Id: Ia7a501a50ae0e6f4d05186333c8517fdcb17d558
Reviewed-on: https://gerrit.libreoffice.org/54692
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 7 insertions, 4 deletions

diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx
index 10f60b7717dd..3e459c661f7c 100644
--- a/xmloff/source/meta/xmlmetai.cxx
+++ b/xmloff/source/meta/xmlmetai.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <comphelper/processfactory.hxx>
+#include <cppuhelper/exc_hlp.hxx>
 #include <rtl/character.hxx>
 #include <xmloff/xmlmetai.hxx>
 #include <xmloff/xmlimp.hxx>
@@ -124,11 +125,12 @@ lcl_initDocumentProperties(SvXMLImport & rImport,
             xDocProps->getGenerator(), rImport.getImportInfo());
     } catch (const uno::RuntimeException&) {
         throw;
-    } catch (const uno::Exception& e) {
+    } catch (const uno::Exception&) {
+        css::uno::Any anyEx = cppu::getCaughtException();
         throw lang::WrappedTargetRuntimeException(
             "SvXMLMetaDocumentContext::initDocumentProperties: "
             "properties init exception",
-            rImport, makeAny(e));
+            rImport, anyEx);
     }
 }
 
@@ -151,10 +153,11 @@ lcl_initGenerator(SvXMLImport & rImport,
         SvXMLMetaDocumentContext::setBuildId(value, rImport.getImportInfo());
     } catch (const uno::RuntimeException&) {
         throw;
-    } catch (const uno::Exception& e) {
+    } catch (const uno::Exception&) {
+        css::uno::Any anyEx = cppu::getCaughtException();
         throw lang::WrappedTargetRuntimeException(
             "SvXMLMetaDocumentContext::initGenerator: exception",
-            rImport, makeAny(e));
+            rImport, anyEx);
     }
 }