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 /sd/inc | |
parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'sd/inc')
-rw-r--r-- | sd/inc/helper/simplereferencecomponent.hxx | 8 | ||||
-rw-r--r-- | sd/inc/sdpage.hxx | 2 | ||||
-rw-r--r-- | sd/inc/stlsheet.hxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sd/inc/helper/simplereferencecomponent.hxx b/sd/inc/helper/simplereferencecomponent.hxx index 3bb1de4d471f..6993a6255fd6 100644 --- a/sd/inc/helper/simplereferencecomponent.hxx +++ b/sd/inc/helper/simplereferencecomponent.hxx @@ -78,13 +78,13 @@ protected: private: oslInterlockedCount m_nCount; - SimpleReferenceComponent(SimpleReferenceComponent &) SAL_DELETED_FUNCTION; + SimpleReferenceComponent(SimpleReferenceComponent &) = delete; - void operator =(SimpleReferenceComponent) SAL_DELETED_FUNCTION; + void operator =(SimpleReferenceComponent) = delete; - static void * operator new[](std::size_t) SAL_DELETED_FUNCTION; + static void * operator new[](std::size_t) = delete; - static void operator delete[](void * pPtr) SAL_DELETED_FUNCTION; + static void operator delete[](void * pPtr) = delete; bool mbDisposed; }; diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index cf5191d2bb7d..99d49ac8de01 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -92,7 +92,7 @@ namespace sd { class SD_DLLPUBLIC SdPage : public FmFormPage, public SdrObjUserCall { - SdPage& operator=(const SdPage&) SAL_DELETED_FUNCTION; + SdPage& operator=(const SdPage&) = delete; friend class SdGenericDrawPage; friend class SdDrawPage; diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index d1e64baa7f61..575758fdd23a 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -149,7 +149,7 @@ protected: std::unique_ptr< ModifyListenerForewarder > mpModifyListenerForewarder; private: - SdStyleSheet& operator=( const SdStyleSheet& ) SAL_DELETED_FUNCTION; + SdStyleSheet& operator=( const SdStyleSheet& ) = delete; }; typedef rtl::Reference< SdStyleSheet > SdStyleSheetRef; |