summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/webdav-neon
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /ucb/source/ucp/webdav-neon
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'ucb/source/ucp/webdav-neon')
-rw-r--r--ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx2
-rw-r--r--ucb/source/ucp/webdav-neon/NeonInputStream.hxx22
-rw-r--r--ucb/source/ucp/webdav-neon/NeonLockStore.cxx2
-rw-r--r--ucb/source/ucp/webdav-neon/NeonSession.hxx40
-rw-r--r--ucb/source/ucp/webdav-neon/webdavcontent.hxx34
-rw-r--r--ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx22
-rw-r--r--ucb/source/ucp/webdav-neon/webdavprovider.hxx18
-rw-r--r--ucb/source/ucp/webdav-neon/webdavresultset.hxx4
8 files changed, 72 insertions, 72 deletions
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<