From c210bf4510585b554e0e9a371f27fa27e2874762 Mon Sep 17 00:00:00 2001
From: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Date: Sun, 10 Apr 2016 21:41:44 +0200
Subject: tdf#94306 replace boost::noncopyable r.. to sdext

... in modules reportdesign to sdext
Replace with C++11 delete copy-constructur and
copy-assignment.
Remove boost/noncopyable.hpp includes.
Make some overloaded ctors explicit
(most in sd slidesorter).
Add deleted copy-assignment in sc/inc/chart2uno.hxx.

Change-Id: I21d4209f0ddb00063ca827474516a05ab4bb2f9a
Reviewed-on: https://gerrit.libreoffice.org/23970
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
---
 sal/rtl/bootstrap.cxx   | 11 ++++++++---
 sal/rtl/rtl_process.cxx |  6 ++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'sal/rtl')

diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 84fd1fc1798b..030afe4e5897 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -37,7 +37,6 @@
 #include <rtl/malformeduriexception.hxx>
 #include <rtl/uri.hxx>
 
-#include <boost/noncopyable.hpp>
 #include <list>
 #include <algorithm>
 #include <unordered_map>
@@ -407,7 +406,7 @@ Bootstrap_Impl * get_static_bootstrap_handle()
     return s_handle;
 }
 
-struct FundamentalIniData: private boost::noncopyable {
+struct FundamentalIniData {
     rtlBootstrapHandle ini;
 
     FundamentalIniData() {
@@ -422,6 +421,9 @@ struct FundamentalIniData: private boost::noncopyable {
     }
 
     ~FundamentalIniData() { rtl_bootstrap_args_close(ini); }
+
+    FundamentalIniData(const FundamentalIniData&) = delete;
+    FundamentalIniData& operator=(const FundamentalIniData&) = delete;
 };
 
 struct FundamentalIni: public rtl::Static< FundamentalIniData, FundamentalIni >
@@ -578,11 +580,14 @@ void Bootstrap_Impl::expandValue(
 
 namespace {
 
-struct bootstrap_map: private boost::noncopyable {
+struct bootstrap_map {
     typedef std::unordered_map<
         rtl::OUString, Bootstrap_Impl *,
         rtl::OUStringHash > t;
 
+    bootstrap_map(const bootstrap_map&) = delete;
+    bootstrap_map& operator=(const bootstrap_map&) = delete;
+
     // get and release must only be called properly synchronized via some mutex
     // (e.g., osl::Mutex::getGlobalMutex()):
 
diff --git a/sal/rtl/rtl_process.cxx b/sal/rtl/rtl_process.cxx
index 5eb411ba72d5..a391dc8e7453 100644
--- a/sal/rtl/rtl_process.cxx
+++ b/sal/rtl/rtl_process.cxx
@@ -21,7 +21,6 @@
 
 #include <cstring>
 
-#include "boost/noncopyable.hpp"
 #include "rtl/instance.hxx"
 #include "rtl/process.h"
 #include "rtl/uuid.h"
@@ -29,10 +28,13 @@
 
 namespace {
 
-class Id: private boost::noncopyable {
+class Id {
 public:
     Id() { rtl_createUuid(uuid_, nullptr, false); }
 
+    Id(const Id&) = delete;
+    Id& operator=(const Id&) = delete;
+
     void copy(sal_uInt8 * target) const
     { std::memcpy(target, uuid_, UUID_SIZE); }
 
-- 
cgit