6 files changed, 3 insertions, 15 deletions
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 5cfbb5d80f67..c9abceffdfd1 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -87,8 +87,6 @@ typedef std::list< UnresolvedListItem > UnresolvedList;
 void parseXcsFile(
     OUString const & url, int layer, Data & data, Partial const * partial,
     Modifications * modifications, Additions * additions)
-    SAL_THROW((
-        css::container::NoSuchElementException, css::uno::RuntimeException))
 {
     assert(partial == 0 && modifications == 0 && additions == 0);
     (void) partial; (void) modifications; (void) additions;
@@ -101,8 +99,6 @@ void parseXcsFile(
 void parseXcuFile(
     OUString const & url, int layer, Data & data, Partial const * partial,
     Modifications * modifications, Additions * additions)
-    SAL_THROW((
-        css::container::NoSuchElementException, css::uno::RuntimeException))
 {
     bool ok = rtl::Reference< ParseManager >(
         new ParseManager(
diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx
index 3c6df800308d..b9f7d9b7e44c 100644
--- a/configmgr/source/configurationprovider.cxx
+++ b/configmgr/source/configurationprovider.cxx
@@ -481,7 +481,6 @@ createFactory(
     SAL_UNUSED_PARAMETER OUString const &,
     SAL_UNUSED_PARAMETER css::uno::Sequence< OUString > const &,
     SAL_UNUSED_PARAMETER rtl_ModuleCount *)
-    SAL_THROW(())
 {
     return new Factory;
 }
diff --git a/configmgr/source/configurationprovider.hxx b/configmgr/source/configurationprovider.hxx
index 0ffbdd3579a5..7fbf5b7619a4 100644
--- a/configmgr/source/configurationprovider.hxx
+++ b/configmgr/source/configurationprovider.hxx
@@ -49,8 +49,7 @@ getSupportedServiceNames();
 com::sun::star::uno::Reference< com::sun::star::lang::XSingleComponentFactory >
 SAL_CALL createFactory(
     cppu::ComponentFactoryFunc, OUString const &,
-    com::sun::star::uno::Sequence< OUString > const &, rtl_ModuleCount *)
-    SAL_THROW(());
+    com::sun::star::uno::Sequence< OUString > const &, rtl_ModuleCount *);
 
 } }
 
diff --git a/configmgr/source/parsemanager.cxx b/configmgr/source/parsemanager.cxx
index 10837c59c944..8768fcb77dba 100644
--- a/configmgr/source/parsemanager.cxx
+++ b/configmgr/source/parsemanager.cxx
@@ -35,9 +35,7 @@ namespace configmgr {
 
 ParseManager::ParseManager(
     OUString const & url, rtl::Reference< Parser > const & parser)
-    SAL_THROW((
-        css::container::NoSuchElementException, css::uno::RuntimeException)):
-    reader_(url), parser_(parser)
+   : reader_(url), parser_(parser)
 {
     assert(parser.is());
     int id;
diff --git a/configmgr/source/parsemanager.hxx b/configmgr/source/parsemanager.hxx
index 94910297cf4a..85ed3c5ca4f3 100644
--- a/configmgr/source/parsemanager.hxx
+++ b/configmgr/source/parsemanager.hxx
@@ -40,10 +40,7 @@ class Parser;
 class ParseManager: public salhelper::SimpleReferenceObject {
 public:
     ParseManager(
-        OUString const & url, rtl::Reference< Parser > const & parser)
-        SAL_THROW((
-            com::sun::star::container::NoSuchElementException,
-            com::sun::star::uno::RuntimeException));
+        OUString const & url, rtl::Reference< Parser > const & parser);
 
     bool parse(std::set< OUString > const * existingDependencies);
 
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index fb667e466b62..7d50d970be96 100644
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -41,7 +41,6 @@ namespace {
 css::uno::Reference< css::uno::XInterface > SAL_CALL dummy(
     SAL_UNUSED_PARAMETER css::uno::Reference< css::uno::XComponentContext >
         const &)
-    SAL_THROW((css::uno::Exception))
 {
     assert(false);
     return css::uno::Reference< css::uno::XInterface >();