summaryrefslogtreecommitdiff
path: root/package/source/manifest
diff options
context:
space:
mode:
Diffstat (limited to 'package/source/manifest')
-rw-r--r--package/source/manifest/ManifestImport.cxx13
-rw-r--r--package/source/manifest/ManifestImport.hxx34
-rw-r--r--package/source/manifest/ManifestReader.cxx4
-rw-r--r--package/source/manifest/ManifestReader.hxx12
-rw-r--r--package/source/manifest/ManifestWriter.cxx4
-rw-r--r--package/source/manifest/ManifestWriter.hxx12
6 files changed, 21 insertions, 58 deletions
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 1b171bc6ffe3..ebf93bff36f0 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -96,17 +96,14 @@ ManifestImport::~ManifestImport()
}
void SAL_CALL ManifestImport::startDocument( )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
{
}
void SAL_CALL ManifestImport::endDocument( )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
{
}
void ManifestImport::doFileEntry(StringHashMap &rConvertedAttribs)
-throw( uno::RuntimeException )
{
aSequence.resize(PKG_SIZE_ENCR_MNFST);
@@ -130,7 +127,6 @@ throw( uno::RuntimeException )
}
void ManifestImport::doEncryptionData(StringHashMap &rConvertedAttribs)
-throw( uno::RuntimeException )
{
// If this element exists, then this stream is encrypted and we need
// to import the initialisation vector, salt and iteration count used
@@ -157,7 +153,6 @@ throw( uno::RuntimeException )
}
void ManifestImport::doAlgorithm(StringHashMap &rConvertedAttribs)
-throw( uno::RuntimeException )
{
if ( !bIgnoreEncryptData ) {
OUString aString = rConvertedAttribs[sAlgorithmNameAttribute];
@@ -193,7 +188,6 @@ throw( uno::RuntimeException )
}
void ManifestImport::doKeyDerivation(StringHashMap &rConvertedAttribs)
-throw( uno::RuntimeException )
{
if ( !bIgnoreEncryptData ) {
OUString aString = rConvertedAttribs[sKeyDerivationNameAttribute];
@@ -226,7 +220,6 @@ throw( uno::RuntimeException )
}
void ManifestImport::doStartKeyAlg(StringHashMap &rConvertedAttribs)
-throw( uno::RuntimeException )
{
OUString aString = rConvertedAttribs[sStartKeyAlgNameAttribute];
if (aString.equals(sSHA256_URL) || aString.equals(sSHA256_URL_ODF12)) {
@@ -240,7 +233,6 @@ throw( uno::RuntimeException )
}
void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
{
StringHashMap aConvertedAttribs;
OUString aConvertedName = PushNameAndNamespaces( aName, xAttribs, aConvertedAttribs );
@@ -305,7 +297,6 @@ bool isEmpty(const css::beans::PropertyValue &rProp)
}
void SAL_CALL ManifestImport::endElement( const OUString& aName )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
{
OUString aConvertedName = ConvertName( aName );
if ( !aStack.empty() && aStack.rbegin()->m_aConvertedName.equals( aConvertedName ) ) {
@@ -325,22 +316,18 @@ throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
}
void SAL_CALL ManifestImport::characters( const OUString& /*aChars*/ )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
{
}
void SAL_CALL ManifestImport::ignorableWhitespace( const OUString& /*aWhitespaces*/ )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
{
}
void SAL_CALL ManifestImport::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
{
}
void SAL_CALL ManifestImport::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ )
-throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
{
}
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 1263af34a577..094e7d70d103 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/package/source/manifest/ManifestImport.hxx
@@ -117,33 +117,25 @@ protected:
public:
ManifestImport( std::vector < css::uno::Sequence < css::beans::PropertyValue > > & rNewVector );
virtual ~ManifestImport() override;
- 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 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;
- 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;
+ 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 ) 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 ) override;
+ virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override;
private:
/// @throws css::uno::RuntimeException
- void doFileEntry(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException);
+ void doFileEntry(StringHashMap &rConvertedAttribs);
/// @throws css::uno::RuntimeException
- void doEncryptionData(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException);
+ void doEncryptionData(StringHashMap &rConvertedAttribs);
/// @throws css::uno::RuntimeException
- void doAlgorithm(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException);
+ void doAlgorithm(StringHashMap &rConvertedAttribs);
/// @throws css::uno::RuntimeException
- void doKeyDerivation(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException);
+ void doKeyDerivation(StringHashMap &rConvertedAttribs);
/// @throws css::uno::RuntimeException
- void doStartKeyAlg(StringHashMap &rConvertedAttribs) throw(css::uno::RuntimeException);
+ void doStartKeyAlg(StringHashMap &rConvertedAttribs);
};
#endif
diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx
index 7ca27786d194..f1661d12a6dc 100644
--- a/package/source/manifest/ManifestReader.cxx
+++ b/package/source/manifest/ManifestReader.cxx
@@ -47,7 +47,6 @@ ManifestReader::~ManifestReader()
{
}
Sequence< Sequence< PropertyValue > > SAL_CALL ManifestReader::readManifestSequence( const Reference< XInputStream >& rStream )
- throw (css::uno::RuntimeException, std::exception)
{
Sequence < Sequence < PropertyValue > > aManifestSequence;
Reference < XParser > xParser = Parser::create(m_xContext);
@@ -95,19 +94,16 @@ Sequence < OUString > ManifestReader::static_getSupportedServiceNames()
}
OUString ManifestReader::getImplementationName()
- throw (RuntimeException, std::exception)
{
return static_getImplementationName();
}
sal_Bool SAL_CALL ManifestReader::supportsService(OUString const & rServiceName)
- throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName );
}
Sequence < OUString > ManifestReader::getSupportedServiceNames()
- throw (RuntimeException, std::exception)
{
return static_getSupportedServiceNames();
}
diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx
index ba9221d5a77e..ba3ad1a1bef2 100644
--- a/package/source/manifest/ManifestReader.hxx
+++ b/package/source/manifest/ManifestReader.hxx
@@ -43,16 +43,12 @@ public:
virtual ~ManifestReader() override;
// XManifestReader
- virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL readManifestSequence( const css::uno::Reference< css::io::XInputStream >& rStream )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL readManifestSequence( const css::uno::Reference< css::io::XInputStream >& rStream ) 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;
// Component constructor
static OUString static_getImplementationName();
diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx
index 0e40d999356f..aa73e2c9e092 100644
--- a/package/source/manifest/ManifestWriter.cxx
+++ b/package/source/manifest/ManifestWriter.cxx
@@ -55,7 +55,6 @@ ManifestWriter::~ManifestWriter()
// XManifestWriter methods
void SAL_CALL ManifestWriter::writeManifestSequence( const Reference< XOutputStream >& rStream, const Sequence< Sequence< PropertyValue > >& rSequence )
- throw (RuntimeException, std::exception)
{
Reference < XWriter > xSource = Writer::create( m_xContext );
xSource->setOutputStream ( rStream );
@@ -86,18 +85,15 @@ Sequence < OUString > ManifestWriter::static_getSupportedServiceNames()
}
OUString ManifestWriter::getImplementationName()
- throw (RuntimeException, std::exception)
{
return static_getImplementationName();
}
sal_Bool SAL_CALL ManifestWriter::supportsService(OUString const & rServiceName)
- throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
Sequence < OUString > ManifestWriter::getSupportedServiceNames()
- throw (RuntimeException, std::exception)
{
return static_getSupportedServiceNames();
}
diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx
index 0a63befb89f5..ef16d311b6ba 100644
--- a/package/source/manifest/ManifestWriter.hxx
+++ b/package/source/manifest/ManifestWriter.hxx
@@ -43,16 +43,12 @@ public:
virtual ~ManifestWriter() override;
// XManifestWriter
- virtual void SAL_CALL writeManifestSequence( const css::uno::Reference< css::io::XOutputStream >& rStream, const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL writeManifestSequence( const css::uno::Reference< css::io::XOutputStream >& rStream, const css::uno::Sequence< css::uno::Sequence< css::beans::PropertyValue > >& rSequence ) 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;
// Component constructor
static OUString static_getImplementationName();
generated by cgit (git 2.34.1) at 2024-12-26 23:21:45 +0000