From bff4c13475957863bfa7da5bc3bcf82a64a7503a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 15:25:41 +0200 Subject: Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3 --- shell/inc/internal/xml_parser.hxx | 4 ++-- shell/source/sessioninstall/SyncDbusSessionHelper.hxx | 4 ++-- shell/source/tools/lngconvex/cmdline.hxx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'shell') diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx index 44094e5d9383..a24d6bf3b65f 100644 --- a/shell/inc/internal/xml_parser.hxx +++ b/shell/inc/internal/xml_parser.hxx @@ -113,8 +113,8 @@ private: XML_Parser xml_parser_; private: - xml_parser(const xml_parser&) SAL_DELETED_FUNCTION; - xml_parser& operator=(const xml_parser&) SAL_DELETED_FUNCTION; + xml_parser(const xml_parser&) = delete; + xml_parser& operator=(const xml_parser&) = delete; }; #endif diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx index 04d9776abefc..6a1877b713f4 100644 --- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx +++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx @@ -52,8 +52,8 @@ namespace shell { namespace sessioninstall { throw ::com::sun::star::uno::RuntimeException(); } // not implemented private: - SyncDbusSessionHelper( const SyncDbusSessionHelper& ) SAL_DELETED_FUNCTION; - SyncDbusSessionHelper& operator=( const SyncDbusSessionHelper& ) SAL_DELETED_FUNCTION; + SyncDbusSessionHelper( const SyncDbusSessionHelper& ) = delete; + SyncDbusSessionHelper& operator=( const SyncDbusSessionHelper& ) = delete; }; }} diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx index cd1b2f3d1bd7..9cbc34e5e343 100644 --- a/shell/source/tools/lngconvex/cmdline.hxx +++ b/shell/source/tools/lngconvex/cmdline.hxx @@ -74,8 +74,8 @@ private: // prevent copy and assignment private: - CommandLine(const CommandLine&) SAL_DELETED_FUNCTION; - CommandLine& operator=(const CommandLine&) SAL_DELETED_FUNCTION; + CommandLine(const CommandLine&) = delete; + CommandLine& operator=(const CommandLine&) = delete; }; #endif -- cgit