throw() -> noexcept, part 2/3: Automatic loplugin:noexcept rewrite

Change-Id: I076f16d0536b534abf0ced4d76051eadb4c0e033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114949
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

23 files changed, 119 insertions, 119 deletions

diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index e8038e25a9f5..56a96534f02c 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -57,7 +57,7 @@ namespace
 }
 
 
-SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw()
+SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) noexcept
 : mpModel( pModel ),
   mpModelPool( pModel ? &pModel->GetItemPool() : nullptr ),
   mnWhich( nWhich ), mnMemberId( nMemberId )
@@ -66,7 +66,7 @@ SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, s
         StartListening( *pModel );
 }
 
-SvxUnoNameItemTable::~SvxUnoNameItemTable() throw()
+SvxUnoNameItemTable::~SvxUnoNameItemTable() noexcept
 {
     if( mpModel )
         EndListening( *mpModel );
@@ -83,7 +83,7 @@ void SvxUnoNameItemTable::dispose()
     maItemSetVector.clear();
 }
 
-void SvxUnoNameItemTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
+void SvxUnoNameItemTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) noexcept
 {
     if (rHint.GetId() != SfxHintId::ThisIsAnSdrHint)
         return;
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index 1bb0b8276bba..47654aaf4f8f 100644
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -49,8 +49,8 @@ private:
     void ImplInsertByName( const OUString& aName, const css::uno::Any& aElement );
 
 public:
-    SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw();
-    virtual ~SvxUnoNameItemTable() throw() override;
+    SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) noexcept;
+    virtual ~SvxUnoNameItemTable() noexcept override;
 
     virtual NameOrIndex* createItem() const = 0;
     virtual bool isValid( const NameOrIndex* pItem ) const;
@@ -58,7 +58,7 @@ public:
     void dispose();
 
     // SfxListener
-    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () override;
+    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) noexcept override;
 
     // XServiceInfo
     virtual sal_Bool SAL_CALL supportsService( const  OUString& ServiceName ) override;
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 88c69e4c6bb5..b7cfe326bd04 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -76,14 +76,14 @@ namespace svx
     }
 
     static Sequence< OUString > NamespaceMap_getSupportedServiceNames()
-        throw()
+        noexcept
     {
         Sequence<OUString> aSupportedServiceNames { "com.sun.star.xml.NamespaceMap" };
         return aSupportedServiceNames;
     }
 
     static OUString NamespaceMap_getImplementationName()
-        throw()
+        noexcept
     {
         return "com.sun.star.comp.Svx.NamespaceMap";
     }
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 39d861327aa8..9455f1fe4069 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -52,7 +52,7 @@ private:
     tools::Long getCount() const { return mpList ? mpList->Count() : 0; }
     const XPropertyEntry* get(tools::Long index) const;
 public:
-    SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw();
+    SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) noexcept;
 
     /// @throws uno::RuntimeException
     virtual uno::Any getAny( const XPropertyEntry* pEntry ) const = 0;
@@ -81,7 +81,7 @@ public:
 
 }
 
-SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw()
+SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) noexcept
 : mpList( pList ), mnWhich( nWhich )
 {
 }
@@ -237,10 +237,10 @@ namespace {
 class SvxUnoXColorTable : public SvxUnoXPropertyTable
 {
 public:
-    explicit SvxUnoXColorTable( XPropertyList* pList ) throw() : SvxUnoXPropertyTable( XATTR_LINECOLOR, pList ) {};
+    explicit SvxUnoXColorTable( XPropertyList* pList ) noexcept : SvxUnoXPropertyTable( XATTR_LINECOLOR, pList ) {};
 
     // SvxUnoXPropertyTable
-    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() override;
+    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const noexcept override;
     virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override;
 
     // XElementAccess
@@ -253,13 +253,13 @@ public:
 
 }
 
-uno::Reference< uno::XInterface > SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw()
+uno::Reference< uno::XInterface > SvxUnoXColorTable_createInstance( XPropertyList* pList ) noexcept
 {
     return static_cast<OWeakObject*>(new SvxUnoXColorTable( pList ));
 }
 
 // SvxUnoXPropertyTable
-uno::Any SvxUnoXColorTable::getAny( const XPropertyEntry* pEntry ) const throw()
+uno::Any SvxUnoXColorTable::getAny( const XPropertyEntry* pEntry ) const noexcept
 {
     return uno::Any( static_cast<sal_Int32>(static_cast<const XColorEntry*>(pEntry)->GetColor()) );
 }
@@ -295,10 +295,10 @@ namespace {
 class SvxUnoXLineEndTable : public SvxUnoXPropertyTable
 {
 public:
-    explicit SvxUnoXLineEndTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable( XATTR_LINEEND, pTable ) {};
+    explicit SvxUnoXLineEndTable( XPropertyList* pTable ) noexcept : SvxUnoXPropertyTable( XATTR_LINEEND, pTable ) {};
 
     // SvxUnoXPropertyTable
-    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() override;
+    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const noexcept override;
     virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override;
 
     // XElementAccess
@@ -311,13 +311,13 @@ public:
 
 }
 
-uno::Reference< uno::XInterface > SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) throw()
+uno::Reference< uno::XInterface > SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) noexcept
 {
     return static_cast<OWeakObject*>(new SvxUnoXLineEndTable( pTable ));
 }
 
 // SvxUnoXPropertyTable
