[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - ios/source

[Libreoffice Gerrit user]

 ios/source/ios.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit a97e3a59644a8c30486e4ade1bd883ee26a0282d
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Oct 31 20:30:24 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Nov 1 22:32:39 2018 +0100

    Handle also css::ucb::NameClashException
    
    Change-Id: I979a163e796418d9a693229698b638cec4bf2226
    Reviewed-on: https://gerrit.libreoffice.org/62708
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/ios/source/ios.cxx b/ios/source/ios.cxx
index 36aaa245f76d..bc89150e7ed6 100644
--- a/ios/source/ios.cxx
+++ b/ios/source/ios.cxx
@@ -8,9 +8,11 @@
  */
 
 #include <cassert>
+#include <iostream>
 
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/ucb/InteractiveAugmentedIOException.hpp"
+#include "com/sun/star/ucb/NameClashException.hpp"
 #include "ios/ios.hxx"
 
 namespace
@@ -28,8 +30,12 @@ void lo_ios_throwException(css::uno::Any const& aException)
     assert(aException.getValueTypeClass() == css::uno::TypeClass_EXCEPTION);
 
     tryThrow<css::ucb::InteractiveAugmentedIOException>(aException);
+    tryThrow<css::ucb::NameClashException>(aException);
     tryThrow<css::uno::RuntimeException>(aException);
 
+    std::cerr << "lo_ios_throwException: Unhandled exception type " << aException.getValueTypeName()
+              << std::endl;
+
     assert(false);
 }