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 /svtools/source/graphic | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'svtools/source/graphic')
| -rw-r--r-- | svtools/source/graphic/descriptor.hxx | 4 | ||||
| -rw-r--r-- | svtools/source/graphic/grfcache.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx index 94142a4d24cf..37f3ba049e5c 100644 --- a/svtools/source/graphic/descriptor.hxx +++ b/svtools/source/graphic/descriptor.hxx @@ -112,9 +112,9 @@ private: bool mbAlpha; bool mbAnimated; - GraphicDescriptor( const GraphicDescriptor& rDescriptor ) SAL_DELETED_FUNCTION; + GraphicDescriptor( const GraphicDescriptor& rDescriptor ) = delete; - GraphicDescriptor& operator=( const GraphicDescriptor& ) SAL_DELETED_FUNCTION; + GraphicDescriptor& operator=( const GraphicDescriptor& ) = delete; void implCreate( SvStream& rIStm, const OUString* pPath ); }; diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 1aa1ecbffe75..9d0e6c58ed1c 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -393,8 +393,8 @@ private: static bool IsCacheableAsBitmap( const GDIMetaFile& rMtf, OutputDevice* pOut, const Size& rSz ); // Copy assignment is forbidden and not implemented. - GraphicDisplayCacheEntry (const GraphicDisplayCacheEntry &) SAL_DELETED_FUNCTION; - GraphicDisplayCacheEntry & operator= (const GraphicDisplayCacheEntry &) SAL_DELETED_FUNCTION; + GraphicDisplayCacheEntry (const GraphicDisplayCacheEntry &) = delete; + GraphicDisplayCacheEntry & operator= (const GraphicDisplayCacheEntry &) = delete; public: |