summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-04-30 08:20:03 +0200
committerStephan Bergmann <sbergman@redhat.com>2021-05-02 17:02:28 +0200
commit10d29c390dd58ed629dd27fe5ed35fae28eceec3 (patch)
tree7476cbb90fff182c5bec0a5a1ef9c41a3ad29f19 /sw/source
parenta9243e626193ab4efe3a618413886773336a38e6 (diff)
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>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/access/acccell.hxx4
-rw-r--r--sw/source/core/access/accdoc.hxx4
-rw-r--r--sw/source/core/access/accembedded.cxx4
-rw-r--r--sw/source/core/access/accembedded.hxx4
-rw-r--r--sw/source/core/access/accnotextframe.hxx4
-rw-r--r--sw/source/core/access/accpara.hxx4
-rw-r--r--sw/source/core/access/acctable.hxx4
-rw-r--r--sw/source/core/access/acctextframe.cxx4
-rw-r--r--sw/source/core/access/acctextframe.hxx4
-rw-r--r--sw/source/core/fields/textapi.cxx2
-rw-r--r--sw/source/core/inc/SwXMLBlockImport.hxx4
-rw-r--r--sw/source/core/inc/textapi.hxx2
-rw-r--r--sw/source/core/inc/unofootnote.hxx4
-rw-r--r--sw/source/core/swg/SwXMLBlockImport.cxx4
-rw-r--r--sw/source/core/swg/SwXMLSectionList.cxx2
-rw-r--r--sw/source/core/unocore/unodraw.cxx6
-rw-r--r--sw/source/core/unocore/unoframe.cxx4
-rw-r--r--sw/source/core/unocore/unoobj2.cxx6
-rw-r--r--sw/source/core/unocore/unorefmk.cxx4
-rw-r--r--sw/source/core/unocore/unostyle.cxx4
-rw-r--r--sw/source/core/unocore/unotbl.cxx8
-rw-r--r--sw/source/filter/inc/wwstyles.hxx6
-rw-r--r--sw/source/filter/ww8/fields.cxx2
-rw-r--r--sw/source/filter/ww8/fields.hxx2
-rw-r--r--sw/source/filter/ww8/styles.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par.hxx8
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx8
-rw-r--r--sw/source/filter/xml/xmlexp.cxx2
-rw-r--r--sw/source/filter/xml/xmlexp.hxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx4
-rw-r--r--sw/source/filter/xml/xmlimp.hxx4
-rw-r--r--sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx8
-rw-r--r--sw/source/uibase/inc/unomod.hxx4
-rw-r--r--sw/source/uibase/inc/unotxvw.hxx4
-rw-r--r--sw/source/uibase/ribbar/workctrl.cxx16
-rw-r--r--sw/source/uibase/uno/SwXDocumentSettings.cxx6
-rw-r--r--sw/source/uibase/uno/SwXDocumentSettings.hxx6
-rw-r--r--sw/source/uibase/uno/unodefaults.cxx4
-rw-r--r--sw/source/uibase/uno/unodefaults.hxx4
-rw-r--r--sw/source/uibase/uno/unomod.cxx4
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx4
-rw-r--r--sw/source/uibase/uno/unotxvw.cxx4
42 files changed, 98 insertions, 98 deletions
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 4caa25cad5d4..5b5d067ab1fd 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -91,10 +91,10 @@ public:
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
- virtual void SAL_CALL acquire( ) throw () override
+ virtual void SAL_CALL acquire( ) noexcept override
{ SwAccessibleContext::acquire(); };
- virtual void SAL_CALL release( ) throw () override
+ virtual void SAL_CALL release( ) noexcept override
{ SwAccessibleContext::release(); };
// XTypeProvider
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index 15d65eb92e01..6f16cc585f90 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -132,10 +132,10 @@ public:
virtual css::uno::Any SAL_CALL queryInterface(
const css::uno::Type& aType ) override;
- virtual void SAL_CALL acquire( ) throw () override
+ virtual void SAL_CALL acquire( ) noexcept override
{ SwAccessibleContext::acquire(); };
- virtual void SAL_CALL release( ) throw () override
+ virtual void SAL_CALL release( ) noexcept override
{ SwAccessibleContext::release(); };
// XTypeProvider
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 7f1b59ffc6c6..1eb54cf25878 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -57,14 +57,14 @@ css::uno::Any SAL_CALL
void SAL_CALL
SwAccessibleEmbeddedObject::acquire()
- throw ()
+ noexcept
{
SwAccessibleNoTextFrame::acquire ();
}
void SAL_CALL
SwAccessibleEmbeddedObject::release()
- throw ()
+ noexcept
{
SwAccessibleNoTextFrame::release ();
}
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index 86fdcc9cd5e5..ce82af9e2bbe 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -41,11 +41,11 @@ public:
virtual void SAL_CALL
acquire()
- throw () override;
+ noexcept override;
virtual void SAL_CALL
release()
- throw () override;
+ noexcept override;
// XServiceInfo
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 21d3bcbe0968..13680ffa5f8a 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -66,10 +66,10 @@ public:
virtual css::uno::Any SAL_CALL queryInterface(
const css::uno::Type& aType ) override;
- virtual void SAL_CALL acquire( ) throw () override
+ virtual void SAL_CALL acquire( ) noexcept override
{ SwAccessibleContext::acquire(); };
- virtual void SAL_CALL release( ) throw () override
+ virtual void SAL_CALL release( ) noexcept override
{ SwAccessibleContext::release(); };
// XTypeProvider
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index dade5606d0ea..ade2df47decf 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -286,10 +286,10 @@ public:
virtual css::uno::Any SAL_CALL queryInterface(
const css::uno::Type& aType ) override;
- virtual void SAL_CALL acquire( ) throw () override
+ virtual void SAL_CALL acquire( ) noexcept override
{ SwAccessibleContext::acquire(); };
- virtual void SAL_CALL release( ) throw () override
+ virtual void SAL_CALL release( ) noexcept override
{ SwAccessibleContext::release(); };
// XTypeProvider
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index a1207986c347..c31ecca95870 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -99,10 +99,10 @@ public:
virtual css::uno::Any SAL_CALL queryInterface(
const css::uno::Type& aType ) override;
- virtual void SAL_CALL acquire( ) throw () override
+ virtual void SAL_CALL acquire( ) noexcept override
{ SwAccessibleContext::acquire(); };
- virtual void SAL_CALL release( ) throw () override
+ virtual void SAL_CALL release( ) noexcept override
{ SwAccessibleContext::release(); };
// XTypeProvider
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index d9e2e2bc4c96..e4671bd44eb9 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -138,14 +138,14 @@ css::uno::Any SAL_CALL
void SAL_CALL
SwAccessibleTextFrame::acquire()
- throw ()
+ noexcept
{
SwAccessibleContext::acquire ();
}
void SAL_CALL
SwAccessibleTextFrame::release()
- throw ()
+ noexcept
{
SwAccessibleContext::release ();
}
diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx
index a4ee77ad8500..050970f62aea 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -44,8 +44,8 @@ public:
virtual css::uno::Any SAL_CALL queryInterface(
css::uno::Type const & rType ) override;
- virtual void SAL_CALL acquire() throw () override;
- virtual void SAL_CALL release() throw () override;
+ virtual void SAL_CALL acquire() noexcept override;
+ virtual void SAL_CALL release() noexcept override;
// XAccessibleSelection
virtual void SAL_CALL selectAccessibleChild(
sal_Int32 nChildIndex ) override;
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index 511f5df9e87c..25c9d46edefa 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -64,7 +64,7 @@ SwTextAPIObject::SwTextAPIObject( std::unique_ptr<SwTextAPIEditSource> p )
{
}
-SwTextAPIObject::~SwTextAPIObject() throw()
+SwTextAPIObject::~SwTextAPIObject() noexcept
{
m_pSource->Dispose();
m_pSource.reset();
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 48dbcc49bb72..40c9699712df 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -51,7 +51,7 @@ public:
return m_rBlockList;
}
virtual ~SwXMLBlockListImport()
- throw() override;
+ noexcept override;
};
class SwXMLTextBlockImport final : public SvXMLImport
@@ -69,7 +69,7 @@ public:
OUString &rNewText, bool bNewTextOnly );
virtual ~SwXMLTextBlockImport()
- throw() override;
+ noexcept override;
virtual void SAL_CALL endDocument() override;
};
diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx
index 3b8683f557b1..1e5e78e4a079 100644
--- a/sw/source/core/inc/textapi.hxx
+++ b/sw/source/core/inc/textapi.hxx
@@ -52,7 +52,7 @@ class SwTextAPIObject final : public SvxUnoText
std::unique_ptr<SwTextAPIEditSource> m_pSource;
public:
SwTextAPIObject( std::unique_ptr<SwTextAPIEditSource> p);
- virtual ~SwTextAPIObject() throw() override;
+ virtual ~SwTextAPIObject() noexcept override;
void DisposeEditSource() { m_pSource->Dispose(); }
std::unique_ptr<OutlinerParaObject> CreateText() { return m_pSource->CreateText(); }
void SetString( const OUString& rText ) { m_pSource->SetString( rText ); }
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index 79014ecba86c..b30c89d8b542 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -68,8 +68,8 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryInterface(
const css::uno::Type& rType) override;
- virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); }
- virtual void SAL_CALL release() throw() override { OWeakObject::release(); }
+ virtual void SAL_CALL acquire() noexcept override { OWeakObject::acquire(); }
+ virtual void SAL_CALL release() noexcept override { OWeakObject::release(); }
// XTypeProvider
virtual css::uno::Sequence< css::uno::Type >
diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx
index 7b43b91ea3ab..b0453a8a5a65 100644
--- a/sw/source/core/swg/SwXMLBlockImport.cxx
+++ b/sw/source/core/swg/SwXMLBlockImport.cxx
@@ -294,7 +294,7 @@ SwXMLBlockListImport::SwXMLBlockListImport(
}
SwXMLBlockListImport::~SwXMLBlockListImport()
- throw ()
+ noexcept
{
}
@@ -317,7 +317,7 @@ SwXMLTextBlockImport::SwXMLTextBlockImport(
}
SwXMLTextBlockImport::~SwXMLTextBlockImport()
- throw()
+ noexcept
{
}
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx b/sw/source/core/swg/SwXMLSectionList.cxx
index 8a58b0df0ebe..47740a6d51c0 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -88,7 +88,7 @@ SwXMLSectionList::SwXMLSectionList(const css::uno::Reference< css::uno::XCompone
}
SwXMLSectionList::~SwXMLSectionList()
- throw()
+ noexcept
{
}
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 79c3ac7fd8e7..2dd384de7f26 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -256,7 +256,7 @@ SwFmDrawPage::SwFmDrawPage( SdrPage* pPage ) :
{
}
-SwFmDrawPage::~SwFmDrawPage() throw ()
+SwFmDrawPage::~SwFmDrawPage() noexcept
{
while (!m_vShapes.empty())
m_vShapes.back()->dispose();
@@ -2709,12 +2709,12 @@ uno::Any SwXGroupShape::queryInterface( const uno::Type& rType )
return aRet;
}
-void SwXGroupShape::acquire( ) throw()
+void SwXGroupShape::acquire( ) noexcept
{
SwXShape::acquire();
}
-void SwXGroupShape::release( ) throw()
+void SwXGroupShape::release( ) noexcept
{
SwXShape::release();
}
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 2772c4cdb3fb..76318143d1e5 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3191,12 +3191,12 @@ SwXTextFrame::CreateXTextFrame(SwDoc & rDoc, SwFrameFormat *const pFrameFormat)
return CreateXFrame<text::XTextFrame, SwXTextFrame>(rDoc, pFrameFormat);
}
-void SAL_CALL SwXTextFrame::acquire( )throw()
+void SAL_CALL SwXTextFrame::acquire( )noexcept
{
SwXFrame::acquire();
}
-void SAL_CALL SwXTextFrame::release( )throw()
+void SAL_CALL SwXTextFrame::release( )noexcept
{
SwXFrame::release();
}
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index e56c88228a23..437bfe8ce6f5 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -412,7 +412,7 @@ struct SwXParagraphEnumerationImpl final : public SwXParagraphEnumeration
virtual ~SwXParagraphEnumerationImpl() override
{ m_pCursor.reset(nullptr); }
- virtual void SAL_CALL release() throw () override
+ virtual void SAL_CALL release() noexcept override
{
SolarMutexGuard g;
OWeakObject::release();
@@ -1570,7 +1570,7 @@ struct SwXTextRangesImpl final : public SwXTextRanges
}
MakeRanges();
}
- virtual void SAL_CALL release() throw () override
+ virtual void SAL_CALL release() noexcept override
{
SolarMutexGuard g;
OWeakObject::release();
@@ -1677,7 +1677,7 @@ struct SwXParaFrameEnumerationImpl final : public SwXParaFrameEnumeration
virtual css::uno::Any SAL_CALL nextElement() override;
SwXParaFrameEnumerationImpl(const SwPaM& rPaM, const enum ParaFrameMode eParaFrameMode, SwFrameFormat* const pFormat);
- virtual void SAL_CALL release() throw () override
+ virtual void SAL_CALL release() noexcept override
{
SolarMutexGuard g;
OWeakObject::release();
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index de031c5a9ec6..a88d2d4f8a98 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -514,8 +514,8 @@ public:
using SwXText::Invalidate;
// XInterface
- virtual void SAL_CALL acquire() throw() override { cppu::OWeakObject::acquire(); }
- virtual void SAL_CALL release() throw() override { cppu::OWeakObject::release(); }
+ virtual void SAL_CALL acquire() noexcept override { cppu::OWeakObject::acquire(); }
+ virtual void SAL_CALL release() noexcept override { cppu::OWeakObject::release(); }
// XTypeProvider
virtual uno::Sequence< sal_Int8 > SAL_CALL
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 3acda97229b4..4a84cfd531d5 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -434,8 +434,8 @@ public:
SwXStyle(&rPool, SfxStyleFamily::Frame, pDoc, rStyleName){}
explicit SwXFrameStyle(SwDoc *pDoc);
- virtual void SAL_CALL acquire( ) throw() override {SwXStyle::acquire();}
- virtual void SAL_CALL release( ) throw() override {SwXStyle::release();}
+ virtual void SAL_CALL acquire( ) noexcept override {SwXStyle::acquire();}
+ virtual void SAL_CALL release( ) noexcept override {SwXStyle::release();}
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 6982ddc6fbdc..395b6864318a 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -781,12 +781,12 @@ uno::Sequence< sal_Int8 > SAL_CALL SwXCell::getImplementationId( )
return css::uno::Sequence<sal_Int8>();
}
-void SAL_CALL SwXCell::acquire( ) throw()
+void SAL_CALL SwXCell::acquire( ) noexcept
{
SwXCellBaseClass::acquire();
}
-void SAL_CALL SwXCell::release( ) throw()
+void SAL_CALL SwXCell::release( ) noexcept
{
SolarMutexGuard aGuard;
@@ -1427,12 +1427,12 @@ OUString SwXTextTableCursor::getImplementationName()
sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName)
{ return cppu::supportsService(this, rServiceName); }
-void SwXTextTableCursor::acquire() throw()
+void SwXTextTableCursor::acquire() noexcept
{
SwXTextTableCursor_Base::acquire();
}
-void SwXTextTableCursor::release() throw()
+void SwXTextTableCursor::release() noexcept
{
SolarMutexGuard aGuard;
SwXTextTableCursor_Base::release();
diff --git a/sw/source/filter/inc/wwstyles.hxx b/sw/source/filter/inc/wwstyles.hxx
index 19faeaad118e..1cc6fdcc69c0 100644
--- a/sw/source/filter/inc/wwstyles.hxx
+++ b/sw/source/filter/inc/wwstyles.hxx
@@ -147,7 +147,7 @@ namespace ww
@return the sti that word would give it. stiUser if word would treat
it as a user defined style.
*/
- sti GetCanonicalStiFromStc(sal_uInt8 stc) throw();
+ sti GetCanonicalStiFromStc(sal_uInt8 stc) noexcept;
/** Find the WinWord english name from a sti index
@@ -159,7 +159,7 @@ namespace ww
@return the name word would give it if it's an inbuilt name, otherwise
NULL
*/
- const char* GetEnglishNameFromSti(sti eSti) throw();
+ const char* GetEnglishNameFromSti(sti eSti) noexcept;
/** Determine if the WinWord sti is standard Character Style
@@ -168,7 +168,7 @@ namespace ww
@return true if a known inbuild character style
*/
- bool StandardStiIsCharStyle(sti eSti) throw();
+ bool StandardStiIsCharStyle(sti eSti) noexcept;
} // namespace ww
#endif
diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx
index 68a58d856f33..36f8e8690b82 100644
--- a/sw/source/filter/ww8/fields.cxx
+++ b/sw/source/filter/ww8/fields.cxx
@@ -23,7 +23,7 @@
namespace ww
{
- const char *GetEnglishFieldName(eField eIndex) throw()
+ const char *GetEnglishFieldName(eField eIndex) noexcept
{
//0 Signifies the field names I can't find.
// #i43956# - field <eFOOTREF> = 5 should be mapped to "REF"
diff --git a/sw/source/filter/ww8/fields.hxx b/sw/source/filter/ww8/fields.hxx
index a539c645cf85..d11b92e2ad5b 100644
--- a/sw/source/filter/ww8/fields.hxx
+++ b/sw/source/filter/ww8/fields.hxx
@@ -40,7 +40,7 @@ namespace ww
@return 0 if not found, otherwise the fieldname as a C style ASCII
string
*/
-const char* GetEnglishFieldName(eField eIndex) throw();
+const char* GetEnglishFieldName(eField eIndex) noexcept;
}
#endif
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index 5da6157f732b..4c8c9bc49555 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -23,7 +23,7 @@
namespace
{
- const char **GetStiNames() throw()
+ const char **GetStiNames() noexcept
{
static const char *stiName[] =
{
@@ -128,7 +128,7 @@ namespace
namespace ww
{
- const char* GetEnglishNameFromSti(sti eSti) throw()
+ const char* GetEnglishNameFromSti(sti eSti) noexcept
{
if (eSti >= stiMax)
return nullptr;
@@ -136,7 +136,7 @@ namespace ww
return GetStiNames()[eSti];
}
- bool StandardStiIsCharStyle(sti eSti) throw()
+ bool StandardStiIsCharStyle(sti eSti) noexcept
{
switch (eSti)
{
@@ -152,7 +152,7 @@ namespace ww
}
}
- sti GetCanonicalStiFromStc(sal_uInt8 stc) throw()
+ sti GetCanonicalStiFromStc(sal_uInt8 stc) noexcept
{
if (stc == 0)
return stiNormal;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index d43182d2e93a..e23d9986b7f5 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -573,10 +573,10 @@ class WW8FieldEntry
sw::hack::Position maStartPos;
sal_uInt16 mnFieldId;
sal_uLong mnObjLocFc;
- WW8FieldEntry(SwPosition const &rPos, sal_uInt16 nFieldId) throw();
- WW8FieldEntry(const WW8FieldEntry &rOther) throw();
- WW8FieldEntry &operator=(const WW8FieldEntry &rOther) throw();
- void Swap(WW8FieldEntry &rOther) throw();
+ WW8FieldEntry(SwPosition const &rPos, sal_uInt16 nFieldId) noexcept;
+ WW8FieldEntry(const WW8FieldEntry &rOther) noexcept;
+ WW8FieldEntry &operator=(const WW8FieldEntry &rOther) noexcept;
+ void Swap(WW8FieldEntry &rOther) noexcept;
SwNodeIndex GetPtNode() const { return maStartPos.GetPtNode(); };
sal_Int32 GetPtContent() const { return maStartPos.GetPtContent(); };
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 1bd48126ed35..3aa79d63e707 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -711,23 +711,23 @@ static bool AcceptableNestedField(sal_uInt16 nFieldCode)
}
}
-WW8FieldEntry::WW8FieldEntry(SwPosition const &rPos, sal_uInt16 nFieldId) throw()
+WW8FieldEntry::WW8FieldEntry(SwPosition const &rPos, sal_uInt16 nFieldId) noexcept
: maStartPos(rPos), mnFieldId(nFieldId), mnObjLocFc(0)
{
}
-WW8FieldEntry::WW8FieldEntry(const WW8FieldEntry &rOther) throw()
+WW8FieldEntry::WW8FieldEntry(const WW8FieldEntry &rOther) noexcept
: maStartPos(rOther.maStartPos), mnFieldId(rOther.mnFieldId), mnObjLocFc(rOther.mnObjLocFc)
{
}
-void WW8FieldEntry::Swap(WW8FieldEntry &rOther) throw()
+void WW8FieldEntry::Swap(WW8FieldEntry &rOther) noexcept
{
std::swap(maStartPos, rOther.maStartPos);
std::swap(mnFieldId, rOther.mnFieldId);
}
-WW8FieldEntry &WW8FieldEntry::operator=(const WW8FieldEntry &rOther) throw()
+WW8FieldEntry &WW8FieldEntry::operator=(const WW8FieldEntry &rOther) noexcept
{
WW8FieldEntry aTemp(rOther);
Swap(aTemp);
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 387546eceda3..3ed4a25570d6 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -475,7 +475,7 @@ void SwXMLExport::ExportContent_()
GetTextParagraphExport()->exportText( xText, m_bShowProgress );
}
-const Sequence< sal_Int8 > & SwXMLExport::getUnoTunnelId() throw()
+const Sequence< sal_Int8 > & SwXMLExport::getUnoTunnelId() noexcept
{
static const UnoTunnelIdInit theSwXMLExportUnoTunnelId;
return theSwXMLExportUnoTunnelId.getSeq();
diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx
index 42c5034c3f1c..53ab4431c645 100644
--- a/sw/source/filter/xml/xmlexp.hxx
+++ b/sw/source/filter/xml/xmlexp.hxx
@@ -129,7 +129,7 @@ public:
void SetShowProgress( bool b ) { m_bShowProgress = b; }
// XUnoTunnel
- static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() noexcept;
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
const SwDoc* getDoc() const;
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 0b78e0755871..28e7e3ff9db3 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -330,7 +330,7 @@ SwXMLImport::SwXMLImport(
InitItemImport();
}
-SwXMLImport::~SwXMLImport() throw ()
+SwXMLImport::~SwXMLImport() noexcept
{
if (HasShapeImport())
{
@@ -359,7 +359,7 @@ void SwXMLImport::setStyleInsertMode( SfxStyleFamily nFamilies,
m_bLoadDoc = false;
}
-const Sequence< sal_Int8 > & SwXMLImport::getUnoTunnelId() throw()
+const Sequence< sal_Int8 > & SwXMLImport::getUnoTunnelId() noexcept
{
static const UnoTunnelIdInit theSwXMLImportUnoTunnelId;
return theSwXMLImportUnoTunnelId.getSeq();
diff --git a/sw/source/filter/xml/xmlimp.hxx b/sw/source/filter/xml/xmlimp.hxx
index 83cee154bbc0..893d6066a0a0 100644
--- a/sw/source/filter/xml/xmlimp.hxx
+++ b/sw/source/filter/xml/xmlimp.hxx
@@ -110,14 +110,14 @@ public:
const css::uno::Reference< css::uno::XComponentContext >& rContext,
OUString const & implementationName, SvXMLImportFlags nImportFlags);
- virtual ~SwXMLImport() throw() override;
+ virtual ~SwXMLImport() noexcept override;
// css::xml::sax::XDocumentHandler
virtual void SAL_CALL startDocument() override;
virtual void SAL_CALL endDocument() override;
// XUnoTunnel
- static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
+ static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() noexcept;
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
// XInitialization
diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
index 00f9a079fbb7..482b1216f753 100644
--- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
+++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx
@@ -120,12 +120,12 @@ public:
return ::cppu::queryInterface(aType, static_cast<lang::XServiceInfo*>(this));
}
- void SAL_CALL acquire() throw () override
+ void SAL_CALL acquire() noexcept override
{
ToolboxController::acquire();
}
- void SAL_CALL release() throw () override
+ void SAL_CALL release() noexcept override
{
ToolboxController::release();
}
@@ -231,12 +231,12 @@ public:
return ::cppu::queryInterface(aType, static_cast<lang::XServiceInfo*>(this));
}
- void SAL_CALL acquire() throw () override
+ void SAL_CALL acquire() noexcept override
{
ToolboxController::acquire();
}
- void SAL_CALL release() throw () override
+ void SAL_CALL release() noexcept override
{
ToolboxController::release();
}
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index 12fdd419db7d..1a11b5a40762 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -86,7 +86,7 @@ class SwXPrintSettings final : public comphelper::ChainablePropertySet
virtual void _postGetValues () override;
virtual ~SwXPrintSettings()
- throw() override;
+ noexcept override;
public:
SwXPrintSettings( SwXPrintSettingsType eType, SwDoc * pDoc = nullptr );
@@ -119,7 +119,7 @@ class SwXViewSettings final : public comphelper::ChainablePropertySet
virtual void _postGetValues () override;
virtual ~SwXViewSettings()
- throw() override;
+ noexcept override;
public:
SwXViewSettings(SwView* pView);
diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx
index 1f52f7ea6230..614f2ac2749d 100644
--- a/sw/source/uibase/inc/unotxvw.hxx
+++ b/sw/source/uibase/inc/unotxvw.hxx
@@ -79,8 +79,8 @@ public:
SwXTextView(SwView* pSwView);
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
- virtual void SAL_CALL acquire( ) throw() override;
- virtual void SAL_CALL release( ) throw() override;
+ virtual void SAL_CALL acquire( ) noexcept override;
+ virtual void SAL_CALL release( ) noexcept override;
//XTypeProvider
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index fe443c9aa99b..fb2f4f25790c 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -590,8 +590,8 @@ class NavElementToolBoxControl : public svt::ToolboxController,
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
- virtual void SAL_CALL acquire() throw () override;
- virtual void SAL_CALL release() throw () override;
+ virtual void SAL_CALL acquire() noexcept override;
+ virtual void SAL_CALL release() noexcept override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
@@ -816,12 +816,12 @@ css::uno::Any SAL_CALL NavElementToolBoxControl::queryInterface( const css::uno:
return ::cppu::queryInterface( aType, static_cast< lang::XServiceInfo* >( this ) );
}
-void SAL_CALL NavElementToolBoxControl::acquire() throw ()
+void SAL_CALL NavElementToolBoxControl::acquire() noexcept
{
ToolboxController::acquire();
}
-void SAL_CALL NavElementToolBoxControl::release() throw ()
+void SAL_CALL NavElementToolBoxControl::release() noexcept
{
ToolboxController::release();
}
@@ -966,8 +966,8 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
- virtual void SAL_CALL acquire() throw () override;
- virtual void SAL_CALL release() throw () override;
+ virtual void SAL_CALL acquire() noexcept override;
+ virtual void SAL_CALL release() noexcept override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
@@ -1005,12 +1005,12 @@ css::uno::Any SAL_CALL PrevNextScrollToolboxController::queryInterface( const cs
return ::cppu::queryInterface( aType, static_cast< css::lang::XServiceInfo* >( this ) );
}
-void SAL_CALL PrevNextScrollToolboxController::acquire() throw ()
+void SAL_CALL PrevNextScrollToolboxController::acquire() noexcept
{
ToolboxController::acquire();
}
-void SAL_CALL PrevNextScrollToolboxController::release() throw ()
+void SAL_CALL PrevNextScrollToolboxController::release() noexcept
{
ToolboxController::release();
}
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx
index 9a85ebeca264..26454819b9c1 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx
@@ -284,7 +284,7 @@ SwXDocumentSettings::SwXDocumentSettings ( SwXTextDocument * pModel )
}
SwXDocumentSettings::~SwXDocumentSettings()
- throw()
+ noexcept
{
}
@@ -302,12 +302,12 @@ Any SAL_CALL SwXDocumentSettings::queryInterface( const Type& rType )
&dynamic_cast<XTypeProvider&>(*this));
}
void SwXDocumentSettings::acquire ()
- throw ()
+ noexcept
{
OWeakObject::acquire();
}
void SwXDocumentSettings::release ()
- throw ()
+ noexcept
{
OWeakObject::release();
}
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx
index 26a123ba7fe8..3d722e40ba80 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.hxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx
@@ -54,16 +54,16 @@ class SwXDocumentSettings final :
virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) override;
virtual void _postGetValues () override;
virtual ~SwXDocumentSettings()
- throw() override;
+ noexcept override;
public:
SwXDocumentSettings( SwXTextDocument* pModel );
// XInterface
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
virtual void SAL_CALL acquire( )
- throw () override;
+ noexcept override;
virtual void SAL_CALL release( )
- throw () override;
+ noexcept override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) override;
diff --git a/sw/source/uibase/uno/unodefaults.cxx b/sw/source/uibase/uno/unodefaults.cxx
index 01e10aaaae5e..378ddc0b987e 100644
--- a/sw/source/uibase/uno/unodefaults.cxx
+++ b/sw/source/uibase/uno/unodefaults.cxx
@@ -30,9 +30,9 @@ SwSvxUnoDrawPool::SwSvxUnoDrawPool(SwDoc& rDoc)
{
}
-SwSvxUnoDrawPool::~SwSvxUnoDrawPool() throw() {}
+SwSvxUnoDrawPool::~SwSvxUnoDrawPool() noexcept {}
-SfxItemPool* SwSvxUnoDrawPool::getModelPool(bool /*bReadOnly*/) throw()
+SfxItemPool* SwSvxUnoDrawPool::getModelPool(bool /*bReadOnly*/) noexcept
{
// DVO, OD 01.10.2003 #i18732# - return item pool of writer document;
// it contains draw model item pool as secondary pool.
diff --git a/sw/source/uibase/uno/unodefaults.hxx b/sw/source/uibase/uno/unodefaults.hxx
index 14b892f94d22..91d7c8f2faa9 100644
--- a/sw/source/uibase/uno/unodefaults.hxx
+++ b/sw/source/uibase/uno/unodefaults.hxx
@@ -29,9 +29,9 @@ class SwSvxUnoDrawPool : public SvxUnoDrawPool
public:
SwSvxUnoDrawPool(SwDoc& rDoc);
- virtual ~SwSvxUnoDrawPool() throw() override;
+ virtual ~SwSvxUnoDrawPool() noexcept override;
- virtual SfxItemPool* getModelPool(bool bReadOnly) throw() override;
+ virtual SfxItemPool* getModelPool(bool bReadOnly) noexcept override;
};
#endif
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index a67a08aab16b..e2662e00e342 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -264,7 +264,7 @@ SwXPrintSettings::SwXPrintSettings(SwXPrintSettingsType eType, SwDoc* pDoc)
}
SwXPrintSettings::~SwXPrintSettings()
- throw()
+ noexcept
{
}
@@ -539,7 +539,7 @@ SwXViewSettings::SwXViewSettings(SwView* pVw)
}
SwXViewSettings::~SwXViewSettings()
- throw()
+ noexcept
{
}
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 4f82c1c5cd90..890ccdd8fcc3 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -331,12 +331,12 @@ Any SAL_CALL SwXTextDocument::queryInterface( const uno::Type& rType )
return aRet;
}
-void SAL_CALL SwXTextDocument::acquire()throw()
+void SAL_CALL SwXTextDocument::acquire()noexcept
{
SfxBaseModel::acquire();
}
-void SAL_CALL SwXTextDocument::release()throw()
+void SAL_CALL SwXTextDocument::release()noexcept
{
SfxBaseModel::release();
}
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 1874bec44ae3..3059016abdfe 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -150,12 +150,12 @@ Sequence< sal_Int8 > SAL_CALL SwXTextView::getImplementationId( )
return css::uno::Sequence<sal_Int8>();
}
-void SAL_CALL SwXTextView::acquire( )throw()
+void SAL_CALL SwXTextView::acquire( )noexcept
{
SfxBaseController::acquire();
}
-void SAL_CALL SwXTextView::release( )throw()
+void SAL_CALL SwXTextView::release( )noexcept
{
SfxBaseController::release();
}