From 567ef6d5782cdb729b49005caf6005610ce03e22 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 27 Mar 2014 18:12:18 +0100 Subject: Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f --- include/oox/vml/vmldrawingfragment.hxx | 6 +++--- include/oox/vml/vmlinputstream.hxx | 10 +++++----- include/oox/vml/vmlshape.hxx | 20 ++++++++++---------- include/oox/vml/vmlshapecontext.hxx | 16 ++++++++-------- 4 files changed, 26 insertions(+), 26 deletions(-) (limited to 'include/oox/vml') diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx index eb5bb5571567..2229426589e8 100644 --- a/include/oox/vml/vmldrawingfragment.hxx +++ b/include/oox/vml/vmldrawingfragment.hxx @@ -39,12 +39,12 @@ public: Drawing& rDrawing ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - openFragmentStream() const; + openFragmentStream() const SAL_OVERRIDE; virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void finalizeImport(); + virtual void finalizeImport() SAL_OVERRIDE; private: Drawing& mrDrawing; diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx index af94056156b9..335858615fee 100644 --- a/include/oox/vml/vmlinputstream.hxx +++ b/include/oox/vml/vmlinputstream.hxx @@ -62,15 +62,15 @@ public: virtual ~InputStream(); virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available() - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput() - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void updateBuffer() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 51054259e504..ac3df2f400f1 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -293,7 +293,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; /** Used by both RectangleShape and ComplexShape. */ com::sun::star::uno::ReferencecreatePictureObject( const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rxShapes, @@ -315,7 +315,7 @@ protected: virtual com::sun::star::uno::Reference implConvertAndInsert( const com::sun::star::uno::Reference& rxShapes, - const com::sun::star::awt::Rectangle& rShapeRect) const; + const com::sun::star::awt::Rectangle& rShapeRect) const SAL_OVERRIDE; }; @@ -340,7 +340,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; }; /** A Line shape object. */ @@ -368,7 +368,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; }; @@ -384,7 +384,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; }; @@ -401,7 +401,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; }; @@ -419,19 +419,19 @@ public: const ShapeContainer& getChildren() const { return *mxChildren; } /** Final processing after import of the drawing fragment. */ - virtual void finalizeFragmentImport(); + virtual void finalizeFragmentImport() SAL_OVERRIDE; /** Returns the shape template with the passed identifier from the child shapes. */ - virtual const ShapeType* getChildTypeById( const OUString& rShapeId ) const; + virtual const ShapeType* getChildTypeById( const OUString& rShapeId ) const SAL_OVERRIDE; /** Returns the shape with the passed identifier from the child shapes. */ - virtual const ShapeBase* getChildById( const OUString& rShapeId ) const; + virtual const ShapeBase* getChildById( const OUString& rShapeId ) const SAL_OVERRIDE; protected: /** Creates the corresponding XShape and inserts it into the passed container. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; private: SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx index a4b6b6eb76ce..4f178db1361a 100644 --- a/include/oox/vml/vmlshapecontext.hxx +++ b/include/oox/vml/vmlshapecontext.hxx @@ -48,7 +48,7 @@ public: Drawing& rDrawing ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: Drawing& mrDrawing; @@ -65,9 +65,9 @@ public: const AttributeList& rAttribs ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; private: ClientData& mrClientData; @@ -101,7 +101,7 @@ public: const AttributeList& rAttribs ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: /** Processes the 'style' attribute. */ @@ -125,7 +125,7 @@ public: const AttributeList& rAttribs ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: /** Processes the 'points' attribute. */ @@ -159,7 +159,7 @@ public: const AttributeList& rAttribs ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: ShapeContainer& mrShapes; @@ -176,7 +176,7 @@ public: RectangleShape& rShape ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; -- cgit