summaryrefslogtreecommitdiff
path: root/xmlscript/source/xml_helper
diff options
context:
space:
mode:
Diffstat (limited to 'xmlscript/source/xml_helper')
-rw-r--r--xmlscript/source/xml_helper/xml_byteseq.cxx32
-rw-r--r--xmlscript/source/xml_helper/xml_element.cxx6
-rw-r--r--xmlscript/source/xml_helper/xml_impctx.cxx92
3 files changed, 31 insertions, 99 deletions
diff --git a/xmlscript/source/xml_helper/xml_byteseq.cxx b/xmlscript/source/xml_helper/xml_byteseq.cxx
index 9a6254c29b38..7948e1cf0d87 100644
--- a/xmlscript/source/xml_helper/xml_byteseq.cxx
+++ b/xmlscript/source/xml_helper/xml_byteseq.cxx
@@ -44,23 +44,17 @@ public:
// XInputStream
virtual sal_Int32 SAL_CALL readBytes(
- Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead )
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception) override;
+ Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead ) override;
virtual sal_Int32 SAL_CALL readSomeBytes(
- Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead )
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception) override;
+ Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead ) override;
virtual void SAL_CALL skipBytes(
- sal_Int32 nBytesToSkip )
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL available()
- throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception) override;
- virtual void SAL_CALL closeInput()
- throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception) override;
+ sal_Int32 nBytesToSkip ) override;
+ virtual sal_Int32 SAL_CALL available() override;
+ virtual void SAL_CALL closeInput() override;
};
sal_Int32 BSeqInputStream::readBytes(
Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead )
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception)
{
nBytesToRead = ((nBytesToRead > (sal_Int32)_seq.size() - _nPos)
? _seq.size() - _nPos
@@ -77,25 +71,21 @@ sal_Int32 BSeqInputStream::readBytes(
sal_Int32 BSeqInputStream::readSomeBytes(
Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead )
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception)
{
return readBytes( rData, nMaxBytesToRead );
}
void BSeqInputStream::skipBytes(
sal_Int32 /*nBytesToSkip*/ )
- throw (io::NotConnectedException, io::BufferSizeExceededException, io::IOException, RuntimeException, std::exception)
{
}
sal_Int32 BSeqInputStream::available()
- throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception)
{
return _seq.size() - _nPos;
}
void BSeqInputStream::closeInput()
- throw (io::NotConnectedException, io::IOException, RuntimeException, std::exception)
{
}
@@ -111,16 +101,12 @@ public:
// XOutputStream
virtual void SAL_CALL writeBytes(
- Sequence< sal_Int8 > const & rData )
- throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception) override;
- virtual void SAL_CALL flush()
- throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception) override;
- virtual void SAL_CALL closeOutput()
- throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception) override;
+ Sequence< sal_Int8 > const & rData ) override;
+ virtual void SAL_CALL flush() override;
+ virtual void SAL_CALL closeOutput() override;
};
void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData )
- throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception)
{
sal_Int32 nPos = _seq->size();
_seq->resize( nPos + rData.getLength() );
@@ -129,12 +115,10 @@ void BSeqOutputStream::writeBytes( Sequence< sal_Int8 > const & rData )
rData.getLength() );
}
void BSeqOutputStream::flush()
- throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception)
{
}
void BSeqOutputStream::closeOutput()
- throw (io::NotConnectedException, io::BufferSizeExceededException, RuntimeException, std::exception)
{
}
diff --git a/xmlscript/source/xml_helper/xml_element.cxx b/xmlscript/source/xml_helper/xml_element.cxx
index 1347ac84d582..326ba5305124 100644
--- a/xmlscript/source/xml_helper/xml_element.cxx
+++ b/xmlscript/source/xml_helper/xml_element.cxx
@@ -63,20 +63,17 @@ void XMLElement::dump( Reference< xml::sax::XDocumentHandler > const & xOut )
// XAttributeList
sal_Int16 XMLElement::getLength()
- throw (RuntimeException, std::exception)
{
return static_cast<sal_Int16>(_attrNames.size());
}
OUString XMLElement::getNameByIndex( sal_Int16 nPos )
- throw (RuntimeException, std::exception)
{
OSL_ASSERT( (size_t)nPos < _attrNames.size() );
return _attrNames[ nPos ];
}
OUString XMLElement::getTypeByIndex( sal_Int16 nPos )
- throw (RuntimeException, std::exception)
{
OSL_ASSERT( (size_t)nPos < _attrNames.size() );
static_cast<void>(nPos);
@@ -85,21 +82,18 @@ OUString XMLElement::getTypeByIndex( sal_Int16 nPos )
}
OUString XMLElement::getTypeByName( OUString const & /*rName*/ )
- throw (RuntimeException, std::exception)
{
// xxx todo
return OUString();
}
OUString XMLElement::getValueByIndex( sal_Int16 nPos )
- throw (RuntimeException, std::exception)
{
OSL_ASSERT( (size_t)nPos < _attrNames.size() );
return _attrValues[ nPos ];
}
OUString XMLElement::getValueByName( OUString const & rName )
- throw (RuntimeException, std::exception)
{
for ( size_t nPos = 0; nPos < _attrNames.size(); ++nPos )
{
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index 859197517bd4..e6297e915c41 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -138,49 +138,35 @@ public:
virtual ~DocumentHandlerImpl() throw () override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw (RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService(
- OUString const & servicename )
- throw (RuntimeException, std::exception) override;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (RuntimeException, std::exception) override;
+ OUString const & servicename ) override;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XInitialization
virtual void SAL_CALL initialize(
- Sequence< Any > const & arguments )
- throw (Exception, std::exception) override;
+ Sequence< Any > const & arguments ) override;
// XDocumentHandler
- virtual void SAL_CALL startDocument()
- throw (xml::sax::SAXException, RuntimeException, std::exception) override;
- virtual void SAL_CALL endDocument()
- throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+ virtual void SAL_CALL startDocument() override;
+ virtual void SAL_CALL endDocument() override;
virtual void SAL_CALL startElement(
OUString const & rQElementName,
- Reference< xml::sax::XAttributeList > const & xAttribs )
- throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+ Reference< xml::sax::XAttributeList > const & xAttribs ) override;
virtual void SAL_CALL endElement(
- OUString const & rQElementName )
- throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+ OUString const & rQElementName ) override;
virtual void SAL_CALL characters(
- OUString const & rChars )
- throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+ OUString const & rChars ) override;
virtual void SAL_CALL ignorableWhitespace(
- OUString const & rWhitespaces )
- throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+ OUString const & rWhitespaces ) override;
virtual void SAL_CALL processingInstruction(
- OUString const & rTarget, OUString const & rData )
- throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+ OUString const & rTarget, OUString const & rData ) override;
virtual void SAL_CALL setDocumentLocator(
- Reference< xml::sax::XLocator > const & xLocator )
- throw (xml::sax::SAXException, RuntimeException, std::exception) override;
+ Reference< xml::sax::XLocator > const & xLocator ) override;
// XNamespaceMapping
- virtual sal_Int32 SAL_CALL getUidByUri( OUString const & Uri )
- throw (RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getUriByUid( sal_Int32 Uid )
- throw (container::NoSuchElementException, RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getUidByUri( OUString const & Uri ) override;
+ virtual OUString SAL_CALL getUriByUid( sal_Int32 Uid ) override;
};
DocumentHandlerImpl::DocumentHandlerImpl(
@@ -345,32 +331,23 @@ public:
virtual ~ExtendedAttributes() throw () override;
// XAttributes
- virtual sal_Int32 SAL_CALL getLength()
- throw (RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getLength() override;
virtual sal_Int32 SAL_CALL getIndexByQName(
- OUString const & rQName )
- throw (RuntimeException, std::exception) override;
+ OUString const & rQName ) override;
virtual sal_Int32 SAL_CALL getIndexByUidName(
- sal_Int32 nUid, OUString const & rLocalName )
- throw (RuntimeException, std::exception) override;
+ sal_Int32 nUid, OUString const & rLocalName ) override;
virtual OUString SAL_CALL getQNameByIndex(
- sal_Int32 nIndex )
- throw (RuntimeException, std::exception) override;
+ sal_Int32 nIndex ) override;
virtual sal_Int32 SAL_CALL getUidByIndex(
- sal_Int32 nIndex )
- throw (RuntimeException, std::exception) override;
+ sal_Int32 nIndex ) override;
virtual OUString SAL_CALL getLocalNameByIndex(
- sal_Int32 nIndex )
- throw (RuntimeException, std::exception) override;
+ sal_Int32 nIndex ) override;
virtual OUString SAL_CALL getValueByIndex(
- sal_Int32 nIndex )
- throw (RuntimeException, std::exception) override;
+ sal_Int32 nIndex ) override;
virtual OUString SAL_CALL getValueByUidName(
- sal_Int32 nUid, OUString const & rLocalName )
- throw (RuntimeException, std::exception) override;
+ sal_Int32 nUid, OUString const & rLocalName ) override;
virtual OUString SAL_CALL getTypeByIndex(
- sal_Int32 nIndex )
- throw (RuntimeException, std::exception) override;
+ sal_Int32 nIndex ) override;
};
inline ExtendedAttributes::ExtendedAttributes(
@@ -403,19 +380,16 @@ ExtendedAttributes::~ExtendedAttributes() throw ()
// XServiceInfo
OUString DocumentHandlerImpl::getImplementationName()
- throw (RuntimeException, std::exception)
{
return getImplementationName_DocumentHandlerImpl();
}
sal_Bool DocumentHandlerImpl::supportsService( OUString const & servicename )
- throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, servicename);
}
Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames()
- throw (RuntimeException, std::exception)
{
return getSupportedServiceNames_DocumentHandlerImpl();
}
@@ -424,7 +398,6 @@ Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames()
void DocumentHandlerImpl::initialize(
Sequence< Any > const & arguments )
- throw (Exception, std::exception)
{
MGuard guard( m_pMutex );
Reference< xml::input::XRoot > xRoot;
@@ -443,7 +416,6 @@ void DocumentHandlerImpl::initialize(
// XNamespaceMapping
sal_Int32 DocumentHandlerImpl::getUidByUri( OUString const & Uri )
- throw (RuntimeException, std::exception)
{
sal_Int32 uid = getUidByURI( Uri );
SAL_WARN_IF( uid == UID_UNKNOWN, "xmlscript.xmlhelper", "uid UNKNOWN");
@@ -451,7 +423,6 @@ sal_Int32 DocumentHandlerImpl::getUidByUri( OUString const & Uri )
}
OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid )
- throw (container::NoSuchElementException, RuntimeException, std::exception)
{
MGuard guard( m_pMutex );
t_OUString2LongMap::const_iterator iPos( m_URI2Uid.begin() );
@@ -467,13 +438,11 @@ OUString DocumentHandlerImpl::getUriByUid( sal_Int32 Uid )
// XDocumentHandler
void DocumentHandlerImpl::startDocument()
- throw (xml::sax::SAXException, RuntimeException, std::exception)
{
m_xRoot->startDocument( static_cast< xml::input::XNamespaceMapping * >( this ) );
}
void DocumentHandlerImpl::endDocument()
- throw (xml::sax::SAXException, RuntimeException, std::exception)
{
m_xRoot->endDocument();
}
@@ -481,7 +450,6 @@ void DocumentHandlerImpl::endDocument()
void DocumentHandlerImpl::startElement(
OUString const & rQElementName,
Reference< xml::sax::XAttributeList > const & xAttribs )
- throw (xml::sax::SAXException, RuntimeException, std::exception)
{
Reference< xml::input::XElement > xCurrentElement;
Reference< xml::input::XAttributes > xAttributes;
@@ -609,7 +577,6 @@ void DocumentHandlerImpl::startElement(
void DocumentHandlerImpl::endElement(
OUString const & rQElementName )
- throw (xml::sax::SAXException, RuntimeException, std::exception)
{
Reference< xml::input::XElement > xCurrentElement;
{
@@ -647,7 +614,6 @@ void DocumentHandlerImpl::endElement(
}
void DocumentHandlerImpl::characters( OUString const & rChars )
- throw (xml::sax::SAXException, RuntimeException, std::exception)
{
Reference< xml::input::XElement > xCurrentElement( getCurrentElement() );
if (xCurrentElement.is())
@@ -656,7 +622,6 @@ void DocumentHandlerImpl::characters( OUString const & rChars )
void DocumentHandlerImpl::ignorableWhitespace(
OUString const & rWhitespaces )
- throw (xml::sax::SAXException, RuntimeException, std::exception)
{
Reference< xml::input::XElement > xCurrentElement( getCurrentElement() );
if (xCurrentElement.is())
@@ -665,7 +630,6 @@ void DocumentHandlerImpl::ignorableWhitespace(
void DocumentHandlerImpl::processingInstruction(
OUString const & rTarget, OUString const & rData )
- throw (xml::sax::SAXException, RuntimeException, std::exception)
{
Reference< xml::input::XElement > xCurrentElement( getCurrentElement() );
if (xCurrentElement.is())
@@ -676,7 +640,6 @@ void DocumentHandlerImpl::processingInstruction(
void DocumentHandlerImpl::setDocumentLocator(
Reference< xml::sax::XLocator > const & xLocator )
- throw (xml::sax::SAXException, RuntimeException, std::exception)
{
m_xRoot->setDocumentLocator( xLocator );
}
@@ -684,7 +647,6 @@ void DocumentHandlerImpl::setDocumentLocator(
// XAttributes
sal_Int32 ExtendedAttributes::getIndexByQName( OUString const & rQName )
- throw (RuntimeException, std::exception)
{
for ( sal_Int32 nPos = m_nAttributes; nPos--; )
{
@@ -697,13 +659,11 @@ sal_Int32 ExtendedAttributes::getIndexByQName( OUString const & rQName )
}
sal_Int32 ExtendedAttributes::getLength()
- throw (RuntimeException, std::exception)
{
return m_nAttributes;
}
OUString ExtendedAttributes::getLocalNameByIndex( sal_Int32 nIndex )
- throw (RuntimeException, std::exception)
{
if (nIndex < m_nAttributes)
return m_pLocalNames[ nIndex ];
@@ -712,7 +672,6 @@ OUString ExtendedAttributes::getLocalNameByIndex( sal_Int32 nIndex )
}
OUString ExtendedAttributes::getQNameByIndex( sal_Int32 nIndex )
- throw (RuntimeException, std::exception)
{
if (nIndex < m_nAttributes)
return m_pQNames[ nIndex ];
@@ -721,7 +680,6 @@ OUString ExtendedAttributes::getQNameByIndex( sal_Int32 nIndex )
}
OUString ExtendedAttributes::getTypeByIndex( sal_Int32 nIndex )
- throw (RuntimeException, std::exception)
{
static_cast<void>(nIndex);
SAL_WARN_IF( nIndex >= m_nAttributes , "xmlscript.xmlhelper", "nIndex is bigger then m_nAttributes");
@@ -729,7 +687,6 @@ OUString ExtendedAttributes::getTypeByIndex( sal_Int32 nIndex )
}
OUString ExtendedAttributes::getValueByIndex( sal_Int32 nIndex )
- throw (RuntimeException, std::exception)
{
if (nIndex < m_nAttributes)
return m_pValues[ nIndex ];
@@ -739,7 +696,6 @@ OUString ExtendedAttributes::getValueByIndex( sal_Int32 nIndex )
sal_Int32 ExtendedAttributes::getIndexByUidName(
sal_Int32 nUid, OUString const & rLocalName )
- throw (RuntimeException, std::exception)
{
for ( sal_Int32 nPos = m_nAttributes; nPos--; )
{
@@ -752,7 +708,6 @@ sal_Int32 ExtendedAttributes::getIndexByUidName(
}
sal_Int32 ExtendedAttributes::getUidByIndex( sal_Int32 nIndex )
- throw (RuntimeException, std::exception)
{
if (nIndex < m_nAttributes)
return m_pUids[ nIndex ];
@@ -762,7 +717,6 @@ sal_Int32 ExtendedAttributes::getUidByIndex( sal_Int32 nIndex )
OUString ExtendedAttributes::getValueByUidName(
sal_Int32 nUid, OUString const & rLocalName )
- throw (RuntimeException, std::exception)
{
for ( sal_Int32 nPos = m_nAttributes; nPos--; )
{