diff options
Diffstat (limited to 'include/oox')
57 files changed, 474 insertions, 474 deletions
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx index 78e519df4d26..5578796bfacf 100644 --- a/include/oox/core/contexthandler.hxx +++ b/include/oox/core/contexthandler.hxx @@ -73,13 +73,13 @@ public: // com.sun.star.xml.sax.XFastContextHandler interface --------------------- - virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; // record context interface ----------------------------------------------- diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index c94bda415ded..1e90cc06182a 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -214,8 +214,8 @@ public: virtual ~ContextHandler2(); // resolve ambiguity from base classes - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { ContextHandler::acquire(); } - virtual void SAL_CALL release() throw() SAL_OVERRIDE { ContextHandler::release(); } + virtual void SAL_CALL acquire() throw() override { ContextHandler::acquire(); } + virtual void SAL_CALL release() throw() override { ContextHandler::release(); } // com.sun.star.xml.sax.XFastContextHandler interface --------------------- @@ -224,38 +224,38 @@ public: sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override; virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override; virtual void SAL_CALL characters( const OUString& rChars ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override; virtual void SAL_CALL endFastElement( sal_Int32 nElement ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override; // oox.core.ContextHandler interface -------------------------------------- - virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void startRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void endRecord( sal_Int32 nRecId ) SAL_OVERRIDE; + virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void startRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void endRecord( sal_Int32 nRecId ) override; // oox.core.ContextHandler2Helper interface ------------------------------- - virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onEndRecord() SAL_OVERRIDE; + virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; + virtual void onEndRecord() override; }; } // namespace core diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx index ff6fd2c603ef..3ac4e5fe14fb 100644 --- a/include/oox/core/fasttokenhandler.hxx +++ b/include/oox/core/fasttokenhandler.hxx @@ -46,16 +46,16 @@ public: virtual ~FastTokenHandler(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XFastTokenHandler - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getTokenFromUTF8( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTokenFromUTF8( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // Much faster direct C++ shortcut to the method that matters - virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const SAL_OVERRIDE; + virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const override; private: const TokenMap& mrTokenMap; ///< Reference to global token map singleton. diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index f34e0ba104bd..f37489db87dc 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -199,11 +199,11 @@ public: virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // com.sun.star.lang.XInitialization interface ---------------------------- @@ -220,30 +220,30 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ) throw( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; // com.sun.star.document.XImporter interface ------------------------------ virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDocument ) throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; // com.sun.star.document.XExporter interface ------------------------------ virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDocument ) throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; // com.sun.star.document.XFilter interface -------------------------------- virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL cancel() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; bool exportVBA() const; diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index 622027f2d0a0..e5db562f1fbd 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -53,18 +53,18 @@ public: virtual ~FilterDetectDocHandler(); // XFastDocumentHandler - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XFastContextHandler - virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; private: void parseRelationship( const AttributeList& rAttribs ); @@ -119,9 +119,9 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // com.sun.star.document.XExtendedFilterDetection interface --------------- @@ -143,7 +143,7 @@ public: */ virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext; diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index 26c9edb348b9..81bce5815ee6 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -88,19 +88,19 @@ public: // com.sun.star.xml.sax.XFastDocumentHandler interface -------------------- - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; // com.sun.star.xml.sax.XFastContextHandler interface --------------------- - virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; // XML stream handling ---------------------------------------------------- diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx index a63d1601fd9e..de2857dd39eb 100644 --- a/include/oox/core/fragmenthandler2.hxx +++ b/include/oox/core/fragmenthandler2.hxx @@ -52,8 +52,8 @@ public: virtual ~FragmentHandler2(); // resolve ambiguity from base classes - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { FragmentHandler::acquire(); } - virtual void SAL_CALL release() throw() SAL_OVERRIDE { FragmentHandler::release(); } + virtual void SAL_CALL acquire() throw() override { FragmentHandler::acquire(); } + virtual void SAL_CALL release() throw() override { FragmentHandler::release(); } // com.sun.star.xml.sax.XFastContextHandler interface --------------------- @@ -62,48 +62,48 @@ public: sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override; virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override; virtual void SAL_CALL characters( const OUString& rChars ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override; virtual void SAL_CALL endFastElement( sal_Int32 nElement ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL override; // com.sun.star.xml.sax.XFastDocumentHandler interface -------------------- virtual void SAL_CALL startDocument() throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; // oox.core.ContextHandler interface -------------------------------------- - virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void startRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void endRecord( sal_Int32 nRecId ) SAL_OVERRIDE; + virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void startRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void endRecord( sal_Int32 nRecId ) override; // oox.core.ContextHandler2Helper interface ------------------------------- - virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement( const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; - virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual void onEndRecord() SAL_OVERRIDE; + virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) override; + virtual void onStartRecord( SequenceInputStream& rStrm ) override; + virtual void onEndRecord() override; // oox.core.FragmentHandler2 interface ------------------------------------ diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx index 15a6a804cffa..9dac43f64428 100644 --- a/include/oox/core/relationshandler.hxx +++ b/include/oox/core/relationshandler.hxx @@ -38,7 +38,7 @@ public: createFastChildContext( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) override; private: RelationsRef mxRelations; diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 45414e1652d6..0a775b73a57b 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -239,18 +239,18 @@ public: protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const SAL_OVERRIDE; + implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > - implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const SAL_OVERRIDE; + implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const override; - virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor ) SAL_OVERRIDE; + virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor ) override; private: virtual StorageRef implCreateStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const override; virtual StorageRef implCreateStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const SAL_OVERRIDE; + const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const override; private: ::std::unique_ptr< XmlFilterBaseImpl > mxImpl; diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx index d1feb8619689..dc9c36d8f1db 100644 --- a/include/oox/crypto/AgileEngine.hxx +++ b/include/oox/crypto/AgileEngine.hxx @@ -61,17 +61,17 @@ public: virtual bool writeEncryptionInfo( const OUString& rPassword, - BinaryXOutputStream& rStream) SAL_OVERRIDE; + BinaryXOutputStream& rStream) override; - virtual bool generateEncryptionKey(const OUString& rPassword) SAL_OVERRIDE; + virtual bool generateEncryptionKey(const OUString& rPassword) override; virtual bool decrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; + BinaryXOutputStream& aOutputStream) override; virtual bool encrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; + BinaryXOutputStream& aOutputStream) override; }; } // namespace core diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index c1602af7c25b..eaf531f4d439 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -95,7 +95,7 @@ public: virtual sal_uInt32 update( std::vector<sal_uInt8>& output, std::vector<sal_uInt8>& input, - sal_uInt32 inputLength = 0) SAL_OVERRIDE; + sal_uInt32 inputLength = 0) override; static sal_uInt32 aes128ecb( @@ -114,7 +114,7 @@ public: virtual sal_uInt32 update( std::vector<sal_uInt8>& output, std::vector<sal_uInt8>& input, - sal_uInt32 inputLength = 0) SAL_OVERRIDE; + sal_uInt32 inputLength = 0) override; }; class Digest diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index 2d76bee8942c..5e5a6fc36bff 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -92,19 +92,19 @@ public: StandardEncryptionInfo& getInfo() { return mInfo;} - virtual bool generateEncryptionKey(const OUString& rPassword) SAL_OVERRIDE; + virtual bool generateEncryptionKey(const OUString& rPassword) override; virtual bool writeEncryptionInfo( const OUString& rPassword, - BinaryXOutputStream& rStream) SAL_OVERRIDE; + BinaryXOutputStream& rStream) override; virtual bool decrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; + BinaryXOutputStream& aOutputStream) override; virtual bool encrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; + BinaryXOutputStream& aOutputStream) override; }; diff --git a/include/oox/drawingml/connectorshapecontext.hxx b/include/oox/drawingml/connectorshapecontext.hxx index 737c91dec576..6d184399de82 100644 --- a/include/oox/drawingml/connectorshapecontext.hxx +++ b/include/oox/drawingml/connectorshapecontext.hxx @@ -31,7 +31,7 @@ class OOX_DLLPUBLIC ConnectorShapeContext : public ShapeContext public: ConnectorShapeContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pMasterShapePtr, ShapePtr pGroupShapePtr ); virtual ~ConnectorShapeContext(); - 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; }; } } diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx index fe4b216bc7a7..9f7115c2cf69 100644 --- a/include/oox/drawingml/graphicshapecontext.hxx +++ b/include/oox/drawingml/graphicshapecontext.hxx @@ -33,7 +33,7 @@ class OOX_DLLPUBLIC GraphicShapeContext : public ShapeContext public: GraphicShapeContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr ); - 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; }; @@ -43,8 +43,8 @@ class OOX_DLLPUBLIC GraphicalObjectFrameContext : public ShapeContext public: GraphicalObjectFrameContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr, bool bEmbedShapesInChart ); - virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; + virtual void onEndElement() override; private: bool mbEmbedShapesInChart; @@ -58,7 +58,7 @@ class OleObjectGraphicDataContext : public ShapeContext public: OleObjectGraphicDataContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pShapePtr ); virtual ~OleObjectGraphicDataContext(); - 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; private: ::oox::vml::OleObjectInfo& mrOleObjectInfo; @@ -74,7 +74,7 @@ class DiagramGraphicDataContext public: DiagramGraphicDataContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pShapePtr ); virtual ~DiagramGraphicDataContext(); - 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; private: OUString msDm; @@ -95,7 +95,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, - const ::oox::AttributeList& rAttribs) SAL_OVERRIDE; + const ::oox::AttributeList& rAttribs) override; private: ChartShapeInfo& mrChartShapeInfo; diff --git a/include/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx index b7c17a7a4ac7..63c3beccf014 100644 --- a/include/oox/drawingml/shapecontext.hxx +++ b/include/oox/drawingml/shapecontext.hxx @@ -34,7 +34,7 @@ public: ShapeContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr ); virtual ~ShapeContext(); - 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; ShapePtr getShape() { return mpShapePtr;} diff --git a/include/oox/drawingml/shapegroupcontext.hxx b/include/oox/drawingml/shapegroupcontext.hxx index f5f9137265ed..877e3d7856aa 100644 --- a/include/oox/drawingml/shapegroupcontext.hxx +++ b/include/oox/drawingml/shapegroupcontext.hxx @@ -31,7 +31,7 @@ class OOX_DLLPUBLIC ShapeGroupContext : public ::oox::core::ContextHandler2 public: ShapeGroupContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pMasterShapePtr, ShapePtr pGroupShapePtr ); virtual ~ShapeGroupContext(); - 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; protected: diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx index 15c46e08a329..4287778d3a9f 100644 --- a/include/oox/drawingml/themefragmenthandler.hxx +++ b/include/oox/drawingml/themefragmenthandler.hxx @@ -39,7 +39,7 @@ public: Theme& rTheme ); virtual ~ThemeFragmentHandler(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: Theme& mrTheme; diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 6ab41a59ea66..46dd050f62a1 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -41,9 +41,9 @@ protected: using SequenceRecordObjectBase::construct; - virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; - virtual void implWriteExtHeader() SAL_OVERRIDE; - virtual void implDumpRecordBody() SAL_OVERRIDE; + virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) override; + virtual void implWriteExtHeader() override; + virtual void implDumpRecordBody() override; private: sal_uInt32 dumpDffSimpleColor( const String& rName ); diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 8e5355e2069d..d3ec9236f4d7 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -602,17 +602,17 @@ public: protected: explicit NameListBase( const SharedConfigData& rCfgData ) : mrCfgData( rCfgData ) {} - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; virtual void implProcessConfigItemInt( TextInputStream& rStrm, sal_Int64 nKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; /** Derived classes set the name for the passed key. */ virtual void implSetName( sal_Int64 nKey, const OUString& rName ) = 0; @@ -655,16 +655,16 @@ protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) override; /** Returns the name for the passed key, or the default name, if key is not contained. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const override; /** Returns the name for the passed double value. */ - virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const SAL_OVERRIDE; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const override; /** Inserts all names from the passed list. */ - virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; + virtual void implIncludeList( const NameListBase& rList ) override; private: OUString maDefName; @@ -684,9 +684,9 @@ protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; - virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) override; private: bool mbIgnoreEmpty; @@ -708,16 +708,16 @@ protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) override; /** Returns the name for the passed key. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const override; /** Returns the name for the passed double value. */ - virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const SAL_OVERRIDE; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const override; /** Inserts all flags from the passed list. */ - virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; + virtual void implIncludeList( const NameListBase& rList ) override; private: sal_Int64 mnIgnore; @@ -732,11 +732,11 @@ public: protected: /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) override; /** Returns the name for the passed key. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const override; /** Inserts all flags from the passed list. */ - virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; + virtual void implIncludeList( const NameListBase& rList ) override; private: struct ExtItemFormatKey @@ -768,13 +768,13 @@ public: protected: /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) override; /** Returns the converted value with appended unit name. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const override; /** Returns the converted value with appended unit name. */ - virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const SAL_OVERRIDE; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const override; /** Empty implementation. */ - virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; + virtual void implIncludeList( const NameListBase& rList ) override; private: OUString maUnitName; @@ -851,11 +851,11 @@ public: bool isPasswordCancelled() const { return mbPwCancelled; } protected: - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ) SAL_OVERRIDE; + const OUString& rData ) override; private: bool readConfigFile( const OUString& rFileUrl ); @@ -957,7 +957,7 @@ protected: const StorageRef& rxRootStrg, const OUString& rSysFileName ); - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; const OUString* implGetOption( const OUString& rKey ) const; NameListRef implGetNameList( const OUString& rListName ) const; @@ -1064,7 +1064,7 @@ public: protected: - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; private: void writeItemName( const String& rItemName ); @@ -1168,7 +1168,7 @@ public: bool isStorage() const; private: - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; private: StorageRef mxStrg; @@ -1196,7 +1196,7 @@ protected: void construct( const ConfigRef& rxConfig ); void construct( const ObjectBase& rParent ); - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; virtual void implDump(); @@ -1222,8 +1222,8 @@ protected: void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ); void construct( const ObjectBase& rParent ); - virtual bool implIsValid() const SAL_OVERRIDE; - virtual void implDump() SAL_OVERRIDE; + virtual bool implIsValid() const override; + virtual void implDump() override; virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, @@ -1298,7 +1298,7 @@ protected: void construct( const ObjectBase& rParent, const OUString& rSysFileName ); void construct( const OutputObjectBase& rParent ); - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; @@ -1468,7 +1468,7 @@ protected: void construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm ); void construct( const InputObjectBase& rParent ); - virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implIsValid() const override; void skipBlock( sal_Int64 nBytes, bool bShowSize = true ); void dumpRawBinary( sal_Int64 nBytes, bool bShowOffset = true, bool bStream = false ); @@ -1662,7 +1662,7 @@ public: protected: void dumpBinaryStream( bool bShowOffset = true ); - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; @@ -1684,8 +1684,8 @@ protected: const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc ); - virtual bool implIsValid() const SAL_OVERRIDE; - virtual void implDump() SAL_OVERRIDE; + virtual bool implIsValid() const override; + virtual void implDump() override; virtual void implDumpText( TextInputStream& rTextStrm ) = 0; @@ -1713,7 +1713,7 @@ public: rtl_TextEncoding eTextEnc ); protected: - virtual void implDumpText( TextInputStream& rTextStrm ) SAL_OVERRIDE; + virtual void implDumpText( TextInputStream& rTextStrm ) override; void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); }; @@ -1728,7 +1728,7 @@ public: const OUString& rSysFileName ); protected: - virtual void implDumpText( TextInputStream& rTextStrm ) SAL_OVERRIDE; + virtual void implDumpText( TextInputStream& rTextStrm ) override; }; @@ -1752,8 +1752,8 @@ protected: sal_Int64 getRecSize() const { return mnRecSize; } NameListRef getRecNames() const { return maRecNames.getNameList( cfg() ); } - virtual bool implIsValid() const SAL_OVERRIDE; - virtual void implDump() SAL_OVERRIDE; + virtual bool implIsValid() const override; + virtual void implDump() override; virtual bool implStartRecord( BinaryInputStream& rBaseStrm, sal_Int64& ornRecPos, sal_Int64& ornRecId, sal_Int64& ornRecSize ) = 0; virtual void implWriteExtHeader(); @@ -1793,7 +1793,7 @@ protected: const String& rRecNames, const String& rSimpleRecs = EMPTY_STRING ); - virtual bool implStartRecord( BinaryInputStream& rBaseStrm, sal_Int64& ornRecPos, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; + virtual bool implStartRecord( BinaryInputStream& rBaseStrm, sal_Int64& ornRecPos, sal_Int64& ornRecId, sal_Int64& ornRecSize ) override; virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) = 0; private: diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index ea0c8fd9458d..629de0f40858 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -60,7 +60,7 @@ public: explicit StdFontObject( const InputObjectBase& rParent ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; @@ -71,7 +71,7 @@ public: explicit StdPicObject( const InputObjectBase& rParent ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; @@ -91,7 +91,7 @@ public: explicit OleCompObjObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; @@ -103,7 +103,7 @@ public: explicit OlePropertyStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; private: void dumpSection( const OUString& rGuid, sal_uInt32 nStartPos ); @@ -152,7 +152,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; }; @@ -166,7 +166,7 @@ protected: sal_uInt32 nDataId5, sal_uInt32 nDataId6, sal_uInt16 nVersion, bool bCommonPart, bool bComplexPart ); - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; virtual void implDumpProperties() = 0; virtual void implDumpCommonExtra( sal_Int64 nEndPos ); virtual void implDumpCommonTrailing(); @@ -194,7 +194,7 @@ public: explicit ComCtlScrollBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpProperties() override; }; @@ -205,7 +205,7 @@ public: explicit ComCtlProgressBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpProperties() override; }; @@ -216,7 +216,7 @@ public: explicit ComCtlSliderObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpProperties() override; }; @@ -227,7 +227,7 @@ public: explicit ComCtlUpDownObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpProperties() override; }; @@ -238,9 +238,9 @@ public: explicit ComCtlImageListObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; - virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; - virtual void implDumpCommonTrailing() SAL_OVERRIDE; + virtual void implDumpProperties() override; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) override; + virtual void implDumpCommonTrailing() override; }; @@ -251,8 +251,8 @@ public: explicit ComCtlTabStripObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; - virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; + virtual void implDumpProperties() override; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) override; }; @@ -263,8 +263,8 @@ public: explicit ComCtlTreeViewObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; - virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; + virtual void implDumpProperties() override; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) override; private: sal_uInt32 mnStringFlags; @@ -278,9 +278,9 @@ public: explicit ComCtlStatusBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties() SAL_OVERRIDE; - virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; - virtual void implDumpCommonTrailing() SAL_OVERRIDE; + virtual void implDumpProperties() override; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) override; + virtual void implDumpCommonTrailing() override; }; @@ -303,8 +303,8 @@ protected: const String& rPropNameList, bool b64BitPropFlags = false ); - virtual bool implIsValid() const SAL_OVERRIDE; - virtual void implDump() SAL_OVERRIDE; + virtual bool implIsValid() const override; + virtual void implDump() override; virtual void implDumpShortProperties(); virtual void implDumpExtended(); @@ -432,7 +432,7 @@ public: explicit AxCFontNewObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -443,7 +443,7 @@ public: explicit AxColumnInfoObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -454,8 +454,8 @@ public: explicit AxCommandButtonObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; }; @@ -466,8 +466,8 @@ public: explicit AxMorphControlObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; private: void dumpColumnInfos(); @@ -485,8 +485,8 @@ public: explicit AxLabelObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; }; @@ -497,7 +497,7 @@ public: explicit AxImageObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -508,7 +508,7 @@ public: explicit AxScrollBarObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -519,7 +519,7 @@ public: explicit AxSpinButtonObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -530,8 +530,8 @@ public: explicit AxTabStripObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; private: sal_Int32 mnTabFlagCount; @@ -554,7 +554,7 @@ public: const OUString* pProgId = 0 ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; private: void constructFormCtrlStrmObj( const OUString* pProgId ); @@ -595,7 +595,7 @@ public: explicit VbaFormClassInfoObject( const InputObjectBase& rParent, VbaFormSharedData& rFormData ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; private: VbaFormSharedData& mrFormData; @@ -609,7 +609,7 @@ public: explicit VbaFormSiteObject( const InputObjectBase& rParent, VbaFormSharedData& rFormData ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; private: VbaFormSharedData& mrFormData; @@ -623,7 +623,7 @@ public: explicit VbaFormDesignExtObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -638,8 +638,8 @@ public: VbaFormSharedData& rFormData ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; private: void dumpClassInfos(); @@ -664,7 +664,7 @@ public: VbaFormSharedData& rFormData ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; private: VbaFormSharedData& mrFormData; @@ -678,7 +678,7 @@ public: explicit VbaPageObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; }; @@ -689,8 +689,8 @@ public: explicit VbaMultiPageObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties() SAL_OVERRIDE; - virtual void implDumpExtended() SAL_OVERRIDE; + virtual void implDumpShortProperties() override; + virtual void implDumpExtended() override; private: sal_Int32 mnPageCount; @@ -708,7 +708,7 @@ public: VbaFormSharedData& rFormData ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; private: VbaFormSharedData& mrFormData; @@ -729,12 +729,12 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; virtual void implDumpStorage( const StorageRef& rxStrg, const OUString& rStrgPath, - const OUString& rSysPath ) SAL_OVERRIDE; + const OUString& rSysPath ) override; private: bool isFormStorage( const OUString& rStrgPath ) const; @@ -771,9 +771,9 @@ public: VbaSharedData& rVbaData ); protected: - virtual bool implIsValid() const SAL_OVERRIDE; - virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; - virtual void implDumpRecordBody() SAL_OVERRIDE; + virtual bool implIsValid() const override; + virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) override; + virtual void implDumpRecordBody() override; private: OUString dumpByteString( const String& rName = EMPTY_STRING ); @@ -801,7 +801,7 @@ public: sal_Int32 nStrmOffset ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; private: VbaSharedData& mrVbaData; @@ -824,7 +824,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; private: VbaSharedData& mrVbaData; @@ -846,7 +846,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; private: VbaSharedData& mrVbaData; @@ -864,12 +864,12 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; virtual void implDumpStorage( const StorageRef& rxStrg, const OUString& rStrgPath, - const OUString& rSysPath ) SAL_OVERRIDE; + const OUString& rSysPath ) override; private: VbaSharedData maVbaData; @@ -889,7 +889,7 @@ public: protected: virtual void implDumpBaseStream( const BinaryInputStreamRef& rxStrm, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; }; diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx index 09aef138ad83..82f6a022872d 100644 --- a/include/oox/dump/pptxdumper.hxx +++ b/include/oox/dump/pptxdumper.hxx @@ -40,7 +40,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; }; @@ -56,7 +56,7 @@ public: const OUString& rSysFileName ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx index 8d01018b0c53..d7c1ef6eea5e 100644 --- a/include/oox/dump/xlsbdumper.hxx +++ b/include/oox/dump/xlsbdumper.hxx @@ -45,7 +45,7 @@ protected: using SequenceRecordObjectBase::construct; - virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; + virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) override; private: typedef std::shared_ptr< SequenceInputStream > SequenceInputStreamRef; @@ -66,7 +66,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ) SAL_OVERRIDE; + const OUString& rSysFileName ) override; }; @@ -82,7 +82,7 @@ public: const OUString& rSysFileName ); protected: - virtual void implDump() SAL_OVERRIDE; + virtual void implDump() override; }; diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 922b019c9b27..5c17c910b456 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -95,7 +95,7 @@ public: sal_uInt32 AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1, sal_Int16 eVOri = -1, sal_Int16 eHRel = -1, sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0, const bool bOOxmlExport = false ); - virtual void AddSdrObjectVMLObject( const SdrObject& rObj) SAL_OVERRIDE; + virtual void AddSdrObjectVMLObject( const SdrObject& rObj) override; static bool IsWaterMarkShape(const OUString& rStr); protected: /// Add an attribute to the generated <v:shape/> element. @@ -116,17 +116,17 @@ protected: /// /// The parameter is just what we got from StartShape(). virtual void EndShape( sal_Int32 nShapeElement ); - virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) override; private: - virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ) SAL_OVERRIDE; - virtual void CloseContainer() SAL_OVERRIDE; + virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ) override; + virtual void CloseContainer() override; - virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 ) SAL_OVERRIDE; - virtual void LeaveGroup() SAL_OVERRIDE; + virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 ) override; + virtual void LeaveGroup() override; - virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ) SAL_OVERRIDE; + virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ) override; private: /// Create an OString representing the id from a numerical id. diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 36edfe351e38..af4cf4a3c8af 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -261,19 +261,19 @@ public: /** Closes the input stream. Does also close the wrapped UNO input stream if bAutoClose has been set to true in the constructor. */ - virtual void close() SAL_OVERRIDE; + virtual void close() override; /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Reads nBytes bytes to the (existing) buffer opMem. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Seeks the stream forward by the passed number of bytes. This works for non-seekable streams too. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) override; private: StreamDataSequence maBuffer; ///< Data buffer used in readMemory() function. @@ -302,15 +302,15 @@ public: /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Reads nBytes bytes to the (existing) buffer opMem. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Seeks the stream forward by the passed number of bytes. This works for non-seekable streams too. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) override; private: /** Returns the number of bytes available in the sequence for the passed byte count. */ @@ -347,31 +347,31 @@ public: /** Returns the size of the data block in the wrapped stream offered by this wrapper. */ - virtual sal_Int64 size() const SAL_OVERRIDE; + virtual sal_Int64 size() const override; /** Returns the current relative stream position. */ - virtual sal_Int64 tell() const SAL_OVERRIDE; + virtual sal_Int64 tell() const override; /** Seeks the stream to the passed relative position, if the wrapped stream is seekable. */ - virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; + virtual void seek( sal_Int64 nPos ) override; /** Closes the input stream but not the wrapped stream. */ - virtual void close() SAL_OVERRIDE; + virtual void close() override; /** Reads nBytes bytes to the passed sequence. Does not read out of the data block whose size has been specified on construction. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Reads nBytes bytes to the (existing) buffer opMem. Does not read out of the data block whose size has been specified on construction. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Seeks the stream forward by the passed number of bytes. This works for non-seekable streams too. Does not seek out of the data block. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) override; private: /** Returns the number of bytes available in the sequence for the passed byte count. */ diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index bcceec379ffa..ac17f292226e 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -140,13 +140,13 @@ public: /** Flushes and closes the output stream. Does also close the wrapped UNO output stream if bAutoClose has been set to true in the constructor. */ - void close() SAL_OVERRIDE; + void close() override; /** Writes the passed data sequence. */ - virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) override; /** Write nBytes bytes from the (preallocated!) buffer pMem. */ - virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; private: StreamDataSequence maBuffer; ///< Data buffer used in writeMemory() function. @@ -176,10 +176,10 @@ public: explicit SequenceOutputStream( StreamDataSequence& rData ); /** Writes the passed data sequence. */ - virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) override; /** Write nBytes bytes from the (preallocated!) buffer pMem. */ - virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; }; diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index 4078fc68f5ac..38a9d67e3c9c 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -128,13 +128,13 @@ public: virtual ~BinaryXSeekableStream(); /** Returns the size of the stream, if wrapped stream is seekable, otherwise -1. */ - virtual sal_Int64 size() const SAL_OVERRIDE; + virtual sal_Int64 size() const override; /** Returns the current stream position, if wrapped stream is seekable, otherwise -1. */ - virtual sal_Int64 tell() const SAL_OVERRIDE; + virtual sal_Int64 tell() const override; /** Seeks the stream to the passed position, if wrapped stream is seekable. */ - virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; + virtual void seek( sal_Int64 nPos ) override; /** Releases the reference to the UNO XSeekable interface. */ - virtual void close() SAL_OVERRIDE; + virtual void close() override; protected: explicit BinaryXSeekableStream( @@ -158,13 +158,13 @@ class OOX_DLLPUBLIC SequenceSeekableStream : public virtual BinaryStreamBase { public: /** Returns the size of the wrapped data sequence. */ - virtual sal_Int64 size() const SAL_OVERRIDE; + virtual sal_Int64 size() const override; /** Returns the current stream position. */ - virtual sal_Int64 tell() const SAL_OVERRIDE; + virtual sal_Int64 tell() const override; /** Seeks the stream to the passed position. */ - virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; + virtual void seek( sal_Int64 nPos ) override; /** Releases the reference to the data sequence. */ - virtual void close() SAL_OVERRIDE; + virtual void close() override; protected: explicit SequenceSeekableStream( const StreamDataSequence& rData ); diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx index da998010f591..02e0dcead04b 100644 --- a/include/oox/helper/progressbar.hxx +++ b/include/oox/helper/progressbar.hxx @@ -92,9 +92,9 @@ public: virtual ~ProgressBar(); /** Returns the current position of the progress bar. */ - virtual double getPosition() const SAL_OVERRIDE; + virtual double getPosition() const override; /** Sets the current position of the progress bar. */ - virtual void setPosition( double fPosition ) SAL_OVERRIDE; + virtual void setPosition( double fPosition ) override; private: ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > @@ -114,14 +114,14 @@ public: const OUString& rText ); /** Returns the current position of the progress bar segment. */ - virtual double getPosition() const SAL_OVERRIDE; + virtual double getPosition() const override; /** Sets the current position of the progress bar segment. */ - virtual void setPosition( double fPosition ) SAL_OVERRIDE; + virtual void setPosition( double fPosition ) override; /** Returns the length that is still free for creating sub segments. */ - virtual double getFreeLength() const SAL_OVERRIDE; + virtual double getFreeLength() const override; /** Adds a new segment with the specified length. */ - virtual ISegmentProgressBarRef createSegment( double fLength ) SAL_OVERRIDE; + virtual ISegmentProgressBarRef createSegment( double fLength ) override; private: ProgressBar maProgress; diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx index f643935bb006..baf8d1241752 100644 --- a/include/oox/helper/zipstorage.hxx +++ b/include/oox/helper/zipstorage.hxx @@ -51,28 +51,28 @@ private: const OUString& rElementName ); /** Returns true, if the object represents a valid storage. */ - virtual bool implIsStorage() const SAL_OVERRIDE; + virtual bool implIsStorage() const override; /** Returns the com.sun.star.embed.XStorage interface of the current storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > - implGetXStorage() const SAL_OVERRIDE; + implGetXStorage() const override; /** Returns the names of all elements of this storage. */ - virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const SAL_OVERRIDE; + virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const override; /** Opens and returns the specified sub storage from the storage. */ - virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) SAL_OVERRIDE; + virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) override; /** Opens and returns the specified input stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - implOpenInputStream( const OUString& rElementName ) SAL_OVERRIDE; + implOpenInputStream( const OUString& rElementName ) override; /** Opens and returns the specified output stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > - implOpenOutputStream( const OUString& rElementName ) SAL_OVERRIDE; + implOpenOutputStream( const OUString& rElementName ) override; /** Commits the current storage. */ - virtual void implCommit() const SAL_OVERRIDE; + virtual void implCommit() const override; private: ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index 382055f2cd97..7a14865e8544 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -45,24 +45,24 @@ public: /** Returns the size of the data this stream represents, if the wrapped stream supports the size() operation. */ - virtual sal_Int64 size() const SAL_OVERRIDE; + virtual sal_Int64 size() const override; /** Return the current relative stream position (relative to position of the wrapped stream at construction time). */ - virtual sal_Int64 tell() const SAL_OVERRIDE; + virtual sal_Int64 tell() const override; /** Seeks the stream to the passed relative position, if it is behind the current position. */ - virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; + virtual void seek( sal_Int64 nPos ) override; /** Closes the input stream but not the wrapped stream. */ - virtual void close() SAL_OVERRIDE; + virtual void close() override; /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Reads nBytes bytes to the (existing) buffer opMem. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Seeks the stream forward by the passed number of bytes. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Aligns the stream to a multiple of the passed size (relative to the position of the wrapped stream at construction time). */ @@ -171,7 +171,7 @@ private: explicit PairProperty( AxPairData& rPairData ) : mrPairData( rPairData ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool readProperty( AxAlignedInputStream& rInStrm ) override; }; /** Complex property for a string value. */ @@ -182,7 +182,7 @@ private: explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : mrValue( rValue ), mnSize( nSize ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool readProperty( AxAlignedInputStream& rInStrm ) override; }; /** Complex property for an array of strings. */ @@ -192,7 +192,7 @@ private: sal_uInt32 mnSize; explicit ArrayStringProperty( AxArrayString& rArray, sal_uInt32 nSize ) : mrArray( rArray ), mnSize( nSize ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool readProperty( AxAlignedInputStream& rInStrm ) override; }; /** Complex property for a GUID value. */ @@ -202,7 +202,7 @@ private: explicit GuidProperty( OUString& rGuid ) : mrGuid( rGuid ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool readProperty( AxAlignedInputStream& rInStrm ) override; }; /** Stream property for a font structure. */ @@ -212,7 +212,7 @@ private: explicit FontProperty( AxFontData& rFontData ) : mrFontData( rFontData ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool readProperty( AxAlignedInputStream& rInStrm ) override; }; /** Stream property for a picture or mouse icon. */ @@ -222,7 +222,7 @@ private: explicit PictureProperty( StreamDataSequence& rPicData ) : mrPicData( rPicData ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool readProperty( AxAlignedInputStream& rInStrm ) override; }; typedef RefVector< ComplexProperty > ComplexPropVector; diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index 4eb133a00c27..3efd418dea64 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -33,22 +33,22 @@ public: /** Returns the size of the data this stream represents, if the wrapped stream supports the size() operation. */ - virtual sal_Int64 size() const SAL_OVERRIDE; + virtual sal_Int64 size() const override; /** Return the current relative stream position (relative to position of the wrapped stream at construction time). */ - virtual sal_Int64 tell() const SAL_OVERRIDE; + virtual sal_Int64 tell() const override; /** Seeks the stream to the passed relative position, if it is behind the current position. */ - virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; + virtual void seek( sal_Int64 nPos ) override; /** Closes the input stream but not the wrapped stream. */ - virtual void close() SAL_OVERRIDE; + virtual void close() override; /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual void writeData( const StreamDataSequence& orData, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void writeData( const StreamDataSequence& orData, size_t nAtomSize = 1 ) override; /** Reads nBytes bytes to the (existing) buffer opMem. @return Number of bytes really read. */ - virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Aligns the stream to a multiple of the passed size (relative to the position of the wrapped stream at construction time). */ @@ -121,7 +121,7 @@ private: explicit PairProperty( AxPairData& rPairData ) : mrPairData( rPairData ) {} - virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ) override; }; /** Complex property for a string value. */ @@ -132,7 +132,7 @@ private: explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : mrValue( rValue ), mnSize( nSize ) {} - virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ) override; }; /** Stream property for a picture or mouse icon. */ @@ -142,7 +142,7 @@ private: explicit PictureProperty( StreamDataSequence& rPicData ) : mrPicData( rPicData ) {} - virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ) override; }; typedef RefVector< ComplexProperty > ComplexPropVector; diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 6160c165ba8b..8a3c6bcd2907 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -401,8 +401,8 @@ public: sal_uInt32 nDataPartId5, sal_uInt32 nDataPartId6, sal_uInt16 nVersion, bool bCommonPart, bool bComplexPart ); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; protected: virtual void importControlData( BinaryInputStream& rInStrm ) = 0; @@ -441,11 +441,11 @@ class ComCtlScrollBarModel : public ComCtlModelBase public: explicit ComCtlScrollBarModel( sal_uInt16 nVersion ); - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; protected: - virtual void importControlData( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual void importControlData( BinaryInputStream& rInStrm ) override; private: sal_uInt32 mnScrollBarFlags; ///< Special flags for scroll bar model. @@ -464,11 +464,11 @@ class ComCtlProgressBarModel : public ComCtlModelBase public: explicit ComCtlProgressBarModel( sal_uInt16 nVersion ); - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; protected: - virtual void importControlData( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual void importControlData( BinaryInputStream& rInStrm ) override; private: float mfMin; ///< Minimum of the value range. @@ -485,7 +485,7 @@ class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase public: explicit AxControlModelBase(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) override; }; @@ -496,11 +496,11 @@ class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase public: explicit AxFontDataModel( bool bSupportsAlign = true ); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) override; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; /** Returns the font height in points. */ sal_Int16 getFontHeight() const { return maFontData.getHeightPoints(); } @@ -520,15 +520,15 @@ class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel public: explicit AxCommandButtonModel(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; - virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) override; + virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ) override; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; public: // direct access needed for legacy VML drawing controls StreamDataSequence maPictureData; ///< Binary picture stream. @@ -549,14 +549,14 @@ class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel public: explicit AxLabelModel(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) override; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; public: // direct access needed for legacy VML drawing controls OUString maCaption; ///< Visible caption of the button. @@ -577,14 +577,14 @@ class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase public: explicit AxImageModel(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; - virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) override; + virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ) override; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; private: StreamDataSequence maPictureData; ///< Binary picture stream. @@ -603,9 +603,9 @@ class OOX_DLLPUBLIC AxTabStripModel : public AxFontDataModel public: explicit AxTabStripModel(); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; - virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; public: sal_uInt32 mnListIndex; @@ -624,11 +624,11 @@ class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel public: explicit AxMorphDataModelBase(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; - virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) override; + virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ) override; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; public: // direct access needed for legacy VML drawing controls StreamDataSequence maPictureData; ///< Binary picture stream. @@ -661,10 +661,10 @@ class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase public: explicit AxToggleButtonModel(); - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; }; @@ -675,10 +675,10 @@ class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase public: explicit AxCheckBoxModel(); - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; }; @@ -692,10 +692,10 @@ public: /** Returns the group name used to goup several option buttons together. */ const OUString& getGroupName() const { return maGroupName; } - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; }; @@ -706,10 +706,10 @@ class OOX_DLLPUBLIC AxTextBoxModel : public AxMorphDataModelBase public: explicit AxTextBoxModel(); - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; }; @@ -720,10 +720,10 @@ class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase public: explicit AxNumericFieldModel(); - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; }; @@ -734,10 +734,10 @@ class OOX_DLLPUBLIC AxListBoxModel : public AxMorphDataModelBase public: explicit AxListBoxModel(); - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; }; @@ -748,10 +748,10 @@ class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase public: explicit AxComboBoxModel(); - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; }; @@ -762,14 +762,14 @@ class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase public: explicit AxSpinButtonModel(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) override; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) override; - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; public: // direct access needed for legacy VML drawing controls sal_uInt32 mnArrowColor; ///< Button arrow color. @@ -791,14 +791,14 @@ class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase public: explicit AxScrollBarModel(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; - virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) override; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) override; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) override; - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) override; public: // direct access needed for legacy VML drawing controls sal_uInt32 mnArrowColor; ///< Button arrow color. @@ -825,12 +825,12 @@ public: explicit AxContainerModelBase( bool bFontSupport = false ); /** Allows to set single properties specified by XML token identifier. */ - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) override; /** Reads the leading structure in the 'f' stream containing the model for this control. */ - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; /** Converts font settings if supported. */ - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; /** Reads the class table structure for embedded controls following the own model from the 'f' stream. */ @@ -864,8 +864,8 @@ class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase public: explicit AxFrameModel(); - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; }; class OOX_DLLPUBLIC AxPageModel : public AxContainerModelBase @@ -873,8 +873,8 @@ class OOX_DLLPUBLIC AxPageModel : public AxContainerModelBase public: explicit AxPageModel(); - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; }; class OOX_DLLPUBLIC AxMultiPageModel : public AxContainerModelBase @@ -882,9 +882,9 @@ class OOX_DLLPUBLIC AxMultiPageModel : public AxContainerModelBase public: explicit AxMultiPageModel(); - virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; bool importPageAndMultiPageProperties( BinaryInputStream& rInStrm, sal_Int32 nPages ); - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; std::vector<sal_uInt32> mnIDs; sal_uInt32 mnActiveTab; sal_uInt32 mnTabStyle; @@ -899,8 +899,8 @@ class OOX_DLLPUBLIC AxUserFormModel : public AxContainerModelBase public: explicit AxUserFormModel(); - virtual ApiControlType getControlType() const SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual ApiControlType getControlType() const override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; }; class HtmlSelectModel : public AxListBoxModel @@ -909,15 +909,15 @@ class HtmlSelectModel : public AxListBoxModel com::sun::star::uno::Sequence< sal_Int16 > msIndices; public: HtmlSelectModel(); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const override; }; class HtmlTextBoxModel : public AxTextBoxModel { public: explicit HtmlTextBoxModel(); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) override; }; diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx index 0edf0dd89cad..7964e55225cd 100644 --- a/include/oox/ole/axcontrolfragment.hxx +++ b/include/oox/ole/axcontrolfragment.hxx @@ -39,7 +39,7 @@ public: ControlModelBase& rModel ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: ControlModelBase& mrModel; @@ -58,7 +58,7 @@ public: EmbeddedControl& rControl ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: EmbeddedControl& mrControl; diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx index 085ef570abaa..af0e51c218b7 100644 --- a/include/oox/ole/olestorage.hxx +++ b/include/oox/ole/olestorage.hxx @@ -65,7 +65,7 @@ private: void initStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ); /** Returns true, if the object represents a valid storage. */ - virtual bool implIsStorage() const SAL_OVERRIDE; + virtual bool implIsStorage() const override; /** Returns the com.sun.star.embed.XStorage interface of the current storage. @@ -73,24 +73,24 @@ private: This function is not implemented for binary OLE storages. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > - implGetXStorage() const SAL_OVERRIDE; + implGetXStorage() const override; /** Returns the names of all elements of this storage. */ - virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const SAL_OVERRIDE; + virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const override; /** Opens and returns the specified sub storage from the storage. */ - virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) SAL_OVERRIDE; + virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) override; /** Opens and returns the specified input stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - implOpenInputStream( const OUString& rElementName ) SAL_OVERRIDE; + implOpenInputStream( const OUString& rElementName ) override; /** Opens and returns the specified output stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > - implOpenOutputStream( const OUString& rElementName ) SAL_OVERRIDE; + implOpenOutputStream( const OUString& rElementName ) override; /** Commits the current storage. */ - virtual void implCommit() const SAL_OVERRIDE; + virtual void implCommit() const override; private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx index 330158bee707..393f517c06b4 100644 --- a/include/oox/ole/vbainputstream.hxx +++ b/include/oox/ole/vbainputstream.hxx @@ -35,22 +35,22 @@ public: explicit VbaInputStream( BinaryInputStream& rInStrm ); /** Returns -1, stream size is not determinable. */ - virtual sal_Int64 size() const SAL_OVERRIDE; + virtual sal_Int64 size() const override; /** Returns -1, stream position is not tracked. */ - virtual sal_Int64 tell() const SAL_OVERRIDE; + virtual sal_Int64 tell() const override; /** Does nothing, stream is not seekable. */ - virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; + virtual void seek( sal_Int64 nPos ) override; /** Closes the input stream but not the wrapped stream. */ - virtual void close() SAL_OVERRIDE; + virtual void close() override; /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Reads nBytes bytes to the (existing) buffer opMem. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) override; /** Seeks the stream forward by the passed number of bytes. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) override; private: /** If no data left in chunk buffer, reads the next chunk from stream. */ diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx index 57202805ad2b..c1106ef23f38 100644 --- a/include/oox/ppt/backgroundproperties.hxx +++ b/include/oox/ppt/backgroundproperties.hxx @@ -31,7 +31,7 @@ class BackgroundPropertiesContext : public ::oox::core::FragmentHandler2 { public: BackgroundPropertiesContext( ::oox::core::FragmentHandler2& rParent, ::oox::drawingml::FillProperties& rFillProperties ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; protected: ::oox::drawingml::FillProperties& mrFillProperties; diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx index 23739cf97ad8..fac3b0216b73 100644 --- a/include/oox/ppt/customshowlistcontext.hxx +++ b/include/oox/ppt/customshowlistcontext.hxx @@ -43,7 +43,7 @@ namespace oox { namespace ppt { std::vector< CustomShow >& rCustomShowList ); virtual ~CustomShowListContext( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; }; } } diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 3fd88b50114c..cee93767fd68 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -40,18 +40,18 @@ public: QuickDiagrammingImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // from FilterBase - virtual bool importDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual bool exportDocument() throw() SAL_OVERRIDE; + virtual bool importDocument() throw (css::uno::RuntimeException, std::exception) override; + virtual bool exportDocument() throw() override; - virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; + virtual const ::oox::drawingml::Theme* getCurrentTheme() const override; + virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() override; - virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; - virtual oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; + virtual oox::vml::Drawing* getVmlDrawing() override; + virtual oox::drawingml::chart::ChartConverter* getChartConverter() override; private: - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const override; }; } } diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index d0ec057f99ca..4df5c154de22 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -40,18 +40,18 @@ public: QuickDiagrammingLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // from FilterBase - virtual bool importDocument() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual bool exportDocument() throw() SAL_OVERRIDE; + virtual bool importDocument() throw (css::uno::RuntimeException) override; + virtual bool exportDocument() throw() override; - virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; + virtual const ::oox::drawingml::Theme* getCurrentTheme() const override; + virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() override; - virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; + virtual ::oox::vml::Drawing* getVmlDrawing() override; + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override; private: - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const override; drawingml::ThemePtr mpThemePtr; }; diff --git a/include/oox/ppt/layoutfragmenthandler.hxx b/include/oox/ppt/layoutfragmenthandler.hxx index 74ae422f5280..d385bc537f8f 100644 --- a/include/oox/ppt/layoutfragmenthandler.hxx +++ b/include/oox/ppt/layoutfragmenthandler.hxx @@ -32,7 +32,7 @@ public: LayoutFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) throw(); virtual ~LayoutFragmentHandler() throw(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; }; } } diff --git a/include/oox/ppt/pptgraphicshapecontext.hxx b/include/oox/ppt/pptgraphicshapecontext.hxx index 827cfe558d9e..5e6d4224bb64 100644 --- a/include/oox/ppt/pptgraphicshapecontext.hxx +++ b/include/oox/ppt/pptgraphicshapecontext.hxx @@ -30,7 +30,7 @@ class PPTGraphicShapeContext : public ::oox::drawingml::GraphicShapeContext public: PPTGraphicShapeContext( ::oox::core::ContextHandler2Helper& rParent, const SlidePersistPtr& rSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr ); - 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; }; } } diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 860da2afa361..476a402a98f0 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -42,13 +42,13 @@ public: virtual ~PowerPointImport(); // from FilterBase - virtual bool importDocument() SAL_OVERRIDE; - virtual bool exportDocument() throw() SAL_OVERRIDE; + virtual bool importDocument() override; + virtual bool exportDocument() throw() override; - virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; - virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; - virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; + virtual const ::oox::drawingml::Theme* getCurrentTheme() const override; + virtual ::oox::vml::Drawing* getVmlDrawing() override; + virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() override; + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() override; SlidePersistPtr getActualSlidePersist() const { return mpActualSlidePersist; }; void setActualSlidePersist( SlidePersistPtr pActualSlidePersist ){ mpActualSlidePersist = pActualSlidePersist; }; @@ -58,7 +58,7 @@ public: std::vector< SlidePersistPtr >& getNotesPages(){ return maNotesPages; }; virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; sal_Int32 getSchemeColor( sal_Int32 nToken ) const; @@ -67,9 +67,9 @@ public: #endif private: - virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; - 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 override; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const override; + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; private: OUString maTableStyleListPath; diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index 30f4a13cd351..852b92f36f30 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -49,7 +49,7 @@ public: const com::sun::star::awt::Rectangle* pShapeRect = 0, ::oox::drawingml::ShapeIdMap* pShapeMap = 0 ); - virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ) SAL_OVERRIDE; + virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ) override; ShapeLocation getShapeLocation() const { return meShapeLocation; }; void setReferenced( bool bReferenced ){ mbReferenced = bReferenced; }; diff --git a/include/oox/ppt/pptshapecontext.hxx b/include/oox/ppt/pptshapecontext.hxx index 11514f75f7ac..2ff237fa09c0 100644 --- a/include/oox/ppt/pptshapecontext.hxx +++ b/include/oox/ppt/pptshapecontext.hxx @@ -31,7 +31,7 @@ class PPTShapeContext : public ::oox::drawingml::ShapeContext public: PPTShapeContext( ::oox::core::ContextHandler2Helper& rParent, const SlidePersistPtr& rSlidePersistPtr, oox::drawingml::ShapePtr pMasterShapePtr, oox::drawingml::ShapePtr pShapePtr ); - 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; }; } } diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx index 07947fbec2cd..a93c3ac6d9f3 100644 --- a/include/oox/ppt/pptshapegroupcontext.hxx +++ b/include/oox/ppt/pptshapegroupcontext.hxx @@ -43,7 +43,7 @@ public: oox::drawingml::ShapePtr pGroupShapePtr ); virtual ::oox::core::ContextHandlerRef - onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; void importExtDrawings(); diff --git a/include/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx index 4184357299cc..b41a18665ca8 100644 --- a/include/oox/ppt/pptshapepropertiescontext.hxx +++ b/include/oox/ppt/pptshapepropertiescontext.hxx @@ -29,7 +29,7 @@ class PPTShapePropertiesContext : public ::oox::drawingml::ShapePropertiesContex public: PPTShapePropertiesContext( ::oox::core::ContextHandler2Helper& rParent, ::oox::drawingml::Shape& rShape ); virtual ::oox::core::ContextHandlerRef - onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; }; } } diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index b4b10bca23b1..c476c67ae091 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -39,8 +39,8 @@ class PresentationFragmentHandler : public ::oox::core::FragmentHandler2 public: PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath ) throw(); virtual ~PresentationFragmentHandler() throw(); - virtual void finalizeImport() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void finalizeImport() override; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; protected: bool importSlide( const ::oox::core::FragmentHandlerRef& rSlideFragmentHandler, diff --git a/include/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx index 07aa83514874..a0d1394d19cf 100644 --- a/include/oox/ppt/slidefragmenthandler.hxx +++ b/include/oox/ppt/slidefragmenthandler.hxx @@ -37,9 +37,9 @@ public: SlideFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation ); virtual ~SlideFragmentHandler(); - virtual void finalizeImport() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void finalizeImport() override; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; const ::std::vector< OUString>& getCharVector() { return maCharVector; } diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx index 05aa3853d5f5..d719e4616666 100644 --- a/include/oox/ppt/slidemastertextstylescontext.hxx +++ b/include/oox/ppt/slidemastertextstylescontext.hxx @@ -32,7 +32,7 @@ class SlideMasterTextStylesContext : public oox::core::FragmentHandler2 public: SlideMasterTextStylesContext( ::oox::core::FragmentHandler2& rParent, SlidePersistPtr pSlidePersistPtr ); virtual ~SlideMasterTextStylesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; protected: SlidePersistPtr mpSlidePersistPtr; diff --git a/include/oox/ppt/slidetimingcontext.hxx b/include/oox/ppt/slidetimingcontext.hxx index b55f775ba2e6..359804593ca6 100644 --- a/include/oox/ppt/slidetimingcontext.hxx +++ b/include/oox/ppt/slidetimingcontext.hxx @@ -35,7 +35,7 @@ public: SlideTimingContext( ::oox::core::FragmentHandler2& rParent, TimeNodePtrList & aTimeNodeList ) throw(); virtual ~SlideTimingContext() throw(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: TimeNodePtrList & maTimeNodeList; diff --git a/include/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx index 287d75d73ba6..8cb53e78969e 100644 --- a/include/oox/ppt/slidetransitioncontext.hxx +++ b/include/oox/ppt/slidetransitioncontext.hxx @@ -35,8 +35,8 @@ namespace oox { namespace ppt { PropertyMap & aProperties ) throw(); virtual ~SlideTransitionContext() throw(); - virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onEndElement() override; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx index 7b72e03e038c..4b3bd9fee30b 100644 --- a/include/oox/ppt/soundactioncontext.hxx +++ b/include/oox/ppt/soundactioncontext.hxx @@ -33,8 +33,8 @@ public: SoundActionContext( ::oox::core::FragmentHandler2& rParent, PropertyMap & aProperties ) throw(); virtual ~SoundActionContext() throw(); - virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onEndElement() override; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: PropertyMap& maSlideProperties; diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx index 45c77a5488d9..1656234c6844 100644 --- a/include/oox/ppt/timenodelistcontext.hxx +++ b/include/oox/ppt/timenodelistcontext.hxx @@ -51,7 +51,7 @@ public: TimeNodeListContext( ::oox::core::FragmentHandler2& rParent, TimeNodePtrList & aList ) throw(); virtual ~TimeNodeListContext() throw(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override; private: diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx index 2229426589e8..6851f582c398 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 SAL_OVERRIDE; + openFragmentStream() const override; virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; - virtual void finalizeImport() SAL_OVERRIDE; + virtual void finalizeImport() override; private: Drawing& mrDrawing; diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx index fa1ff1d2338b..e4a6130b276b 100644 --- a/include/oox/vml/vmlinputstream.hxx +++ b/include/oox/vml/vmlinputstream.hxx @@ -60,15 +60,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) SAL_OVERRIDE; + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL closeInput() - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) 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 e4b5c9288920..c14ea4c11d11 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 SAL_OVERRIDE; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const override; /** Used by both RectangleShape and ComplexShape. */ com::sun::star::uno::Reference<com::sun::star::drawing::XShape>createPictureObject( const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rxShapes, @@ -315,7 +315,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 SAL_OVERRIDE; + const com::sun::star::awt::Rectangle& rShapeRect) const 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 SAL_OVERRIDE; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const override; }; /** A Line shape object. */ @@ -351,9 +351,9 @@ public: protected: /** Returns the absolute shape rectangle. */ - virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const override; /** Returns the rectangle relative to the parent coordinate system. */ - virtual ::com::sun::star::awt::Rectangle getRelRectangle() const SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle getRelRectangle() const override; }; /** Bezier shape object that supports to, from, control1 and control2 @@ -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 SAL_OVERRIDE; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const 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 SAL_OVERRIDE; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const 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 SAL_OVERRIDE; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const override; }; @@ -419,19 +419,19 @@ public: const ShapeContainer& getChildren() const { return *mxChildren; } /** Final processing after import of the drawing fragment. */ - virtual void finalizeFragmentImport() SAL_OVERRIDE; + virtual void finalizeFragmentImport() override; /** Returns the shape template with the passed identifier from the child shapes. */ - virtual const ShapeType* getChildTypeById( const OUString& rShapeId ) const SAL_OVERRIDE; + virtual const ShapeType* getChildTypeById( const OUString& rShapeId ) const override; /** Returns the shape with the passed identifier from the child shapes. */ - virtual const ShapeBase* getChildById( const OUString& rShapeId ) const SAL_OVERRIDE; + virtual const ShapeBase* getChildById( const OUString& rShapeId ) const 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 SAL_OVERRIDE; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const override; private: typedef ::std::unique_ptr< ShapeContainer > ShapeContainerPtr; diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx index 4f178db1361a..194a66c600aa 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 ) SAL_OVERRIDE; + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: Drawing& mrDrawing; @@ -65,9 +65,9 @@ public: const AttributeList& rAttribs ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onEndElement() override; private: ClientData& mrClientData; @@ -101,7 +101,7 @@ public: const AttributeList& rAttribs ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) 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 ) SAL_OVERRIDE; + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) 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 ) SAL_OVERRIDE; + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; private: ShapeContainer& mrShapes; @@ -176,7 +176,7 @@ public: RectangleShape& rShape ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; }; diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx index b7d6d72323da..770a6f015861 100644 --- a/include/oox/vml/vmltextboxcontext.hxx +++ b/include/oox/vml/vmltextboxcontext.hxx @@ -42,10 +42,10 @@ public: const AttributeList& rAttribs ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual void onStartElement(const AttributeList& rAttribs) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onCharacters( const OUString& rChars ) override; + virtual void onStartElement(const AttributeList& rAttribs) override; + virtual void onEndElement() override; private: TextBox& mrTextBox; @@ -66,9 +66,9 @@ public: const GraphicHelper& graphicHelper ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onStartElement(const AttributeList& rAttribs) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) override; + virtual void onStartElement(const AttributeList& rAttribs) override; + virtual void onEndElement() override; private: TextBox& mrTextBox; |