Remove dynamic exception specifications

...(for now, from LIBO_INTERNAL_CODE only).  See the mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html>
"Dynamic Exception Specifications" for details.

Most changes have been done automatically by the rewriting loplugin:dynexcspec
(after enabling the rewriting mode, to be committed shortly).  The way it only
removes exception specs from declarations if it also sees a definition, it
identified some dead declarations-w/o-definitions (that have been removed
manually) and some cases where a definition appeared in multiple include files
(which have also been cleaned up manually).  There's also been cases of macro
paramters (that were used to abstract over exception specs) that have become
unused now (and been removed).

Furthermore, some code needed to be cleaned up manually
(avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no
configurations available that would actually build that code.  Missing @throws
documentation has not been applied in such manual clean-up.

Change-Id: I3408691256c9b0c12bc5332de976743626e13960
Reviewed-on: https://gerrit.libreoffice.org/33574
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

10 files changed, 7 insertions, 99 deletions

diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx
index 10b01dc07c8f..6cb4dd4a87a5 100644
--- a/sfx2/source/sidebar/Accessible.cxx
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -43,7 +43,6 @@ void SAL_CALL Accessible::disposing()
 }
 
 Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleContext()
-    throw (css::uno::RuntimeException, std::exception)
 {
     return mxContext;
 }
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 27cd449d2c7c..7a1ac1f588b6 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -63,8 +63,7 @@ namespace
             if (mxFrame.is())
                 mxFrame->removeFrameActionListener(this);
         }
-        virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) override
         {
             (void)rEvent;
 
@@ -72,8 +71,7 @@ namespace
             mrControllerItem.ResetFrame();
             mxFrame = nullptr;
         }
-        virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent)
-            throw (css::uno::RuntimeException, std::exception) override
+        virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent) override
         {
             SolarMutexGuard g;
             if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED)
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 840d7531e1c5..4e275a5d1ab5 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -262,7 +262,6 @@ void SAL_CALL SidebarController::disposing()
 }
 
 void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     // Update to the requested new context asynchronously to avoid
     // subtle errors caused by SFX2 which in rare cases can not
@@ -283,19 +282,16 @@ void SAL_CALL SidebarController::notifyContextChangeEvent (const css::ui::Contex
 }
 
 void SAL_CALL SidebarController::disposing (const css::lang::EventObject& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     dispose();
 }
 
 void SAL_CALL SidebarController::propertyChange (const css::beans::PropertyChangeEvent& )
-    throw(css::uno::RuntimeException, std::exception)
 {
     maPropertyChangeForwarder.RequestCall();
 }
 
 void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEvent& rEvent)
-    throw(css::uno::RuntimeException, std::exception)
 {
     bool bIsReadWrite (true);
     if (rEvent.IsEnabled)
@@ -316,7 +312,6 @@ void SAL_CALL SidebarController::statusChanged (const css::frame::FeatureStateEv
 }
 
 void SAL_CALL SidebarController::requestLayout()
-    throw(css::uno::RuntimeException, std::exception)
 {
     sal_Int32 nMinimalWidth = 0;
     if (mpCurrentDeck && !mpCurrentDeck->isDisposed())
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 0e90e95f6f96..8c8db52d0731 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -79,7 +79,6 @@ SidebarPanelBase::~SidebarPanelBase()
 }
 
 void SAL_CALL SidebarPanelBase::disposing()
-    throw (css::uno::RuntimeException)
 {
     mpControl.disposeAndClear();
 
@@ -96,7 +95,6 @@ void SAL_CALL SidebarPanelBase::disposing()
 // XContextChangeEventListener
 void SAL_CALL SidebarPanelBase::notifyContextChangeEvent (
     const ui::ContextChangeEventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     IContextChangeReceiver* pContextChangeReceiver
         = dynamic_cast<IContextChangeReceiver*>(mpControl.get());
@@ -111,7 +109,6 @@ void SAL_CALL SidebarPanelBase::notifyContextChangeEvent (
 
 void SAL_CALL SidebarPanelBase::disposing (
     const css::lang::EventObject& rEvent)
-    throw (css::uno::RuntimeException, std::exception)
 {
     (void)rEvent;
 
@@ -120,32 +117,27 @@ void SAL_CALL SidebarPanelBase::disposing (
 }
 
 css::uno::Reference<css::frame::XFrame> SAL_CALL SidebarPanelBase::getFrame()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return mxFrame;
 }
 
 ::rtl::OUString SAL_CALL SidebarPanelBase::getResourceURL()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return msResourceURL;
 }
 
 sal_Int16 SAL_CALL SidebarPanelBase::getType()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return ui::UIElementType::TOOLPANEL;
 }
 
 Reference<XInterface> SAL_CALL SidebarPanelBase::getRealInterface()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Reference<XInterface>(static_cast<XWeak*>(this));
 }
 
 Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessible (
     const Reference<accessibility::XAccessible>& rxParentAccessible)
-    throw(css::uno::RuntimeException, std::exception)
 {
     (void)rxParentAccessible;
 
@@ -154,7 +146,6 @@ Reference<accessibility::XAccessible> SAL_CALL SidebarPanelBase::createAccessibl
 }
 
 Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow()
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (mpControl != nullptr)
         return Reference<awt::XWindow>(
@@ -165,7 +156,6 @@ Reference<awt::XWindow> SAL_CALL SidebarPanelBase::getWindow()
 }
 
 ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWidth)
