include/toolkit/controls/dialogcontrol.hxx | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 1f1b45ab5d076a77545c54ff1839b98bae53a009
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed May 22 12:32:46 2013 +0200
Fix exception specifications
Change-Id: Ic2384073bba833224815582d4b9fee88c1ead782
(cherry picked from commit 697a007c61b9cabceb9767fad87cd5822b300452)
diff --git a/include/toolkit/controls/dialogcontrol.hxx
b/include/toolkit/controls/dialogcontrol.hxx
index 812bb3d..f92652a 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -178,21 +178,21 @@ public:
// overrides to resolve ambiguity
- virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const
rtl::OUString& p1) throw (::com::sun::star::uno::RuntimeException)
+ virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const
rtl::OUString& p1) throw (com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::getPropertyValue(p1); }
- virtual void SAL_CALL setPropertyValue(const OUString& p1, const
com::sun::star::uno::Any& p2) throw (::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL setPropertyValue(const OUString& p1, const
com::sun::star::uno::Any& p2) 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)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::setPropertyValue(p1,
p2); }
- virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const
com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>&
p2) throw (::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const
com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>&
p2) throw (com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::addPropertyChangeListener(p1,
p2); }
- virtual void SAL_CALL removePropertyChangeListener(const OUString& p1,
const
com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>&
p2) throw (::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL removePropertyChangeListener(const OUString& p1,
const
com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>&
p2) throw (com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::removePropertyChangeListener(p1,
p2); }
- virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const
com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>&
p2) throw (::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const
com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>&
p2) throw (com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::addVetoableChangeListener(p1,
p2); }
- virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1,
const
com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>&
p2) throw (::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1,
const
com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>&
p2) throw (com::sun::star::beans::UnknownPropertyException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::removeVetoableChangeListener(p1,
p2); }
- virtual com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
SAL_CALL createInstance(const OUString& p1) throw
(::com::sun::star::uno::RuntimeException)
+ virtual com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
SAL_CALL createInstance(const OUString& p1) throw
(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::createInstance(p1); }
- virtual com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
SAL_CALL createInstanceWithArguments(const OUString& p1, const
com::sun::star::uno::Sequence<com::sun::star::uno::Any>& p2) throw
(::com::sun::star::uno::RuntimeException)
+ virtual com::sun::star::uno::Reference<com::sun::star::uno::XInterface>
SAL_CALL createInstanceWithArguments(const OUString& p1, const
com::sun::star::uno::Sequence<com::sun::star::uno::Any>& p2) throw
(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::createInstanceWithArguments(p1,
p2); }
virtual com::sun::star::uno::Sequence<rtl::OUString> SAL_CALL
getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::getAvailableServiceNames();
}
@@ -202,17 +202,17 @@ public:
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::getElementType(); }
virtual sal_Bool SAL_CALL hasElements() throw
(::com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::hasElements(); }
- virtual com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString&
p1) throw (::com::sun::star::uno::RuntimeException)
+ virtual com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString&
p1) throw (com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::getByName(p1); }
virtual com::sun::star::uno::Sequence<rtl::OUString> SAL_CALL
getElementNames() throw (::com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::getElementNames(); }
virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& p1) throw
(::com::sun::star::uno::RuntimeException)
{ return
UnoControlDialogModel_Base::ControlModelContainerBase::hasByName(p1); }
- virtual void SAL_CALL replaceByName(const rtl::OUString& p1, const
com::sun::star::uno::Any& p2) throw (::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL replaceByName(const rtl::OUString& p1, const
com::sun::star::uno::Any& p2) throw
(com::sun::star::lang::IllegalArgumentException,
com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException)
{
UnoControlDialogModel_Base::ControlModelContainerBase::replaceByName(p1, p2); }
- virtual void SAL_CALL insertByName(const rtl::OUString& p1, const
com::sun::star::uno::Any& p2) throw (::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL insertByName(const rtl::OUString& p1, const
com::sun::star::uno::Any& p2) throw
(com::sun::star::lang::IllegalArgumentException,
com::sun::star::container::ElementExistException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException)
{
UnoControlDialogModel_Base::ControlModelContainerBase::insertByName(p1, p2); }
- virtual void SAL_CALL removeByName(const rtl::OUString& p1) throw
(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL removeByName(const rtl::OUString& p1) throw
(com::sun::star::container::NoSuchElementException,
com::sun::star::lang::WrappedTargetException,
com::sun::star::uno::RuntimeException)
{
UnoControlDialogModel_Base::ControlModelContainerBase::removeByName(p1); }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
