summaryrefslogtreecommitdiff
path: root/xmloff
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 /xmloff
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 'xmloff')
-rw-r--r--xmloff/inc/PropertySetMerger.hxx2
-rw-r--r--xmloff/inc/SchXMLImport.hxx2
-rw-r--r--xmloff/inc/XMLEmbeddedObjectExportFilter.hxx4
-rw-r--r--xmloff/inc/xmlversion.hxx2
-rw-r--r--xmloff/source/chart/SchXMLImport.cxx2
-rw-r--r--xmloff/source/core/PropertySetMerger.cxx2
-rw-r--r--xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx4
-rw-r--r--xmloff/source/core/unoatrcn.cxx2
-rw-r--r--xmloff/source/core/xmlimp.cxx6
-rw-r--r--xmloff/source/draw/animationimport.cxx8
-rw-r--r--xmloff/source/draw/shapeexport.cxx2
-rw-r--r--xmloff/source/meta/xmlversion.cxx2
-rw-r--r--xmloff/source/text/XMLAutoTextEventImport.cxx2
-rw-r--r--xmloff/source/text/XMLAutoTextEventImport.hxx2
-rw-r--r--xmloff/source/transform/MutableAttrList.cxx2
-rw-r--r--xmloff/source/transform/MutableAttrList.hxx2
-rw-r--r--xmloff/source/transform/OOo2Oasis.cxx6
-rw-r--r--xmloff/source/transform/OOo2Oasis.hxx10
-rw-r--r--xmloff/source/transform/Oasis2OOo.cxx6
-rw-r--r--xmloff/source/transform/Oasis2OOo.hxx6
-rw-r--r--xmloff/source/transform/TransformerBase.cxx4
-rw-r--r--xmloff/source/transform/TransformerBase.hxx4
22 files changed, 41 insertions, 41 deletions
diff --git a/xmloff/inc/PropertySetMerger.hxx b/xmloff/inc/PropertySetMerger.hxx
index dba99d5b1b37..f002f4c8f639 100644
--- a/xmloff/inc/PropertySetMerger.hxx
+++ b/xmloff/inc/PropertySetMerger.hxx
@@ -23,6 +23,6 @@
extern css::uno::Reference<css::beans::XPropertySet> PropertySetMerger_CreateInstance(
const css::uno::Reference<css::beans::XPropertySet>& rPropSet1,
- const css::uno::Reference<css::beans::XPropertySet>& rPropSet2) throw();
+ const css::uno::Reference<css::beans::XPropertySet>& rPropSet2) noexcept;
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 71c85511d85f..b61b038be7d4 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -35,7 +35,7 @@ public:
SchXMLImport(const css::uno::Reference<css::uno::XComponentContext>& xContext,
OUString const& implementationName, SvXMLImportFlags nImportFlags);
- virtual ~SchXMLImport() throw() override;
+ virtual ~SchXMLImport() noexcept override;
SvXMLImportContext* CreateStylesContext();
diff --git a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx b/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
index 1513215fb776..c21321321af6 100644
--- a/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
+++ b/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx
@@ -34,8 +34,8 @@ class XMLEmbeddedObjectExportFilter final : public cppu::WeakImplHelper<
css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > xExtHandler;
public:
- XMLEmbeddedObjectExportFilter( const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler ) throw();
- virtual ~XMLEmbeddedObjectExportFilter () throw() override;
+ XMLEmbeddedObjectExportFilter( const css::uno::Reference< css::xml::sax::XDocumentHandler > & rHandler ) noexcept;
+ virtual ~XMLEmbeddedObjectExportFilter () noexcept override;
// css::xml::sax::XDocumentHandler
virtual void SAL_CALL startDocument() override;
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index e3e696434604..284e998c5bf1 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -59,7 +59,7 @@ public:
XMLVersionListImport(
const css::uno::Reference< css::uno::XComponentContext >& rContext,
css::uno::Sequence < css::util::RevisionTag >& rVersions );
- virtual ~XMLVersionListImport() throw() override;
+ virtual ~XMLVersionListImport() noexcept override;
css::uno::Sequence < css::util::RevisionTag >&
GetList() { return maVersions; }
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 893e83fa3a95..d0523a39dc02 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -248,7 +248,7 @@ SchXMLImport::SchXMLImport(
GetNamespaceMap().Add( GetXMLToken(XML_NP_CHART_EXT), GetXMLToken(XML_N_CHART_EXT), XML_NAMESPACE_CHART_EXT);
}
-SchXMLImport::~SchXMLImport() throw ()
+SchXMLImport::~SchXMLImport() noexcept
{
uno::Reference< chart2::XChartDocument > xChartDoc( GetModel(), uno::UNO_QUERY );
if( xChartDoc.is() && xChartDoc->hasControllersLocked() )
diff --git a/xmloff/source/core/PropertySetMerger.cxx b/xmloff/source/core/PropertySetMerger.cxx
index 812201024c86..bef82ea39923 100644
--- a/xmloff/source/core/PropertySetMerger.cxx
+++ b/xmloff/source/core/PropertySetMerger.cxx
@@ -223,7 +223,7 @@ sal_Bool SAL_CALL PropertySetMergerImpl::hasPropertyByName( const OUString& Name
return mxPropSet2Info->hasPropertyByName( Name );
}
-Reference< XPropertySet > PropertySetMerger_CreateInstance( const Reference< XPropertySet >& rPropSet1, const Reference< XPropertySet >& rPropSet2 ) throw()
+Reference< XPropertySet > PropertySetMerger_CreateInstance( const Reference< XPropertySet >& rPropSet1, const Reference< XPropertySet >& rPropSet2 ) noexcept
{
return new PropertySetMergerImpl( rPropSet1, rPropSet2 );
}
diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
index e89c192a052f..78f302db2d27 100644
--- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
+++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx
@@ -25,13 +25,13 @@ using namespace ::com::sun::star::xml::sax;
XMLEmbeddedObjectExportFilter::XMLEmbeddedObjectExportFilter(
- const Reference< XDocumentHandler > & rHandler ) throw() :
+ const Reference< XDocumentHandler > & rHandler ) noexcept :
xHandler( rHandler ),
xExtHandler( rHandler, UNO_QUERY )
{
}
-XMLEmbeddedObjectExportFilter::~XMLEmbeddedObjectExportFilter () throw()
+XMLEmbeddedObjectExportFilter::~XMLEmbeddedObjectExportFilter () noexcept
{
}
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 5b709d1bc588..001033b711c3 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -86,7 +86,7 @@ sal_uInt16 SvUnoAttributeContainer::getIndexByName(const OUString& aName ) const
return USHRT_MAX;
}
-const css::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::getUnoTunnelId() throw()
+const css::uno::Sequence< sal_Int8 > & SvUnoAttributeContainer::getUnoTunnelId() noexcept
{
static const UnoTunnelIdInit theSvUnoAttributeContainerUnoTunnelId;
return theSvUnoAttributeContainerUnoTunnelId.getSeq();
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 980891ffc175..9bd811775185 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -433,7 +433,7 @@ SvXMLImport::SvXMLImport(
maNamespaceAttrList = new comphelper::AttributeList;
}
-void SvXMLImport::cleanup() throw ()
+void SvXMLImport::cleanup() noexcept
{
if (mxEventListener.is() && mxModel.is())
mxModel->removeEventListener(mxEventListener);
@@ -451,7 +451,7 @@ void SvXMLImport::cleanup() throw ()
DisposingModel();
}
-SvXMLImport::~SvXMLImport() throw ()
+SvXMLImport::~SvXMLImport() noexcept
{
cleanup();
}
@@ -465,7 +465,7 @@ bool SvXMLImport::addEmbeddedFont(const css::uno::Reference< css::io::XInputStre
return mxEmbeddedFontHelper->addEmbeddedFont(stream, fontName, extra, key, eot);
}
-const css::uno::Sequence<sal_Int8>& SvXMLImport::getUnoTunnelId() throw()
+const css::uno::Sequence<sal_Int8>& SvXMLImport::getUnoTunnelId() noexcept
{
static const UnoTunnelIdInit theSvXMLImportUnoTunnelId;
return theSvXMLImportUnoTunnelId.getSeq();
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index c648e8133a2f..f39922967f48 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -1195,8 +1195,8 @@ public:
// XInterface
virtual Any SAL_CALL queryInterface( const 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;
// XAnimationNodeSupplier
Reference< XAnimationNode > SAL_CALL getAnimationNode() override;
@@ -1229,12 +1229,12 @@ Any SAL_CALL AnimationsImport::queryInterface( const Type& aType )
}
}
-void SAL_CALL AnimationsImport::acquire() throw ()
+void SAL_CALL AnimationsImport::acquire() noexcept
{
SvXMLImport::acquire();
}
-void SAL_CALL AnimationsImport::release() throw ()
+void SAL_CALL AnimationsImport::release() noexcept
{
SvXMLImport::release();
}
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 37d49afd1f12..cd334405d030 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1051,7 +1051,7 @@ void FixZOrder(uno::Reference<drawing::XShapes> const& xShapes,
} // namespace xmloff
-void XMLShapeExport::seekShapes( const uno::Reference< drawing::XShapes >& xShapes ) throw()
+void XMLShapeExport::seekShapes( const uno::Reference< drawing::XShapes >& xShapes ) noexcept
{
if( xShapes.is() )
{
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 1276e0e6fcdf..833db28db721 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -108,7 +108,7 @@ XMLVersionListImport::XMLVersionListImport(
{
}
-XMLVersionListImport::~XMLVersionListImport() throw()
+XMLVersionListImport::~XMLVersionListImport() noexcept
{}
SvXMLImportContext *XMLVersionListImport::CreateFastContext( sal_Int32 nElement,
diff --git a/xmloff/source/text/XMLAutoTextEventImport.cxx b/xmloff/source/text/XMLAutoTextEventImport.cxx
index 09cce6ffd0ae..b1873e4c47a5 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.cxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.cxx
@@ -46,7 +46,7 @@ XMLAutoTextEventImport::XMLAutoTextEventImport(
{
}
-XMLAutoTextEventImport::~XMLAutoTextEventImport() throw() {}
+XMLAutoTextEventImport::~XMLAutoTextEventImport() noexcept {}
void XMLAutoTextEventImport::initialize(const Sequence<Any>& rArguments)
{
diff --git a/xmloff/source/text/XMLAutoTextEventImport.hxx b/xmloff/source/text/XMLAutoTextEventImport.hxx
index 58a2ee785993..b79b231c5308 100644
--- a/xmloff/source/text/XMLAutoTextEventImport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventImport.hxx
@@ -43,7 +43,7 @@ public:
explicit XMLAutoTextEventImport(
const css::uno::Reference< css::uno::XComponentContext >& xContext);
- virtual ~XMLAutoTextEventImport() throw() override;
+ virtual ~XMLAutoTextEventImport() noexcept override;
// XInitialization
virtual void SAL_CALL initialize(
diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index a8a55990a59c..fc11fb964716 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -57,7 +57,7 @@ XMLMutableAttributeList::~XMLMutableAttributeList()
m_xAttrList = nullptr;
}
-const css::uno::Sequence<sal_Int8>& XMLMutableAttributeList::getUnoTunnelId() throw()
+const css::uno::Sequence<sal_Int8>& XMLMutableAttributeList::getUnoTunnelId() noexcept
{
static const UnoTunnelIdInit theXMLMutableAttributeListUnoTunnelId;
return theXMLMutableAttributeListUnoTunnelId.getSeq();
diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx
index 6c72fd9112c1..c025ffc5cc94 100644
--- a/xmloff/source/transform/MutableAttrList.hxx
+++ b/xmloff/source/transform/MutableAttrList.hxx
@@ -47,7 +47,7 @@ public:
virtual ~XMLMutableAttributeList() 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;
// css::xml::sax::XAttributeList
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index ff947c0731ef..5495864bf120 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1768,7 +1768,7 @@ OUString OOo2OasisTransformer::GetEventName( const OUString& rName, bool )
OOo2OasisTransformer::OOo2OasisTransformer( OUString const & rImplName,
OUString const & rSubServiceName )
- throw() :
+ noexcept :
XMLTransformerBase( aActionTable, aTokenMap ),
m_aImplName(rImplName),
m_aSubServiceName(rSubServiceName),
@@ -1823,7 +1823,7 @@ OOo2OasisTransformer::OOo2OasisTransformer( OUString const & rImplName,
rp.reset();
}
-OOo2OasisTransformer::~OOo2OasisTransformer() throw()
+OOo2OasisTransformer::~OOo2OasisTransformer() noexcept
{
for(auto & rp : m_aActions)
rp.reset();
@@ -1944,7 +1944,7 @@ void OOo2OasisTransformer::Initialize(
}
}
-const css::uno::Sequence<sal_Int8>& OOo2OasisTransformer::getUnoTunnelId() throw()
+const css::uno::Sequence<sal_Int8>& OOo2OasisTransformer::getUnoTunnelId() noexcept
{
static const UnoTunnelIdInit theOOo2OasisTransformerUnoTunnelId;
return theOOo2OasisTransformerUnoTunnelId.getSeq();
diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx
index 64ce800f9199..43d69853f4ef 100644
--- a/xmloff/source/transform/OOo2Oasis.hxx
+++ b/xmloff/source/transform/OOo2Oasis.hxx
@@ -47,8 +47,8 @@ protected:
public:
OOo2OasisTransformer( OUString const & rImplName,
- OUString const & rSubServiceName ) throw();
- virtual ~OOo2OasisTransformer() throw() override;
+ OUString const & rSubServiceName ) noexcept;
+ virtual ~OOo2OasisTransformer() noexcept override;
// XInterface
@@ -59,10 +59,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
{ XMLTransformerBase::acquire(); };
- virtual void SAL_CALL release( ) throw () override
+ virtual void SAL_CALL release( ) noexcept override
{ XMLTransformerBase::release(); };
// XInitialization
@@ -78,7 +78,7 @@ public:
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) 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;
// XImporter
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index c74013307d68..ceb5daeffcfd 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -1878,7 +1878,7 @@ OUString Oasis2OOoTransformer::GetEventName( const OUString& rName,
bForm ? m_pFormEventMap : nullptr );
}
-Oasis2OOoTransformer::Oasis2OOoTransformer() throw() :
+Oasis2OOoTransformer::Oasis2OOoTransformer() noexcept :
XMLTransformerBase( aActionTable, aTokenMap ),
m_pEventMap( nullptr ),
m_pFormEventMap( nullptr )
@@ -1935,7 +1935,7 @@ Oasis2OOoTransformer::Oasis2OOoTransformer() throw() :
rp.reset();
}
-Oasis2OOoTransformer::~Oasis2OOoTransformer() throw()
+Oasis2OOoTransformer::~Oasis2OOoTransformer() noexcept
{
for(auto & rp : m_aActions)
rp.reset();
@@ -1943,7 +1943,7 @@ Oasis2OOoTransformer::~Oasis2OOoTransformer() throw()
XMLEventOASISTransformerContext::FlushEventMap( m_pFormEventMap );
}
-const css::uno::Sequence<sal_Int8>& Oasis2OOoTransformer::getUnoTunnelId() throw()
+const css::uno::Sequence<sal_Int8>& Oasis2OOoTransformer::getUnoTunnelId() noexcept
{
static const class UnoTunnelIdInit theOasis2OOoTransformerUnoTunnelId;
return theOasis2OOoTransformerUnoTunnelId.getSeq();
diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx
index c7d4ba6d349d..fe3db7ceafa8 100644
--- a/xmloff/source/transform/Oasis2OOo.hxx
+++ b/xmloff/source/transform/Oasis2OOo.hxx
@@ -40,8 +40,8 @@ protected:
virtual XMLTransformerActions *GetUserDefinedActions( sal_uInt16 n ) override;
public:
- Oasis2OOoTransformer () throw();
- virtual ~Oasis2OOoTransformer() throw() override;
+ Oasis2OOoTransformer () noexcept;
+ virtual ~Oasis2OOoTransformer() noexcept override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) override;
@@ -49,7 +49,7 @@ public:
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) 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;
virtual OUString GetEventName( const OUString& rName,
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 15a5859f95ef..c937e00ca2c4 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -175,7 +175,7 @@ XMLTransformerActions *XMLTransformerBase::GetUserDefinedActions( sal_uInt16 )
XMLTransformerBase::XMLTransformerBase( XMLTransformerActionInit const *pInit,
::xmloff::token::XMLTokenEnum const *pTKMapInit )
- throw () :
+ noexcept :
m_pNamespaceMap( new SvXMLNamespaceMap ),
m_ElemActions( pInit ),
m_TokenMap( pTKMapInit )
@@ -189,7 +189,7 @@ XMLTransformerBase::XMLTransformerBase( XMLTransformerActionInit const *pInit,
GetNamespaceMap().Add( GetXMLToken(XML_NP_OOOC), GetXMLToken(XML_N_OOOC), XML_NAMESPACE_OOOC );
}
-XMLTransformerBase::~XMLTransformerBase() throw ()
+XMLTransformerBase::~XMLTransformerBase() noexcept
{
}
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index ae360165e403..8fb4e6adfd69 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -77,8 +77,8 @@ protected:
public:
XMLTransformerBase( XMLTransformerActionInit const *pInit,
- ::xmloff::token::XMLTokenEnum const *pTKMapInit ) throw();
- virtual ~XMLTransformerBase() throw() override;
+ ::xmloff::token::XMLTokenEnum const *pTKMapInit ) noexcept;
+ virtual ~XMLTransformerBase() noexcept override;
// css::xml::sax::XDocumentHandler
virtual void SAL_CALL startDocument() override;