diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /UnoControls/source | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'UnoControls/source')
-rw-r--r-- | UnoControls/source/inc/OConnectionPointContainerHelper.hxx | 14 | ||||
-rw-r--r-- | UnoControls/source/inc/OConnectionPointHelper.hxx | 16 | ||||
-rw-r--r-- | UnoControls/source/inc/framecontrol.hxx | 46 | ||||
-rw-r--r-- | UnoControls/source/inc/progressbar.hxx | 28 | ||||
-rw-r--r-- | UnoControls/source/inc/progressmonitor.hxx | 52 | ||||
-rw-r--r-- | UnoControls/source/inc/statusindicator.hxx | 42 |
6 files changed, 99 insertions, 99 deletions
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx index ec2154c3c8c3..5ea65d92da6a 100644 --- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx @@ -87,7 +87,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -96,7 +96,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override; /**_______________________________________________________________________________________________________ @short decrement refcount @@ -105,7 +105,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() override; // XConnectionPointContainer @@ -123,7 +123,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_________________________________________________________________________________________________________ @short @@ -140,7 +140,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint( const ::com::sun::star::uno::Type& aType - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_________________________________________________________________________________________________________ @short @@ -158,7 +158,7 @@ public: virtual void SAL_CALL advise( const ::com::sun::star::uno::Type& aType , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_________________________________________________________________________________________________________ @short @@ -176,7 +176,7 @@ public: virtual void SAL_CALL unadvise( const ::com::sun::star::uno::Type& aType , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // public but impl method! // Is necessary to get container member at OConnectionPoint-instance. diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx index 638174eeb794..2aead8160699 100644 --- a/UnoControls/source/inc/OConnectionPointHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointHelper.hxx @@ -92,7 +92,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -101,7 +101,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override; /**_______________________________________________________________________________________________________ @short decrement refcount @@ -110,7 +110,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() override; // XConnectionPoint @@ -128,7 +128,7 @@ public: */ virtual ::com::sun::star::uno::Type SAL_CALL getConnectionType() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_________________________________________________________________________________________________________ @short @@ -144,7 +144,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_________________________________________________________________________________________________________ @short @@ -165,7 +165,7 @@ public: ::com::sun::star::lang::ListenerExistException, ::com::sun::star::lang::InvalidListenerException , ::com::sun::star::uno::RuntimeException, std::exception - ) SAL_OVERRIDE; + ) override; /**_________________________________________________________________________________________________________ @short @@ -181,7 +181,7 @@ public: */ virtual void SAL_CALL unadvise( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_________________________________________________________________________________________________________ @short @@ -197,7 +197,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > SAL_CALL getConnections() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // private methods diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index 257edecfc55f..7ae1880ee5cc 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -70,7 +70,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -79,7 +79,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override; /**_______________________________________________________________________________________________________ @short decrement refcount @@ -88,70 +88,70 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() override; // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XAggregation ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XControl virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent - ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XComponent - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XView virtual sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xDevice - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XConnectionPointContainer virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint( const ::com::sun::star::uno::Type& aType - ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL advise( const ::com::sun::star::uno::Type& aType , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL unadvise( const ::com::sun::star::uno::Type& aType , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // impl but public methods to register service! @@ -171,28 +171,28 @@ protected: ::com::sun::star::uno::Any& rOldValue , sal_Int32 nHandle , const ::com::sun::star::uno::Any& rValue - ) throw( ::com::sun::star::lang::IllegalArgumentException ) SAL_OVERRIDE; + ) throw( ::com::sun::star::lang::IllegalArgumentException ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const ::com::sun::star::uno::Any& rValue - ) throw ( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; + ) throw ( ::com::sun::star::uno::Exception, std::exception ) override; virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue , - sal_Int32 nHandle ) const SAL_OVERRIDE; + sal_Int32 nHandle ) const override; - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // XPropertySet ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // BaseControl virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentPeer - ) SAL_OVERRIDE; + ) override; // private methods diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx index 2b1dee2de696..8beee8c6c5df 100644 --- a/UnoControls/source/inc/progressbar.hxx +++ b/UnoControls/source/inc/progressbar.hxx @@ -100,7 +100,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -109,7 +109,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override; /**_______________________________________________________________________________________________________ @short decrement refcount @@ -118,7 +118,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() override; // XTypeProvider @@ -136,7 +136,7 @@ public: */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XAggregation @@ -154,7 +154,7 @@ public: */ ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XProgressBar @@ -172,7 +172,7 @@ public: */ virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_________________________________________________________________________________________________________ @short @@ -188,7 +188,7 @@ public: */ virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_________________________________________________________________________________________________________ @short @@ -203,7 +203,7 @@ public: @onerror */ - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_________________________________________________________________________________________________________ @short @@ -221,7 +221,7 @@ public: virtual void SAL_CALL setRange( sal_Int32 nMin , sal_Int32 nMax - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_________________________________________________________________________________________________________ @short @@ -236,7 +236,7 @@ public: @onerror */ - virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XWindow @@ -259,7 +259,7 @@ public: sal_Int32 nWidth , sal_Int32 nHeight , sal_Int16 nFlags - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XControl @@ -278,7 +278,7 @@ public: virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_________________________________________________________________________________________________________ @short @@ -294,7 +294,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // BaseControl @@ -349,7 +349,7 @@ protected: sal_Int32 nX , sal_Int32 nY , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics - ) SAL_OVERRIDE; + ) override; /**_________________________________________________________________________________________________________ @short diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index 6a5feb201ba8..6f21b7111f67 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -152,7 +152,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -161,7 +161,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override; /**_______________________________________________________________________________________________________ @short decrement refcount @@ -170,7 +170,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() override; // XTypeProvider @@ -182,7 +182,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XAggregation @@ -190,7 +190,7 @@ public: */ virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XProgressMonitor @@ -215,7 +215,7 @@ public: const OUString& sTopic , const OUString& sText , sal_Bool bbeforeProgress - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ @@ -223,7 +223,7 @@ public: virtual void SAL_CALL removeText( const OUString& sTopic , sal_Bool bbeforeProgress - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ @@ -232,35 +232,35 @@ public: const OUString& sTopic , const OUString& sText , sal_Bool bbeforeProgress - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XProgressBar /**_______________________________________________________________________________________________________ */ - virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ - virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ virtual void SAL_CALL setRange( sal_Int32 nMin , - sal_Int32 nMax ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + sal_Int32 nMax ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ - virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XButton @@ -269,43 +269,43 @@ public: virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& xListener - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ - virtual void SAL_CALL setLabel( const OUString& sLabel ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setLabel( const OUString& sLabel ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ virtual void SAL_CALL setActionCommand( const OUString& sCommand ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XLayoutConstrains /**_______________________________________________________________________________________________________ */ - virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ - virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XControl @@ -315,26 +315,26 @@ public: virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XComponent /**_______________________________________________________________________________________________________ */ - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XWindow @@ -345,7 +345,7 @@ public: sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // BaseControl @@ -368,7 +368,7 @@ protected: virtual void impl_paint( sal_Int32 nX , sal_Int32 nY , - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics ) SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics ) override; // private methods diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx index 47c17b9a8b8e..5570624fed56 100644 --- a/UnoControls/source/inc/statusindicator.hxx +++ b/UnoControls/source/inc/statusindicator.hxx @@ -109,7 +109,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains */ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -118,7 +118,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override; /**_______________________________________________________________________________________________________ @short decrement refcount @@ -127,7 +127,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() override; // XTypeProvider @@ -140,7 +140,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XAggregation @@ -148,7 +148,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains */ virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XStatusIndicator @@ -158,45 +158,45 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains virtual void SAL_CALL start( const OUString& sText , sal_Int32 nRange - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /*-**************************************************************************************************** *//*-*****************************************************************************************************/ - virtual void SAL_CALL end() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL end() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /*-**************************************************************************************************** *//*-*****************************************************************************************************/ - virtual void SAL_CALL reset() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL reset() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /*-**************************************************************************************************** *//*-*****************************************************************************************************/ - virtual void SAL_CALL setText( const OUString& sText ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& sText ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /*-**************************************************************************************************** *//*-*****************************************************************************************************/ - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XLayoutConstrains /**_______________________________________________________________________________________________________ */ - virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ - virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getPreferredSize() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ virtual ::com::sun::star::awt::Size SAL_CALL calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XControl @@ -206,26 +206,26 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& xToolkit , const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParent - ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ virtual sal_Bool SAL_CALL setModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; /**_______________________________________________________________________________________________________ */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XComponent /**_______________________________________________________________________________________________________ */ - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XWindow @@ -236,7 +236,7 @@ class StatusIndicator : public ::com::sun::star::awt::XLayoutConstrains sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // BaseControl @@ -259,7 +259,7 @@ protected: virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& xParentPeer - ) SAL_OVERRIDE; + ) override; /**_______________________________________________________________________________________________________ */ @@ -268,12 +268,12 @@ protected: sal_Int32 nX, sal_Int32 nY, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > & rGraphics - ) SAL_OVERRIDE; + ) override; /**_______________________________________________________________________________________________________ */ - virtual void impl_recalcLayout( const ::com::sun::star::awt::WindowEvent& aEvent ) SAL_OVERRIDE; + virtual void impl_recalcLayout( const ::com::sun::star::awt::WindowEvent& aEvent ) override; // debug methods |