Kaydet (Commit) 615a69e3 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Clean-up std::bad_alloc handling

...post 0bc89aac "cppumaker: Allow UNO interface functions to throw std::exception."

Change-Id: I232a1b266a45d39856d44a2f4e012b5df10fa880
üst b70df91a
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
#define INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX #define INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX
#include "sal/config.h" #include "sal/config.h"
#include <exception>
#include "com/sun/star/beans/PropertyVetoException.hpp" #include "com/sun/star/beans/PropertyVetoException.hpp"
#include "com/sun/star/beans/UnknownPropertyException.hpp" #include "com/sun/star/beans/UnknownPropertyException.hpp"
#include "com/sun/star/beans/XFastPropertySet.hpp" #include "com/sun/star/beans/XFastPropertySet.hpp"
...@@ -266,7 +269,8 @@ protected: ...@@ -266,7 +269,8 @@ protected:
// @see com::sun::star::beans::XPropertySet::getPropertySetInfo // @see com::sun::star::beans::XPropertySet::getPropertySetInfo
virtual virtual
com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >
SAL_CALL getPropertySetInfo() throw (com::sun::star::uno::RuntimeException); SAL_CALL getPropertySetInfo()
throw (com::sun::star::uno::RuntimeException, std::exception);
// @see com::sun::star::beans::XPropertySet::setPropertyValue // @see com::sun::star::beans::XPropertySet::setPropertyValue
virtual void SAL_CALL setPropertyValue( virtual void SAL_CALL setPropertyValue(
...@@ -277,7 +281,7 @@ protected: ...@@ -277,7 +281,7 @@ protected:
com::sun::star::beans::PropertyVetoException, com::sun::star::beans::PropertyVetoException,
com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::WrappedTargetException, com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException); com::sun::star::uno::RuntimeException, std::exception);
// @see com::sun::star::beans::XPropertySet::getPropertyValue // @see com::sun::star::beans::XPropertySet::getPropertyValue
virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(
...@@ -285,7 +289,7 @@ protected: ...@@ -285,7 +289,7 @@ protected:
throw ( throw (
com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException, com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException); com::sun::star::uno::RuntimeException, std::exception);
/** /**
@short Adds a @short Adds a
...@@ -303,7 +307,7 @@ protected: ...@@ -303,7 +307,7 @@ protected:
throw ( throw (
com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException, com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException); com::sun::star::uno::RuntimeException, std::exception);
// @see com::sun::star::beans::XPropertySet::removePropertyChangeListener // @see com::sun::star::beans::XPropertySet::removePropertyChangeListener
virtual void SAL_CALL removePropertyChangeListener( virtual void SAL_CALL removePropertyChangeListener(
...@@ -313,7 +317,7 @@ protected: ...@@ -313,7 +317,7 @@ protected:
throw ( throw (
com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException, com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException); com::sun::star::uno::RuntimeException, std::exception);
/** /**
@short Adds a @short Adds a
...@@ -331,7 +335,7 @@ protected: ...@@ -331,7 +335,7 @@ protected:
throw ( throw (
com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException, com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException); com::sun::star::uno::RuntimeException, std::exception);
// @see com::sun::star::beans::XPropertySet::removeVetoableChangeListener // @see com::sun::star::beans::XPropertySet::removeVetoableChangeListener
virtual void SAL_CALL removeVetoableChangeListener( virtual void SAL_CALL removeVetoableChangeListener(
...@@ -341,7 +345,7 @@ protected: ...@@ -341,7 +345,7 @@ protected:
throw ( throw (
com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException, com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException); com::sun::star::uno::RuntimeException, std::exception);
// @see com::sun::star::beans::XFastPropertySet::setFastPropertyValue // @see com::sun::star::beans::XFastPropertySet::setFastPropertyValue
virtual void SAL_CALL setFastPropertyValue( virtual void SAL_CALL setFastPropertyValue(
...@@ -351,7 +355,7 @@ protected: ...@@ -351,7 +355,7 @@ protected:
com::sun::star::beans::PropertyVetoException, com::sun::star::beans::PropertyVetoException,
com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::WrappedTargetException, com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException); com::sun::star::uno::RuntimeException, std::exception);
// @see com::sun::star::beans::XFastPropertySet::getFastPropertyValue // @see com::sun::star::beans::XFastPropertySet::getFastPropertyValue
virtual com::sun::star::uno::Any SAL_CALL getFastPropertyValue( virtual com::sun::star::uno::Any SAL_CALL getFastPropertyValue(
...@@ -359,12 +363,13 @@ protected: ...@@ -359,12 +363,13 @@ protected:
throw ( throw (
com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException, com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException); com::sun::star::uno::RuntimeException, std::exception);
// @see com::sun::star::beans::XPropertyAccess::getPropertyValues // @see com::sun::star::beans::XPropertyAccess::getPropertyValues
virtual virtual
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > 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);
// @see com::sun::star::beans::XPropertyAccess::setPropertyValues // @see com::sun::star::beans::XPropertyAccess::setPropertyValues
virtual void SAL_CALL setPropertyValues( virtual void SAL_CALL setPropertyValues(
...@@ -375,7 +380,7 @@ protected: ...@@ -375,7 +380,7 @@ protected:
com::sun::star::beans::PropertyVetoException, com::sun::star::beans::PropertyVetoException,
com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::IllegalArgumentException,
com::sun::star::lang::WrappedTargetException, com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException); com::sun::star::uno::RuntimeException, std::exception);
private: private:
PropertySetMixinImpl( const PropertySetMixinImpl&); // not defined PropertySetMixinImpl( const PropertySetMixinImpl&); // not defined
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment