summaryrefslogtreecommitdiff
path: root/xmloff/source/transform
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /xmloff/source/transform
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff/source/transform')
-rw-r--r--xmloff/source/transform/MutableAttrList.cxx8
-rw-r--r--xmloff/source/transform/MutableAttrList.hxx16
-rw-r--r--xmloff/source/transform/OOo2Oasis.cxx15
-rw-r--r--xmloff/source/transform/OOo2Oasis.hxx26
-rw-r--r--xmloff/source/transform/Oasis2OOo.cxx6
-rw-r--r--xmloff/source/transform/Oasis2OOo.hxx8
-rw-r--r--xmloff/source/transform/TransformerBase.cxx16
-rw-r--r--xmloff/source/transform/TransformerBase.hxx39
-rw-r--r--xmloff/source/transform/XMLFilterRegistration.hxx58
9 files changed, 71 insertions, 121 deletions
diff --git a/xmloff/source/transform/MutableAttrList.cxx b/xmloff/source/transform/MutableAttrList.cxx
index a020147ddd05..c831e6f27d21 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -71,7 +71,6 @@ namespace
// XUnoTunnel
sal_Int64 SAL_CALL XMLMutableAttributeList::getSomething(
const Sequence< sal_Int8 >& rId )
- throw( RuntimeException, std::exception )
{
if( rId.getLength() == 16 &&
0 == memcmp( theXMLMutableAttributeListUnoTunnelId::get().getSeq().getConstArray(),
@@ -83,48 +82,41 @@ sal_Int64 SAL_CALL XMLMutableAttributeList::getSomething(
}
sal_Int16 SAL_CALL XMLMutableAttributeList::getLength()
- throw( RuntimeException, std::exception )
{
return m_xAttrList->getLength();
}
OUString SAL_CALL XMLMutableAttributeList::getNameByIndex(sal_Int16 i)
- throw( RuntimeException, std::exception )
{
return m_xAttrList->getNameByIndex( i );
}
OUString SAL_CALL XMLMutableAttributeList::getTypeByIndex(sal_Int16 i)
- throw( RuntimeException, std::exception )
{
return m_xAttrList->getTypeByIndex( i );
}
OUString SAL_CALL XMLMutableAttributeList::getValueByIndex(sal_Int16 i)
- throw( RuntimeException, std::exception )
{
return m_xAttrList->getValueByIndex( i );
}
OUString SAL_CALL XMLMutableAttributeList::getTypeByName(
const OUString& rName )
- throw( RuntimeException, std::exception )
{
return m_xAttrList->getTypeByName( rName );
}
OUString SAL_CALL XMLMutableAttributeList::getValueByName(
const OUString& rName)
- throw( RuntimeException, std::exception )
{
return m_xAttrList->getValueByName( rName );
}
Reference< XCloneable > XMLMutableAttributeList::createClone()
- throw( RuntimeException, std::exception )
{
// A cloned list will be a read only list!
Reference< XCloneable > r = new SvXMLAttributeList( m_xAttrList );
diff --git a/xmloff/source/transform/MutableAttrList.hxx b/xmloff/source/transform/MutableAttrList.hxx
index f5df31659ab5..dd311560c655 100644
--- a/xmloff/source/transform/MutableAttrList.hxx
+++ b/xmloff/source/transform/MutableAttrList.hxx
@@ -47,18 +47,18 @@ public:
virtual ~XMLMutableAttributeList() override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
// css::xml::sax::XAttributeList
- virtual sal_Int16 SAL_CALL getLength() throw( css::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getTypeByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getValueByName(const OUString& aName) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Int16 SAL_CALL getLength() override;
+ virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) override;
+ virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) override;
+ virtual OUString SAL_CALL getTypeByName(const OUString& aName) override;
+ virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) override;
+ virtual OUString SAL_CALL getValueByName(const OUString& aName) override;
// css::util::XCloneable
- virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
// methods that are not contained in any interface
void SetValueByIndex( sal_Int16 i, const OUString& rValue );
diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx
index e5e188eb13a8..9d2dcf492283 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1810,7 +1810,6 @@ OOo2OasisTransformer::~OOo2OasisTransformer() throw()
}
Any OOo2OasisTransformer::queryInterface( const Type& rType )
- throw (RuntimeException, std::exception)
{
Any aRet;
if ( rType == cppu::UnoType<XImporter>::get())
@@ -1834,7 +1833,6 @@ Any OOo2OasisTransformer::queryInterface( const Type& rType )
// XImporter
void SAL_CALL OOo2OasisTransformer::setTargetDocument(
const Reference< XComponent >& xDoc )
- throw( IllegalArgumentException, RuntimeException, std::exception)
{
if( !GetDocHandler().is() )
{
@@ -1855,7 +1853,6 @@ void SAL_CALL OOo2OasisTransformer::setTargetDocument(
// XFilter
sal_Bool SAL_CALL OOo2OasisTransformer::filter(
const Sequence< PropertyValue >& aDescriptor )
- throw ( RuntimeException, std::exception)
{
Reference< XFilter> xFilter( GetDocHandler(), UNO_QUERY );
OSL_ENSURE( xFilter.is(), "doc handler is not a filter" );
@@ -1866,7 +1863,6 @@ sal_Bool SAL_CALL OOo2OasisTransformer::filter(
}
void SAL_CALL OOo2OasisTransformer::cancel( )
- throw ( RuntimeException, std::exception)
{
Reference< XFilter> xFilter( GetDocHandler(), UNO_QUERY );
OSL_ENSURE( xFilter.is(), "doc handler is not a filter" );
@@ -1877,13 +1873,11 @@ void SAL_CALL OOo2OasisTransformer::cancel( )
// XInitialize
void SAL_CALL OOo2OasisTransformer::initialize(
const Sequence< Any >& rArguments )
- throw( Exception, RuntimeException, std::exception )
{
Initialize( rArguments );
}
void SAL_CALL OOo2OasisTransformer::startDocument()
- throw( SAXException, RuntimeException, std::exception )
{
if( !GetDocHandler().is() )
{
@@ -1898,7 +1892,6 @@ void SAL_CALL OOo2OasisTransformer::startDocument()
void SAL_CALL OOo2OasisTransformer::Initialize(
const Sequence< Any >& rArguments )
- throw( Exception, RuntimeException )
{
OSL_ENSURE( !GetDocHandler().is(), "duplication initialization" );
@@ -1944,7 +1937,6 @@ namespace
// XUnoTunnel
sal_Int64 SAL_CALL OOo2OasisTransformer::getSomething( const Sequence< sal_Int8 >& rId )
- throw(RuntimeException, std::exception)
{
if( rId.getLength() == 16
&& 0 == memcmp( theOOo2OasisTransformerUnoTunnelId::get().getSeq().getConstArray(),
@@ -1960,19 +1952,16 @@ sal_Int64 SAL_CALL OOo2OasisTransformer::getSomething( const Sequence< sal_Int8
// XServiceInfo
OUString SAL_CALL OOo2OasisTransformer::getImplementationName()
- throw(RuntimeException, std::exception)
{
return m_aImplName;
}
sal_Bool SAL_CALL OOo2OasisTransformer::supportsService( const OUString& ServiceName )
- throw(RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL OOo2OasisTransformer::getSupportedServiceNames( )
- throw(RuntimeException, std::exception)
{
Sequence<OUString> aSeq(0);
return aSeq;
@@ -1980,7 +1969,7 @@ Sequence< OUString > SAL_CALL OOo2OasisTransformer::getSupportedServiceNames( )
// XTypeProvider
Sequence< css::uno::Type > SAL_CALL
- OOo2OasisTransformer::getTypes() throw(RuntimeException, std::exception)
+ OOo2OasisTransformer::getTypes()
{
Sequence< css::uno::Type > aTypes( XMLTransformerBase::getTypes() );
@@ -2010,7 +1999,6 @@ Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() th
Reference< XInterface > SAL_CALL OOo2OasisTransformer_createInstance(
const Reference< XMultiServiceFactory > & )
- throw( Exception )
{
return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer());
}
@@ -2030,7 +2018,6 @@ Sequence< OUString > SAL_CALL className##_getSupportedServiceNames() throw()\
\
Reference< XInterface > SAL_CALL className##_createInstance( \
const Reference< XMultiServiceFactory > & ) \
- throw( Exception ) \
{ \
return static_cast<cppu::OWeakObject*>(new OOo2OasisTransformer( implName, \
subServiceName )); \
diff --git a/xmloff/source/transform/OOo2Oasis.hxx b/xmloff/source/transform/OOo2Oasis.hxx
index 14c4bcfae20a..96dcb42d8f87 100644
--- a/xmloff/source/transform/OOo2Oasis.hxx
+++ b/xmloff/source/transform/OOo2Oasis.hxx
@@ -58,8 +58,7 @@ public:
// the new interfaces).
virtual css::uno::Any SAL_CALL queryInterface(
- const css::uno::Type& aType )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Type& aType ) override;
virtual void SAL_CALL acquire( ) throw () override
{ XMLTransformerBase::acquire(); };
@@ -68,34 +67,33 @@ public:
{ XMLTransformerBase::release(); };
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
// XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
// XImporter
- virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) override;
// XFilter
- virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL cancel( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL filter( const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override;
+ virtual void SAL_CALL cancel( ) override;
/// @throws css::uno::Exception
/// @throws css::uno::RuntimeException
- void SAL_CALL Initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException);
+ void SAL_CALL Initialize( const css::uno::Sequence< css::uno::Any >& aArguments );
// css::xml::sax::XDocumentHandler
- virtual void SAL_CALL startDocument()
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL startDocument() override;
virtual OUString GetEventName( const OUString& rName,
bool bForm = false ) override;
diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx
index e90126430594..b5784f520344 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -41,6 +41,7 @@
#include "AttrTransformerAction.hxx"
#include "TransformerActions.hxx"
#include "FamilyType.hxx"
+#include "XMLFilterRegistration.hxx"
#include "facreg.hxx"
#include <comphelper/servicehelper.hxx>
#include "Oasis2OOo.hxx"
@@ -1924,7 +1925,6 @@ namespace
// XUnoTunnel
sal_Int64 SAL_CALL Oasis2OOoTransformer::getSomething( const Sequence< sal_Int8 >& rId )
- throw(RuntimeException, std::exception)
{
if( rId.getLength() == 16
&& 0 == memcmp( theOasis2OOoTransformerUnoTunnelId::get().getSeq().getConstArray(),
@@ -1940,19 +1940,16 @@ sal_Int64 SAL_CALL Oasis2OOoTransformer::getSomething( const Sequence< sal_Int8
// XServiceInfo
OUString SAL_CALL Oasis2OOoTransformer::getImplementationName()
- throw(RuntimeException, std::exception)
{
return Oasis2OOoTransformer_getImplementationName();
}
sal_Bool SAL_CALL Oasis2OOoTransformer::supportsService( const OUString& ServiceName )
- throw(RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL Oasis2OOoTransformer::getSupportedServiceNames( )
- throw(RuntimeException, std::exception)
{
Sequence<OUString> aSeq(0);
return aSeq;
@@ -1975,7 +1972,6 @@ Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames()
Reference< XInterface > SAL_CALL Oasis2OOoTransformer_createInstance(
const Reference< XMultiServiceFactory > &)
- throw( Exception )
{
SAL_INFO("xmloff.transform", "Creating Oasis2OOoTransformer");
return static_cast<cppu::OWeakObject*>(new Oasis2OOoTransformer);
diff --git a/xmloff/source/transform/Oasis2OOo.hxx b/xmloff/source/transform/Oasis2OOo.hxx
index 2dd880200ec3..eac75d289224 100644
--- a/xmloff/source/transform/Oasis2OOo.hxx
+++ b/xmloff/source/transform/Oasis2OOo.hxx
@@ -45,12 +45,12 @@ public:
virtual ~Oasis2OOoTransformer() throw() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
// XUnoTunnel
- virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
virtual OUString GetEventName( const OUString& rName,
bool bForm = false ) override;
diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx
index 08c4a21d00e5..92c569af0d41 100644
--- a/xmloff/source/transform/TransformerBase.cxx
+++ b/xmloff/source/transform/TransformerBase.cxx
@@ -211,20 +211,17 @@ XMLTransformerBase::~XMLTransformerBase() throw ()
}
void SAL_CALL XMLTransformerBase::startDocument()
- throw( SAXException, RuntimeException, std::exception )
{
m_xHandler->startDocument();
}
void SAL_CALL XMLTransformerBase::endDocument()
- throw( SAXException, RuntimeException, std::exception)
{
m_xHandler->endDocument();
}
void SAL_CALL XMLTransformerBase::startElement( const OUString& rName,
const Reference< XAttributeList >& rAttrList )
- throw(SAXException, RuntimeException, std::exception)
{
SvXMLNamespaceMap *pRewindMap = nullptr;
@@ -321,7 +318,6 @@ void SAL_CALL XMLTransformerBase::endElement( const OUString&
rName
#endif
)
- throw(SAXException, RuntimeException, std::exception)
{
if( !m_pContexts.empty() )
{
@@ -355,7 +351,6 @@ rName
}
void SAL_CALL XMLTransformerBase::characters( const OUString& rChars )
- throw(SAXException, RuntimeException, std::exception)
{
if( !m_pContexts.empty() )
{
@@ -364,53 +359,47 @@ void SAL_CALL XMLTransformerBase::characters( const OUString& rChars )
}
void SAL_CALL XMLTransformerBase::ignorableWhitespace( const OUString& rWhitespaces )
- throw(SAXException, RuntimeException, std::exception)
{
m_xHandler->ignorableWhitespace( rWhitespaces );
}
void SAL_CALL XMLTransformerBase::processingInstruction( const OUString& rTarget,
const OUString& rData )
- throw(SAXException, RuntimeException, std::exception)
{
m_xHandler->processingInstruction( rTarget, rData );
}
void SAL_CALL XMLTransformerBase::setDocumentLocator( const Reference< XLocator >& rLocator )
- throw(SAXException, RuntimeException, std::exception)
{
m_xLocator = rLocator;
}
// XExtendedDocumentHandler
-void SAL_CALL XMLTransformerBase::startCDATA() throw(SAXException, RuntimeException, std::exception)
+void SAL_CALL XMLTransformerBase::startCDATA()
{
if( m_xExtHandler.is() )
m_xExtHandler->startCDATA();
}
-void SAL_CALL XMLTransformerBase::endCDATA() throw(RuntimeException, std::exception)
+void SAL_CALL XMLTransformerBase::endCDATA()
{
if( m_xExtHandler.is() )
m_xExtHandler->endCDATA();
}
void SAL_CALL XMLTransformerBase::comment( const OUString& rComment )
- throw(SAXException, RuntimeException, std::exception)
{
if( m_xExtHandler.is() )
m_xExtHandler->comment( rComment );
}
void SAL_CALL XMLTransformerBase::allowLineBreak()
- throw(SAXException, RuntimeException, std::exception)
{
if( m_xExtHandler.is() )
m_xExtHandler->allowLineBreak();
}
void SAL_CALL XMLTransformerBase::unknown( const OUString& rString )
- throw(SAXException, RuntimeException, std::exception)
{
if( m_xExtHandler.is() )
m_xExtHandler->unknown( rString );
@@ -418,7 +407,6 @@ void SAL_CALL XMLTransformerBase::unknown( const OUString& rString )
// XInitialize
void SAL_CALL XMLTransformerBase::initialize( const Sequence< Any >& aArguments )
- throw(Exception, RuntimeException, std::exception)
{
const sal_Int32 nAnyCount = aArguments.getLength();
const Any* pAny = aArguments.getConstArray();
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index 2dbb32a74950..323ddc5a55fc 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -94,37 +94,26 @@ public:
virtual ~XMLTransformerBase() throw() override;
// css::xml::sax::XDocumentHandler
- virtual void SAL_CALL startDocument()
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL endDocument()
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL startDocument() override;
+ virtual void SAL_CALL endDocument() override;
virtual void SAL_CALL startElement(const OUString& aName,
- const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs)
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL endElement(const OUString& aName)
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL characters(const OUString& aChars)
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces)
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs) override;
+ virtual void SAL_CALL endElement(const OUString& aName) override;
+ virtual void SAL_CALL characters(const OUString& aChars) override;
+ virtual void SAL_CALL ignorableWhitespace(const OUString& aWhitespaces) override;
virtual void SAL_CALL processingInstruction(const OUString& aTarget,
- const OUString& aData)
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator)
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ const OUString& aData) override;
+ virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override;
// css::xml::sax::XExtendedDocumentHandler
- virtual void SAL_CALL startCDATA() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL endCDATA() throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL comment(const OUString& sComment)
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL allowLineBreak()
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL unknown(const OUString& sString)
- throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL startCDATA() override;
+ virtual void SAL_CALL endCDATA() override;
+ virtual void SAL_CALL comment(const OUString& sComment) override;
+ virtual void SAL_CALL allowLineBreak() override;
+ virtual void SAL_CALL unknown(const OUString& sString) override;
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// C++
const css::uno::Reference< css::xml::sax::XDocumentHandler > & GetDocHandler() { return m_xHandler; }
diff --git a/xmloff/source/transform/XMLFilterRegistration.hxx b/xmloff/source/transform/XMLFilterRegistration.hxx
index 813c431288cf..67747352c621 100644
--- a/xmloff/source/transform/XMLFilterRegistration.hxx
+++ b/xmloff/source/transform/XMLFilterRegistration.hxx
@@ -26,175 +26,175 @@ OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL OOo2OasisTransformer_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL Oasis2OOoTransformer_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLAutoTextEventImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLAutoTextEventImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLAutoTextEventImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMetaImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLMathSettingsImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLMathSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMathSettingsImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLMathMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLMathMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLMathMetaImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLCalcSettingsImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLCalcSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcSettingsImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLCalcMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLCalcMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcMetaImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLCalcContentImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLCalcContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcContentImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLCalcStylesImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLCalcStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcStylesImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLCalcImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLCalcImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLCalcImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLWriterSettingsImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLWriterSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterSettingsImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLWriterMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLWriterMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterMetaImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLWriterContentImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLWriterContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterContentImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLWriterStylesImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLWriterStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterStylesImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLWriterImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLWriterImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLWriterImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLChartContentImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLChartContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartContentImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLChartStylesImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLChartStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartStylesImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLChartImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLChartImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLChartImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLDrawSettingsImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLDrawSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawSettingsImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLDrawMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLDrawMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawMetaImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLDrawContentImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLDrawContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawContentImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLDrawStylesImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLDrawStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawStylesImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLDrawImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLDrawImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLDrawImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLImpressSettingsImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLImpressSettingsImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressSettingsImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLImpressMetaImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLImpressMetaImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressMetaImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLImpressContentImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLImpressContentImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressContentImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLImpressStylesImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLImpressStylesImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressStylesImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
OUString SAL_CALL XMLImpressImportOOO_getImplementationName() throw();
css::uno::Sequence< OUString > SAL_CALL XMLImpressImportOOO_getSupportedServiceNames() throw();
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface > SAL_CALL XMLImpressImportOOO_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
+ const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr );
#endif