summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 15:25:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:26 +0200
commitbff4c13475957863bfa7da5bc3bcf82a64a7503a (patch)
tree23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /unotools
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/configmgr.cxx4
-rw-r--r--unotools/source/config/lingucfg.cxx4
-rw-r--r--unotools/source/config/searchopt.cxx4
-rw-r--r--unotools/source/misc/componentresmodule.cxx4
-rw-r--r--unotools/source/misc/sharedunocomponent.cxx4
5 files changed, 10 insertions, 10 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;
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index 74af55a443e2..bf45f21ea40f 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.cxx
@@ -38,8 +38,8 @@ namespace utl
bool m_bInitialized;
OString m_sResFilePrefix;
- OComponentResModuleImpl(const OComponentResModuleImpl&) SAL_DELETED_FUNCTION;
- OComponentResModuleImpl& operator=(const OComponentResModuleImpl&) SAL_DELETED_FUNCTION;
+ OComponentResModuleImpl(const OComponentResModuleImpl&) = delete;
+ OComponentResModuleImpl& operator=(const OComponentResModuleImpl&) = delete;
public:
explicit OComponentResModuleImpl( const OString& _rResFilePrefix )
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index 9390df81362d..a2f29e328756 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.cxx
@@ -71,8 +71,8 @@ namespace utl
private:
Reference< XCloseable > m_xCloseable;
- CloseableComponentImpl(const CloseableComponentImpl&) SAL_DELETED_FUNCTION;
- CloseableComponentImpl& operator=(const CloseableComponentImpl&) SAL_DELETED_FUNCTION;
+ CloseableComponentImpl(const CloseableComponentImpl&) = delete;
+ CloseableComponentImpl& operator=(const CloseableComponentImpl&) = delete;
public:
explicit CloseableComponentImpl( const Reference< XInterface >& _rxComponent );