From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- UnoControls/source/inc/progressmonitor.hxx | 52 +++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'UnoControls/source/inc/progressmonitor.hxx') 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 -- cgit