summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-09 17:07:54 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-04-11 07:22:50 +0000
commitd84ef731d8f5d8c1e896ecda3d03d4bb9129578d (patch)
tree582bdc8fc22114031c5564e2abb1691ef56acfe0 /jvmfwk
parent2553c5b95d4596fc1ef679a42073d5bc62737914 (diff)
tdf#94306 replace boost::noncopyable ...
... in modules editeng to oox. Replace with C++11 delete copy-constructur and copy-assignment. Remove boost/noncopyable.hpp includes and one unused boost/checked_delete.hpp include in linguistic. Change-Id: I5a38d8e5ac1b4286bdeb3858d56490a53d13fe80 Reviewed-on: https://gerrit.libreoffice.org/23928 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 4cf18713728a..bd65ec9b670d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -33,7 +33,6 @@
#include "rtl/instance.hxx"
#include "salhelper/linkhelper.hxx"
#include "salhelper/thread.hxx"
-#include "boost/noncopyable.hpp"
#include <memory>
#include "com/sun/star/uno/Sequence.hxx"
#include <utility>
@@ -205,7 +204,7 @@ rtl::Bootstrap * getBootstrap()
}
-class FileHandleGuard: private boost::noncopyable
+class FileHandleGuard
{
public:
explicit FileHandleGuard(oslFileHandle & rHandle):
@@ -213,6 +212,9 @@ public:
inline ~FileHandleGuard();
+ FileHandleGuard(const FileHandleGuard&) = delete;
+ FileHandleGuard& operator=(const FileHandleGuard&) = delete;
+
inline oslFileHandle & getHandle() { return m_rHandle; }
private: