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 /basctl | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/breakpoint.hxx | 2 | ||||
| -rw-r--r-- | basctl/source/inc/bastypes.hxx | 4 | ||||
| -rw-r--r-- | basctl/source/inc/dlgedmod.hxx | 4 | ||||
| -rw-r--r-- | basctl/source/inc/dlgedpage.hxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/basctl/source/basicide/breakpoint.hxx b/basctl/source/basicide/breakpoint.hxx index 5d1981bcf165..926729795cc0 100644 --- a/basctl/source/basicide/breakpoint.hxx +++ b/basctl/source/basicide/breakpoint.hxx @@ -51,7 +51,7 @@ struct BreakPoint class BreakPointList { private: - void operator =(BreakPointList) SAL_DELETED_FUNCTION; + void operator =(BreakPointList) = delete; ::std::vector<BreakPoint*> maBreakPoints; public: diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index 7a98027dbfd5..5f7d627d8543 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -301,8 +301,8 @@ bool QueryPassword( const css::uno::Reference< css::script::XLibraryContainer >& class ModuleInfoHelper { - ModuleInfoHelper (const ModuleInfoHelper&) SAL_DELETED_FUNCTION; - ModuleInfoHelper& operator = (const ModuleInfoHelper&) SAL_DELETED_FUNCTION; + ModuleInfoHelper (const ModuleInfoHelper&) = delete; + ModuleInfoHelper& operator = (const ModuleInfoHelper&) = delete; public: static void getObjectName( const css::uno::Reference< css::container::XNameContainer >& rLib, const OUString& rModName, OUString& rObjName ); static sal_Int32 getModuleType( const css::uno::Reference< css::container::XNameContainer >& rLib, const OUString& rModName ); diff --git a/basctl/source/inc/dlgedmod.hxx b/basctl/source/inc/dlgedmod.hxx index 131d51cafb71..453b92567873 100644 --- a/basctl/source/inc/dlgedmod.hxx +++ b/basctl/source/inc/dlgedmod.hxx @@ -34,8 +34,8 @@ class DlgEdModel : public SdrModel friend class DlgEdPage; private: - DlgEdModel( const DlgEdModel& ) SAL_DELETED_FUNCTION; - void operator=(const DlgEdModel& rSrcModel) SAL_DELETED_FUNCTION; + DlgEdModel( const DlgEdModel& ) = delete; + void operator=(const DlgEdModel& rSrcModel) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/basctl/source/inc/dlgedpage.hxx b/basctl/source/inc/dlgedpage.hxx index 7376f262ed65..3a3d1097d4de 100644 --- a/basctl/source/inc/dlgedpage.hxx +++ b/basctl/source/inc/dlgedpage.hxx @@ -34,7 +34,7 @@ class DlgEdForm; class DlgEdPage : public SdrPage { - DlgEdPage& operator=(const DlgEdPage&) SAL_DELETED_FUNCTION; + DlgEdPage& operator=(const DlgEdPage&) = delete; private: DlgEdForm* pDlgEdForm; |