summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-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
10 files changed, 23 insertions, 23 deletions
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