-uno::Any SvxUnoXLineEndTable::getAny( const XPropertyEntry* pEntry ) const throw()
+uno::Any SvxUnoXLineEndTable::getAny( const XPropertyEntry* pEntry ) const noexcept
 {
     drawing::PolyPolygonBezierCoords aBezier;
     basegfx::utils::B2DPolyPolygonToUnoPolyPolygonBezierCoords( static_cast<const XLineEndEntry*>(pEntry)->GetLineEnd(),
@@ -363,10 +363,10 @@ namespace {
 class SvxUnoXDashTable : public SvxUnoXPropertyTable
 {
 public:
-    explicit SvxUnoXDashTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable( XATTR_LINEDASH, pTable ) {};
+    explicit SvxUnoXDashTable( XPropertyList* pTable ) noexcept : SvxUnoXPropertyTable( XATTR_LINEDASH, pTable ) {};
 
     // SvxUnoXPropertyTable
-    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() override;
+    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const noexcept override;
     virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override;
 
     // XElementAccess
@@ -379,13 +379,13 @@ public:
 
 }
 
-uno::Reference< uno::XInterface > SvxUnoXDashTable_createInstance( XPropertyList* pTable ) throw()
+uno::Reference< uno::XInterface > SvxUnoXDashTable_createInstance( XPropertyList* pTable ) noexcept
 {
     return static_cast<OWeakObject*>(new SvxUnoXDashTable( pTable ));
 }
 
 // SvxUnoXPropertyTable
-uno::Any SvxUnoXDashTable::getAny( const XPropertyEntry* pEntry ) const throw()
+uno::Any SvxUnoXDashTable::getAny( const XPropertyEntry* pEntry ) const noexcept
 {
     const XDash& rXD = static_cast<const XDashEntry*>(pEntry)->GetDash();
 
@@ -441,10 +441,10 @@ namespace {
 class SvxUnoXHatchTable : public SvxUnoXPropertyTable
 {
 public:
-    explicit SvxUnoXHatchTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable( XATTR_FILLHATCH, pTable ) {};
+    explicit SvxUnoXHatchTable( XPropertyList* pTable ) noexcept : SvxUnoXPropertyTable( XATTR_FILLHATCH, pTable ) {};
 
     // SvxUnoXPropertyTable
-    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() override;
+    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const noexcept override;
     virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override;
 
     // XElementAccess
@@ -457,13 +457,13 @@ public:
 
 }
 
-uno::Reference< uno::XInterface > SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) throw()
+uno::Reference< uno::XInterface > SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) noexcept
 {
     return static_cast<OWeakObject*>(new SvxUnoXHatchTable( pTable ));
 }
 
 // SvxUnoXPropertyTable
-uno::Any SvxUnoXHatchTable::getAny( const XPropertyEntry* pEntry ) const throw()
+uno::Any SvxUnoXHatchTable::getAny( const XPropertyEntry* pEntry ) const noexcept
 {
     const XHatch& aHatch = static_cast<const XHatchEntry*>(pEntry)->GetHatch();
 
@@ -514,10 +514,10 @@ namespace {
 class SvxUnoXGradientTable : public SvxUnoXPropertyTable
 {
 public:
-    explicit SvxUnoXGradientTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable( XATTR_FILLGRADIENT, pTable ) {};
+    explicit SvxUnoXGradientTable( XPropertyList* pTable ) noexcept : SvxUnoXPropertyTable( XATTR_FILLGRADIENT, pTable ) {};
 
     // SvxUnoXPropertyTable
-    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() override;
+    virtual uno::Any getAny( const XPropertyEntry* pEntry ) const noexcept override;
     virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override;
 
     // XElementAccess
@@ -530,13 +530,13 @@ public:
 
 }
 
-uno::Reference< uno::XInterface > SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) throw()
+uno::Reference< uno::XInterface > SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) noexcept
 {
     return static_cast<OWeakObject*>(new SvxUnoXGradientTable( pTable ));
 }
 
 // SvxUnoXPropertyTable
-uno::Any SvxUnoXGradientTable::getAny( const XPropertyEntry* pEntry ) const throw()
+uno::Any SvxUnoXGradientTable::getAny( const XPropertyEntry* pEntry ) const noexcept
 {
     const XGradient& aXGradient = static_cast<const XGradientEntry*>(pEntry)->GetGradient();
     awt::Gradient aGradient;
@@ -599,7 +599,7 @@ namespace {
 class SvxUnoXBitmapTable : public SvxUnoXPropertyTable
 {
 public:
-    explicit SvxUnoXBitmapTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable( XATTR_FILLBITMAP, pTable ) {};
+    explicit SvxUnoXBitmapTable( XPropertyList* pTable ) noexcept : SvxUnoXPropertyTable( XATTR_FILLBITMAP, pTable ) {};
 
     // SvxUnoXPropertyTable
     virtual uno::Any getAny( const XPropertyEntry* pEntry ) const override;
@@ -615,7 +615,7 @@ public:
 
 }
 
-uno::Reference< uno::XInterface > SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) throw()
+uno::Reference< uno::XInterface > SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) noexcept
 {
     return static_cast<OWeakObject*>(new SvxUnoXBitmapTable( pTable ));
 }
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index 5311def81e18..fcc381a95451 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -45,7 +45,7 @@ private:
     tools::WeakReference<SdrObject>    mpObject;
 
 public:
-    explicit SvxUnoGluePointAccess( SdrObject* pObject ) throw();
+    explicit SvxUnoGluePointAccess( SdrObject* pObject ) noexcept;
 
     // XIdentifierContainer
     virtual sal_Int32 SAL_CALL insert( const uno::Any& aElement ) override;
@@ -79,7 +79,7 @@ public:
 
 }
 
-static void convert( const SdrGluePoint& rSdrGlue, drawing::GluePoint2& rUnoGlue ) throw()
+static void convert( const SdrGluePoint& rSdrGlue, drawing::GluePoint2& rUnoGlue ) noexcept
 {
     rUnoGlue.Position.X = rSdrGlue.GetPos().X();
     rUnoGlue.Position.Y = rSdrGlue.GetPos().Y();
@@ -133,7 +133,7 @@ static void convert( const SdrGluePoint& rSdrGlue, drawing::GluePoint2& rUnoGlue
     }
 }
 
-static void convert( const drawing::GluePoint2& rUnoGlue, SdrGluePoint& rSdrGlue ) throw()
+static void convert( const drawing::GluePoint2& rUnoGlue, SdrGluePoint& rSdrGlue ) noexcept
 {
     rSdrGlue.SetPos( Point( rUnoGlue.Position.X, rUnoGlue.Position.Y ) );
     rSdrGlue.SetPercent( rUnoGlue.IsRelative );
@@ -196,7 +196,7 @@ static void convert( const drawing::GluePoint2& rUnoGlue, SdrGluePoint& rSdrGlue
     }
 }
 
-SvxUnoGluePointAccess::SvxUnoGluePointAccess( SdrObject* pObject ) throw()
+SvxUnoGluePointAccess::SvxUnoGluePointAccess( SdrObject* pObject ) noexcept
 : mpObject( pObject )
 {
 }
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index b2abe9f074aa..0ccf22071194 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -26,7 +26,7 @@ class SvxShapeCaption : public SvxShapeText
 {
 public:
     explicit SvxShapeCaption(SdrObject* pObj);
-    virtual ~SvxShapeCaption() throw() override;
+    virtual ~SvxShapeCaption() noexcept override;
 };
 class SvxPluginShape : public SvxOle2Shape
 {
@@ -37,7 +37,7 @@ protected:
 
 public:
     explicit SvxPluginShape(SdrObject* pObj);
-    virtual ~SvxPluginShape() throw() override;
+    virtual ~SvxPluginShape() noexcept override;
 
     virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
     using SvxUnoTextRangeBase::setPropertyValue;
@@ -55,7 +55,7 @@ protected:
 
 public:
     explicit SvxAppletShape(SdrObject* pObj);
-    virtual ~SvxAppletShape() throw() override;
+    virtual ~SvxAppletShape() noexcept override;
 
     virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
     using SvxUnoTextRangeBase::setPropertyValue;
@@ -74,7 +74,7 @@ protected:
 
 public:
     explicit SvxFrameShape(SdrObject* pObj);
-    virtual ~SvxFrameShape() throw() override;
+    virtual ~SvxFrameShape() noexcept override;
 
     virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
     using SvxUnoTextRangeBase::setPropertyValue;
@@ -98,7 +98,7 @@ protected:
 public:
 
     explicit SvxTableShape(SdrObject* pObj);
-    virtual ~SvxTableShape() throw() override;
+    virtual ~SvxTableShape() noexcept override;
 };
 
 SvxUnoPropertyMapProvider& getSvxMapProvider();
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index 31bf7d756b45..69823ea3043b 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -41,7 +41,7 @@ SvxTableShape::SvxTableShape(SdrObject* pObj)
     SetShapeType( "com.sun.star.drawing.TableShape" );
 }
 
-SvxTableShape::~SvxTableShape() throw()
+SvxTableShape::~SvxTableShape() noexcept
 {
 }
 
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index 0b3dae21f2d4..bba7bdbff24f 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -34,7 +34,7 @@ namespace {
 class SvxUnoBitmapTable : public SvxUnoNameItemTable
 {
 public:
-    explicit SvxUnoBitmapTable( SdrModel* pModel ) throw();
+    explicit SvxUnoBitmapTable( SdrModel* pModel ) noexcept;
 
     virtual NameOrIndex* createItem() const override;
     virtual bool isValid( const NameOrIndex* pItem ) const override;
@@ -49,7 +49,7 @@ public:
 
 }
 
-SvxUnoBitmapTable::SvxUnoBitmapTable( SdrModel* pModel ) throw()
+SvxUnoBitmapTable::SvxUnoBitmapTable( SdrModel* pModel ) noexcept
 : SvxUnoNameItemTable( pModel, XATTR_FILLBITMAP, MID_BITMAP )
 {
 }
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 7809f5889bd0..c460bbd7ca30 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -34,7 +34,7 @@ namespace
 class SvxUnoDashTable : public SvxUnoNameItemTable
 {
 public:
-    explicit SvxUnoDashTable(SdrModel* pModel) throw();
+    explicit SvxUnoDashTable(SdrModel* pModel) noexcept;
 
     virtual NameOrIndex* createItem() const override;
 
@@ -47,7 +47,7 @@ public:
 };
 }
 
-SvxUnoDashTable::SvxUnoDashTable(SdrModel* pModel) throw()
+SvxUnoDashTable::SvxUnoDashTable(SdrModel* pModel) noexcept
     : SvxUnoNameItemTable(pModel, XATTR_LINEDASH, MID_LINEDASH)
 {
 }
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 2826105b42a4..7939ccfd0e89 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -34,7 +34,7 @@ namespace
 class SvxUnoGradientTable : public SvxUnoNameItemTable
 {
 public:
-    explicit SvxUnoGradientTable(SdrModel* pModel) throw();
+    explicit SvxUnoGradientTable(SdrModel* pModel) noexcept;
 
     virtual NameOrIndex* createItem() const override;
 
@@ -47,7 +47,7 @@ public:
 };
 }
 
