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 /desktop | |
parent | HAVE_CXX11_DELETE is required on all supported toolchains (diff) | |
download | core-bff4c13475957863bfa7da5bc3bcf82a64a7503a.tar.gz core-bff4c13475957863bfa7da5bc3bcf82a64a7503a.zip |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'desktop')
9 files changed, 20 insertions, 20 deletions
diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index 71a97b9b1b3c..787eb7e42634 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -75,8 +75,8 @@ public: virtual ~SelectedPackage(); private: - SelectedPackage(SelectedPackage &) SAL_DELETED_FUNCTION; - void operator =(SelectedPackage &) SAL_DELETED_FUNCTION; + SelectedPackage(SelectedPackage &) = delete; + void operator =(SelectedPackage &) = delete; css::uno::Reference< css::deployment::XPackage> m_xPackage; }; diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index 2d7d3e9a13da..820147286636 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -41,8 +41,8 @@ public: virtual void dispose() SAL_OVERRIDE; private: - DependencyDialog(DependencyDialog &) SAL_DELETED_FUNCTION; - void operator =(DependencyDialog &) SAL_DELETED_FUNCTION; + DependencyDialog(DependencyDialog &) = delete; + void operator =(DependencyDialog &) = delete; VclPtr<ListBox> m_list; }; diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx index e6aaac9bd783..f880112aea8d 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx @@ -87,8 +87,8 @@ public: bool isBusy(); private: - ExtensionCmdQueue(ExtensionCmdQueue &) SAL_DELETED_FUNCTION; - void operator =(ExtensionCmdQueue &) SAL_DELETED_FUNCTION; + ExtensionCmdQueue(ExtensionCmdQueue &) = delete; + void operator =(ExtensionCmdQueue &) = delete; class Thread; diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index b3298daaedbc..024c43722e75 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -96,8 +96,8 @@ public: css::uno::Sequence< css::uno::Sequence< OUString > > &rItemList ); private: - UpdateDialog(UpdateDialog &) SAL_DELETED_FUNCTION; - void operator =(UpdateDialog &) SAL_DELETED_FUNCTION; + UpdateDialog(UpdateDialog &) = delete; + void operator =(UpdateDialog &) = delete; struct DisabledUpdate; struct SpecificError; @@ -115,8 +115,8 @@ private: sal_uInt16 getItemCount() const; private: - explicit CheckListBox(UpdateDialog::CheckListBox &) SAL_DELETED_FUNCTION; - void operator =(UpdateDialog::CheckListBox &) SAL_DELETED_FUNCTION; + explicit CheckListBox(UpdateDialog::CheckListBox &) = delete; + void operator =(UpdateDialog::CheckListBox &) = delete; virtual void MouseButtonDown(MouseEvent const & event) SAL_OVERRIDE; virtual void MouseButtonUp(MouseEvent const & event) SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index 13bc6d6559fb..2b624ba8bdeb 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -66,8 +66,8 @@ public: virtual short Execute() SAL_OVERRIDE; private: - UpdateInstallDialog(UpdateInstallDialog &) SAL_DELETED_FUNCTION; - void operator =(UpdateInstallDialog &) SAL_DELETED_FUNCTION; + UpdateInstallDialog(UpdateInstallDialog &) = delete; + void operator =(UpdateInstallDialog &) = delete; class Thread; friend class Thread; diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index 24449b111382..4f83d0a76c08 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.hxx @@ -83,8 +83,8 @@ public: void erase(OUString const & id, OUString const & fileName); private: - ActivePackages(ActivePackages &) SAL_DELETED_FUNCTION; - void operator =(ActivePackages &) SAL_DELETED_FUNCTION; + ActivePackages(ActivePackages &) = delete; + void operator =(ActivePackages &) = delete; #if HAVE_FEATURE_EXTENSIONS ::dp_misc::PersistentMap m_map; #endif diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index efe34f1cbad0..36b15f82887e 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -47,8 +47,8 @@ private: css::uno::Reference<css::xml::dom::XDocument> m_doc; css::uno::Reference<css::xml::xpath::XXPathAPI> m_xpathApi; - BackendDb(BackendDb const &) SAL_DELETED_FUNCTION; - BackendDb & operator = (BackendDb const &) SAL_DELETED_FUNCTION; + BackendDb(BackendDb const &) = delete; + BackendDb & operator = (BackendDb const &) = delete; protected: const css::uno::Reference<css::uno::XComponentContext> m_xContext; diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx index 6d4aa8231daf..504fc6b7cb44 100644 --- a/desktop/source/lib/lokinteractionhandler.hxx +++ b/desktop/source/lib/lokinteractionhandler.hxx @@ -38,8 +38,8 @@ class LOKInteractionHandler: public cppu::WeakImplHelper<com::sun::star::lang::X com::sun::star::lang::XInitialization, com::sun::star::task::XInteractionHandler2> { - LOKInteractionHandler(const LOKInteractionHandler&) SAL_DELETED_FUNCTION; - LOKInteractionHandler& operator=(const LOKInteractionHandler&) SAL_DELETED_FUNCTION; + LOKInteractionHandler(const LOKInteractionHandler&) = delete; + LOKInteractionHandler& operator=(const LOKInteractionHandler&) = delete; public: explicit LOKInteractionHandler(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const & rxContext); diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index 318829b9af46..1805fee037b0 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -31,8 +31,8 @@ namespace desktop { class UnxSplashScreen : public ::cppu::WeakImplHelper< css::task::XStatusIndicator, css::lang::XInitialization, css::lang::XServiceInfo > { private: - UnxSplashScreen( const UnxSplashScreen& ) SAL_DELETED_FUNCTION; - UnxSplashScreen operator =( const UnxSplashScreen& ) SAL_DELETED_FUNCTION; + UnxSplashScreen( const UnxSplashScreen& ) = delete; + UnxSplashScreen operator =( const UnxSplashScreen& ) = delete; virtual ~UnxSplashScreen(); |