diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-13 10:07:19 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-04-13 11:34:32 +0000 |
| commit | 0de868cd0f430efc6256926c2865530818d7b7dd (patch) | |
| tree | 60e681b0e119d50022500fbc0f91cbdd4d7c979c /shell | |
| parent | 19b34c0039c6293f9b37aa70f8055aa2be28ba09 (diff) | |
tdf#94306 replace boost::noncopyable in sfx2 to sot
Replace with C++11 delete copy-constructur
and copy-assignment.
Remove boost/noncopyable.hpp includes.
Add missing default ctors.
Make some overloaded ctors explicit,
seems cppcheck doesn't flag: T(const template<X>& rx).
Change-Id: I63c5a3ac84a33ea6d49868e2d9aa281ada79958e
Reviewed-on: https://gerrit.libreoffice.org/24050
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'shell')
4 files changed, 13 insertions, 11 deletions
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index dc98f455b036..745d96dab759 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -19,7 +19,6 @@ #include "sal/config.h" -#include "boost/noncopyable.hpp" #include "com/sun/star/beans/Optional.hpp" #include "com/sun/star/beans/PropertyVetoException.hpp" #include "com/sun/star/beans/UnknownPropertyException.hpp" @@ -65,11 +64,12 @@ css::uno::Sequence< OUString > SAL_CALL getDefaultSupportedServiceNames() { class Default: public cppu::WeakImplHelper< - css::lang::XServiceInfo, css::beans::XPropertySet >, - private boost::noncopyable + css::lang::XServiceInfo, css::beans::XPropertySet > { public: Default() {} + Default(const Default&) = delete; + Default& operator=(const Default&) = delete; private: virtual ~Default() {} diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index d15f2d2e1d72..013e5321d507 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -21,7 +21,6 @@ #include <kapplication.h> -#include "boost/noncopyable.hpp" #include "com/sun/star/beans/Optional.hpp" #include "com/sun/star/beans/PropertyVetoException.hpp" #include "com/sun/star/beans/UnknownPropertyException.hpp" @@ -66,11 +65,12 @@ css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() { class Service: public cppu::WeakImplHelper< - css::lang::XServiceInfo, css::beans::XPropertySet >, - private boost::noncopyable + css::lang::XServiceInfo, css::beans::XPropertySet > { public: Service(); + Service(const Service&) = delete; + Service& operator=(const Service&) = delete; private: virtual ~Service() {} diff --git a/shell/source/backends/kdebe/kdebackend.cxx b/shell/source/backends/kdebe/kdebackend.cxx index d13c0d136218..738113127444 100644 --- a/shell/source/backends/kdebe/kdebackend.cxx +++ b/shell/source/backends/kdebe/kdebackend.cxx @@ -19,7 +19,6 @@ #include "sal/config.h" -#include "boost/noncopyable.hpp" #include "com/sun/star/beans/Optional.hpp" #include "com/sun/star/beans/PropertyVetoException.hpp" #include "com/sun/star/beans/UnknownPropertyException.hpp" @@ -66,11 +65,12 @@ css::uno::Sequence< OUString > SAL_CALL getServiceSupportedServiceNames() { class Service: public cppu::WeakImplHelper< - css::lang::XServiceInfo, css::beans::XPropertySet >, - private boost::noncopyable + css::lang::XServiceInfo, css::beans::XPropertySet > { public: Service(); + Service(const Service&) = delete; + Service& operator=(const Service&) = delete; private: virtual ~Service() {} diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx index 0d5ded137199..ee9e697e1f7f 100644 --- a/shell/source/unix/sysshell/recently_used_file_handler.cxx +++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include "boost/noncopyable.hpp" #include "osl/process.h" #include "rtl/ustring.hxx" #include "rtl/string.hxx" @@ -212,7 +211,7 @@ namespace /* private */ { class unknown_xml_format_exception {}; class recently_used_file_filter: - public i_xml_parser_event_handler, private boost::noncopyable + public i_xml_parser_event_handler { public: explicit recently_used_file_filter(recently_used_item_list_t& item_list) : @@ -229,6 +228,9 @@ namespace /* private */ { named_command_map_[TAG_GROUP] = &recently_used_item::set_groups; } + recently_used_file_filter(const recently_used_file_filter&) = delete; + recently_used_file_filter& operator=(const recently_used_file_filter&) = delete; + virtual void start_element( const string_t& /*raw_name*/, const string_t& local_name, |