diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 15:25:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:26 +0200 |
| commit | bff4c13475957863bfa7da5bc3bcf82a64a7503a (patch) | |
| tree | 23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /ucb | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/filrec.hxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/ftp/ftploaderthread.hxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/ContentProperties.hxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx index 9760c4a6c998..e3963d9e1807 100644 --- a/ucb/source/ucp/file/filrec.hxx +++ b/ucb/source/ucp/file/filrec.hxx @@ -33,9 +33,9 @@ class ReconnectingFile bool m_bDisconnect; - ReconnectingFile( ReconnectingFile& ) SAL_DELETED_FUNCTION; + ReconnectingFile( ReconnectingFile& ) = delete; - ReconnectingFile& operator=( ReconnectingFile& ) SAL_DELETED_FUNCTION; + ReconnectingFile& operator=( ReconnectingFile& ) = delete; public: diff --git a/ucb/source/ucp/ftp/ftploaderthread.hxx b/ucb/source/ucp/ftp/ftploaderthread.hxx index f955ca9c866c..0919c9b23b06 100644 --- a/ucb/source/ucp/ftp/ftploaderthread.hxx +++ b/ucb/source/ucp/ftp/ftploaderthread.hxx @@ -47,8 +47,8 @@ namespace ftp { private: - FTPLoaderThread(const FTPLoaderThread&) SAL_DELETED_FUNCTION; - FTPLoaderThread& operator=(const FTPLoaderThread&) SAL_DELETED_FUNCTION; + FTPLoaderThread(const FTPLoaderThread&) = delete; + FTPLoaderThread& operator=(const FTPLoaderThread&) = delete; oslThreadKey m_threadKey; diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx index 1e730c836a0d..3943f8dd620a 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx @@ -161,7 +161,7 @@ private: static com::sun::star::uno::Any m_aEmptyAny; - ContentProperties & operator=( const ContentProperties & ) SAL_DELETED_FUNCTION; + ContentProperties & operator=( const ContentProperties & ) = delete; const PropertyValue * get( const OUString & rName ) const; }; @@ -171,8 +171,8 @@ class CachableContentProperties private: ContentProperties m_aProps; - CachableContentProperties & operator=( const CachableContentProperties & ) SAL_DELETED_FUNCTION; - CachableContentProperties( const CachableContentProperties & ) SAL_DELETED_FUNCTION; + CachableContentProperties & operator=( const CachableContentProperties & ) = delete; + CachableContentProperties( const CachableContentProperties & ) = delete; public: explicit CachableContentProperties( const ContentProperties & rProps ); |