-    throw(css::uno::RuntimeException, std::exception)
 {
     if (maLayoutSize.Minimum >= 0)
         return maLayoutSize;
@@ -191,7 +181,7 @@ ui::LayoutSize SAL_CALL SidebarPanelBase::getHeightForWidth (const sal_Int32 nWi
     return ui::LayoutSize(0,0,0);
 }
 
-sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth () throw(css::uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth ()
 {
     if (isLayoutEnabled(mpControl))
     {
@@ -203,7 +193,6 @@ sal_Int32 SAL_CALL SidebarPanelBase::getMinimalWidth () throw(css::uno::RuntimeE
 }
 
 void SAL_CALL SidebarPanelBase::updateModel(const css::uno::Reference<css::frame::XModel>& xModel)
-    throw(css::uno::RuntimeException, std::exception)
 {
     SidebarModelUpdate* pModelUpdate = dynamic_cast<SidebarModelUpdate*>(mpControl.get());
     if (!pModelUpdate)
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 1b96d23c7879..097e4df762c2 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -378,7 +378,6 @@ Reference<beans::XPropertySet> Theme::GetPropertySet()
 }
 
 Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo()
-    throw(css::uno::RuntimeException, std::exception)
 {
     return Reference<beans::XPropertySetInfo>(this);
 }
@@ -386,9 +385,6 @@ Reference<beans::XPropertySetInfo> SAL_CALL Theme::getPropertySetInfo()
 void SAL_CALL Theme::setPropertyValue (
     const ::rtl::OUString& rsPropertyName,
     const css::uno::Any& rValue)
-    throw (css::beans::UnknownPropertyException,
-           css::uno::RuntimeException,
-           std::exception)
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
@@ -431,9 +427,6 @@ void SAL_CALL Theme::setPropertyValue (
 
 Any SAL_CALL Theme::getPropertyValue (
     const ::rtl::OUString& rsPropertyName)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
@@ -451,9 +444,6 @@ Any SAL_CALL Theme::getPropertyValue (
 void SAL_CALL Theme::addPropertyChangeListener(
     const ::rtl::OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
@@ -476,9 +466,6 @@ void SAL_CALL Theme::addPropertyChangeListener(
 void SAL_CALL Theme::removePropertyChangeListener(
     const ::rtl::OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XPropertyChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
@@ -511,9 +498,6 @@ void SAL_CALL Theme::removePropertyChangeListener(
 void SAL_CALL Theme::addVetoableChangeListener(
     const ::rtl::OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
@@ -536,9 +520,6 @@ void SAL_CALL Theme::addVetoableChangeListener(
 void SAL_CALL Theme::removeVetoableChangeListener(
     const ::rtl::OUString& rsPropertyName,
     const css::uno::Reference<css::beans::XVetoableChangeListener>& rxListener)
-    throw(css::beans::UnknownPropertyException,
-        css::lang::WrappedTargetException,
-        css::uno::RuntimeException, std::exception)
 {
     ThemeItem eItem (AnyItem_);
     if (rsPropertyName.getLength() > 0)
@@ -568,7 +549,6 @@ void SAL_CALL Theme::removeVetoableChangeListener(
 }
 
 css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties()
-    throw(css::uno::RuntimeException, std::exception)
 {
     ::std::vector<beans::Property> aProperties;
 
@@ -593,8 +573,6 @@ css::uno::Sequence<css::beans::Property> SAL_CALL Theme::getProperties()
 }
 
 beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsPropertyName)
-    throw(css::beans::UnknownPropertyException,
-        css::uno::RuntimeException, std::exception)
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
@@ -614,7 +592,6 @@ beans::Property SAL_CALL Theme::getPropertyByName (const ::rtl::OUString& rsProp
 }
 
 sal_Bool SAL_CALL Theme::hasPropertyByName (const ::rtl::OUString& rsPropertyName)
-    throw(css::uno::RuntimeException, std::exception)
 {
     PropertyNameToIdMap::const_iterator iId (maPropertyNameToIdMap.find(rsPropertyName));
     if (iId == maPropertyNameToIdMap.end())
diff --git a/sfx2/source/sidebar/UnoDeck.cxx b/sfx2/source/sidebar/UnoDeck.cxx
index 0c2b2cf1a1d3..facddd25fa65 100644
--- a/sfx2/source/sidebar/UnoDeck.cxx
+++ b/sfx2/source/sidebar/UnoDeck.cxx
@@ -34,7 +34,6 @@ SidebarController* SfxUnoDeck::getSidebarController()
 }
 
 OUString SAL_CALL SfxUnoDeck::getId()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -42,7 +41,6 @@ OUString SAL_CALL SfxUnoDeck::getId()
 }
 
 OUString SAL_CALL  SfxUnoDeck::getTitle()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -60,7 +58,6 @@ OUString SAL_CALL  SfxUnoDeck::getTitle()
 }
 
 void SAL_CALL SfxUnoDeck::setTitle( const OUString& newTitle )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -83,7 +80,6 @@ void SAL_CALL SfxUnoDeck::setTitle( const OUString& newTitle )
 }
 
 sal_Bool SAL_CALL SfxUnoDeck::isActive()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -93,7 +89,6 @@ sal_Bool SAL_CALL SfxUnoDeck::isActive()
 
 
 void SAL_CALL SfxUnoDeck::activate( const sal_Bool bActivate )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -109,7 +104,6 @@ void SAL_CALL SfxUnoDeck::activate( const sal_Bool bActivate )
 }
 
 uno::Reference<ui::XPanels> SAL_CALL SfxUnoDeck::getPanels()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -118,7 +112,6 @@ uno::Reference<ui::XPanels> SAL_CALL SfxUnoDeck::getPanels()
 }
 
 sal_Int32 SAL_CALL SfxUnoDeck::getOrderIndex()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -128,7 +121,6 @@ sal_Int32 SAL_CALL SfxUnoDeck::getOrderIndex()
 }
 
 void SAL_CALL SfxUnoDeck::setOrderIndex( const sal_Int32 newOrderIndex )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -144,7 +136,6 @@ void SAL_CALL SfxUnoDeck::setOrderIndex( const sal_Int32 newOrderIndex )
 }
 
 void SAL_CALL SfxUnoDeck::moveFirst()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -168,7 +159,6 @@ void SAL_CALL SfxUnoDeck::moveFirst()
 }
 
 void SAL_CALL SfxUnoDeck::moveLast()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -192,7 +182,6 @@ void SAL_CALL SfxUnoDeck::moveLast()
 }
 
 void SAL_CALL SfxUnoDeck::moveUp()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -225,7 +214,6 @@ void SAL_CALL SfxUnoDeck::moveUp()
 }
 
 void SAL_CALL SfxUnoDeck::moveDown()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
diff --git a/sfx2/source/sidebar/UnoDecks.cxx b/sfx2/source/sidebar/UnoDecks.cxx
index a26568f3b6ab..b8bee8e300e1 100644
--- a/sfx2/source/sidebar/UnoDecks.cxx
+++ b/sfx2/source/sidebar/UnoDecks.cxx
@@ -32,9 +32,6 @@ SidebarController* SfxUnoDecks::getSidebarController()
 // XNameAccess
 
 uno::Any SAL_CALL SfxUnoDecks::getByName( const OUString& aName )
-                                throw(container::NoSuchElementException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -53,7 +50,6 @@ uno::Any SAL_CALL SfxUnoDecks::getByName( const OUString& aName )
 
 
 uno::Sequence< OUString > SAL_CALL SfxUnoDecks::getElementNames()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -88,7 +84,6 @@ uno::Sequence< OUString > SAL_CALL SfxUnoDecks::getElementNames()
 }
 
 sal_Bool SAL_CALL SfxUnoDecks::hasByName( const OUString& aName )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -121,7 +116,7 @@ sal_Bool SAL_CALL SfxUnoDecks::hasByName( const OUString& aName )
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL SfxUnoDecks::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SfxUnoDecks::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -130,9 +125,6 @@ sal_Int32 SAL_CALL SfxUnoDecks::getCount() throw(uno::RuntimeException, std::exc
 }
 
 uno::Any SAL_CALL SfxUnoDecks::getByIndex( sal_Int32 Index )
-                                throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     uno::Any aRet;
@@ -150,14 +142,13 @@ uno::Any SAL_CALL SfxUnoDecks::getByIndex( sal_Int32 Index )
 
 // XElementAccess
 uno::Type SAL_CALL SfxUnoDecks::getElementType()
-                                throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
     return uno::Type();
 }
 
-sal_Bool SAL_CALL SfxUnoDecks::hasElements() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxUnoDecks::hasElements()
 {
     SolarMutexGuard aGuard;
 
diff --git a/sfx2/source/sidebar/UnoPanel.cxx b/sfx2/source/sidebar/UnoPanel.cxx
index e696e32b0b88..ac46f80a79e1 100644
--- a/sfx2/source/sidebar/UnoPanel.cxx
+++ b/sfx2/source/sidebar/UnoPanel.cxx
@@ -42,7 +42,6 @@ SidebarController* SfxUnoPanel::getSidebarController()
 }
 
 OUString SAL_CALL SfxUnoPanel::getId()
-                               throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -50,7 +49,6 @@ OUString SAL_CALL SfxUnoPanel::getId()
 }
 
 OUString SAL_CALL  SfxUnoPanel::getTitle()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -59,7 +57,6 @@ OUString SAL_CALL  SfxUnoPanel::getTitle()
 }
 
 void SAL_CALL SfxUnoPanel::setTitle( const OUString& newTitle )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -76,7 +73,6 @@ void SAL_CALL SfxUnoPanel::setTitle( const OUString& newTitle )
 }
 
 sal_Bool SAL_CALL SfxUnoPanel::isExpanded()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -85,7 +81,6 @@ sal_Bool SAL_CALL SfxUnoPanel::isExpanded()
 
 
 void SAL_CALL SfxUnoPanel::expand( const sal_Bool bCollapseOther )
