From 922ee9a9da62febfe38a7780b11cf0d7ea0d5685 Mon Sep 17 00:00:00 2001 From: Jochen Nitschke Date: Fri, 8 Apr 2016 14:58:51 +0200 Subject: tdf#94306 replace boost::noncopyable in d... dbaccess, desktop and drawinglayer. Replace with C++11 delete copy-constructur and copy-assignment. Nothing special, only one unused include in dbaccess/source/filter/xml/xmlfilter.cxx. Change-Id: Iebabbc658215162450d4caf08d4fb2f116c456d9 Reviewed-on: https://gerrit.libreoffice.org/23918 Tested-by: Jenkins Reviewed-by: David Tardon --- desktop/test/deployment/active/active_native.cxx | 13 ++++++++----- desktop/test/deployment/passive/passive_native.cxx | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'desktop/test/deployment') diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index 5baf91c14de9..82325ec74d33 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -21,7 +21,6 @@ #include -#include #include #include #include @@ -60,10 +59,12 @@ namespace { class Provider: public cppu::WeakImplHelper2< - css::lang::XServiceInfo, css::frame::XDispatchProvider >, - private boost::noncopyable + css::lang::XServiceInfo, css::frame::XDispatchProvider > { public: + Provider(const Provider&) = delete; + const Provider& operator=(const Provider&) = delete; + static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create( css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); } @@ -151,10 +152,12 @@ Provider::queryDispatches( class Dispatch: public cppu::WeakImplHelper2< - css::lang::XServiceInfo, css::frame::XDispatch >, - private boost::noncopyable + css::lang::XServiceInfo, css::frame::XDispatch > { public: + Dispatch(const Dispatch&) = delete; + const Dispatch& operator=(const Dispatch&) = delete; + static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create( css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); } diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index 41970549eabb..fac8c7bc5515 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -21,7 +21,6 @@ #include -#include #include #include #include @@ -57,10 +56,12 @@ namespace { class Provider: public cppu::WeakImplHelper2< - css::lang::XServiceInfo, css::frame::XDispatchProvider >, - private boost::noncopyable + css::lang::XServiceInfo, css::frame::XDispatchProvider > { public: + Provider(const Provider&) = delete; + const Provider& operator=(const Provider&) = delete; + static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create( css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Provider(xContext)); } @@ -148,10 +149,12 @@ Provider::queryDispatches( class Dispatch: public cppu::WeakImplHelper2< - css::lang::XServiceInfo, css::frame::XDispatch >, - private boost::noncopyable + css::lang::XServiceInfo, css::frame::XDispatch > { public: + Dispatch(const Dispatch&) = delete; + const Dispatch& operator=(const Dispatch&) = delete; + static css::uno::Reference< css::uno::XInterface > SAL_CALL static_create( css::uno::Reference< css::uno::XComponentContext > const & xContext) { return static_cast< cppu::OWeakObject * >(new Dispatch(xContext)); } -- cgit