summaryrefslogtreecommitdiff
path: root/include/svl
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 /include/svl
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'include/svl')
-rw-r--r--include/svl/itemprop.hxx12
-rw-r--r--include/svl/numuno.hxx6
-rw-r--r--include/svl/strmadpt.hxx18
-rw-r--r--include/svl/style.hxx2
4 files changed, 19 insertions, 19 deletions
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index a38d91f58b24..daa3bd5c850d 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -164,16 +164,16 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL
getProperties( )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException, std::exception);
virtual ::com::sun::star::beans::Property SAL_CALL
getPropertyByName( const OUString& aName )
throw(::com::sun::star::beans::UnknownPropertyException,
- ::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
hasPropertyByName( const OUString& Name )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException, std::exception);
};
@@ -188,15 +188,15 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL
getProperties( )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException, std::exception);
virtual ::com::sun::star::beans::Property SAL_CALL
getPropertyByName( const OUString& aName )
- throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Bool SAL_CALL
hasPropertyByName( const OUString& Name )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException, std::exception);
};
#endif
diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx
index a0568163b600..c6965378c681 100644
--- a/include/svl/numuno.hxx
+++ b/include/svl/numuno.hxx
@@ -69,15 +69,15 @@ public:
// XNumberFormatsSupplier
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL
getNumberFormatSettings()
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException, std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL
getNumberFormats()
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException, std::exception);
// XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence<
sal_Int8 >& aIdentifier )
- throw(::com::sun::star::uno::RuntimeException);
+ throw(::com::sun::star::uno::RuntimeException, std::exception);
static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
static SvNumberFormatsSupplierObj* getImplementation( const com::sun::star::uno::Reference<
diff --git a/include/svl/strmadpt.hxx b/include/svl/strmadpt.hxx
index 8750612a8392..8299069368fc 100644
--- a/include/svl/strmadpt.hxx
+++ b/include/svl/strmadpt.hxx
@@ -78,7 +78,7 @@ public:
virtual com::sun::star::uno::Any SAL_CALL
queryInterface(const com::sun::star::uno::Type & rType)
- throw (com::sun::star::uno::RuntimeException);
+ throw (com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL acquire() throw();
@@ -88,38 +88,38 @@ public:
readBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData,
sal_Int32 nBytesToRead)
throw (com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL
readSomeBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData,
sal_Int32 nMaxBytesToRead)
throw (com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip)
throw (com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int32 SAL_CALL available()
throw (com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL closeInput()
throw (com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL seek(sal_Int64 nLocation)
throw (com::sun::star::lang::IllegalArgumentException,
com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int64 SAL_CALL getPosition()
throw (com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
virtual sal_Int64 SAL_CALL getLength()
throw (com::sun::star::io::IOException,
- com::sun::star::uno::RuntimeException);
+ com::sun::star::uno::RuntimeException, std::exception);
};
#endif // INCLUDED_SVL_STRMADPT_HXX
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 4db5f5c41889..a91d20d9cb88 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -369,7 +369,7 @@ public:
static SfxUnoStyleSheet* getUnoStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle );
// XUnoTunnel
- virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception);
private:
SfxUnoStyleSheet(); // not implemented