-SvxUnoGradientTable::SvxUnoGradientTable(SdrModel* pModel) throw()
+SvxUnoGradientTable::SvxUnoGradientTable(SdrModel* pModel) noexcept
     : SvxUnoNameItemTable(pModel, XATTR_FILLGRADIENT, MID_FILLGRADIENT)
 {
 }
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 47cf857d08ec..cb36192bd06f 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -34,7 +34,7 @@ namespace {
 class SvxUnoHatchTable : public SvxUnoNameItemTable
 {
 public:
-    explicit SvxUnoHatchTable( SdrModel* pModel ) throw();
+    explicit SvxUnoHatchTable( SdrModel* pModel ) noexcept;
 
     virtual NameOrIndex* createItem() const override;
 
@@ -48,7 +48,7 @@ public:
 
 }
 
-SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) throw()
+SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) noexcept
 : SvxUnoNameItemTable( pModel, XATTR_FILLHATCH, MID_FILLHATCH )
 {
 }
diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx
index b040dc179347..781b3dc385e8 100644
--- a/svx/source/unodraw/unomlstr.cxx
+++ b/svx/source/unodraw/unomlstr.cxx
@@ -24,12 +24,12 @@
 
 using namespace ::com::sun::star;
 
-SvxUnoShapeModifyListener::SvxUnoShapeModifyListener( SdrObject* pObj ) throw()
+SvxUnoShapeModifyListener::SvxUnoShapeModifyListener( SdrObject* pObj ) noexcept
 {
     mpObj = pObj;
 }
 
