summaryrefslogtreecommitdiff
path: root/filter/source/svg
diff options
context:
space:
mode:
Diffstat (limited to 'filter/source/svg')
-rw-r--r--filter/source/svg/svgdialog.cxx16
-rw-r--r--filter/source/svg/svgdialog.hxx16
-rw-r--r--filter/source/svg/svgfilter.cxx10
-rw-r--r--filter/source/svg/svgfilter.hxx10
-rw-r--r--filter/source/svg/svgwriter.cxx2
-rw-r--r--filter/source/svg/svgwriter.hxx2
-rw-r--r--filter/source/svg/test/odfserializer.cxx32
-rw-r--r--filter/source/svg/test/svg2odf.cxx6
8 files changed, 47 insertions, 47 deletions
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index 9ae45d865d20..9dc9bd4efa28 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -100,7 +100,7 @@ SVGDialog::~SVGDialog()
Any SAL_CALL SVGDialog::queryInterface( const Type& rType )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
Any aReturn( OGenericUnoDialog::queryInterface( rType ) );
@@ -132,7 +132,7 @@ void SAL_CALL SVGDialog::release()
Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId()
- throw(RuntimeException)
+ throw(RuntimeException, std::exception)
{
return SVGDialog_getImplementationId();
}
@@ -140,7 +140,7 @@ Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId()
OUString SAL_CALL SVGDialog::getImplementationName()
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return SVGDialog_getImplementationName();
}
@@ -148,7 +148,7 @@ OUString SAL_CALL SVGDialog::getImplementationName()
Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames()
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return SVGDialog_getSupportedServiceNames();
}
@@ -175,7 +175,7 @@ void SVGDialog::executedDialog( sal_Int16 nExecutionResult )
Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo()
- throw(RuntimeException)
+ throw(RuntimeException, std::exception)
{
return( Reference< XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ) );
}
@@ -199,7 +199,7 @@ Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo()
Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues()
- throw ( RuntimeException )
+ throw ( RuntimeException, std::exception )
{
sal_Int32 i, nCount;
@@ -223,7 +223,7 @@ Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues()
void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rProps )
- throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
+ throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception )
{
maMediaDescriptor = rProps;
@@ -240,7 +240,7 @@ void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
void SAL_CALL SVGDialog::setSourceDocument( const Reference< XComponent >& xDoc )
- throw(IllegalArgumentException, RuntimeException)
+ throw(IllegalArgumentException, RuntimeException, std::exception)
{
mxSrcDoc = xDoc;
}
diff --git a/filter/source/svg/svgdialog.hxx b/filter/source/svg/svgdialog.hxx
index c426065ead46..8e8f59c3723f 100644
--- a/filter/source/svg/svgdialog.hxx
+++ b/filter/source/svg/svgdialog.hxx
@@ -47,28 +47,28 @@ private:
protected:
// XInterface
- virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL acquire() throw ();
virtual void SAL_CALL release() throw ();
// OGenericUnoDialog
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException);
- virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException, std::exception);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception);
virtual Dialog* createDialog( Window* pParent );
virtual void executedDialog( sal_Int16 nExecutionResult );
- virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(com::sun::star::uno::RuntimeException, std::exception);
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
// XPropertyAccess
using cppu::OPropertySetHelper::getPropertyValues;
- virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (com::sun::star::uno::RuntimeException, std::exception);
using cppu::OPropertySetHelper::setPropertyValues;
- virtual void SAL_CALL setPropertyValues( const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValues( const com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception);
// XExporter
- virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setSourceDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDoc ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception);
public:
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index e8e7df608e8a..ce6d93edf0a1 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -80,7 +80,7 @@ SVGFilter::~SVGFilter()
sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescriptor )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
Window* pFocusWindow = Application::GetFocusWindow();
@@ -244,14 +244,14 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
-void SAL_CALL SVGFilter::cancel( ) throw (RuntimeException)
+void SAL_CALL SVGFilter::cancel( ) throw (RuntimeException, std::exception)
{
}
void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc )
- throw (IllegalArgumentException, RuntimeException)
+ throw (IllegalArgumentException, RuntimeException, std::exception)
{
mxSrcDoc = xDoc;
}
@@ -259,14 +259,14 @@ void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc
void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc )
- throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException)
+ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception)
{
mxDstDoc = xDoc;
}
-OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException)
+OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException, std::exception)
{
uno::Reference< io::XInputStream > xInput;
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index 9c5a0587c343..7dfbb7767e66 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -312,17 +312,17 @@ private:
protected:
// XFilter
- virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException);
- virtual void SAL_CALL cancel( ) throw (RuntimeException);
+ virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& rDescriptor ) throw(RuntimeException, std::exception);
+ virtual void SAL_CALL cancel( ) throw (RuntimeException, std::exception);
// XImporter
- virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
+ virtual void SAL_CALL setTargetDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception);
// XExporter
- virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException);
+ virtual void SAL_CALL setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException, std::exception);
// XExtendedFilterDetection
- virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException);
+ virtual OUString SAL_CALL detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException, std::exception);
public:
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index a124abf2d726..ec7d5e186229 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -3632,7 +3632,7 @@ SVGWriter::~SVGWriter()
void SAL_CALL SVGWriter::write( const Reference<XDocumentHandler>& rxDocHandler,
- const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException )
+ const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception )
{
SvMemoryStream aMemStm( (char*) rMtfSeq.getConstArray(), rMtfSeq.getLength(), STREAM_READ );
GDIMetaFile aMtf;
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 85ec20ecd73e..a5ac3092f0b0 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -416,7 +416,7 @@ public:
// XSVGWriter
virtual void SAL_CALL write( const Reference<XDocumentHandler>& rxDocHandler,
- const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException );
+ const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException, std::exception );
};
#endif
diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx
index b49f82b78893..6d16a35d7852 100644
--- a/filter/source/svg/test/odfserializer.cxx
+++ b/filter/source/svg/test/odfserializer.cxx
@@ -47,14 +47,14 @@ public:
m_aLineFeed[0] = '\n';
}
- virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException);
- virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException);
- virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException);
- virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException);
- virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException);
- virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException);
- virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException);
- virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException);
+ virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception);
+ virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception);
+ virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception);
+ virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception);
+ virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception);
+ virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception);
+ virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception);
+ virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception);
private:
uno::Reference<io::XOutputStream> m_xOutStream;
@@ -62,7 +62,7 @@ private:
uno::Sequence<sal_Int8> m_aBuf;
};
-void SAL_CALL ODFSerializer::startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException)
+void SAL_CALL ODFSerializer::startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
{
OSL_PRECOND(m_xOutStream.is(), "ODFSerializer(): invalid output stream");
@@ -71,11 +71,11 @@ void SAL_CALL ODFSerializer::startDocument( ) throw (xml::sax::SAXException, un
characters(aElement.makeStringAndClear());
}
-void SAL_CALL ODFSerializer::endDocument() throw (xml::sax::SAXException, uno::RuntimeException)
+void SAL_CALL ODFSerializer::endDocument() throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
{}
void SAL_CALL ODFSerializer::startElement( const OUString& aName,
- const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException)
+ const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
{
OUStringBuffer aElement("<" + aName + " ");
@@ -87,12 +87,12 @@ void SAL_CALL ODFSerializer::startElement( const OUString& aName,
characters(aElement.makeStringAndClear() + ">");
}
-void SAL_CALL ODFSerializer::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException)
+void SAL_CALL ODFSerializer::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
{
characters("</" + aName + ">");
}
-void SAL_CALL ODFSerializer::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException)
+void SAL_CALL ODFSerializer::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
{
const OString aStr = OUStringToOString(aChars,
RTL_TEXTENCODING_UTF8);
@@ -106,17 +106,17 @@ void SAL_CALL ODFSerializer::characters( const OUString& aChars ) throw (xml::sa
m_xOutStream->writeBytes(m_aLineFeed);
}
-void SAL_CALL ODFSerializer::ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException)
+void SAL_CALL ODFSerializer::ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
{
// TODO(F1): Make pretty printing configurable
characters(aWhitespaces);
}
void SAL_CALL ODFSerializer::processingInstruction( const OUString&,
- const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException)
+ const OUString& ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
{}
-void SAL_CALL ODFSerializer::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException)
+void SAL_CALL ODFSerializer::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& ) throw (xml::sax::SAXException, uno::RuntimeException, std::exception)
{}
uno::Reference< xml::sax::XDocumentHandler> createSerializer(const uno::Reference<io::XOutputStream>& xOut )
diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx
index 1aaf4e118ba9..33b308c5aebf 100644
--- a/filter/source/svg/test/svg2odf.cxx
+++ b/filter/source/svg/test/svg2odf.cxx
@@ -46,18 +46,18 @@ namespace
maFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write );
}
- virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception)
{
sal_uInt64 nBytesWritten(0);
maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten);
}
- virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception)
{
}
- virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception)
{
maFile.close();
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 08:54:32 +0000