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 /oox/source/shape | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'oox/source/shape')
-rw-r--r-- | oox/source/shape/LockedCanvasContext.hxx | 2 | ||||
-rw-r--r-- | oox/source/shape/ShapeContextHandler.hxx | 50 | ||||
-rw-r--r-- | oox/source/shape/ShapeDrawingFragmentHandler.hxx | 4 | ||||
-rw-r--r-- | oox/source/shape/ShapeFilterBase.cxx | 2 | ||||
-rw-r--r-- | oox/source/shape/ShapeFilterBase.hxx | 18 | ||||
-rw-r--r-- | oox/source/shape/WpgContext.hxx | 2 | ||||
-rw-r--r-- | oox/source/shape/WpsContext.hxx | 2 |
7 files changed, 40 insertions, 40 deletions
diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx index ca1599d0078b..a2e430c67938 100644 --- a/oox/source/shape/LockedCanvasContext.hxx +++ b/oox/source/shape/LockedCanvasContext.hxx @@ -25,7 +25,7 @@ public: explicit LockedCanvasContext(oox::core::ContextHandler2Helper& rParent); virtual ~LockedCanvasContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const ::oox::AttributeList& rAttribs) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const ::oox::AttributeList& rAttribs) override; oox::drawingml::ShapePtr getShape() { diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx index 8aba74a45967..87910910025e 100644 --- a/oox/source/shape/ShapeContextHandler.hxx +++ b/oox/source/shape/ShapeContextHandler.hxx @@ -58,91 +58,91 @@ public: // ::com::sun::star::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService - (const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + (const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; // ::com::sun::star::xml::sax::XFastContextHandler: virtual void SAL_CALL startFastElement (::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL startUnknownElement (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endFastElement(::sal_Int32 Element) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL endUnknownElement (const OUString & Namespace, const OUString & Name) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext (::sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext (const OUString & Namespace, const OUString & Name, const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; virtual void SAL_CALL characters(const OUString & aChars) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; // ::com::sun::star::xml::sax::XFastShapeContextHandler: virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getShape() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDrawPage (const css::uno::Reference< css::drawing::XDrawPage > & the_value) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setModel (const css::uno::Reference< css::frame::XModel > & the_value) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getInputStream() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + getInputStream() throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setInputStream (const css::uno::Reference< css::io::XInputStream > & the_value) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual OUString SAL_CALL getRelationFragmentPath() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setRelationFragmentPath (const OUString & the_value) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getStartToken() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getStartToken() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Point SAL_CALL getPosition() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setDocumentProperties(const css::uno::Reference<css::document::XDocumentProperties>& xDocProps) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference<css::document::XDocumentProperties> SAL_CALL getDocumentProperties() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; private: ShapeContextHandler(ShapeContextHandler &) = delete; diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx index 367f29a35fe7..82360a2620b8 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx @@ -21,8 +21,8 @@ class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler2 public: ShapeDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr pGroupShapePtr ) throw(); virtual ~ShapeDrawingFragmentHandler() throw(); - virtual void SAL_CALL endDocument() throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void SAL_CALL endDocument() throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const AttributeList& rAttribs ) override; private: oox::drawingml::ShapePtr mpGroupShapePtr; diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx index 2d886749528e..3a69807ef08d 100644 --- a/oox/source/shape/ShapeFilterBase.cxx +++ b/oox/source/shape/ShapeFilterBase.cxx @@ -77,7 +77,7 @@ class ShapeGraphicHelper : public GraphicHelper { public: explicit ShapeGraphicHelper( const ShapeFilterBase& rFilter ); - virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE; + virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const override; private: const ShapeFilterBase& mrFilter; }; diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx index 171e27419a07..70160b62d7ec 100644 --- a/oox/source/shape/ShapeFilterBase.hxx +++ b/oox/source/shape/ShapeFilterBase.hxx @@ -42,27 +42,27 @@ public: virtual ~ShapeFilterBase(); /** Has to be implemented by each filter, returns the current theme. */ - virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; + virtual const ::oox::drawingml::Theme* getCurrentTheme() const override; void setCurrentTheme(::oox::drawingml::ThemePtr pTheme); /** Has to be implemented by each filter to return the collection of VML shapes. */ - virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; + virtual ::oox::vml::Drawing* getVmlDrawing() override; /** Has to be implemented by each filter to return TableStyles. */ - virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; + virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() override; - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override; - virtual bool importDocument() SAL_OVERRIDE { return true; } - virtual bool exportDocument() SAL_OVERRIDE { return true; } + virtual bool importDocument() override { return true; } + virtual bool exportDocument() override { return true; } sal_Int32 getSchemeColor( sal_Int32 nToken ) const; private: - virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual GraphicHelper* implCreateGraphicHelper() const override; std::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv; ::oox::drawingml::ThemePtr mpTheme; diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx index f57eff1415ee..ed0cebf1e245 100644 --- a/oox/source/shape/WpgContext.hxx +++ b/oox/source/shape/WpgContext.hxx @@ -25,7 +25,7 @@ public: explicit WpgContext(oox::core::ContextHandler2Helper& rParent); virtual ~WpgContext(); - virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) SAL_OVERRIDE; + virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override; oox::drawingml::ShapePtr getShape() { diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx index df83f888ecb3..90fd3fb9aa21 100644 --- a/oox/source/shape/WpsContext.hxx +++ b/oox/source/shape/WpsContext.hxx @@ -25,7 +25,7 @@ public: WpsContext(oox::core::ContextHandler2Helper& rParent, css::uno::Reference<css::drawing::XShape> xShape); virtual ~WpsContext(); - virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) SAL_OVERRIDE; + virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override; oox::drawingml::ShapePtr getShape() { |