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

[Stephan Bergmann]

 framework/source/inc/loadenv/loadenv.hxx |    2 +-
 framework/source/loadenv/loadenv.cxx     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e753f8b9dc3b4df22f85f1366a15503de2464fd5
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Nov 19 18:25:42 2014 +0100

    Revert "cid#706551 Uncaught exception"
    
    This reverts commit ec651eaead5aaa2a74f4c87d3bf17f7feddb958e, now that
    fced31697bcc2a2a4da34d804582002de0320302 "comphelper::SequenceAsHashMap: throw
    IllegalArgumentException" made the underlying problem go away.
    
    Conflicts:
    	framework/source/inc/loadenv/loadenv.hxx
    	framework/source/loadenv/loadenv.cxx
    
    Change-Id: I473815256b95f6e20a2e1a4a5617f491636305ab

diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 3ac1465..4b157ca 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -466,7 +466,7 @@ private:
                 the whole runtime can't be used any longer.
      */
     bool impl_loadContent()
-        throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException, std::exception);
+        throw(LoadEnvException, css::uno::RuntimeException, std::exception);
 
     /** @short  checks if the specified content is already loaded.
 
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 64eca8e..8bc66de 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -999,7 +999,7 @@ bool LoadEnv::impl_furtherDocsAllowed()
 }
 
 bool LoadEnv::impl_loadContent()
-    throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException, std::exception)
+    throw(LoadEnvException, css::uno::RuntimeException, std::exception)
 {
     // SAFE -> -----------------------------------
     osl::ClearableMutexGuard aWriteLock(m_mutex);