diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /toolkit/source/controls/dialogcontrol.cxx | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'toolkit/source/controls/dialogcontrol.cxx')
-rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 521ebfc14e4e..16913f013874 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -79,7 +79,7 @@ class SimpleNamedThingContainer : public SimpleNameContainer_BASE ::osl::Mutex m_aMutex; public: // ::com::sun::star::container::XNameContainer, XNameReplace, XNameAccess - virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) + virtual void SAL_CALL replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) @@ -89,14 +89,14 @@ public: throw IllegalArgumentException(); things[ aName ] = xElement; } - virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) + virtual Any SAL_CALL getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw NoSuchElementException(); return uno::makeAny( things[ aName ] ); } - virtual Sequence< OUString > SAL_CALL getElementNames( ) throw(RuntimeException, std::exception) + virtual Sequence< OUString > SAL_CALL getElementNames( ) throw(RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); Sequence< OUString > aResult( things.size() ); @@ -107,12 +107,12 @@ public: *pName = it->first; return aResult; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); return ( things.find( aName ) != things.end() ); } - virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) + virtual void SAL_CALL insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -122,18 +122,18 @@ public: throw IllegalArgumentException(); things[ aName ] = xElement; } - virtual void SAL_CALL removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw NoSuchElementException(); things.erase( things.find( aName ) ); } - virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) + virtual Type SAL_CALL getElementType( ) throw (RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<T>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); return ( things.size() > 0 ); @@ -149,21 +149,21 @@ class UnoControlDialogModel : public ControlModelContainerBase { protected: css::uno::Reference< css::graphic::XGraphicObject > mxGrfObj; - css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const; - ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + css::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const SAL_OVERRIDE; + ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // ::cppu::OPropertySetHelper - void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception); + void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) SAL_OVERRIDE; public: UnoControlDialogModel( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); UnoControlDialogModel( const UnoControlDialogModel& rModel ); ~UnoControlDialogModel(); - UnoControlModel* Clone() const; + UnoControlModel* Clone() const SAL_OVERRIDE; // css::beans::XMultiPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception); + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::io::XPersistObject - OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception); + OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo DECLIMPL_SERVICEINFO_DERIVED( UnoControlDialogModel, ControlModelContainerBase, "com.sun.star.awt.UnoControlDialogModel" ) |