Kaydet (Commit) e753f8b9 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Revert "cid#706551 Uncaught exception"

This reverts commit ec651eae, now that
fced3169 "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
üst fced3169
...@@ -466,7 +466,7 @@ private: ...@@ -466,7 +466,7 @@ private:
the whole runtime can't be used any longer. the whole runtime can't be used any longer.
*/ */
bool impl_loadContent() 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. /** @short checks if the specified content is already loaded.
......
...@@ -999,7 +999,7 @@ bool LoadEnv::impl_furtherDocsAllowed() ...@@ -999,7 +999,7 @@ bool LoadEnv::impl_furtherDocsAllowed()
} }
bool LoadEnv::impl_loadContent() bool LoadEnv::impl_loadContent()
throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException, std::exception) throw(LoadEnvException, css::uno::RuntimeException, std::exception)
{ {
// SAFE -> ----------------------------------- // SAFE -> -----------------------------------
osl::ClearableMutexGuard aWriteLock(m_mutex); osl::ClearableMutexGuard aWriteLock(m_mutex);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment