From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- ucb/source/cacher/cachedcontentresultset.cxx | 16 +-- ucb/source/cacher/cachedcontentresultset.hxx | 128 ++++++++++----------- ucb/source/cacher/cachedcontentresultsetstub.hxx | 46 ++++---- ucb/source/cacher/cacheddynamicresultset.hxx | 40 +++---- ucb/source/cacher/cacheddynamicresultsetstub.hxx | 40 +++---- ucb/source/cacher/contentresultsetwrapper.hxx | 120 +++++++++---------- ucb/source/cacher/dynamicresultsetwrapper.hxx | 28 ++--- ucb/source/core/FileAccess.cxx | 56 ++++----- ucb/source/core/cmdenv.hxx | 12 +- ucb/source/core/identify.hxx | 4 +- ucb/source/core/provprox.hxx | 34 +++--- ucb/source/core/ucb.hxx | 50 ++++---- ucb/source/core/ucbcmds.cxx | 16 +-- ucb/source/core/ucbprops.hxx | 12 +- ucb/source/core/ucbstore.cxx | 6 +- ucb/source/core/ucbstore.hxx | 76 ++++++------ ucb/source/sorter/sortdynres.hxx | 32 +++--- ucb/source/sorter/sortresult.cxx | 6 +- ucb/source/sorter/sortresult.hxx | 112 +++++++++--------- ucb/source/ucp/cmis/auth_provider.hxx | 2 +- ucb/source/ucp/cmis/certvalidation_handler.hxx | 2 +- ucb/source/ucp/cmis/cmis_content.hxx | 32 +++--- ucb/source/ucp/cmis/cmis_datasupplier.hxx | 22 ++-- ucb/source/ucp/cmis/cmis_provider.hxx | 18 +-- ucb/source/ucp/cmis/cmis_repo_content.hxx | 28 ++--- ucb/source/ucp/cmis/cmis_resultset.hxx | 4 +- ucb/source/ucp/expand/ucpexpand.cxx | 12 +- ucb/source/ucp/ext/ucpext_content.hxx | 16 +-- ucb/source/ucp/ext/ucpext_datasupplier.hxx | 22 ++-- ucb/source/ucp/ext/ucpext_provider.hxx | 6 +- ucb/source/ucp/ext/ucpext_resultset.hxx | 4 +- ucb/source/ucp/file/bc.hxx | 66 +++++------ ucb/source/ucp/file/filcmd.hxx | 16 +-- ucb/source/ucp/file/filid.hxx | 14 +-- ucb/source/ucp/file/filinpstr.hxx | 26 ++--- ucb/source/ucp/file/filinsreq.hxx | 6 +- ucb/source/ucp/file/filprp.hxx | 6 +- ucb/source/ucp/file/filrow.hxx | 40 +++---- ucb/source/ucp/file/filrset.hxx | 126 ++++++++++---------- ucb/source/ucp/file/filstr.hxx | 30 ++--- ucb/source/ucp/file/prov.cxx | 12 +- ucb/source/ucp/file/prov.hxx | 34 +++--- ucb/source/ucp/ftp/ftpcontent.cxx | 4 +- ucb/source/ucp/ftp/ftpcontent.hxx | 36 +++--- ucb/source/ucp/ftp/ftpcontentidentifier.hxx | 14 +-- ucb/source/ucp/ftp/ftpcontentprovider.hxx | 18 +-- ucb/source/ucp/ftp/ftpdynresultset.hxx | 4 +- ucb/source/ucp/ftp/ftpintreq.hxx | 4 +- ucb/source/ucp/ftp/ftpresultsetbase.cxx | 12 +- ucb/source/ucp/ftp/ftpresultsetbase.hxx | 112 +++++++++--------- ucb/source/ucp/gio/gio_content.hxx | 30 ++--- ucb/source/ucp/gio/gio_datasupplier.hxx | 22 ++-- ucb/source/ucp/gio/gio_inputstream.hxx | 10 +- ucb/source/ucp/gio/gio_outputstream.hxx | 12 +- ucb/source/ucp/gio/gio_provider.hxx | 18 +-- ucb/source/ucp/gio/gio_resultset.hxx | 4 +- ucb/source/ucp/gio/gio_seekable.hxx | 14 +-- ucb/source/ucp/hierarchy/dynamicresultset.hxx | 4 +- ucb/source/ucp/hierarchy/hierarchycontent.hxx | 32 +++--- ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 56 ++++----- ucb/source/ucp/hierarchy/hierarchydatasource.hxx | 28 ++--- ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx | 22 ++-- ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 20 ++-- ucb/source/ucp/package/pkgcontent.hxx | 30 ++--- ucb/source/ucp/package/pkgdatasupplier.hxx | 22 ++-- ucb/source/ucp/package/pkgprovider.cxx | 10 +- ucb/source/ucp/package/pkgprovider.hxx | 18 +-- ucb/source/ucp/package/pkgresultset.hxx | 4 +- ucb/source/ucp/tdoc/tdoc_content.hxx | 32 +++--- ucb/source/ucp/tdoc/tdoc_datasupplier.hxx | 22 ++-- ucb/source/ucp/tdoc/tdoc_docmgr.hxx | 10 +- .../ucp/tdoc/tdoc_documentcontentfactory.hxx | 8 +- ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx | 16 +-- ucb/source/ucp/tdoc/tdoc_provider.hxx | 24 ++-- ucb/source/ucp/tdoc/tdoc_resultset.hxx | 4 +- ucb/source/ucp/tdoc/tdoc_stgelems.hxx | 110 +++++++++--------- ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx | 2 +- ucb/source/ucp/webdav-neon/NeonInputStream.hxx | 22 ++-- ucb/source/ucp/webdav-neon/NeonLockStore.cxx | 2 +- ucb/source/ucp/webdav-neon/NeonSession.hxx | 40 +++---- ucb/source/ucp/webdav-neon/webdavcontent.hxx | 34 +++--- ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx | 22 ++-- ucb/source/ucp/webdav-neon/webdavprovider.hxx | 18 +-- ucb/source/ucp/webdav-neon/webdavresultset.hxx | 4 +- ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx | 2 +- ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx | 6 +- ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx | 6 +- ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx | 6 +- ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx | 6 +- ucb/source/ucp/webdav/SerfInputStream.hxx | 22 ++-- ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx | 8 +- ucb/source/ucp/webdav/SerfLockStore.cxx | 2 +- ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx | 6 +- ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx | 6 +- ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx | 6 +- ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx | 6 +- ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx | 6 +- ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx | 6 +- ucb/source/ucp/webdav/SerfSession.hxx | 42 +++---- ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx | 8 +- ucb/source/ucp/webdav/webdavcontent.hxx | 34 +++--- ucb/source/ucp/webdav/webdavdatasupplier.hxx | 22 ++-- ucb/source/ucp/webdav/webdavprovider.hxx | 18 +-- ucb/source/ucp/webdav/webdavresponseparser.cxx | 16 +-- ucb/source/ucp/webdav/webdavresultset.hxx | 4 +- 105 files changed, 1273 insertions(+), 1273 deletions(-) (limited to 'ucb') diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index cc3c44007de7..5b097fc2de88 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -414,30 +414,30 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XPropertySetInfo virtual Sequence< com::sun::star::beans::Property > SAL_CALL getProperties() - throw( RuntimeException, std::exception ) SAL_OVERRIDE; + throw( RuntimeException, std::exception ) override; virtual com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( RuntimeException, std::exception ) SAL_OVERRIDE; + throw( RuntimeException, std::exception ) override; }; OUString CCRS_PropertySetInfo::m_aPropertyNameForCount( "RowCount" ); diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index d4de26951ed0..775a287ca5b9 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -159,7 +159,7 @@ class CachedContentResultSet private: //helping XPropertySet methods. - virtual void SAL_CALL impl_initPropertySetInfo() SAL_OVERRIDE; + virtual void SAL_CALL impl_initPropertySetInfo() override; @@ -201,26 +201,26 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -235,46 +235,46 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // own inherited virtual void SAL_CALL impl_disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException ) override; virtual void SAL_CALL impl_propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt ) - throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException ) override; virtual void SAL_CALL impl_vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent ) throw( com::sun::star::beans::PropertyVetoException, - com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException ) override; // XContentAccess inherited virtual OUString SAL_CALL queryContentIdentifierString() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL queryContent() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XResultSet inherited @@ -282,76 +282,76 @@ public: virtual sal_Bool SAL_CALL next() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isBeforeFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isAfterLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL beforeFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL afterLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL first() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL last() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getRow() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL previous() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL refreshRow() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowUpdated() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowInserted() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowDeleted() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getStatement() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XRow inherited @@ -359,110 +359,110 @@ public: virtual sal_Bool SAL_CALL wasNull() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // Type Converter support @@ -503,25 +503,25 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -539,7 +539,7 @@ public: com::sun::star::sdbc::XResultSet > & xSource, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifierMapping > & xMapping ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index c4e46cfe7faa..66c3bc1b969f 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -98,37 +98,37 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // own inherited virtual void SAL_CALL impl_propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt ) - throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException ) override; virtual void SAL_CALL impl_vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent ) throw( com::sun::star::beans::PropertyVetoException, - com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException ) override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -139,7 +139,7 @@ public: virtual com::sun::star::ucb::FetchResult SAL_CALL fetch( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XFetchProviderForContentAccess @@ -147,17 +147,17 @@ public: virtual com::sun::star::ucb::FetchResult SAL_CALL fetchContentIdentifierStrings( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::ucb::FetchResult SAL_CALL fetchContentIdentifiers( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::ucb::FetchResult SAL_CALL fetchContents( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; }; @@ -183,26 +183,26 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -218,7 +218,7 @@ public: createCachedContentResultSetStub( const com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > & xSource ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx index af9b60770d22..ee04a838fe5b 100644 --- a/ucb/source/cacher/cacheddynamicresultset.hxx +++ b/ucb/source/cacher/cacheddynamicresultset.hxx @@ -40,10 +40,10 @@ class CachedDynamicResultSet protected: virtual void SAL_CALL impl_InitResultSetOne( const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet >& xResultSet ) SAL_OVERRIDE; + com::sun::star::sdbc::XResultSet >& xResultSet ) override; virtual void SAL_CALL impl_InitResultSetTwo( const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet >& xResultSet ) SAL_OVERRIDE; + com::sun::star::sdbc::XResultSet >& xResultSet ) override; public: CachedDynamicResultSet( com::sun::star::uno::Reference< @@ -58,26 +58,26 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -87,7 +87,7 @@ public: virtual void SAL_CALL impl_disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException ) override; }; @@ -113,26 +113,26 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -153,7 +153,7 @@ public: com::sun::star::ucb::XContentIdentifierMapping > & ContentIdentifierMapping ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx index efadea37fa5f..60dfd9fbb595 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx @@ -36,10 +36,10 @@ class CachedDynamicResultSetStub protected: virtual void SAL_CALL impl_InitResultSetOne( const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet >& xResultSet ) SAL_OVERRIDE; + com::sun::star::sdbc::XResultSet >& xResultSet ) override; virtual void SAL_CALL impl_InitResultSetTwo( const com::sun::star::uno::Reference< - com::sun::star::sdbc::XResultSet >& xResultSet ) SAL_OVERRIDE; + com::sun::star::sdbc::XResultSet >& xResultSet ) override; public: CachedDynamicResultSetStub( com::sun::star::uno::Reference< @@ -52,26 +52,26 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -100,25 +100,25 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -134,7 +134,7 @@ public: createCachedDynamicResultSetStub( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > & Source ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL connectToCache( @@ -151,7 +151,7 @@ public: com::sun::star::ucb::ListenerAlreadySetException , com::sun::star::ucb::AlreadyInitializedException , com::sun::star::uno::RuntimeException, std::exception - ) SAL_OVERRIDE; + ) override; }; #endif diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx index 73a1fbaaacaf..b62f62dc140c 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -193,23 +193,23 @@ public: virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XComponent virtual void SAL_CALL - dispose() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + dispose() throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; //XCloseable @@ -217,7 +217,7 @@ public: virtual void SAL_CALL close() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; //XResultSetMetaDataSupplier @@ -226,7 +226,7 @@ public: com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XPropertySet @@ -234,7 +234,7 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, @@ -243,13 +243,13 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, @@ -257,7 +257,7 @@ public: com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, @@ -265,7 +265,7 @@ public: com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, @@ -273,7 +273,7 @@ public: com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, @@ -281,7 +281,7 @@ public: com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // own methods @@ -304,17 +304,17 @@ public: virtual OUString SAL_CALL queryContentIdentifierString() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL queryContent() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XResultSet @@ -322,76 +322,76 @@ public: virtual sal_Bool SAL_CALL next() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isBeforeFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isAfterLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL beforeFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL afterLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL first() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL last() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getRow() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL previous() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL refreshRow() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowUpdated() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowInserted() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowDeleted() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getStatement() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XRow @@ -399,110 +399,110 @@ public: virtual sal_Bool SAL_CALL wasNull() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; }; @@ -523,24 +523,24 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; //XEventListener virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; //XPropertyChangeListener virtual void SAL_CALL propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; //XVetoableChangeListener @@ -548,7 +548,7 @@ public: virtual void SAL_CALL vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent ) throw( com::sun::star::beans::PropertyVetoException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // own methods: diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index dfc2f4eec8e5..9f0f505c8647 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -112,20 +112,20 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XDynamicResultSet virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > SAL_CALL getStaticResultSet() throw( com::sun::star::ucb::ListenerAlreadySetException - , com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + , com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSetListener > & Listener ) throw( com::sun::star::ucb::ListenerAlreadySetException - , com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + , com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL connectToCache( const com::sun::star::uno::Reference< @@ -133,25 +133,25 @@ public: throw( com::sun::star::ucb::ListenerAlreadySetException , com::sun::star::ucb::AlreadyInitializedException , com::sun::star::ucb::ServiceNotFoundException - , com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + , com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL - getCapabilities() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + getCapabilities() throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XComponent ( base of XDynamicResultSet ) virtual void SAL_CALL - dispose() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + dispose() throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XSourceInitialization @@ -160,7 +160,7 @@ public: setSource( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & Source ) throw( com::sun::star::ucb::AlreadyInitializedException - , com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + , com::sun::star::uno::RuntimeException, std::exception ) override; // own methods: @@ -191,22 +191,22 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XEventListener ( base of XDynamicResultSetListener ) virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XDynamicResultSetListener virtual void SAL_CALL notify( const ::com::sun::star::ucb::ListEvent& Changes ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // own methods: diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index b746f7adf701..21ffe5fa58b5 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -97,36 +97,36 @@ public: explicit OFileAccess( const Reference< XComponentContext > & xContext ) : m_xContext( xContext), mpEnvironment( NULL ) {} // Methods - virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL kill( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getContentType( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL writeFile( const OUString& FileURL, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& data ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL kill( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getContentType( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeFile( const OUString& FileURL, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& data ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return OUString(IMPLEMENTATION_NAME); } sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return cppu::supportsService(this, ServiceName); } css::uno::Sequence SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (css::uno::RuntimeException, std::exception) override { return FileAccess_getSupportedServiceNames(); } }; @@ -140,9 +140,9 @@ public: // Methods virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; virtual Reference< XInputStream > SAL_CALL getInputStream( ) - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; }; // Implementation XActiveDataStreamer @@ -155,9 +155,9 @@ public: // Methods virtual void SAL_CALL setStream( const Reference< XStream >& aStream ) - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; virtual Reference< XStream > SAL_CALL getStream() - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; }; // Implementation XCommandEnvironment @@ -174,9 +174,9 @@ public: // Methods virtual Reference< XInteractionHandler > SAL_CALL getInteractionHandler() - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() - throw(RuntimeException, std::exception) SAL_OVERRIDE; + throw(RuntimeException, std::exception) override; }; void OActiveDataSink::setInputStream( const Reference< XInputStream >& aStream ) diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx index 1e80457c3bdd..60c636384f08 100644 --- a/ucb/source/core/cmdenv.hxx +++ b/ucb/source/core/cmdenv.hxx @@ -50,29 +50,29 @@ public: initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - 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; // XCommandEnvironment virtual com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > SAL_CALL getInteractionHandler() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XProgressHandler > SAL_CALL getProgressHandler() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // Non-UNO interfaces static OUString diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx index a17742e10cef..a835ffaef4e4 100644 --- a/ucb/source/core/identify.hxx +++ b/ucb/source/core/identify.hxx @@ -34,9 +34,9 @@ public: // XContentIdentifier virtual OUString SAL_CALL getContentIdentifier() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getContentProviderScheme() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; private: OUString m_aContentId; diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx index b4a3d5f3a555..5f53198f01fb 100644 --- a/ucb/source/core/provprox.hxx +++ b/ucb/source/core/provprox.hxx @@ -54,11 +54,11 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -71,7 +71,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL createContentProvider( const OUString& Service ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; }; @@ -111,25 +111,25 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -138,7 +138,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL getContentProvider() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XContentProvider virtual ::com::sun::star::uno::Reference< @@ -146,13 +146,13 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL compareContentIds( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Id1, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XParameterizedContentProvider virtual ::com::sun::star::uno::Reference< @@ -161,13 +161,13 @@ public: const OUString& Arguments, sal_Bool ReplaceExisting ) throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL deregisterInstance( const OUString& Template, const OUString& Arguments ) throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; }; #endif // INCLUDED_UCB_SOURCE_CORE_PROVPROX_HXX diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx index dc5ffcfa13bf..5367adf0a4ab 100644 --- a/ucb/source/core/ucb.hxx +++ b/ucb/source/core/ucb.hxx @@ -67,25 +67,25 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -97,22 +97,22 @@ public: // XComponent virtual void SAL_CALL dispose() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XInitialization virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XContentProviderManager virtual com::sun::star::uno::Reference< @@ -123,21 +123,21 @@ public: const OUString& Scheme, sal_Bool ReplaceExisting ) throw( com::sun::star::ucb::DuplicateProviderException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL deregisterContentProvider( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& Provider, const OUString& Scheme ) - 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< com::sun::star::ucb::ContentProviderInfo > SAL_CALL queryContentProviders() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > SAL_CALL queryContentProvider( const OUString& Identifier ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XContentProvider virtual com::sun::star::uno::Reference< @@ -145,24 +145,24 @@ public: queryContent( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL compareContentIds( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id1, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XContentIdentifierFactory virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL createContentIdentifier( const OUString& ContentId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XCommandProcessor virtual sal_Int32 SAL_CALL createCommandIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL execute( const com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, @@ -170,22 +170,22 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XCommandProcessor2 virtual void SAL_CALL releaseCommandIdentifier(sal_Int32 aCommandId) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XChangesListener virtual void SAL_CALL changesOccurred( const com::sun::star::util::ChangesEvent& Event ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XEventListener ( base of XChangesLisetenr ) virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) - 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::ucb::XContentProvider > diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index cfdebc8a9c52..3a7ff47207b3 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -106,7 +106,7 @@ public: // XInteractionHandler methods. virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& Request ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; }; @@ -175,9 +175,9 @@ public: // XActiveDataSink methods. virtual void SAL_CALL setInputStream( const uno::Reference< io::XInputStream >& aStream ) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( uno::RuntimeException, std::exception ) override; virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( uno::RuntimeException, std::exception ) override; }; @@ -214,17 +214,17 @@ public: // XCommandInfo methods virtual uno::Sequence< ucb::CommandInfo > SAL_CALL getCommands() - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( uno::RuntimeException, std::exception ) override; virtual ucb::CommandInfo SAL_CALL getCommandInfoByName( const OUString& Name ) - throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) override; virtual ucb::CommandInfo SAL_CALL getCommandInfoByHandle( sal_Int32 Handle ) - throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( uno::RuntimeException, std::exception ) override; }; diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx index fd71b1fa36fa..5e2ccf39bb3f 100644 --- a/ucb/source/core/ucbprops.hxx +++ b/ucb/source/core/ucbprops.hxx @@ -56,11 +56,11 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -73,14 +73,14 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > SAL_CALL getProperties() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; }; #endif // INCLUDED_UCB_SOURCE_CORE_UCBPROPS_HXX diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index c1cab9c8166f..f63b480749d2 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -122,11 +122,11 @@ public: // XPropertySetInfo virtual Sequence< Property > SAL_CALL getProperties() - throw( RuntimeException, std::exception ) SAL_OVERRIDE; + throw( RuntimeException, std::exception ) override; virtual Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException, std::exception ) SAL_OVERRIDE; + throw( UnknownPropertyException, RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( RuntimeException, std::exception ) SAL_OVERRIDE; + throw( RuntimeException, std::exception ) override; // Non-interface methods. void reset() { delete m_pProps; m_pProps = 0; } diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx index 6a56d1e8b256..f79a7bbd6664 100644 --- a/ucb/source/core/ucbstore.hxx +++ b/ucb/source/core/ucbstore.hxx @@ -63,11 +63,11 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -80,14 +80,14 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::ucb::XPropertySetRegistry > SAL_CALL createPropertySetRegistry( const OUString& URL ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getInitArgs() const; @@ -130,11 +130,11 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -143,31 +143,31 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::ucb::XPersistentPropertySet > SAL_CALL openPropertySet( const OUString& key, sal_Bool create ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertySet( const OUString& key ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XElementAccess ( XNameAccess is derived from it ) virtual com::sun::star::uno::Type SAL_CALL getElementType() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasElements() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XNameAccess virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // Non-interface methods com::sun::star::uno::Reference< com::sun::star::uno::XInterface > @@ -208,11 +208,11 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -220,21 +220,21 @@ public: // XComponent virtual void SAL_CALL dispose() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XPropertySet virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) @@ -242,57 +242,57 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XPersistentPropertySet virtual com::sun::star::uno::Reference< com::sun::star::ucb::XPropertySetRegistry > SAL_CALL getRegistry() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getKey() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XNamed virtual OUString SAL_CALL getName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setName( const OUString& aName ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; // XPropertyContainer virtual void SAL_CALL @@ -302,28 +302,28 @@ public: throw( com::sun::star::beans::PropertyExistException, com::sun::star::beans::IllegalTypeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XPropertySetInfoChangeNotifier virtual void SAL_CALL addPropertySetInfoChangeListener( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertySetInfoChangeListener( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XPropertyAccess virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setPropertyValues( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aProps ) @@ -331,7 +331,7 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // Non-interface methods. PropertySetRegistry& getPropertySetRegistry(); diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx index 4aa86e6e5c24..ebc6a6757d77 100644 --- a/ucb/source/sorter/sortdynres.hxx +++ b/ucb/source/sorter/sortdynres.hxx @@ -81,46 +81,46 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XDynamicResultSet virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getStaticResultSet() - throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener ) - throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) throw( css::ucb::ListenerAlreadySetException, css::ucb::AlreadyInitializedException, css::ucb::ServiceNotFoundException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getCapabilities() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // own methods: @@ -146,12 +146,12 @@ public: virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XDynamicResultSetListener virtual void SAL_CALL notify( const css::ucb::ListEvent& Changes ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // own methods: @@ -182,11 +182,11 @@ public: // XSortedDynamicResultSetFactory virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -195,7 +195,7 @@ public: const css::uno::Reference< css::ucb::XDynamicResultSet > & Source, const css::uno::Sequence< css::ucb::NumberedSortingInfo > & Info, const css::uno::Reference< css::ucb::XAnyCompareFactory > & CompareFactory ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index d318bf9f7f05..8e9864b56f9d 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -105,11 +105,11 @@ public: // XPropertySetInfo virtual Sequence< Property > SAL_CALL getProperties() - throw( RuntimeException, std::exception ) SAL_OVERRIDE; + throw( RuntimeException, std::exception ) override; virtual Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException, std::exception ) SAL_OVERRIDE; + throw( UnknownPropertyException, RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( RuntimeException, std::exception ) SAL_OVERRIDE; + throw( RuntimeException, std::exception ) override; }; typedef OMultiTypeInterfaceContainerHelperVar diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx index f5f74690cce6..5f45da992782 100644 --- a/ucb/source/sorter/sortresult.hxx +++ b/ucb/source/sorter/sortresult.hxx @@ -189,199 +189,199 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XComponent virtual void SAL_CALL - dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + dispose() throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XContentAccess virtual OUString SAL_CALL queryContentIdentifierString() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XResultSet virtual sal_Bool SAL_CALL next() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isBeforeFirst() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isAfterLast() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isFirst() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isLast() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL beforeFirst() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL afterLast() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL first() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL last() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getRow() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL previous() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL refreshRow() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowUpdated() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowInserted() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL rowDeleted() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; // XRow virtual sal_Bool SAL_CALL - wasNull() throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + wasNull() throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; // XCloseable virtual void SAL_CALL close() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; // XResultSetMetaDataSupplier virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setPropertyValue( const OUString& PropertyName, @@ -390,13 +390,13 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& PropertyName, @@ -404,7 +404,7 @@ public: css::beans::XPropertyChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& PropertyName, @@ -412,7 +412,7 @@ public: css::beans::XPropertyChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, @@ -420,7 +420,7 @@ public: css::beans::XVetoableChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, @@ -428,7 +428,7 @@ public: css::beans::XVetoableChangeListener >& aListener ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; }; #endif diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx index 9fbf59983630..fa50054241ad 100644 --- a/ucb/source/ucp/cmis/auth_provider.hxx +++ b/ucb/source/ucp/cmis/auth_provider.hxx @@ -29,7 +29,7 @@ namespace cmis const OUString& sBindingUrl ): m_xEnv( xEnv ), m_sUrl( sUrl ), m_sBindingUrl( sBindingUrl ) { } - bool authenticationQuery( std::string& username, std::string& password ) SAL_OVERRIDE; + bool authenticationQuery( std::string& username, std::string& password ) override; static char* onedriveAuthCodeFallback( const char* url, const char* /*username*/, diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx index b501ecd54c37..e0e7ea3b7417 100644 --- a/ucb/source/ucp/cmis/certvalidation_handler.hxx +++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx @@ -33,7 +33,7 @@ namespace cmis const OUString& sHostname ): m_xEnv( xEnv ), m_xContext( xContext ), m_sHostname( sHostname ) { } - bool validateCertificate( std::vector< std::string > certificates ) SAL_OVERRIDE; + bool validateCertificate( std::vector< std::string > certificates ) override; }; } diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index 2fe633b29dfe..40b69a943c22 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -143,7 +143,7 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; libcmis::ObjectPtr updateProperties( const com::sun::star::uno::Any& iCmisProps, @@ -152,57 +152,57 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; - virtual OUString getParentURL() SAL_OVERRIDE; + virtual OUString getParentURL() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getImplementationName() - 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; virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL execute( const com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - 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< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > queryCreatableContentsInfo( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) throw( com::sun::star::uno::RuntimeException ); - virtual std::list< com::sun::star::uno::Reference< com::sun::star::ucb::XContent > > getChildren( ) SAL_OVERRIDE; + virtual std::list< com::sun::star::uno::Reference< com::sun::star::ucb::XContent > > getChildren( ) override; libcmis::ObjectPtr getObject( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception); }; diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx index 200fbe539722..9fe7b7739368 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx @@ -51,26 +51,26 @@ namespace cmis virtual ~DataSupplier(); - virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > - queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContentIdentifier( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > - queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContent( sal_uInt32 nIndex ) override; - virtual bool getResult( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual bool getResult( sal_uInt32 nIndex ) override; - virtual sal_uInt32 totalCount() SAL_OVERRIDE; - virtual sal_uInt32 currentCount() SAL_OVERRIDE; - virtual bool isCountFinal() SAL_OVERRIDE; + virtual sal_uInt32 totalCount() override; + virtual sal_uInt32 currentCount() override; + virtual bool isCountFinal() override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > - queryPropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual void releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryPropertyValues( sal_uInt32 nIndex ) override; + virtual void releasePropertyValues( sal_uInt32 nIndex ) override; - virtual void close() SAL_OVERRIDE; + virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE; + throw( com::sun::star::ucb::ResultSetException ) override; }; } diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx index 1dcad0a84852..4cff7beab5db 100644 --- a/ucb/source/ucp/cmis/cmis_provider.hxx +++ b/ucb/source/ucp/cmis/cmis_provider.hxx @@ -29,25 +29,25 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -62,7 +62,7 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; libcmis::Session* getSession( const OUString& sBindingUrl, const OUString& sUsername ); void registerSession( const OUString& sBindingUrl, const OUString& sUsername, libcmis::Session* pSession ); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx index e2ca6fa85a65..cd5cc6311c87 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.hxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx @@ -84,49 +84,49 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; - virtual OUString getParentURL() SAL_OVERRIDE; + virtual OUString getParentURL() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getImplementationName() - 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; virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL execute( const com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual std::list< com::sun::star::uno::Reference< com::sun::star::ucb::XContent > > getChildren( ) SAL_OVERRIDE; + virtual std::list< com::sun::star::uno::Reference< com::sun::star::ucb::XContent > > getChildren( ) override; }; } diff --git a/ucb/source/ucp/cmis/cmis_resultset.hxx b/ucb/source/ucp/cmis/cmis_resultset.hxx index f739b7a34194..c3e05e2dfa83 100644 --- a/ucb/source/ucp/cmis/cmis_resultset.hxx +++ b/ucb/source/ucp/cmis/cmis_resultset.hxx @@ -23,8 +23,8 @@ namespace cmis com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; private: - virtual void initStatic() SAL_OVERRIDE; - virtual void initDynamic() SAL_OVERRIDE; + virtual void initStatic() override; + virtual void initDynamic() override; public: diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 2ea5701ddaaf..b02ddfa36a55 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -60,7 +60,7 @@ class ExpandContentProviderImpl : protected MutexHolder, public t_impl_helper protected: inline void check() const; - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; public: explicit ExpandContentProviderImpl( @@ -73,20 +73,20 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; // XContentProvider virtual uno::Reference< ucb::XContent > SAL_CALL queryContent( uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) - throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL compareContentIds( uno::Reference< ucb::XContentIdentifier > const & xId1, uno::Reference< ucb::XContentIdentifier > const & xId2 ) - throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (uno::RuntimeException, std::exception) override; }; diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index 40594f211465..86facae26906 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -77,7 +77,7 @@ namespace ucb { namespace ucp { namespace ext static OUString decodeIdentifier( const OUString& i_rIdentifier ); - virtual OUString getParentURL() SAL_OVERRIDE; + virtual OUString getParentURL() override; ExtensionContentType getExtensionContentType() const { return m_eExtContentType; } @@ -90,11 +90,11 @@ namespace ucb { namespace ucp { namespace ext virtual ~Content(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XContent - virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -106,18 +106,18 @@ namespace ucb { namespace ucp { namespace ext throw ( ::com::sun::star::uno::Exception , ::com::sun::star::ucb::CommandAbortedException , ::com::sun::star::uno::RuntimeException, std::exception - ) SAL_OVERRIDE; + ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) throw ( ::com::sun::star::uno::RuntimeException, std::exception - ) SAL_OVERRIDE; + ) override; private: - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > getProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::CommandInfo > getCommands( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > getProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv ) override; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::CommandInfo > getCommands( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& i_rEnv ) override; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > setPropertyValues( diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index bb82e772886b..aedc4e60faa4 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -51,22 +51,22 @@ namespace ucb { namespace ucp { namespace ext protected: virtual ~DataSupplier(); - virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; + virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; + virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; - virtual bool getResult( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual bool getResult( sal_uInt32 nIndex ) override; - virtual sal_uInt32 totalCount() SAL_OVERRIDE; - virtual sal_uInt32 currentCount() SAL_OVERRIDE; - virtual bool isCountFinal() SAL_OVERRIDE; + virtual sal_uInt32 totalCount() override; + virtual sal_uInt32 currentCount() override; + virtual bool isCountFinal() override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual void releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; + virtual void releasePropertyValues( sal_uInt32 nIndex ) override; - virtual void close() SAL_OVERRIDE; + virtual void close() override; - virtual void validate() throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE; + virtual void validate() throw( com::sun::star::ucb::ResultSetException ) override; private: std::unique_ptr< DataSupplier_Impl > m_pImpl; diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index 5efda9da4b71..baeff9a4eefe 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -38,8 +38,8 @@ namespace ucb { namespace ucp { namespace ext virtual ~ContentProvider(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) 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 ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo - static versions static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); @@ -47,7 +47,7 @@ namespace ucb { namespace ucp { namespace ext static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ); // XContentProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw (::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw (::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException, std::exception) override; public: static OUString getRootURL(); diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx b/ucb/source/ucp/ext/ucpext_resultset.hxx index 61501d3dbf23..8f4d68372d86 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.hxx +++ b/ucb/source/ucp/ext/ucpext_resultset.hxx @@ -48,8 +48,8 @@ namespace ucb { namespace ucp { namespace ext ::rtl::Reference< Content > m_xContent; private: - virtual void initStatic() SAL_OVERRIDE; - virtual void initDynamic() SAL_OVERRIDE; + virtual void initStatic() override; + virtual void initDynamic() override; }; diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index 8de055b8c0b4..dc89399837e2 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -90,62 +90,62 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( void ) - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release( void ) - throw() SAL_OVERRIDE; + throw() override; // XComponent virtual void SAL_CALL dispose( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - 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; // XCommandProcessor virtual sal_Int32 SAL_CALL createCommandIdentifier( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL execute( @@ -154,34 +154,34 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XContent virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getContentType( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addContentEventListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeContentEventListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XPropertiesChangeNotifier @@ -190,13 +190,13 @@ namespace fileaccess { const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertiesChangeListener( const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XPropertyContainer @@ -208,14 +208,14 @@ namespace fileaccess { throw( com::sun::star::beans::PropertyExistException, com::sun::star::beans::IllegalTypeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XPropertySetInfoChangeNotifier @@ -223,13 +223,13 @@ namespace fileaccess { addPropertySetInfoChangeListener( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removePropertySetInfoChangeListener( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XContentCreator @@ -237,33 +237,33 @@ namespace fileaccess { virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XChild virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getParent( - void ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + void ) throw( com::sun::star::uno::RuntimeException, std::exception ) override; // Not supported virtual void SAL_CALL setParent( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& Parent ) throw( com::sun::star::lang::NoSupportException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; // Notifier - ContentEventNotifier* cDEL() SAL_OVERRIDE; - ContentEventNotifier* cEXC( const OUString& aNewName ) SAL_OVERRIDE; - ContentEventNotifier* cCEL() SAL_OVERRIDE; - PropertySetInfoChangeNotifier* cPSL() SAL_OVERRIDE; - PropertyChangeNotifier* cPCL() SAL_OVERRIDE; + ContentEventNotifier* cDEL() override; + ContentEventNotifier* cEXC( const OUString& aNewName ) override; + ContentEventNotifier* cCEL() override; + PropertySetInfoChangeNotifier* cPSL() override; + PropertyChangeNotifier* cPCL() override; private: // Data members diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx index e33a6de6c084..27daba8a6b1f 100644 --- a/ucb/source/ucp/file/filcmd.hxx +++ b/ucb/source/ucp/file/filcmd.hxx @@ -47,46 +47,46 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( void ) - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release( void ) - throw() SAL_OVERRIDE; + throw() override; // XCommandInfo virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL getCommands( void ) - throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::ucb::CommandInfo SAL_CALL getCommandInfoByName( const OUString& Name ) throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::ucb::CommandInfo SAL_CALL getCommandInfoByHandle( sal_Int32 Handle ) throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; private: diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx index 54c25408479e..8d58001f4df0 100644 --- a/ucb/source/ucp/file/filid.hxx +++ b/ucb/source/ucp/file/filid.hxx @@ -45,39 +45,39 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire( void ) - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release( void ) - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes( void ) - 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< sal_Int8 > SAL_CALL getImplementationId( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XContentIdentifier virtual OUString SAL_CALL getContentIdentifier( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getContentProviderScheme( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; private: OUString m_aContentId; // The URL string diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index 579dd6323fae..d97bca854611 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -57,24 +57,24 @@ namespace fileaccess { // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( void ) - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release( void ) - throw() SAL_OVERRIDE; + throw() override; virtual sal_Int32 SAL_CALL readBytes( @@ -83,7 +83,7 @@ namespace fileaccess { 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; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL readSomeBytes( @@ -92,7 +92,7 @@ namespace fileaccess { 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; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL skipBytes( @@ -100,40 +100,40 @@ namespace fileaccess { 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; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL available( void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL closeInput( void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL seek( sal_Int64 location ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getPosition( void ) throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLength( void ) throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; private: diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index 5e142876be2f..4ed056c1b4d1 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -46,13 +46,13 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< } virtual void SAL_CALL select() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (::com::sun::star::uno::RuntimeException, std::exception) override { m_bSelected = true; } void SAL_CALL setName(const OUString& Name) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw(::com::sun::star::uno::RuntimeException, std::exception) override { m_aNewName = Name; } @@ -86,7 +86,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< } virtual void SAL_CALL select() - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + throw (::com::sun::star::uno::RuntimeException, std::exception) override { m_bSelected = true; } diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx index 7b796654567e..b3c53ea1ae64 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -40,17 +40,17 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper< virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > SAL_CALL getProperties( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; private: shell* m_pMyShell; diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index a2cec70506ef..1e900f1b49a3 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -39,123 +39,123 @@ namespace fileaccess { wasNull( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; private: osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index c8e104a2cba1..26758a4a5541 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -61,27 +61,27 @@ class XResultSet_impl : public Notifier, virtual ~XResultSet_impl(); - virtual ContentEventNotifier* cDEL() SAL_OVERRIDE + virtual ContentEventNotifier* cDEL() override { return 0; } - virtual ContentEventNotifier* cEXC( const OUString& ) SAL_OVERRIDE + virtual ContentEventNotifier* cEXC( const OUString& ) override { return 0; } - virtual ContentEventNotifier* cCEL() SAL_OVERRIDE + virtual ContentEventNotifier* cCEL() override { return 0; } - virtual PropertySetInfoChangeNotifier* cPSL() SAL_OVERRIDE + virtual PropertySetInfoChangeNotifier* cPSL() override { return 0; } - virtual PropertyChangeNotifier* cPCL() SAL_OVERRIDE + virtual PropertyChangeNotifier* cPCL() override { return 0; } @@ -93,22 +93,22 @@ class XResultSet_impl : public Notifier, virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XComponent virtual void SAL_CALL dispose( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XRow @@ -116,7 +116,7 @@ class XResultSet_impl : public Notifier, wasNull( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception ) override { if( 0<= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) m_nWasNull = m_aItems[m_nRow]->wasNull(); @@ -129,7 +129,7 @@ class XResultSet_impl : public Notifier, getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getString( columnIndex ); @@ -141,7 +141,7 @@ class XResultSet_impl : public Notifier, getBoolean( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getBoolean( columnIndex ); @@ -153,7 +153,7 @@ class XResultSet_impl : public Notifier, getByte( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getByte( columnIndex ); @@ -166,7 +166,7 @@ class XResultSet_impl : public Notifier, sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getShort( columnIndex ); @@ -178,7 +178,7 @@ class XResultSet_impl : public Notifier, getInt( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getInt( columnIndex ); @@ -190,7 +190,7 @@ class XResultSet_impl : public Notifier, getLong( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getLong( columnIndex ); @@ -202,7 +202,7 @@ class XResultSet_impl : public Notifier, getFloat( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getFloat( columnIndex ); @@ -214,7 +214,7 @@ class XResultSet_impl : public Notifier, getDouble( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getDouble( columnIndex ); @@ -226,7 +226,7 @@ class XResultSet_impl : public Notifier, getBytes( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getBytes( columnIndex ); @@ -238,7 +238,7 @@ class XResultSet_impl : public Notifier, getDate( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getDate( columnIndex ); @@ -250,7 +250,7 @@ class XResultSet_impl : public Notifier, getTime( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getTime( columnIndex ); @@ -262,7 +262,7 @@ class XResultSet_impl : public Notifier, getTimestamp( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getTimestamp( columnIndex ); @@ -274,7 +274,7 @@ class XResultSet_impl : public Notifier, getBinaryStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getBinaryStream( columnIndex ); @@ -286,7 +286,7 @@ class XResultSet_impl : public Notifier, getCharacterStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getCharacterStream( columnIndex ); @@ -299,7 +299,7 @@ class XResultSet_impl : public Notifier, sal_Int32 columnIndex, const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getObject( columnIndex,typeMap ); @@ -311,7 +311,7 @@ class XResultSet_impl : public Notifier, getRef( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getRef( columnIndex ); @@ -323,7 +323,7 @@ class XResultSet_impl : public Notifier, getBlob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getBlob( columnIndex ); @@ -335,7 +335,7 @@ class XResultSet_impl : public Notifier, getClob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getClob( columnIndex ); @@ -347,7 +347,7 @@ class XResultSet_impl : public Notifier, getArray( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getArray( columnIndex ); @@ -362,110 +362,110 @@ class XResultSet_impl : public Notifier, next( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isBeforeFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAfterLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL beforeFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL afterLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL first( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL last( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getRow( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL previous( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL refreshRow( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowUpdated( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowInserted( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowDeleted( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getStatement( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; // XDynamicResultSet @@ -474,25 +474,25 @@ class XResultSet_impl : public Notifier, getStaticResultSet( void ) throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSetListener >& Listener ) throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL connectToCache( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > & xCache ) throw( com::sun::star::ucb::ListenerAlreadySetException, com::sun::star::ucb::AlreadyInitializedException, com::sun::star::ucb::ServiceNotFoundException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int16 SAL_CALL getCapabilities() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XCloseable @@ -501,37 +501,37 @@ class XResultSet_impl : public Notifier, close( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; // XContentAccess virtual OUString SAL_CALL queryContentIdentifierString( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL queryContent( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XResultSetMetaDataSupplier virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, @@ -540,14 +540,14 @@ class XResultSet_impl : public Notifier, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( @@ -555,7 +555,7 @@ class XResultSet_impl : public Notifier, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( @@ -563,7 +563,7 @@ class XResultSet_impl : public Notifier, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( @@ -571,14 +571,14 @@ class XResultSet_impl : public Notifier, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; private: diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index 5b04f1f626a1..df107f20c525 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -64,18 +64,18 @@ class XStream_impl : public cppu::WeakImplHelper< virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XTruncate virtual void SAL_CALL truncate() throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XInputStream @@ -87,7 +87,7 @@ class XStream_impl : public cppu::WeakImplHelper< 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; + com::sun::star::uno::RuntimeException, std::exception) override; sal_Int32 SAL_CALL readSomeBytes( @@ -96,7 +96,7 @@ class XStream_impl : public cppu::WeakImplHelper< 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; + com::sun::star::uno::RuntimeException, std::exception) override; void SAL_CALL @@ -105,21 +105,21 @@ class XStream_impl : public cppu::WeakImplHelper< 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; + com::sun::star::uno::RuntimeException, std::exception ) override; sal_Int32 SAL_CALL available( void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; void SAL_CALL closeInput( void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XSeekable @@ -128,19 +128,19 @@ class XStream_impl : public cppu::WeakImplHelper< sal_Int64 location ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; sal_Int64 SAL_CALL getPosition( void ) throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; sal_Int64 SAL_CALL getLength( void ) throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XOutputStream @@ -150,7 +150,7 @@ class XStream_impl : public cppu::WeakImplHelper< 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; + com::sun::star::uno::RuntimeException, std::exception) override; @@ -159,7 +159,7 @@ class XStream_impl : public cppu::WeakImplHelper< 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; + com::sun::star::uno::RuntimeException, std::exception) override; void SAL_CALL @@ -167,12 +167,12 @@ class XStream_impl : public cppu::WeakImplHelper< void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL waitForCompletion() throw ( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; private: diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index e0159ad6499e..ba3e638057a8 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -296,33 +296,33 @@ public: virtual Any SAL_CALL queryInterface( const Type& aType ) - throw( RuntimeException, std::exception) SAL_OVERRIDE; + throw( RuntimeException, std::exception) override; virtual void SAL_CALL acquire( void ) - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release( void ) - throw() SAL_OVERRIDE; + throw() override; virtual Sequence< Property > SAL_CALL getProperties( void ) - throw( RuntimeException, std::exception ) SAL_OVERRIDE; + throw( RuntimeException, std::exception ) override; virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw( UnknownPropertyException, - RuntimeException, std::exception) SAL_OVERRIDE; + RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( RuntimeException, std::exception ) SAL_OVERRIDE; + throw( RuntimeException, std::exception ) override; private: diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index 9c1d5b5476a7..db15667e622d 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -66,17 +66,17 @@ namespace fileaccess { virtual OUString SAL_CALL getImplementationName( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - 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( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; static com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > SAL_CALL @@ -91,7 +91,7 @@ namespace fileaccess { virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; // XContentProvider @@ -99,27 +99,27 @@ namespace fileaccess { queryContent( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XContentIdentifierFactory virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL createContentIdentifier( const OUString& ContentId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL compareContentIds( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id1, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XProperySet virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL setPropertyValue( @@ -129,14 +129,14 @@ namespace fileaccess { com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addPropertyChangeListener( @@ -144,7 +144,7 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( @@ -152,7 +152,7 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addVetoableChangeListener( @@ -160,7 +160,7 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeVetoableChangeListener( @@ -168,21 +168,21 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; // XFileIdentifierConverter virtual sal_Int32 SAL_CALL getFileProviderLocality( const OUString& BaseURL ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getFileURLFromSystemPath( const OUString& BaseURL, const OUString& SystemPath ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; private: diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index c150284a6fe4..b71ac1730a22 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -252,7 +252,7 @@ public: { } - virtual ResultSetBase* createResultSet() SAL_OVERRIDE + virtual ResultSetBase* createResultSet() override { return new ResultSetI(m_xContext, m_xProvider, @@ -725,7 +725,7 @@ public: virtual ~InsertData() {} // returns the number of bytes actually read - virtual sal_Int32 read(sal_Int8 *dest,sal_Int32 nBytesRequested) SAL_OVERRIDE; + virtual sal_Int32 read(sal_Int8 *dest,sal_Int32 nBytesRequested) override; private: diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx index 71f4c4a7146f..00b9a43f6387 100644 --- a/ucb/source/ucp/ftp/ftpcontent.hxx +++ b/ucb/source/ucp/ftp/ftpcontent.hxx @@ -64,34 +64,34 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XContent virtual OUString SAL_CALL getContentType() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XCommandProcessor virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, @@ -100,30 +100,30 @@ public: css::ucb::XCommandEnvironment >& Environment ) throw( css::uno::Exception, css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort(sal_Int32 CommandId) - throw( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception) override; // XContentCreator virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; // XChild virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) - throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception) override; static css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo_Static() throw (css::uno::RuntimeException); @@ -138,15 +138,15 @@ private: virtual css::uno::Sequence< css::beans::Property > getProperties( const css::uno::Reference< - css::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + css::ucb::XCommandEnvironment > & xEnv ) override; virtual css::uno::Sequence< css::ucb::CommandInfo> getCommands(const css::uno::Reference< - css::ucb::XCommandEnvironment > & xEnv) SAL_OVERRIDE; + css::ucb::XCommandEnvironment > & xEnv) override; - virtual OUString getParentURL() SAL_OVERRIDE; + virtual OUString getParentURL() override; css::uno::Reference getPropertyValues( diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx index 38dabce6e06a..71d6eb1c9257 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx @@ -54,11 +54,11 @@ namespace ftp { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() override; // XTypeProvider @@ -68,14 +68,14 @@ namespace ftp { ) throw( com::sun::star::uno::RuntimeException, std::exception - ) SAL_OVERRIDE; + ) override; virtual com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw( com::sun::star::uno::RuntimeException, std::exception - ) SAL_OVERRIDE; + ) override; // XContentIdentifier @@ -85,14 +85,14 @@ namespace ftp { ) throw ( com::sun::star::uno::RuntimeException, std::exception - ) SAL_OVERRIDE; + ) override; virtual OUString SAL_CALL getContentProviderScheme( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception - ) SAL_OVERRIDE; + ) override; private: diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx index 62ebe6b7414b..9a0d8d93041d 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx @@ -52,30 +52,30 @@ namespace ftp // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -89,7 +89,7 @@ namespace ftp queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) throw( css::ucb::IllegalIdentifierException, css::uno::RuntimeException, - std::exception ) SAL_OVERRIDE; + std::exception ) override; CURL* handle(); diff --git a/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx index 01942a73a439..757855d497c4 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.hxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx @@ -37,8 +37,8 @@ namespace ftp { ResultSetFactory* m_pFactory; private: - virtual void initStatic() SAL_OVERRIDE; - virtual void initDynamic() SAL_OVERRIDE; + virtual void initStatic() override; + virtual void initDynamic() override; public: DynamicResultSet( diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx index 3bab88b5f6c1..409dbdb9c4b0 100644 --- a/ucb/source/ucp/ftp/ftpintreq.hxx +++ b/ucb/source/ucp/ftp/ftpintreq.hxx @@ -42,7 +42,7 @@ namespace ftp { virtual void SAL_CALL select() throw (css::uno::RuntimeException, - std::exception) SAL_OVERRIDE; + std::exception) override; bool isSelected() const { return m_bSelected;} @@ -62,7 +62,7 @@ namespace ftp { XInteractionDisapproveImpl(); virtual void SAL_CALL select() - throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (com::sun::star::uno::RuntimeException, std::exception) override; private: diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 2f35a7e569f9..c92769d3592a 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -443,20 +443,20 @@ public: } void SAL_CALL acquire() - throw() SAL_OVERRIDE + throw() override { OWeakObject::acquire(); } void SAL_CALL release() - throw() SAL_OVERRIDE + throw() override { OWeakObject::release(); } uno::Any SAL_CALL queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE + throw( uno::RuntimeException, std::exception ) override { uno::Any aRet = cppu::queryInterface( rType, @@ -465,14 +465,14 @@ public: } uno::Sequence< beans::Property > SAL_CALL getProperties() - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE + throw( uno::RuntimeException, std::exception ) override { return m_aSeq; } beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw( beans::UnknownPropertyException, - uno::RuntimeException, std::exception) SAL_OVERRIDE + uno::RuntimeException, std::exception) override { for( int i = 0; i < m_aSeq.getLength(); ++i ) if( aName == m_aSeq[i].Name ) @@ -481,7 +481,7 @@ public: } sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE + throw( uno::RuntimeException, std::exception ) override { for( int i = 0; i < m_aSeq.getLength(); ++i ) if( Name == m_aSeq[i].Name ) diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx index 258b9d67abce..2ee5d63fd036 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx @@ -66,34 +66,34 @@ namespace ftp { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL acquire( void ) - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release( void ) - throw() SAL_OVERRIDE; + throw() override; // XComponent virtual void SAL_CALL dispose( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XRow @@ -101,7 +101,7 @@ namespace ftp { wasNull( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception ) override { if( 0<= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) m_nWasNull = m_aItems[m_nRow]->wasNull(); @@ -114,7 +114,7 @@ namespace ftp { getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { OUString ret; if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) @@ -127,7 +127,7 @@ namespace ftp { getBoolean( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getBoolean( columnIndex ); @@ -139,7 +139,7 @@ namespace ftp { getByte( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getByte( columnIndex ); @@ -152,7 +152,7 @@ namespace ftp { sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getShort( columnIndex ); @@ -164,7 +164,7 @@ namespace ftp { getInt( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getInt( columnIndex ); @@ -176,7 +176,7 @@ namespace ftp { getLong( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getLong( columnIndex ); @@ -188,7 +188,7 @@ namespace ftp { getFloat( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getFloat( columnIndex ); @@ -200,7 +200,7 @@ namespace ftp { getDouble( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getDouble( columnIndex ); @@ -212,7 +212,7 @@ namespace ftp { getBytes( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getBytes( columnIndex ); @@ -224,7 +224,7 @@ namespace ftp { getDate( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getDate( columnIndex ); @@ -236,7 +236,7 @@ namespace ftp { getTime( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getTime( columnIndex ); @@ -248,7 +248,7 @@ namespace ftp { getTimestamp( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getTimestamp( columnIndex ); @@ -262,7 +262,7 @@ namespace ftp { getBinaryStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getBinaryStream( columnIndex ); @@ -276,7 +276,7 @@ namespace ftp { getCharacterStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getCharacterStream( columnIndex ); @@ -291,7 +291,7 @@ namespace ftp { const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getObject( columnIndex,typeMap ); @@ -304,7 +304,7 @@ namespace ftp { getRef( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getRef( columnIndex ); @@ -317,7 +317,7 @@ namespace ftp { getBlob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getBlob( columnIndex ); @@ -330,7 +330,7 @@ namespace ftp { getClob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getClob( columnIndex ); @@ -344,7 +344,7 @@ namespace ftp { getArray( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE + com::sun::star::uno::RuntimeException, std::exception) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast(m_aItems.size()) ) return m_aItems[m_nRow]->getArray( columnIndex ); @@ -360,103 +360,103 @@ namespace ftp { next( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isBeforeFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isAfterLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL beforeFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL afterLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL first( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL last( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Int32 SAL_CALL getRow( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL previous( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL refreshRow( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowUpdated( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowInserted( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL rowDeleted( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Reference< @@ -464,7 +464,7 @@ namespace ftp { getStatement( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; // XCloseable @@ -472,26 +472,26 @@ namespace ftp { close( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; // XContentAccess virtual OUString SAL_CALL queryContentIdentifierString( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL queryContent( void ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XResultSetMetaDataSupplier virtual com::sun::star::uno::Reference< @@ -499,14 +499,14 @@ namespace ftp { getMetaData( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; // XPropertySet virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, @@ -515,14 +515,14 @@ namespace ftp { com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addPropertyChangeListener( @@ -531,7 +531,7 @@ namespace ftp { com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removePropertyChangeListener( @@ -540,7 +540,7 @@ namespace ftp { com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL addVetoableChangeListener( @@ -549,7 +549,7 @@ namespace ftp { com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, @@ -557,7 +557,7 @@ namespace ftp { com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception) override; protected: diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx index 6055b6bad548..180ba638d649 100644 --- a/ucb/source/ucp/gio/gio_content.hxx +++ b/ucb/source/ucp/gio/gio_content.hxx @@ -136,54 +136,54 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; - virtual OUString getParentURL() SAL_OVERRIDE; + virtual OUString getParentURL() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getImplementationName() - 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; virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Any SAL_CALL execute( const com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - 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< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > queryCreatableContentsInfo( diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx index 15c6142c4c1e..824b1174f320 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.hxx +++ b/ucb/source/ucp/gio/gio_datasupplier.hxx @@ -64,26 +64,26 @@ public: const com::sun::star::uno::Reference< Content >& rContent, sal_Int32 nOpenMode ); virtual ~DataSupplier(); - virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > - queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContentIdentifier( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > - queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContent( sal_uInt32 nIndex ) override; - virtual bool getResult( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual bool getResult( sal_uInt32 nIndex ) override; - virtual sal_uInt32 totalCount() SAL_OVERRIDE; - virtual sal_uInt32 currentCount() SAL_OVERRIDE; - virtual bool isCountFinal() SAL_OVERRIDE; + virtual sal_uInt32 totalCount() override; + virtual sal_uInt32 currentCount() override; + virtual bool isCountFinal() override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > - queryPropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual void releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryPropertyValues( sal_uInt32 nIndex ) override; + virtual void releasePropertyValues( sal_uInt32 nIndex ) override; - virtual void close() SAL_OVERRIDE; + virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE; + throw( com::sun::star::ucb::ResultSetException ) override; }; } diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx index 709ae5d1fd9d..ca2bac2018d2 100644 --- a/ucb/source/ucp/gio/gio_inputstream.hxx +++ b/ucb/source/ucp/gio/gio_inputstream.hxx @@ -46,30 +46,30 @@ public: 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; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData, 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; + ::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; + ::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; + ::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; + ::com::sun::star::uno::RuntimeException, std::exception ) override; }; } // namespace gio diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx index caf8a5fd096d..e11beab088a8 100644 --- a/ucb/source/ucp/gio/gio_outputstream.hxx +++ b/ucb/source/ucp/gio/gio_outputstream.hxx @@ -46,28 +46,28 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XOutputStream virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData ) 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; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL flush() 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; + com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL closeOutput() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; }; } // namespace gio diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx index 848271bcdb76..863e0e46a895 100644 --- a/ucb/source/ucp/gio/gio_provider.hxx +++ b/ucb/source/ucp/gio/gio_provider.hxx @@ -36,25 +36,25 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -69,7 +69,7 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; }; } diff --git a/ucb/source/ucp/gio/gio_resultset.hxx b/ucb/source/ucp/gio/gio_resultset.hxx index 1b1d15000698..236a7e18c889 100644 --- a/ucb/source/ucp/gio/gio_resultset.hxx +++ b/ucb/source/ucp/gio/gio_resultset.hxx @@ -32,8 +32,8 @@ namespace gio com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; private: - virtual void initStatic() SAL_OVERRIDE; - virtual void initDynamic() SAL_OVERRIDE; + virtual void initStatic() override; + virtual void initDynamic() override; public: DynamicResultSet( diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx index 7b0eddb7b87d..339b8281da6a 100644 --- a/ucb/source/ucp/gio/gio_seekable.hxx +++ b/ucb/source/ucp/gio/gio_seekable.hxx @@ -44,28 +44,28 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw () SAL_OVERRIDE { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XSeekable virtual void SAL_CALL seek( sal_Int64 location ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getPosition() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLength() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; // XTruncate virtual void SAL_CALL truncate() throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; }; } // namespace gio diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.hxx b/ucb/source/ucp/hierarchy/dynamicresultset.hxx index 3c3cd014c6ae..bb4bba1fd3aa 100644 --- a/ucb/source/ucp/hierarchy/dynamicresultset.hxx +++ b/ucb/source/ucp/hierarchy/dynamicresultset.hxx @@ -31,8 +31,8 @@ class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper rtl::Reference< HierarchyContent > m_xContent; private: - virtual void initStatic() SAL_OVERRIDE; - virtual void initDynamic() SAL_OVERRIDE; + virtual void initStatic() override; + virtual void initDynamic() override; public: DynamicResultSet( diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index e00a507fefd7..6bdb4e9be3ea 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -130,11 +130,11 @@ private: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; - virtual OUString getParentURL() SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual OUString getParentURL() override; static bool hasData( const com::sun::star::uno::Reference< @@ -227,34 +227,34 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - 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; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -264,10 +264,10 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // Additional interfaces @@ -277,11 +277,11 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // Non-interface methods. diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index cd3f0d9092ec..115810c7942a 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -97,56 +97,56 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XComponent virtual void SAL_CALL dispose() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; // XSingleServiceFactory virtual uno::Reference< uno::XInterface > SAL_CALL createInstance() - throw ( uno::Exception, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::Exception, uno::RuntimeException, std::exception ) override; virtual uno::Reference< uno::XInterface > SAL_CALL createInstanceWithArguments( const uno::Sequence< uno::Any > & aArguments ) - throw ( uno::Exception, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::Exception, uno::RuntimeException, std::exception ) override; // XHierarchicalNameAccess virtual uno::Any SAL_CALL getByHierarchicalName( const OUString & aName ) - throw ( container::NoSuchElementException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( container::NoSuchElementException, uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString & aName ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; // XNameContainer virtual void SAL_CALL @@ -154,12 +154,12 @@ public: throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) SAL_OVERRIDE; + uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeByName( const OUString & Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) SAL_OVERRIDE; + uno::RuntimeException, std::exception ) override; // XNameReplace ( base of XNameContainer ) virtual void SAL_CALL @@ -167,49 +167,49 @@ public: throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) SAL_OVERRIDE; + uno::RuntimeException, std::exception ) override; // XNameAccess ( base of XNameReplace ) virtual uno::Any SAL_CALL getByName( const OUString & aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException, std::exception ) SAL_OVERRIDE; + uno::RuntimeException, std::exception ) override; virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasByName( const OUString & aName ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; // XElementAccess ( base of XNameAccess ) virtual uno::Type SAL_CALL getElementType() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasElements() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; // XChangesNotifier virtual void SAL_CALL addChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; // XChangesBatch virtual void SAL_CALL commitChanges() - throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasPendingChanges() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual uno::Sequence< util::ElementChange > SAL_CALL getPendingChanges() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; }; } // namespace hcp_impl diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx index 1ec383784583..8ee2ac3d2a6e 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -52,19 +52,19 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -74,29 +74,29 @@ public: // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XComponent virtual void SAL_CALL dispose() - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; // XMultiServiceFactory virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString & aServiceSpecifier ) throw ( css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString & ServiceSpecifier, const css::uno::Sequence< css::uno::Any > & Arguments ) throw ( css::uno::Exception, - css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( css::uno::RuntimeException, std::exception ) override; // Non-Interface methods diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx index c0383f52a7b6..1ecd4932aa5f 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx @@ -46,27 +46,27 @@ public: sal_Int32 nOpenMode = com::sun::star::ucb::OpenMode::ALL ); virtual ~HierarchyResultSetDataSupplier(); - virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > - queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContentIdentifier( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > - queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContent( sal_uInt32 nIndex ) override; - virtual bool getResult( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual bool getResult( sal_uInt32 nIndex ) override; - virtual sal_uInt32 totalCount() SAL_OVERRIDE; - virtual sal_uInt32 currentCount() SAL_OVERRIDE; - virtual bool isCountFinal() SAL_OVERRIDE; + virtual sal_uInt32 totalCount() override; + virtual sal_uInt32 currentCount() override; + virtual bool isCountFinal() override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > - queryPropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual void releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryPropertyValues( sal_uInt32 nIndex ) override; + virtual void releasePropertyValues( sal_uInt32 nIndex ) override; - virtual void close() SAL_OVERRIDE; + virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE; + throw( com::sun::star::ucb::ResultSetException ) override; }; } // namespace hierarchy_ucp diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index 973ff75957db..290865ed0d96 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -80,25 +80,25 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -113,14 +113,14 @@ public: queryContent( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; // Non-Interface methods com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx index 9f909ce7793f..d0d49d088a3c 100644 --- a/ucb/source/ucp/package/pkgcontent.hxx +++ b/ucb/source/ucp/package/pkgcontent.hxx @@ -127,11 +127,11 @@ private: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; - virtual OUString getParentURL() SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual OUString getParentURL() override; static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > getPropertyValues( const ::com::sun::star::uno::Reference< @@ -248,30 +248,30 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - 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; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -281,10 +281,10 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // Additional interfaces @@ -294,11 +294,11 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // Non-interface methods. diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx index bb43819a0822..493409b3dad5 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.hxx +++ b/ucb/source/ucp/package/pkgdatasupplier.hxx @@ -39,27 +39,27 @@ public: sal_Int32 nOpenMode ); virtual ~DataSupplier(); - virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > - queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContentIdentifier( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > - queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContent( sal_uInt32 nIndex ) override; - virtual bool getResult( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual bool getResult( sal_uInt32 nIndex ) override; - virtual sal_uInt32 totalCount() SAL_OVERRIDE; - virtual sal_uInt32 currentCount() SAL_OVERRIDE; - virtual bool isCountFinal() SAL_OVERRIDE; + virtual sal_uInt32 totalCount() override; + virtual sal_uInt32 currentCount() override; + virtual bool isCountFinal() override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > - queryPropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual void releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryPropertyValues( sal_uInt32 nIndex ) override; + virtual void releasePropertyValues( sal_uInt32 nIndex ) override; - virtual void close() SAL_OVERRIDE; + virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE; + throw( com::sun::star::ucb::ResultSetException ) override; OUString assembleChildURL( const OUString& aName ); }; diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index d5d07add621e..5362c6fbefa3 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -65,23 +65,23 @@ public: // XInterface virtual uno::Any SAL_CALL queryInterface( const uno::Type& aType ) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE + throw( uno::RuntimeException, std::exception ) override { return m_xNA->queryInterface( aType ); } virtual void SAL_CALL - acquire() throw() SAL_OVERRIDE + acquire() throw() override { OWeakObject::acquire(); } virtual void SAL_CALL - release() throw() SAL_OVERRIDE + release() throw() override { OWeakObject::release(); } // XHierarchicalNameAccess virtual uno::Any SAL_CALL getByHierarchicalName( const OUString& aName ) - throw( container::NoSuchElementException, uno::RuntimeException, std::exception ) SAL_OVERRIDE + throw( container::NoSuchElementException, uno::RuntimeException, std::exception ) override { return m_xNA->getByHierarchicalName( aName ); } virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& aName ) - throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE + throw( uno::RuntimeException, std::exception ) override { return m_xNA->hasByHierarchicalName( aName ); } }; diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx index 540808ec60f0..906efa2e4f3e 100644 --- a/ucb/source/ucp/package/pkgprovider.hxx +++ b/ucb/source/ucp/package/pkgprovider.hxx @@ -56,25 +56,25 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -89,7 +89,7 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; // Additional interfaces diff --git a/ucb/source/ucp/package/pkgresultset.hxx b/ucb/source/ucp/package/pkgresultset.hxx index 25946fb1217d..8b1ccb4ca7a7 100644 --- a/ucb/source/ucp/package/pkgresultset.hxx +++ b/ucb/source/ucp/package/pkgresultset.hxx @@ -33,8 +33,8 @@ class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper com::sun::star::ucb::XCommandEnvironment > m_xEnv; private: - virtual void initStatic() SAL_OVERRIDE; - virtual void initDynamic() SAL_OVERRIDE; + virtual void initStatic() override; + virtual void initDynamic() override; public: DynamicResultSet( diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index d69b4fb84413..aa513b442259 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -115,11 +115,11 @@ private: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; - virtual OUString getParentURL() SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual OUString getParentURL() override; static bool hasData( ContentProvider* pProvider, const Uri & rUri ); bool hasData( const Uri & rUri ) { return hasData( m_pProvider, rUri ); } @@ -254,34 +254,34 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - 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; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -291,10 +291,10 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // Additional interfaces @@ -304,11 +304,11 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // Non-interface methods. diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx index cff9224b172d..9facfc074ac9 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx @@ -45,27 +45,27 @@ public: sal_Int32 nOpenMode = com::sun::star::ucb::OpenMode::ALL ); virtual ~ResultSetDataSupplier(); - virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > - queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContentIdentifier( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > - queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContent( sal_uInt32 nIndex ) override; - virtual bool getResult( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual bool getResult( sal_uInt32 nIndex ) override; - virtual sal_uInt32 totalCount() SAL_OVERRIDE; - virtual sal_uInt32 currentCount() SAL_OVERRIDE; - virtual bool isCountFinal() SAL_OVERRIDE; + virtual sal_uInt32 totalCount() override; + virtual sal_uInt32 currentCount() override; + virtual bool isCountFinal() override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > - queryPropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual void releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryPropertyValues( sal_uInt32 nIndex ) override; + virtual void releasePropertyValues( sal_uInt32 nIndex ) override; - virtual void close() SAL_OVERRIDE; + virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE; + throw( com::sun::star::ucb::ResultSetException ) override; }; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index 25009ef3ad41..c914d645e66e 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -98,16 +98,16 @@ namespace tdoc_ucp { const ::com::sun::star::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, - ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw (::com::sun::star::uno::RuntimeException, std::exception) override; // lang::XEventListener (base of util::XCloseListener) virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject & Source ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; void Dispose() { m_pManager = 0; } @@ -127,12 +127,12 @@ namespace tdoc_ucp { // document::XDocumentEventListener virtual void SAL_CALL documentEventOccured( const com::sun::star::document::DocumentEvent & Event ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // lang::XEventListener (base of document::XDocumentEventListener) virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject & Source ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // Non-interface com::sun::star::uno::Reference< com::sun::star::embed::XStorage > diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx index 63a4111bc1af..d67cd90b2ed5 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx @@ -40,15 +40,15 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - 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; // XTransientDocumentsDocumentContentFactory virtual com::sun::star::uno::Reference< @@ -56,7 +56,7 @@ public: createDocumentContent( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& Model ) throw ( com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // Non-UNO interfaces static OUString diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx index 9fb89cd3d585..1bf11291c760 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx @@ -45,27 +45,27 @@ namespace tdoc_ucp // XInterface virtual uno::Any SAL_CALL queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw () SAL_OVERRIDE; + throw () override; virtual void SAL_CALL release() - throw () SAL_OVERRIDE; + throw () override; // XTypeProvider virtual uno::Sequence< uno::Type > SAL_CALL getTypes() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; // XInteractionContinuation virtual void SAL_CALL select() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; // XInteractionPassword virtual void SAL_CALL setPassword( const OUString & aPasswd ) - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; virtual OUString SAL_CALL getPassword() - throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( uno::RuntimeException, std::exception ) override; private: osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx index c2a212e8fe23..c1000b7a7fc6 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.hxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx @@ -68,25 +68,25 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -101,7 +101,7 @@ public: queryContent( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XTransientDocumentsDocumentContentFactory virtual com::sun::star::uno::Reference< @@ -109,7 +109,7 @@ public: createDocumentContent( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& Model ) throw ( com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // Non-UNO interfaces com::sun::star::uno::Reference< com::sun::star::embed::XStorage > @@ -149,8 +149,8 @@ public: queryDocumentModel( const OUString & rUri ) const; // interface OfficeDocumentsEventListener - virtual void notifyDocumentOpened( const OUString & rDocId ) SAL_OVERRIDE; - virtual void notifyDocumentClosed( const OUString & rDocId ) SAL_OVERRIDE; + virtual void notifyDocumentOpened( const OUString & rDocId ) override; + virtual void notifyDocumentClosed( const OUString & rDocId ) override; private: rtl::Reference< OfficeDocumentsManager > m_xDocsMgr; diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.hxx b/ucb/source/ucp/tdoc/tdoc_resultset.hxx index 8dffd9d0cfc1..c740534bf398 100644 --- a/ucb/source/ucp/tdoc/tdoc_resultset.hxx +++ b/ucb/source/ucp/tdoc/tdoc_resultset.hxx @@ -32,8 +32,8 @@ class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper rtl::Reference< Content > m_xContent; private: - virtual void initStatic() SAL_OVERRIDE; - virtual void initDynamic() SAL_OVERRIDE; + virtual void initStatic() override; + virtual void initDynamic() override; public: DynamicResultSet( diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx index dcf8dd1ac3c3..2aab25863482 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx @@ -94,54 +94,54 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw () SAL_OVERRIDE; + throw () override; virtual void SAL_CALL release() - throw () SAL_OVERRIDE; + throw () override; // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // XComponent ( one of XStorage bases ) virtual void SAL_CALL dispose() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > & xListener ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // XNameAccess ( one of XStorage bases ) virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // XElementAccess (base of XNameAccess) virtual com::sun::star::uno::Type SAL_CALL getElementType() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL hasElements() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // XStorage virtual void SAL_CALL @@ -151,7 +151,7 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) @@ -160,7 +160,7 @@ public: com::sun::star::packages::WrongPasswordException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, @@ -171,7 +171,7 @@ public: com::sun::star::packages::WrongPasswordException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::embed::XStorage > SAL_CALL openStorageElement( const OUString& aStorName, sal_Int32 nOpenMode ) @@ -179,7 +179,7 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL cloneStreamElement( const OUString& aStreamName ) throw ( com::sun::star::embed::InvalidStorageException, @@ -187,7 +187,7 @@ public: com::sun::star::packages::WrongPasswordException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( const OUString& aStreamName, const OUString& aPassword ) @@ -197,7 +197,7 @@ public: com::sun::star::packages::WrongPasswordException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL copyLastCommitTo( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xTargetStorage ) @@ -205,7 +205,7 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL copyStorageElementLastCommitTo( const OUString& aStorName, const com::sun::star::uno::Reference< @@ -215,19 +215,19 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::embed::InvalidStorageException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::embed::InvalidStorageException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeElement( const OUString& aElementName ) throw ( com::sun::star::embed::InvalidStorageException, @@ -235,7 +235,7 @@ public: com::sun::star::container::NoSuchElementException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL renameElement( const OUString& aEleName, const OUString& aNewName ) @@ -245,7 +245,7 @@ public: com::sun::star::container::ElementExistException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL copyElementTo( const OUString& aElementName, const com::sun::star::uno::Reference< @@ -257,7 +257,7 @@ public: com::sun::star::container::ElementExistException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL moveElementTo( const OUString& aElementName, const com::sun::star::uno::Reference< @@ -269,17 +269,17 @@ public: com::sun::star::container::ElementExistException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XTransactedObject virtual void SAL_CALL commit() throw ( com::sun::star::io::IOException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL revert() throw ( com::sun::star::io::IOException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; private: explicit Storage( const rtl::Reference< Storage > & rFactory ); // n.i. @@ -326,16 +326,16 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // XOutputStream virtual void SAL_CALL @@ -343,34 +343,34 @@ public: 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; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL flush( ) 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; + com::sun::star::uno::RuntimeException, std::exception ) override; // Note: We need to intercept this one. virtual void SAL_CALL closeOutput( ) 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; + com::sun::star::uno::RuntimeException, std::exception ) override; // XComponent // Note: We need to intercept this one. virtual void SAL_CALL dispose() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - 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< @@ -409,27 +409,27 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; // XStream virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getInputStream() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL getOutputStream() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XOutputStream virtual void SAL_CALL @@ -437,26 +437,26 @@ public: 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; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL flush() 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; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL closeOutput() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XTruncate virtual void SAL_CALL truncate() throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // XInputStream virtual sal_Int32 SAL_CALL @@ -465,7 +465,7 @@ public: 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; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL readSomeBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData, @@ -473,40 +473,40 @@ public: 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; + 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; + 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; + 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; + com::sun::star::uno::RuntimeException, std::exception ) override; // XComponent // Note: We need to intercept this one. virtual void SAL_CALL dispose() - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw ( com::sun::star::uno::RuntimeException, std::exception ) override; private: void commitChanges() diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx index 0af177bbf0fa..87b7b7651e04 100644 --- a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx @@ -63,7 +63,7 @@ namespace webdav_ucp const OUString & inHostName, OUString & inoutUserName, OUString & outPassWord, - bool bCanUseSystemCredentials ) SAL_OVERRIDE; + bool bCanUseSystemCredentials ) override; private: const com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx index fa69244c8e93..30deb7e2ed50 100644 --- a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx +++ b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx @@ -60,14 +60,14 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream, // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw () SAL_OVERRIDE + throw () override { OWeakObject::acquire(); } virtual void SAL_CALL release() - throw() SAL_OVERRIDE + throw() override { OWeakObject::release(); } @@ -78,7 +78,7 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream, 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; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData, @@ -86,37 +86,37 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream, 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; + ::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; + ::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; + ::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; + ::com::sun::star::uno::RuntimeException, std::exception ) override; // XSeekable virtual void SAL_CALL seek( sal_Int64 location ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getPosition() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; virtual sal_Int64 SAL_CALL getLength() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index 61efe8455a26..2c088516c8f2 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -57,7 +57,7 @@ public: private: - virtual void execute() SAL_OVERRIDE; + virtual void execute() override; }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx index 3b113adcac7d..16d5b1d062f7 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.hxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx @@ -79,9 +79,9 @@ public: // DAVSession methods virtual bool CanUse( const OUString & inPath, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) SAL_OVERRIDE; + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) override; - virtual bool UsesProxy() SAL_OVERRIDE; + virtual bool UsesProxy() override; const DAVRequestEnvironment & getRequestEnvironment() const { return m_aEnv; } @@ -93,7 +93,7 @@ public: const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; // propnames virtual void @@ -101,39 +101,39 @@ public: const Depth inDepth, std::vector< DAVResourceInfo >& ioResInfo, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual void PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual void HEAD( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual void GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual void GET( const OUString & inPath, @@ -142,14 +142,14 @@ public: const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual void PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > POST( const OUString & inPath, @@ -158,7 +158,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual void POST( const OUString & inPath, @@ -169,44 +169,44 @@ public: com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual void MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual void COPY( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, bool inOverWrite ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual void MOVE( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, bool inOverWrite ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; // set new lock. virtual void LOCK( const OUString & inURL, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; virtual void UNLOCK( const OUString & inURL, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; // helpers virtual void abort() - throw ( std::exception ) SAL_OVERRIDE; + throw ( std::exception ) override; const OUString & getHostName() const { return m_aHostName; } diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx index fdee359bc300..fcb894e10403 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx @@ -102,11 +102,11 @@ class Content : public ::ucbhelper::ContentImplHelper, private: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; - virtual OUString getParentURL() SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual OUString getParentURL() override; bool isFolder( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -242,31 +242,31 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - 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; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -276,10 +276,10 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // XPropertyContainer virtual void SAL_CALL @@ -289,13 +289,13 @@ public: throw( com::sun::star::beans::PropertyExistException, com::sun::star::beans::IllegalTypeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException, std::exception ) override; // Additional interfaces @@ -305,11 +305,11 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException, std::exception ) override; // Non-interface methods. diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx index 9a67534891bf..d3415f7594eb 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx @@ -55,27 +55,27 @@ public: virtual ~DataSupplier(); - virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > - queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContentIdentifier( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > - queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContent( sal_uInt32 nIndex ) override; - virtual bool getResult( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual bool getResult( sal_uInt32 nIndex ) override; - virtual sal_uInt32 totalCount() SAL_OVERRIDE; - virtual sal_uInt32 currentCount() SAL_OVERRIDE; - virtual bool isCountFinal() SAL_OVERRIDE; + virtual sal_uInt32 totalCount() override; + virtual sal_uInt32 currentCount() override; + virtual bool isCountFinal() override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > - queryPropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual void releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryPropertyValues( sal_uInt32 nIndex ) override; + virtual void releasePropertyValues( sal_uInt32 nIndex ) override; - virtual void close() SAL_OVERRIDE; + virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE; + throw( com::sun::star::ucb::ResultSetException ) override; }; } diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index dbec74e415fe..58eb438750c3 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -84,25 +84,25 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -117,7 +117,7 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception ) override; // Non-interface methods. diff --git a/ucb/source/ucp/webdav-neon/webdavresultset.hxx b/ucb/source/ucp/webdav-neon/webdavresultset.hxx index 5f86008128d1..98e9515a2ffe 100644 --- a/ucb/source/ucp/webdav-neon/webdavresultset.hxx +++ b/ucb/source/ucp/webdav-neon/webdavresultset.hxx @@ -44,8 +44,8 @@ class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper com::sun::star::ucb::XCommandEnvironment > m_xEnv; private: - virtual void initStatic() SAL_OVERRIDE; - virtual void initDynamic() SAL_OVERRIDE; + virtual void initStatic() override; + virtual void initDynamic() override; public: DynamicResultSet( const com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx index 425695236f2d..2e0c91c9cf40 100644 --- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx @@ -56,7 +56,7 @@ namespace http_dav_ucp OUString & inoutUserName, OUString & outPassWord, bool bCanUseSystemCredentials, - bool bUsePreviousCredentials = true ) SAL_OVERRIDE; + bool bUsePreviousCredentials = true ) override; private: const com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx index ea7ad3ed2e84..d1fc5476ea5e 100644 --- a/ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfCopyReqProcImpl.hxx @@ -36,14 +36,14 @@ public: virtual ~SerfCopyReqProcImpl(); virtual - serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) override; protected: virtual - void processChunkOfResponseData( const char* data, apr_size_t len ) SAL_OVERRIDE; + void processChunkOfResponseData( const char* data, apr_size_t len ) override; virtual - void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; private: const char* mDestPathStr; diff --git a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx index 4449f1e7ba37..bfda8f15093d 100644 --- a/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfDeleteReqProcImpl.hxx @@ -34,14 +34,14 @@ public: virtual ~SerfDeleteReqProcImpl(); virtual - serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) override; protected: virtual - void processChunkOfResponseData( const char* data, apr_size_t len ) SAL_OVERRIDE; + void processChunkOfResponseData( const char* data, apr_size_t len ) override; virtual - void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; }; diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx index 1c8942f56bbc..2c382398508c 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx @@ -58,17 +58,17 @@ public: virtual ~SerfGetReqProcImpl(); virtual - serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) override; void processSingleResponseHeader( const char* inHeaderName, const char* inHeaderValue ); protected: virtual - void processChunkOfResponseData( const char* data, apr_size_t len ) SAL_OVERRIDE; + void processChunkOfResponseData( const char* data, apr_size_t len ) override; virtual - void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; private: com::sun::star::uno::Reference< SerfInputStream > xInputStream; diff --git a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx index 5864953a77e5..291ff8288aff 100644 --- a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx @@ -43,17 +43,17 @@ public: virtual ~SerfHeadReqProcImpl(); virtual - serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) override; void processSingleResponseHeader( const char* inHeaderName, const char* inHeaderValue ); protected: virtual - void processChunkOfResponseData( const char* data, apr_size_t len ) SAL_OVERRIDE; + void processChunkOfResponseData( const char* data, apr_size_t len ) override; virtual - void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; private: const std::vector< OUString > * mpHeaderNames; diff --git a/ucb/source/ucp/webdav/SerfInputStream.hxx b/ucb/source/ucp/webdav/SerfInputStream.hxx index 1d35c3ebe44a..81c42e538874 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.hxx +++ b/ucb/source/ucp/webdav/SerfInputStream.hxx @@ -55,14 +55,14 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream, // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException ) override; virtual void SAL_CALL acquire() - throw () SAL_OVERRIDE + throw () override { OWeakObject::acquire(); } virtual void SAL_CALL release() - throw() SAL_OVERRIDE + throw() override { OWeakObject::release(); } @@ -73,7 +73,7 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream, throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException ) override; virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData, @@ -81,37 +81,37 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream, throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException ) 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 ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException ) override; virtual sal_Int32 SAL_CALL available() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException ) override; virtual void SAL_CALL closeInput() throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException ) override; // XSeekable virtual void SAL_CALL seek( sal_Int64 location ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException ) override; virtual sal_Int64 SAL_CALL getPosition() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException ) override; virtual sal_Int64 SAL_CALL getLength() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException ) override; }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx index 275e5e92142b..2e798fde85c1 100644 --- a/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx @@ -40,17 +40,17 @@ public: const css::ucb::Lock& rLock, sal_Int32* plastChanceToSendRefreshRequest = 0 ); - virtual ~SerfLockReqProcImpl() SAL_OVERRIDE; + virtual ~SerfLockReqProcImpl() override; virtual - serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) override; private: virtual - void processChunkOfResponseData( const char* data, apr_size_t len ) SAL_OVERRIDE; + void processChunkOfResponseData( const char* data, apr_size_t len ) override; virtual - void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; SerfSession& m_rSession; css::ucb::Lock m_aLock; diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx index daee2d2b7ace..e774d09a8622 100644 --- a/ucb/source/ucp/webdav/SerfLockStore.cxx +++ b/ucb/source/ucp/webdav/SerfLockStore.cxx @@ -41,7 +41,7 @@ public: protected: - virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL run() override; }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx index 5c1498a0624e..974389bb8fbc 100644 --- a/ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfMkColReqProcImpl.hxx @@ -34,14 +34,14 @@ public: virtual ~SerfMkColReqProcImpl(); virtual - serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) override; protected: virtual - void processChunkOfResponseData( const char* data, apr_size_t len ) SAL_OVERRIDE; + void processChunkOfResponseData( const char* data, apr_size_t len ) override; virtual - void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx index ff44eb8c13ea..8a0dee50cd1b 100644 --- a/ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfMoveReqProcImpl.hxx @@ -36,14 +36,14 @@ public: virtual ~SerfMoveReqProcImpl(); virtual - serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) override; protected: virtual - void processChunkOfResponseData( const char* data, apr_size_t len ) SAL_OVERRIDE; + void processChunkOfResponseData( const char* data, apr_size_t len ) override; virtual - void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; private: const char* mDestPathStr; diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx index f9fe11f5b1f7..9d04e27ef22f 100644 --- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx @@ -50,14 +50,14 @@ public: virtual ~SerfPostReqProcImpl(); virtual - serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) override; protected: virtual - void processChunkOfResponseData( const char* data, apr_size_t len ) SAL_OVERRIDE; + void processChunkOfResponseData( const char* data, apr_size_t len ) override; virtual - void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; private: const char* mpPostData; diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx index 7d8b73e111d2..955cebd1c7b8 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx @@ -49,14 +49,14 @@ public: virtual ~SerfPropFindReqProcImpl(); virtual - serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) override; protected: virtual - void processChunkOfResponseData( const char* data, apr_size_t len ) SAL_OVERRIDE; + void processChunkOfResponseData( const char* data, apr_size_t len ) override; virtual - void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; private: void init( const Depth inDepth ); diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx index c791f6911d98..830dd2ae177c 100644 --- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.hxx @@ -38,14 +38,14 @@ public: virtual ~SerfPropPatchReqProcImpl(); virtual - serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) override; protected: virtual - void processChunkOfResponseData( const char* data, apr_size_t len ) SAL_OVERRIDE; + void processChunkOfResponseData( const char* data, apr_size_t len ) override; virtual - void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; private: const std::vector< ProppatchValue > * mpProperties; diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx index f9cec9633b51..c4ca2e7ec29a 100644 --- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.hxx @@ -38,14 +38,14 @@ public: virtual ~SerfPutReqProcImpl(); virtual - serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_bucket_t * createSerfRequestBucket( serf_request_t * inSerfRequest ) override; protected: virtual - void processChunkOfResponseData( const char* data, apr_size_t len ) SAL_OVERRIDE; + void processChunkOfResponseData( const char* data, apr_size_t len ) override; virtual - void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; private: const char* mpData; diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index e9fb8d2681d9..e595c17da44c 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -108,9 +108,9 @@ public: serf_connection_t* getSerfConnection(); // DAVSession methods - virtual bool CanUse( const OUString & inUri ) SAL_OVERRIDE; + virtual bool CanUse( const OUString & inUri ) override; - virtual bool UsesProxy() SAL_OVERRIDE; + virtual bool UsesProxy() override; const DAVRequestEnvironment & getRequestEnvironment() const { return m_aEnv; } @@ -122,7 +122,7 @@ public: const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; // propnames virtual void @@ -130,41 +130,41 @@ public: const Depth inDepth, std::vector< DAVResourceInfo >& ioResInfo, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual void PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual void HEAD( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; bool isHeadRequestInProgress(); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual void GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual void GET( const OUString & inPath, @@ -173,14 +173,14 @@ public: const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual void PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > POST( const OUString & inPath, @@ -189,7 +189,7 @@ public: const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual void POST( const OUString & inPath, @@ -200,50 +200,50 @@ public: com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual void MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual void COPY( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, bool inOverWrite ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual void MOVE( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, bool inOverWrite ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; // set new lock. virtual void LOCK( const OUString & inURL, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; // refresh existing lock. virtual sal_Int64 LOCK( const OUString & inURL, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; virtual void UNLOCK( const OUString & inURL, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; // helpers virtual void abort() - throw ( DAVException ) SAL_OVERRIDE; + throw ( DAVException ) override; const OUString & getHostName() const { return m_aUri.GetHost(); } int getPort() const { return m_aUri.GetPort(); } diff --git a/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx index a6e9115d4adb..afef3f28b187 100644 --- a/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfUnlockReqProcImpl.hxx @@ -32,17 +32,17 @@ public: const DAVRequestHeaders& inRequestHeaders, const OUString& sToken); - virtual ~SerfUnlockReqProcImpl() SAL_OVERRIDE; + virtual ~SerfUnlockReqProcImpl() override; virtual serf_bucket_t *createSerfRequestBucket( - serf_request_t * inSerfRequest ) SAL_OVERRIDE; + serf_request_t * inSerfRequest ) override; private: virtual void processChunkOfResponseData( - const char* data, apr_size_t len ) SAL_OVERRIDE; + const char* data, apr_size_t len ) override; virtual void handleEndOfResponseData( - serf_bucket_t * inSerfResponseBucket ) SAL_OVERRIDE; + serf_bucket_t * inSerfResponseBucket ) override; OUString m_sToken; }; diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx index dec7cddbf7ba..364b5478c68a 100644 --- a/ucb/source/ucp/webdav/webdavcontent.hxx +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -89,11 +89,11 @@ class Content : public ::ucbhelper::ContentImplHelper, private: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) SAL_OVERRIDE; - virtual OUString getParentURL() SAL_OVERRIDE; + com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual OUString getParentURL() override; bool isFolder( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -227,31 +227,31 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException ) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( ::com::sun::star::uno::RuntimeException ) override; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException ) override; // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -261,10 +261,10 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException ) override; // XPropertyContainer virtual void SAL_CALL @@ -274,13 +274,13 @@ public: throw( com::sun::star::beans::PropertyExistException, com::sun::star::beans::IllegalTypeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException ) override; virtual void SAL_CALL removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + com::sun::star::uno::RuntimeException ) override; // Additional interfaces @@ -290,11 +290,11 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + throw( com::sun::star::uno::RuntimeException ) override; // Non-interface methods. diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx index 853ebd9d0b44..0bdd8273e5bb 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx @@ -48,27 +48,27 @@ public: virtual ~DataSupplier(); - virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > - queryContentIdentifier( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContentIdentifier( sal_uInt32 nIndex ) override; virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > - queryContent( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryContent( sal_uInt32 nIndex ) override; - virtual bool getResult( sal_uInt32 nIndex ) SAL_OVERRIDE; + virtual bool getResult( sal_uInt32 nIndex ) override; - virtual sal_uInt32 totalCount() SAL_OVERRIDE; - virtual sal_uInt32 currentCount() SAL_OVERRIDE; - virtual bool isCountFinal() SAL_OVERRIDE; + virtual sal_uInt32 totalCount() override; + virtual sal_uInt32 currentCount() override; + virtual bool isCountFinal() override; virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > - queryPropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; - virtual void releasePropertyValues( sal_uInt32 nIndex ) SAL_OVERRIDE; + queryPropertyValues( sal_uInt32 nIndex ) override; + virtual void releasePropertyValues( sal_uInt32 nIndex ) override; - virtual void close() SAL_OVERRIDE; + virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) SAL_OVERRIDE; + throw( com::sun::star::ucb::ResultSetException ) override; }; } diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx index 776473bd5600..8d696545a941 100644 --- a/ucb/source/ucp/webdav/webdavprovider.hxx +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -74,25 +74,25 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual void SAL_CALL acquire() - throw() SAL_OVERRIDE; + throw() override; virtual void SAL_CALL release() - throw() SAL_OVERRIDE; + throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + throw( css::uno::RuntimeException, std::exception ) override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -107,7 +107,7 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException ) override; // Non-interface methods. diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index a00b13daf0f3..b04ea8188799 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -356,14 +356,14 @@ namespace virtual ~WebDAVResponseParser(); // Methods XDocumentHandler - virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) override; + virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) override; + virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) override; + virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) override; + virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException) override; + virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException) override; const std::vector< ucb::Lock >& getResult_Lock() const { return maResult_Lock; } const std::vector< http_dav_ucp::DAVResource >& getResult_PropFind() const { return maResult_PropFind; } diff --git a/ucb/source/ucp/webdav/webdavresultset.hxx b/ucb/source/ucp/webdav/webdavresultset.hxx index 47205fbd19d8..7b7af17ad496 100644 --- a/ucb/source/ucp/webdav/webdavresultset.hxx +++ b/ucb/source/ucp/webdav/webdavresultset.hxx @@ -36,8 +36,8 @@ class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper com::sun::star::ucb::XCommandEnvironment > m_xEnv; private: - virtual void initStatic() SAL_OVERRIDE; - virtual void initDynamic() SAL_OVERRIDE; + virtual void initStatic() override; + virtual void initDynamic() override; public: DynamicResultSet( const com::sun::star::uno::Reference< -- cgit v1.2.3