-SvxUnoShapeModifyListener::~SvxUnoShapeModifyListener() throw()
+SvxUnoShapeModifyListener::~SvxUnoShapeModifyListener() noexcept
 {
 }
 
@@ -51,7 +51,7 @@ void SvxUnoShapeModifyListener::disposing(const lang::EventObject& )
 }
 
 // internal
-void SvxUnoShapeModifyListener::invalidate() throw()
+void SvxUnoShapeModifyListener::invalidate() noexcept
 {
     mpObj = nullptr;
 }
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index dcdc1b0983a1..784fc59d2e83 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -71,7 +71,7 @@ private:
     SvxUnoDrawingModel& mrModel;
 
 public:
-    explicit SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) throw();
+    explicit SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) noexcept;
 
     // XDrawPages
     virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) override;
@@ -225,7 +225,7 @@ SdrModel& SvxUnoDrawingModel::getSdrModelFromUnoModel() const
     return *mpDoc;
 }
 
-SvxUnoDrawingModel::SvxUnoDrawingModel(SdrModel* pDoc) throw()
+SvxUnoDrawingModel::SvxUnoDrawingModel(SdrModel* pDoc) noexcept
 :   SfxBaseModel(nullptr),
     SvxFmMSFactory(),
     css::drawing::XDrawPagesSupplier(),
@@ -243,7 +243,7 @@ SvxUnoDrawingModel::SvxUnoDrawingModel(SdrModel* pDoc) throw()
 {
 }
 
-SvxUnoDrawingModel::~SvxUnoDrawingModel() throw()
+SvxUnoDrawingModel::~SvxUnoDrawingModel() noexcept
 {
 }
 
@@ -530,7 +530,7 @@ uno::Reference< css::ucb::XAnyCompare > SAL_CALL SvxUnoDrawingModel::createAnyCo
     return SvxCreateNumRuleCompare();
 }
 
-SvxUnoDrawPagesAccess::SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel )  throw()
+SvxUnoDrawPagesAccess::SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel )  noexcept
 :   mrModel(rMyModel)
 {
 }
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 4e9de869ab40..d57e9665156f 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -61,13 +61,13 @@ private:
     ItemPoolVector maItemSetVector;
 
 public:
-    explicit SvxUnoMarkerTable( SdrModel* pModel ) throw();
-    virtual ~SvxUnoMarkerTable() throw() override;
+    explicit SvxUnoMarkerTable( SdrModel* pModel ) noexcept;
+    virtual ~SvxUnoMarkerTable() noexcept override;
 
     void dispose();
 
     // SfxListener
-    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () override;
+    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) noexcept override;
 
     void ImplInsertByName( const OUString& aName, const uno::Any& aElement );
 
@@ -95,7 +95,7 @@ public:
 
 }
 
