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/textenc | |
| 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/textenc')
| -rw-r--r-- | sal/textenc/textenc.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx index e4a6a6c89217..afae9c2eb41e 100644 --- a/sal/textenc/textenc.cxx +++ b/sal/textenc/textenc.cxx @@ -26,7 +26,6 @@ #include <cstddef> #include <cstdlib> -#include "boost/noncopyable.hpp" #include "osl/diagnose.h" #include "osl/module.hxx" #include "rtl/instance.hxx" @@ -359,12 +358,15 @@ namespace { extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData( rtl_TextEncoding); // from tables.cxx in sal_textenc library -class FullTextEncodingData: private boost::noncopyable { +class FullTextEncodingData { public: ImplTextEncodingData const * get(rtl_TextEncoding encoding) { (void) this; // loplugin:staticmethods return sal_getFullTextEncodingData(encoding); } + FullTextEncodingData() = default; + FullTextEncodingData(const FullTextEncodingData&) = delete; + FullTextEncodingData& operator=(const FullTextEncodingData&) = delete; }; #else @@ -377,7 +379,7 @@ void SAL_CALL thisModule() {} }; -class FullTextEncodingData: private boost::noncopyable { +class FullTextEncodingData { public: FullTextEncodingData() { if (!module_.loadRelative(&thisModule, SAL_MODULENAME("sal_textenclo"))) @@ -398,6 +400,9 @@ public: return (*function_)(encoding); } + FullTextEncodingData(const FullTextEncodingData&) = delete; + FullTextEncodingData& operator=(const FullTextEncodingData&) = delete; + private: osl::Module module_; TextEncodingFunction * function_; |