diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-10 21:41:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-11 07:15:35 +0000 |
| commit | c210bf4510585b554e0e9a371f27fa27e2874762 (patch) | |
| tree | 62f8c45ab415da97af398508e3ea64329268e7a3 /sal/osl | |
| parent | cf81f3ba0602eeffad8907a1bb9cdd24e62c2d1e (diff) | |
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>
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/unx/file.cxx | 5 | ||||
| -rw-r--r-- | sal/osl/unx/file_path_helper.cxx | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index 3f44a1019065..2938e0e1da37 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -19,7 +19,6 @@ #include <config_features.h> -#include "boost/noncopyable.hpp" #include "osl/file.hxx" #include "osl/detail/file.h" @@ -152,12 +151,14 @@ struct FileHandle_Impl /** Buffer cache / allocator. */ - class Allocator: private boost::noncopyable + class Allocator { rtl_cache_type * m_cache; size_t m_bufsiz; public: + Allocator(const Allocator&) = delete; + Allocator& operator=(const Allocator&) = delete; static Allocator & get(); void allocate (sal_uInt8 ** ppBuffer, size_t * pnSize); diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx index ec8eeb5666ce..23486c596a4d 100644 --- a/sal/osl/unx/file_path_helper.cxx +++ b/sal/osl/unx/file_path_helper.cxx @@ -20,7 +20,6 @@ #include "file_path_helper.hxx" #include "uunxapi.hxx" -#include <boost/noncopyable.hpp> #include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <sal/log.hxx> @@ -157,7 +156,7 @@ bool SAL_CALL osl_systemPathIsLocalOrParentDirectoryEntry( the specified character **********************************************/ -class path_list_iterator: private boost::noncopyable +class path_list_iterator { public: @@ -173,6 +172,9 @@ public: reset(); } + path_list_iterator(const path_list_iterator&) = delete; + path_list_iterator& operator=(const path_list_iterator&) = delete; + void reset() { m_path_segment_begin = m_path_segment_end = m_path_list.getStr(); |