-SvxUnoMarkerTable::SvxUnoMarkerTable( SdrModel* pModel ) throw()
+SvxUnoMarkerTable::SvxUnoMarkerTable( SdrModel* pModel ) noexcept
 : mpModel( pModel ),
   mpModelPool( pModel ? &pModel->GetItemPool() : nullptr )
 {
@@ -103,7 +103,7 @@ SvxUnoMarkerTable::SvxUnoMarkerTable( SdrModel* pModel ) throw()
         StartListening( *pModel );
 }
 
-SvxUnoMarkerTable::~SvxUnoMarkerTable() throw()
+SvxUnoMarkerTable::~SvxUnoMarkerTable() noexcept
 {
     if( mpModel )
         EndListening( *mpModel );
@@ -116,7 +116,7 @@ void SvxUnoMarkerTable::dispose()
 }
 
 // SfxListener
-void SvxUnoMarkerTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
+void SvxUnoMarkerTable::Notify( SfxBroadcaster&, const SfxHint& rHint ) noexcept
 {
     if (rHint.GetId() == SfxHintId::ThisIsAnSdrHint)
     {
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 00be46da451d..0cc4f7d954e5 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -71,7 +71,7 @@ SvxDrawPage::SvxDrawPage(SdrPage* pInPage) // TTTT should be reference
     mpView->SetDesignMode();
 }
 
-SvxDrawPage::~SvxDrawPage() throw()
+SvxDrawPage::~SvxDrawPage() noexcept
 {
     if( !mrBHelper.bDisposed )
     {
@@ -82,13 +82,13 @@ SvxDrawPage::~SvxDrawPage() throw()
 }
 
 // XInterface
-void SvxDrawPage::release() throw()
+void SvxDrawPage::release() noexcept
 {
     OWeakAggObject::release();
 }
 
 // XComponent
-void SvxDrawPage::disposing() throw()
+void SvxDrawPage::disposing() noexcept
 {
     if( mpModel )
     {
@@ -396,7 +396,7 @@ namespace
 
 // ATTENTION: SelectObjectsInView selects the css::drawing::Shapes
 // only in the given SdrPageView. It hasn't to be the visible SdrPageView.
-void SvxDrawPage::SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw ()
+void SvxDrawPage::SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) noexcept
 {
     SAL_WARN_IF(!pPageView, "svx", "SdrPageView is NULL!");
     SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!");
@@ -418,7 +418,7 @@ void SvxDrawPage::SelectObjectsInView( const Reference< drawing::XShapes > & aSh
 
 // ATTENTION: SelectObjectInView selects the shape only in the given SdrPageView.
 // It hasn't to be the visible SdrPageView.
-void SvxDrawPage::SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) throw()
+void SvxDrawPage::SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) noexcept
 {
     SAL_WARN_IF(!pPageView, "svx", "SdrPageView is NULL!");
     SAL_WARN_IF(!mpView, "svx", "SdrView is NULL!");
@@ -561,7 +561,7 @@ SdrObject* SvxDrawPage::CreateSdrObject_(const Reference< drawing::XShape > & xS
     return pNewObj;
 }
 
-void SvxDrawPage::GetTypeAndInventor( SdrObjKind& rType, SdrInventor& rInventor, const OUString& aName ) throw()
+void SvxDrawPage::GetTypeAndInventor( SdrObjKind& rType, SdrInventor& rInventor, const OUString& aName ) noexcept
 {
     sal_uInt32 nTempType = UHashMap::getId( aName );
 
@@ -827,7 +827,7 @@ Reference< drawing::XShape >  SvxDrawPage::CreateShape( SdrObject *pObj ) const
     return xShape;
 }
 
-SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xShape, bool bBeginning ) throw()
+SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xShape, bool bBeginning ) noexcept
 {
     SdrObject* pObj = CreateSdrObject_( xShape );
     if( pObj)
@@ -867,7 +867,7 @@ rtl::Reference<SvxShape> CreateSvxShapeByTypeAndInventor(sal_uInt16 nType, SdrIn
 }
 
 /** returns a StarOffice API wrapper for the given SdrPage */
-uno::Reference< drawing::XDrawPage > GetXDrawPageForSdrPage( SdrPage* pPage ) throw ()
+uno::Reference< drawing::XDrawPage > GetXDrawPageForSdrPage( SdrPage* pPage ) noexcept
 {
     if(pPage)
     {
@@ -880,7 +880,7 @@ uno::Reference< drawing::XDrawPage > GetXDrawPageForSdrPage( SdrPage* pPage ) th
 }
 
 /** returns the SdrObject from the given StarOffice API wrapper */
-SdrPage* GetSdrPageFromXDrawPage( const uno::Reference< drawing::XDrawPage >& xDrawPage ) throw()
+SdrPage* GetSdrPageFromXDrawPage( const uno::Reference< drawing::XDrawPage >& xDrawPage ) noexcept
 {
     if(xDrawPage.is())
     {
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index ec293ac1bf55..79ca1c1f951e 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -52,7 +52,7 @@ SvxUnoDrawPool::SvxUnoDrawPool(SdrModel* pModel)
     init();
 }
 
-SvxUnoDrawPool::~SvxUnoDrawPool() throw()
+SvxUnoDrawPool::~SvxUnoDrawPool() noexcept
 {
     if (mpDefaultsPool)
     {
@@ -73,7 +73,7 @@ void SvxUnoDrawPool::init()
     mpDefaultsPool->FreezeIdRanges();
 }
 
-SfxItemPool* SvxUnoDrawPool::getModelPool( bool bReadOnly ) throw()
+SfxItemPool* SvxUnoDrawPool::getModelPool( bool bReadOnly ) noexcept
 {
     if( mpModel )
     {
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 865380d2a0c8..07a0aeffaa17 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -954,7 +954,7 @@ const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(sal_uInt16 n
 /** maps the vcl MapUnit enum to an API constant MeasureUnit.
     Returns false if conversion is not supported.
 */
-bool SvxMapUnitToMeasureUnit( const MapUnit eVcl, short& eApi ) throw()
+bool SvxMapUnitToMeasureUnit( const MapUnit eVcl, short& eApi ) noexcept
 {
     switch( eVcl )
     {
@@ -980,7 +980,7 @@ bool SvxMapUnitToMeasureUnit( const MapUnit eVcl, short& eApi ) throw()
     Returns false if conversion is not supported.
 */
 
-bool SvxMeasureUnitToFieldUnit( const short eApi, FieldUnit& eVcl ) throw()
+bool SvxMeasureUnitToFieldUnit( const short eApi, FieldUnit& eVcl ) noexcept
 {
     switch( eApi )
     {
@@ -1006,7 +1006,7 @@ bool SvxMeasureUnitToFieldUnit( const short eApi, FieldUnit& eVcl ) throw()
 /** maps the vcl MapUnit enum to an API constant MeasureUnit.
     Returns false if conversion is not supported.
 */
-bool SvxFieldUnitToMeasureUnit( const FieldUnit eVcl, short& eApi ) throw()
+bool SvxFieldUnitToMeasureUnit( const FieldUnit eVcl, short& eApi ) noexcept
 {
     switch( eVcl )
     {
@@ -1575,7 +1575,7 @@ static const char* RID_SVXSTR_TRASNGR[] =
     RID_SVXSTR_TRASNGR0
 };
 
-static bool SvxUnoGetResourceRanges( const sal_uInt16 nWhich, const char**& pApiResIds, const char**& pIntResIds, int& nCount ) throw()
+static bool SvxUnoGetResourceRanges( const sal_uInt16 nWhich, const char**& pApiResIds, const char**& pIntResIds, int& nCount ) noexcept
 {
     switch( nWhich )
     {
@@ -2013,7 +2013,7 @@ OUString SvxUnogetInternalNameForItem(const sal_uInt16 nWhich, const OUString& r
 }
 
 
-rtl::Reference<comphelper::PropertySetInfo> const & SvxPropertySetInfoPool::getOrCreate( sal_Int32 nServiceId ) throw()
+rtl::Reference<comphelper::PropertySetInfo> const & SvxPropertySetInfoPool::getOrCreate( sal_Int32 nServiceId ) noexcept
 {
     SolarMutexGuard aGuard;
 
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index bf339a0930d1..5fa0596ef98c 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -84,7 +84,7 @@ SvxShapeGroup::SvxShapeGroup(SdrObject* pObj, SvxDrawPage* pDrawPage)
 {
 }
 
-SvxShapeGroup::~SvxShapeGroup() throw()
+SvxShapeGroup::~SvxShapeGroup() noexcept
 {
 }
 
@@ -338,7 +338,7 @@ SvxShapeConnector::SvxShapeConnector(SdrObject* pObj)
 }
 
 
-SvxShapeConnector::~SvxShapeConnector() throw()
+SvxShapeConnector::~SvxShapeConnector() noexcept
 {
 }
 
@@ -461,7 +461,7 @@ SvxShapeControl::SvxShapeControl(SdrObject* pObj)
 }
 
 
-SvxShapeControl::~SvxShapeControl() throw()
+SvxShapeControl::~SvxShapeControl() noexcept
 {
 }
 
@@ -869,7 +869,7 @@ SvxShapeDimensioning::SvxShapeDimensioning(SdrObject* pObj)
 {
 }
 
-SvxShapeDimensioning::~SvxShapeDimensioning() throw()
+SvxShapeDimensioning::~SvxShapeDimensioning() noexcept
 {
 }
 
@@ -878,7 +878,7 @@ SvxShapeCircle::SvxShapeCircle(SdrObject* pObj)
 {
 }
 
-SvxShapeCircle::~SvxShapeCircle() throw()
+SvxShapeCircle::~SvxShapeCircle() noexcept
 {
 }
 
@@ -893,7 +893,7 @@ SvxShapePolyPolygon::SvxShapePolyPolygon(
 {
 }
 
-SvxShapePolyPolygon::~SvxShapePolyPolygon() throw()
+SvxShapePolyPolygon::~SvxShapePolyPolygon() noexcept
 {
 }
 
@@ -1144,7 +1144,7 @@ void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew)
 }
 
 
-basegfx::B2DPolyPolygon SvxShapePolyPolygon::GetPolygon() const throw()
+basegfx::B2DPolyPolygon SvxShapePolyPolygon::GetPolygon() const noexcept
 {
     ::SolarMutexGuard aGuard;
 
@@ -1165,7 +1165,7 @@ SvxGraphicObject::SvxGraphicObject(SdrObject* pObj)
 {
 }
 
-SvxGraphicObject::~SvxGraphicObject() throw()
+SvxGraphicObject::~SvxGraphicObject() noexcept
 {
 }
 
@@ -1556,7 +1556,7 @@ SvxShapeCaption::SvxShapeCaption(SdrObject* pObj)
 {
 }
 
-SvxShapeCaption::~SvxShapeCaption() throw()
+SvxShapeCaption::~SvxShapeCaption() noexcept
 {
 }
 
@@ -1565,7 +1565,7 @@ SvxCustomShape::SvxCustomShape(SdrObject* pObj)
 {
 }
 
-SvxCustomShape::~SvxCustomShape() throw()
+SvxCustomShape::~SvxCustomShape() noexcept
 {
 }
 
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 10a9c398f02c..ad8286f1e97a 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -69,7 +69,7 @@ Svx3DSceneObject::Svx3DSceneObject(SdrObject* pObj, SvxDrawPage* pDrawPage)
 }
 
 
-Svx3DSceneObject::~Svx3DSceneObject() throw()
+Svx3DSceneObject::~Svx3DSceneObject() noexcept
 {
 }
 
@@ -408,7 +408,7 @@ Svx3DCubeObject::Svx3DCubeObject(SdrObject* pObj)
 {
 }
 
-Svx3DCubeObject::~Svx3DCubeObject() throw()
+Svx3DCubeObject::~Svx3DCubeObject() noexcept
 {
 }
 
@@ -529,7 +529,7 @@ Svx3DSphereObject::Svx3DSphereObject(SdrObject* pObj)
 {
 }
 
-Svx3DSphereObject::~Svx3DSphereObject() throw()
+Svx3DSphereObject::~Svx3DSphereObject() noexcept
 {
 }
 
@@ -634,7 +634,7 @@ Svx3DLatheObject::Svx3DLatheObject(SdrObject* pObj)
 {
 }
 
-Svx3DLatheObject::~Svx3DLatheObject() throw()
+Svx3DLatheObject::~Svx3DLatheObject() noexcept
 {
 }
 
@@ -814,7 +814,7 @@ Svx3DExtrudeObject::Svx3DExtrudeObject(SdrObject* pObj)
 {
 }
 
-Svx3DExtrudeObject::~Svx3DExtrudeObject() throw()
+Svx3DExtrudeObject::~Svx3DExtrudeObject() noexcept
 {
 }
 
@@ -897,7 +897,7 @@ Svx3DPolygonObject::Svx3DPolygonObject(SdrObject* pObj)
 {
 }
 
-Svx3DPolygonObject::~Svx3DPolygonObject() throw()
+Svx3DPolygonObject::~Svx3DPolygonObject() noexcept
 {
 }
 
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index f1099f2c150f..9274a60a2e28 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -73,7 +73,7 @@ SvxOle2Shape::SvxOle2Shape(SdrObject* pObject, const SfxItemPropertyMapEntry* pP
 {
 }
 
-SvxOle2Shape::~SvxOle2Shape() throw()
+SvxOle2Shape::~SvxOle2Shape() noexcept
 {
 }
 
@@ -554,7 +554,7 @@ SvxAppletShape::SvxAppletShape(SdrObject* pObject)
     SetShapeType( "com.sun.star.drawing.AppletShape" );
 }
 
-SvxAppletShape::~SvxAppletShape() throw()
+SvxAppletShape::~SvxAppletShape() noexcept
 {
 }
 
@@ -625,7 +625,7 @@ SvxPluginShape::SvxPluginShape(SdrObject* pObject)
     SetShapeType( "com.sun.star.drawing.PluginShape" );
 }
 
-SvxPluginShape::~SvxPluginShape() throw()
+SvxPluginShape::~SvxPluginShape() noexcept
 {
 }
 
@@ -697,7 +697,7 @@ SvxFrameShape::SvxFrameShape(SdrObject* pObject)
     SetShapeType( "com.sun.star.drawing.FrameShape" );
 }
 
-SvxFrameShape::~SvxFrameShape() throw()
+SvxFrameShape::~SvxFrameShape() noexcept
 {
 }
 
@@ -770,7 +770,7 @@ SvxMediaShape::SvxMediaShape(SdrObject* pObj, OUString const & referer)
 }
 
 
-SvxMediaShape::~SvxMediaShape() throw()
+SvxMediaShape::~SvxMediaShape() noexcept
 {
 }
 
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 972879ae4336..1c6d3c9c451c 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -223,7 +223,7 @@ SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries,
 }
 
 
-SvxShape::~SvxShape() throw()
+SvxShape::~SvxShape() noexcept
 {
     ::SolarMutexGuard aGuard;
 
@@ -308,7 +308,7 @@ uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType )
     return SvxShape_UnoImplHelper::queryAggregation(rType);
 }
 
-const css::uno::Sequence< sal_Int8 > & SvxShape::getUnoTunnelId() throw()
+const css::uno::Sequence< sal_Int8 > & SvxShape::getUnoTunnelId() noexcept
 {
     static const UnoTunnelIdInit theSvxShapeUnoTunnelId;
     return theSvxShapeUnoTunnelId.getSeq();
@@ -449,7 +449,7 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ )
     }
 }
 
-void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw()
+void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const noexcept
 {
     DBG_TESTSOLARMUTEX();
     if(!HasSdrObject())
@@ -470,7 +470,7 @@ void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw()
     }
 }
 
-void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const throw()
+void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon) const noexcept
 {
     DBG_TESTSOLARMUTEX();
     if(!HasSdrObject())
@@ -491,7 +491,7 @@ void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon
     }
 }
 
-void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DHomMatrix& rB2DHomMatrix) const throw()
+void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DHomMatrix& rB2DHomMatrix) const noexcept
 {
     DBG_TESTSOLARMUTEX();
     if(!HasSdrObject())
@@ -517,7 +517,7 @@ void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DHomMatrix& rB2DHomMatrix)
     }
 }
 
