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 /fpicker | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/aqua/SalAquaFilePicker.hxx | 4 | ||||
| -rw-r--r-- | fpicker/source/aqua/SalAquaFolderPicker.hxx | 4 | ||||
| -rw-r--r-- | fpicker/source/office/asyncfilepicker.hxx | 4 | ||||
| -rw-r--r-- | fpicker/source/office/fpsmartcontent.hxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index f018f86df25f..6ed8f76ddc52 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -163,8 +163,8 @@ public: } private: - SalAquaFilePicker( const SalAquaFilePicker& ) SAL_DELETED_FUNCTION; - SalAquaFilePicker& operator=( const SalAquaFilePicker& ) SAL_DELETED_FUNCTION; + SalAquaFilePicker( const SalAquaFilePicker& ) = delete; + SalAquaFilePicker& operator=( const SalAquaFilePicker& ) = delete; virtual void ensureFilterHelper(); diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx index 9de88bd43341..c23ebd21aea1 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.hxx +++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx @@ -101,8 +101,8 @@ public: throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: - SalAquaFolderPicker( const SalAquaFolderPicker& ) SAL_DELETED_FUNCTION; - SalAquaFolderPicker& operator=( const SalAquaFolderPicker& ) SAL_DELETED_FUNCTION; + SalAquaFolderPicker( const SalAquaFolderPicker& ) = delete; + SalAquaFolderPicker& operator=( const SalAquaFolderPicker& ) = delete; // to instantiate own services ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceMgr; diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index 0778d979760c..1deb5869f6f5 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -90,8 +90,8 @@ namespace svt private: DECL_LINK_TYPED( OnActionDone, void*, void ); - AsyncPickerAction( const AsyncPickerAction& ) SAL_DELETED_FUNCTION; - AsyncPickerAction& operator=( const AsyncPickerAction& ) SAL_DELETED_FUNCTION; + AsyncPickerAction( const AsyncPickerAction& ) = delete; + AsyncPickerAction& operator=( const AsyncPickerAction& ) = delete; }; diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx index 0e6f0b5fc1d6..06eb103a1e84 100644 --- a/fpicker/source/office/fpsmartcontent.hxx +++ b/fpicker/source/office/fpsmartcontent.hxx @@ -61,8 +61,8 @@ namespace svt /// checks if the currently bound content is a folder or document bool implIs( const OUString& _rURL, Type _eType ); - SmartContent( const SmartContent& _rSource ) SAL_DELETED_FUNCTION; - SmartContent& operator=( const SmartContent& _rSource ) SAL_DELETED_FUNCTION; + SmartContent( const SmartContent& _rSource ) = delete; + SmartContent& operator=( const SmartContent& _rSource ) = delete; public: SmartContent(); |