summaryrefslogtreecommitdiff
path: root/filter/source/t602
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /filter/source/t602
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'filter/source/t602')
-rw-r--r--filter/source/t602/t602filter.cxx32
-rw-r--r--filter/source/t602/t602filter.hxx34
2 files changed, 33 insertions, 33 deletions
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index 213d3c1a74f5..1d9550dcc856 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -140,7 +140,7 @@ T602ImportFilter::~T602ImportFilter()
// XExtendedTypeDetection
OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor)
- throw(RuntimeException)
+ throw(RuntimeException, std::exception)
{
sal_Int32 nLength = Descriptor.getLength();
const PropertyValue * pValue = Descriptor.getConstArray();
@@ -168,21 +168,21 @@ OUString T602ImportFilter::detect( Sequence<PropertyValue>& Descriptor)
// XFilter
sal_Bool SAL_CALL T602ImportFilter::filter( const Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return importImpl ( aDescriptor );
}
// XImporter
void SAL_CALL T602ImportFilter::setTargetDocument( const Reference< ::com::sun::star::lang::XComponent >& xDoc )
- throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException)
+ throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException, std::exception)
{
mxDoc = xDoc;
}
// XInitialization
void SAL_CALL T602ImportFilter::initialize( const Sequence< Any >& aArguments )
- throw (Exception, RuntimeException)
+ throw (Exception, RuntimeException, std::exception)
{
Sequence < PropertyValue > aAnySeq;
sal_Int32 nLength = aArguments.getLength();
@@ -842,19 +842,19 @@ void T602ImportFilter::Read602()
// XServiceInfo
OUString SAL_CALL T602ImportFilter::getImplementationName( )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return T602ImportFilter_getImplementationName();
}
sal_Bool SAL_CALL T602ImportFilter::supportsService( const OUString& rServiceName )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return cppu::supportsService( this, rServiceName );
}
Sequence< OUString > SAL_CALL T602ImportFilter::getSupportedServiceNames( )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return T602ImportFilter_getSupportedServiceNames();
}
@@ -893,14 +893,14 @@ T602ImportFilterDialog::~T602ImportFilterDialog()
// XLocalizable
void SAL_CALL T602ImportFilterDialog::setLocale( const Locale& eLocale )
- throw(::com::sun::star::uno::RuntimeException)
+ throw(::com::sun::star::uno::RuntimeException, std::exception)
{
meLocale = eLocale;
initLocale();
}
Locale SAL_CALL T602ImportFilterDialog::getLocale()
- throw(::com::sun::star::uno::RuntimeException)
+ throw(::com::sun::star::uno::RuntimeException, std::exception)
{
return meLocale;
}
@@ -1102,12 +1102,12 @@ ResMgr* T602ImportFilterDialog::getResMgr()
}
void SAL_CALL T602ImportFilterDialog::setTitle( const OUString& )
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
}
sal_Int16 SAL_CALL T602ImportFilterDialog::execute()
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException, std::exception)
{
if (OptionsDlg())
return com::sun::star::ui::dialogs::ExecutableDialogResults::OK;
@@ -1121,33 +1121,33 @@ OUString T602ImportFilterDialog::getResStr( sal_Int16 resid )
return sStr;
}
-uno::Sequence<beans::PropertyValue> SAL_CALL T602ImportFilterDialog::getPropertyValues() throw(uno::RuntimeException)
+uno::Sequence<beans::PropertyValue> SAL_CALL T602ImportFilterDialog::getPropertyValues() throw(uno::RuntimeException, std::exception)
{
return uno::Sequence<beans::PropertyValue>();
}
void SAL_CALL T602ImportFilterDialog::setPropertyValues( const uno::Sequence<beans::PropertyValue>& )
throw(beans::UnknownPropertyException, beans::PropertyVetoException,
- lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
+ lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
}
// XServiceInfo
OUString SAL_CALL T602ImportFilterDialog::getImplementationName( )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return T602ImportFilterDialog_getImplementationName();
}
sal_Bool SAL_CALL T602ImportFilterDialog::supportsService( const OUString& rServiceName )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return cppu::supportsService( this, rServiceName );
}
Sequence< OUString > SAL_CALL T602ImportFilterDialog::getSupportedServiceNames( )
- throw (RuntimeException)
+ throw (RuntimeException, std::exception)
{
return T602ImportFilterDialog_getSupportedServiceNames();
}
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index d31a78b766f9..3c6640db6d1e 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -108,34 +108,34 @@ class T602ImportFilterDialog : public cppu::WeakImplHelper4 <
// XExecutableDialog
virtual void SAL_CALL setTitle( const OUString& aTitle )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int16 SAL_CALL execute()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// XLocalizable
virtual void SAL_CALL setLocale( const com::sun::star::lang::Locale& eLocale )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException, std::exception);
virtual com::sun::star::lang::Locale SAL_CALL getLocale()
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException, std::exception);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// XPropertyAccess
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
- SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException);
+ SAL_CALL getPropertyValues() throw (::com::sun::star::uno::RuntimeException, std::exception);
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);
+ ::com::sun::star::uno::RuntimeException, std::exception);
public:
T602ImportFilterDialog(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r );
@@ -221,30 +221,30 @@ private:
// XFilter
virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL cancel( )
- throw (::com::sun::star::uno::RuntimeException) {};
+ throw (::com::sun::star::uno::RuntimeException, std::exception) {};
// XImporter
virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
- throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
// XExtendedTypeDetection
virtual OUString SAL_CALL detect(
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
- throw( com::sun::star::uno::RuntimeException );
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
- throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
};
OUString T602ImportFilter_getImplementationName()