diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-13 10:11:37 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-04-13 11:19:04 +0000 |
| commit | 97abbec95665b43a9a09e10a0fb31854cdbd5c0d (patch) | |
| tree | b6917d80775c411a5480febd77b89fb256203b6a /svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | |
| parent | 9a2ff36b51f86ca3ade8093d7698314c0d3db6a6 (diff) | |
tdf#94306 replace boost::noncopyable in stoc to xmlsec..
Replace with C++11 delete copy-constructur
and copy-assignment.
Remove boost/noncopyable.hpp includes.
Add missing default ctors.
With this commit there should be no users
of boost::noncopyable left.
Change-Id: I6b1e47824912a6a80cc3f00f34938ebc048d8975
Reviewed-on: https://gerrit.libreoffice.org/24051
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx')
| -rw-r--r-- | svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index c89f60a97d93..bc60a1c37e30 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -56,8 +56,6 @@ #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive2d/controlprimitive2d.hxx> -#include <boost/noncopyable.hpp> - /* Form controls (more precise: UNO Controls) in the drawing layer are ... prone to breakage, since they have some @@ -500,8 +498,7 @@ namespace sdr { namespace contact { > ViewObjectContactOfUnoControl_Impl_Base; class SVX_DLLPRIVATE ViewObjectContactOfUnoControl_Impl: - public ViewObjectContactOfUnoControl_Impl_Base, - private boost::noncopyable + public ViewObjectContactOfUnoControl_Impl_Base { private: // fdo#41935 note that access to members is protected with SolarMutex; @@ -541,6 +538,8 @@ namespace sdr { namespace contact { public: explicit ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl ); + ViewObjectContactOfUnoControl_Impl(const ViewObjectContactOfUnoControl_Impl&) = delete; + ViewObjectContactOfUnoControl_Impl& operator=(const ViewObjectContactOfUnoControl_Impl&) = delete; /** disposes the instance, which is nonfunctional afterwards */ |