-                                throw(uno::RuntimeException, std::exception)
 {
 
     SolarMutexGuard aGuard;
@@ -111,7 +106,6 @@ void SAL_CALL SfxUnoPanel::expand( const sal_Bool bCollapseOther )
 }
 
 void SAL_CALL SfxUnoPanel::collapse()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -121,7 +115,6 @@ void SAL_CALL SfxUnoPanel::collapse()
 }
 
 uno::Reference<awt::XWindow> SAL_CALL SfxUnoPanel::getDialog()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -130,7 +123,6 @@ uno::Reference<awt::XWindow> SAL_CALL SfxUnoPanel::getDialog()
 
 
 sal_Int32 SAL_CALL SfxUnoPanel::getOrderIndex()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -140,7 +132,6 @@ sal_Int32 SAL_CALL SfxUnoPanel::getOrderIndex()
 }
 
 void SAL_CALL SfxUnoPanel::setOrderIndex( const sal_Int32 newOrderIndex )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -156,7 +147,6 @@ void SAL_CALL SfxUnoPanel::setOrderIndex( const sal_Int32 newOrderIndex )
 }
 
 void SAL_CALL SfxUnoPanel::moveFirst()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -180,7 +170,6 @@ void SAL_CALL SfxUnoPanel::moveFirst()
 }
 
 void SAL_CALL SfxUnoPanel::moveLast()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -204,7 +193,6 @@ void SAL_CALL SfxUnoPanel::moveLast()
 }
 
 void SAL_CALL SfxUnoPanel::moveUp()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