-void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw()
+void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const noexcept
 {
     DBG_TESTSOLARMUTEX();
     if(!HasSdrObject())
@@ -538,7 +538,7 @@ void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw()
     }
 }
 
-void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const throw()
+void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) const noexcept
 {
     DBG_TESTSOLARMUTEX();
     if(!HasSdrObject())
@@ -559,7 +559,7 @@ void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) cons
     }
 }
 
-void SvxShape::ForceMetricTo100th_mm(basegfx::B2DHomMatrix& rB2DHomMatrix) const throw()
+void SvxShape::ForceMetricTo100th_mm(basegfx::B2DHomMatrix& rB2DHomMatrix) const noexcept
 {
     DBG_TESTSOLARMUTEX();
     if(!HasSdrObject())
@@ -989,7 +989,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId()
     return css::uno::Sequence<sal_Int8>();
 }
 
-void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
+void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) noexcept
 {
     DBG_TESTSOLARMUTEX();
 
@@ -3745,7 +3745,7 @@ SvxShapeText::SvxShapeText(SdrObject* pObject, const SfxItemPropertyMapEntry* pP
 }
 
 
-SvxShapeText::~SvxShapeText() throw ()
+SvxShapeText::~SvxShapeText() noexcept
 {
     // check if only this instance is registered at the ranges
     DBG_ASSERT( (nullptr == GetEditSource()) || (GetEditSource()->getRanges().size()==1),
@@ -3929,7 +3929,7 @@ SvxShapeRect::SvxShapeRect(SdrObject* pObj)
 {
 }
 
-SvxShapeRect::~SvxShapeRect() throw()
+SvxShapeRect::~SvxShapeRect() noexcept
 {
 }
 
@@ -3951,14 +3951,14 @@ uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames()
 }
 
 /** returns a StarOffice API wrapper for the given SdrObject */
-uno::Reference< drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) throw ()
+uno::Reference< drawing::XShape > GetXShapeForSdrObject( SdrObject* pObj ) noexcept
 {
     uno::Reference< drawing::XShape > xShape( pObj->getUnoShape(), uno::UNO_QUERY );
     return xShape;
 }
 
 /** returns the SdrObject from the given StarOffice API wrapper */
-SdrObject* GetSdrObjectFromXShape( const uno::Reference< drawing::XShape >& xShape ) throw()
+SdrObject* GetSdrObjectFromXShape( const uno::Reference< drawing::XShape >& xShape ) noexcept
 {
     SvxShape* pShape = comphelper::getUnoTunnelImplementation<SvxShape>( xShape );
     return pShape ? pShape->GetSdrObject() : nullptr;
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index b1f3a4f4a10e..616f05151e8f 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -52,10 +52,10 @@ private:
     cppu::OBroadcastHelper mrBHelper;
 
 public:
-    SvxShapeCollection() throw();
+    SvxShapeCollection() noexcept;
 
     // XInterface
-    virtual void SAL_CALL release() throw() override;
+    virtual void SAL_CALL release() noexcept override;
 
     // XComponent
     virtual void SAL_CALL dispose() override;
@@ -80,13 +80,13 @@ public:
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 };
 
-SvxShapeCollection::SvxShapeCollection() throw()
+SvxShapeCollection::SvxShapeCollection() noexcept
 : maShapeContainer( maMutex ), mrBHelper( maMutex )
 {
 }
 
 // XInterface
-void SvxShapeCollection::release() throw()
+void SvxShapeCollection::release() noexcept
 {
     uno::Reference< uno::XInterface > x( xDelegator );
     if (! x.is())
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 45ce44f96c20..6233bccb9a0b 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -33,7 +33,7 @@ namespace
 class SvxUnoTransGradientTable : public SvxUnoNameItemTable
 {
 public:
-    explicit SvxUnoTransGradientTable(SdrModel* pModel) throw();
+    explicit SvxUnoTransGradientTable(SdrModel* pModel) noexcept;
 
     virtual NameOrIndex* createItem() const override;
 
@@ -46,7 +46,7 @@ public:
 };
 }
 
-SvxUnoTransGradientTable::SvxUnoTransGradientTable(SdrModel* pModel) throw()
+SvxUnoTransGradientTable::SvxUnoTransGradientTable(SdrModel* pModel) noexcept
     : SvxUnoNameItemTable(pModel, XATTR_FILLFLOATTRANSPARENCE, MID_FILLGRADIENT)
 {
 }