diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-19 18:28:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-19 18:28:46 +0100 |
| commit | 6f58f34fc0cd74c198b9474d074529bc4c9d7e02 (patch) | |
| tree | c7a05e376446e5d3b094c893c63e576df5b80b4c /framework | |
| parent | e753f8b9dc3b4df22f85f1366a15503de2464fd5 (diff) | |
Revert "cid#706552 Uncaught exception"
This reverts commit ecd00991fd5884cd769ed00c9c3f42ba44d64511, 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: I7821ae67b5cc99b8591fbf06396ac20098e55c8d
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/inc/loadenv/loadenv.hxx | 2 | ||||
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 4b157ca931bc..cbc11dc8078b 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -447,7 +447,7 @@ private: the whole runtime can't be used any longer. */ bool impl_handleContent() - throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException, std::exception); + throw(LoadEnvException, css::uno::RuntimeException, std::exception); /** @short tries to use FrameLoader objects for loading. diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 8bc66de1c1b1..965d6d4a0887 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -853,7 +853,7 @@ void LoadEnv::impl_detectTypeAndFilter() } bool LoadEnv::impl_handleContent() - throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException, std::exception) + throw(LoadEnvException, css::uno::RuntimeException, std::exception) { // SAFE -> ----------------------------------- osl::ClearableMutexGuard aReadLock(m_mutex); |