@@ -237,7 +225,6 @@ void SAL_CALL SfxUnoPanel::moveUp()
 }
 
 void SAL_CALL SfxUnoPanel::moveDown()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
     SidebarController* pSidebarController = getSidebarController();
diff --git a/sfx2/source/sidebar/UnoPanels.cxx b/sfx2/source/sidebar/UnoPanels.cxx
index 22cc780e56b6..dd47d3f95d1f 100644
--- a/sfx2/source/sidebar/UnoPanels.cxx
+++ b/sfx2/source/sidebar/UnoPanels.cxx
@@ -35,7 +35,6 @@ SidebarController* SfxUnoPanels::getSidebarController()
 }
 
 OUString SAL_CALL SfxUnoPanels::getDeckId()
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -45,9 +44,6 @@ OUString SAL_CALL SfxUnoPanels::getDeckId()
 // XNameAccess
 
 uno::Any SAL_CALL SfxUnoPanels::getByName( const OUString& aName )
-                                throw(container::NoSuchElementException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -66,7 +62,6 @@ uno::Any SAL_CALL SfxUnoPanels::getByName( const OUString& aName )
 
 
 uno::Sequence< OUString > SAL_CALL SfxUnoPanels::getElementNames()
-                                throw(uno::RuntimeException, std::exception)
 {
 
     SolarMutexGuard aGuard;
@@ -101,7 +96,6 @@ uno::Sequence< OUString > SAL_CALL SfxUnoPanels::getElementNames()
 }
 
 sal_Bool SAL_CALL SfxUnoPanels::hasByName( const OUString& aName )
-                                throw(uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -132,7 +126,7 @@ sal_Bool SAL_CALL SfxUnoPanels::hasByName( const OUString& aName )
 
 // XIndexAccess
 
-sal_Int32 SAL_CALL SfxUnoPanels::getCount() throw(uno::RuntimeException, std::exception)
+sal_Int32 SAL_CALL SfxUnoPanels::getCount()
 {
     SolarMutexGuard aGuard;
 
@@ -141,9 +135,6 @@ sal_Int32 SAL_CALL SfxUnoPanels::getCount() throw(uno::RuntimeException, std::ex
 }
 
 uno::Any SAL_CALL SfxUnoPanels::getByIndex( sal_Int32 Index )
-                                throw(lang::IndexOutOfBoundsException,
-                                    lang::WrappedTargetException,
-                                    uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -162,14 +153,13 @@ uno::Any SAL_CALL SfxUnoPanels::getByIndex( sal_Int32 Index )
 
 // XElementAccess
 uno::Type SAL_CALL SfxUnoPanels::getElementType()
-                                throw(css::uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
     return uno::Type();
 }
 
-sal_Bool SAL_CALL SfxUnoPanels::hasElements() throw(css::uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL SfxUnoPanels::hasElements()
 {
     SolarMutexGuard aGuard;
 
diff --git a/sfx2/source/sidebar/UnoSidebar.cxx b/sfx2/source/sidebar/UnoSidebar.cxx
index 6ea75563d16c..abf4d420f975 100644
--- a/sfx2/source/sidebar/UnoSidebar.cxx
+++ b/sfx2/source/sidebar/UnoSidebar.cxx
@@ -36,7 +36,6 @@ SidebarController* SfxUnoSidebar::getSidebarController()
 }
 
 void SAL_CALL SfxUnoSidebar::showDecks ( const sal_Bool bVisible )
-                            throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -52,7 +51,6 @@ void SAL_CALL SfxUnoSidebar::showDecks ( const sal_Bool bVisible )
 }
 
 void SAL_CALL SfxUnoSidebar::setVisible ( const sal_Bool bVisible )
-                            throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -69,7 +67,6 @@ void SAL_CALL SfxUnoSidebar::setVisible ( const sal_Bool bVisible )
 }
 
 sal_Bool SAL_CALL SfxUnoSidebar::isVisible()
-                            throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -79,7 +76,6 @@ sal_Bool SAL_CALL SfxUnoSidebar::isVisible()
 }
 
 uno::Reference<frame::XFrame> SAL_CALL SfxUnoSidebar::getFrame()
-                            throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -90,7 +86,6 @@ uno::Reference<frame::XFrame> SAL_CALL SfxUnoSidebar::getFrame()
 }
 
 uno::Reference<ui::XDecks> SAL_CALL SfxUnoSidebar::getDecks()
-                            throw (uno::RuntimeException, std::exception)
 {
     SolarMutexGuard aGuard;
 
@@ -99,7 +94,6 @@ uno::Reference<ui::XDecks> SAL_CALL SfxUnoSidebar::getDecks()
 }
 
 uno::Reference<ui::XSidebar> SAL_CALL SfxUnoSidebar::getSidebar()
-                            throw (uno::RuntimeException, std::exception)
 {
     return getSidebarController();
 }