framework/source/inc/loadenv/loadenv.hxx | 3 +-- framework/source/loadenv/loadenv.cxx | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
New commits: commit 30bf5787e1f996b4dd690e8bf8d49133ad1e9bba Author: Stephan Bergmann <sberg...@redhat.com> Date: Wed Nov 19 18:30:46 2014 +0100 Revert "cid#706553 Uncaught exception" This reverts commit 0a87f4ad1a45aaaaad885a1418d0d6bed21db456, 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: Id2f468bf0f24f5a8a7a0e6eb113ccfedd35b03cc diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index cbc11dc..3bf66fff 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -22,7 +22,6 @@ #include <loadenv/loadenvexception.hxx> #include <loadenv/actionlockguard.hxx> -#include <com/sun/star/beans/IllegalTypeException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> @@ -413,7 +412,7 @@ private: the whole runtime can't be used any longer. */ void impl_detectTypeAndFilter() - throw(LoadEnvException, css::uno::RuntimeException, css::beans::IllegalTypeException, std::exception); + throw(LoadEnvException, css::uno::RuntimeException, std::exception); /** @short tries to ask user for it's filter decision in case normal detection failed. diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 965d6d4..cfb474a 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -735,7 +735,7 @@ bool queryOrcusTypeAndFilter(const uno::Sequence<beans::PropertyValue>&, OUStrin } void LoadEnv::impl_detectTypeAndFilter() - throw(LoadEnvException, css::uno::RuntimeException, beans::IllegalTypeException, std::exception) + throw(LoadEnvException, css::uno::RuntimeException, std::exception) { static const char TYPEPROP_PREFERREDFILTER[] = "PreferredFilter"; static const char FILTERPROP_FLAGS [] = "Flags"; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits