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 /unotools/source/config | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'unotools/source/config')
| -rw-r--r-- | unotools/source/config/configmgr.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/config/lingucfg.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/config/searchopt.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx index 91a77ef8e8a9..870cc8d31beb 100644 --- a/unotools/source/config/configmgr.cxx +++ b/unotools/source/config/configmgr.cxx @@ -59,8 +59,8 @@ private: utl::ConfigManager & manager_; utl::ConfigItem * item_; - RegisterConfigItemHelper(const RegisterConfigItemHelper&) SAL_DELETED_FUNCTION; - RegisterConfigItemHelper& operator=(const RegisterConfigItemHelper&) SAL_DELETED_FUNCTION; + RegisterConfigItemHelper(const RegisterConfigItemHelper&) = delete; + RegisterConfigItemHelper& operator=(const RegisterConfigItemHelper&) = delete; }; css::uno::Reference< css::lang::XMultiServiceFactory > diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 5bda4e65b148..d2fceaed0a80 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -151,8 +151,8 @@ class SvtLinguConfigItem : public utl::ConfigItem bool LoadOptions( const uno::Sequence< OUString > &rProperyNames ); bool SaveOptions( const uno::Sequence< OUString > &rProperyNames ); - SvtLinguConfigItem(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION; - SvtLinguConfigItem& operator=(const SvtLinguConfigItem&) SAL_DELETED_FUNCTION; + SvtLinguConfigItem(const SvtLinguConfigItem&) = delete; + SvtLinguConfigItem& operator=(const SvtLinguConfigItem&) = delete; virtual void ImplCommit() SAL_OVERRIDE; public: diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index ed3b6e956ed5..8afa66b0bc5f 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -40,8 +40,8 @@ class SvtSearchOptions_Impl : public ConfigItem sal_Int32 nFlags; bool bModified; - SvtSearchOptions_Impl(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION; - SvtSearchOptions_Impl& operator=(const SvtSearchOptions_Impl&) SAL_DELETED_FUNCTION; + SvtSearchOptions_Impl(const SvtSearchOptions_Impl&) = delete; + SvtSearchOptions_Impl& operator=(const SvtSearchOptions_Impl&) = delete; // ConfigItem virtual void ImplCommit() SAL_OVERRIDE; |