summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-13 10:11:37 +0200
committerMichael Stahl <mstahl@redhat.com>2016-04-13 11:19:04 +0000
commit97abbec95665b43a9a09e10a0fb31854cdbd5c0d (patch)
treeb6917d80775c411a5480febd77b89fb256203b6a /vcl
parent9a2ff36b51f86ca3ade8093d7698314c0d3db6a6 (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 'vcl')
-rw-r--r--vcl/osx/DragSource.hxx7
-rw-r--r--vcl/osx/DragSourceContext.hxx7
-rw-r--r--vcl/osx/DropTarget.hxx7
-rw-r--r--vcl/osx/OSXTransferable.hxx6
-rw-r--r--vcl/osx/clipboard.hxx6
5 files changed, 15 insertions, 18 deletions
diff --git a/vcl/osx/DragSource.hxx b/vcl/osx/DragSource.hxx
index e96a3deb0ffc..ea16c2606bb5 100644
--- a/vcl/osx/DragSource.hxx
+++ b/vcl/osx/DragSource.hxx
@@ -30,8 +30,6 @@
#include <osl/thread.h>
#include <com/sun/star/awt/MouseEvent.hpp>
-#include <boost/noncopyable.hpp>
-
#include <premac.h>
#import <Cocoa/Cocoa.h>
#include <postmac.h>
@@ -72,12 +70,13 @@ class AquaSalFrame;
class DragSource : public ::cppu::BaseMutex,
public ::cppu::WeakComponentImplHelper< css::datatransfer::dnd::XDragSource,
css::lang::XInitialization,
- css::lang::XServiceInfo >,
- private ::boost::noncopyable
+ css::lang::XServiceInfo >
{
public:
DragSource();
virtual ~DragSource();
+ DragSource(const DragSource&) = delete;
+ DragSource& operator=(const DragSource&) = delete;
// XInitialization
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
diff --git a/vcl/osx/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx
index da5a3a8bac87..0aa74c622015 100644
--- a/vcl/osx/DragSourceContext.hxx
+++ b/vcl/osx/DragSourceContext.hxx
@@ -24,8 +24,6 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <boost/noncopyable.hpp>
-
// This class fires events to XDragSourceListener implementations.
// Of that interface only dragDropEnd and dropActionChanged are called.
// The functions dragEnter, dragExit and dragOver are not supported
@@ -33,12 +31,13 @@
// An instance of SourceContext only lives as long as the drag and drop
// operation lasts.
class DragSourceContext: public cppu::BaseMutex,
- public cppu::WeakComponentImplHelper<css::datatransfer::dnd::XDragSourceContext>,
- private ::boost::noncopyable
+ public cppu::WeakComponentImplHelper<css::datatransfer::dnd::XDragSourceContext>
{
public:
DragSourceContext();
virtual ~DragSourceContext();
+ DragSourceContext(const DragSourceContext&) = delete;
+ DragSourceContext& operator=(const DragSourceContext&) = delete;
virtual sal_Int32 SAL_CALL getCurrentCursor( )
throw( css::uno::RuntimeException, std::exception) override;
diff --git a/vcl/osx/DropTarget.hxx b/vcl/osx/DropTarget.hxx
index a54d390167b4..7659eed2eccc 100644
--- a/vcl/osx/DropTarget.hxx
+++ b/vcl/osx/DropTarget.hxx
@@ -34,8 +34,6 @@
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <boost/noncopyable.hpp>
-
#include <premac.h>
#import <Cocoa/Cocoa.h>
#include <postmac.h>
@@ -77,12 +75,13 @@ class DropTarget: public cppu::BaseMutex,
css::datatransfer::dnd::XDropTarget,
css::datatransfer::dnd::XDropTargetDragContext,
css::datatransfer::dnd::XDropTargetDropContext,
- css::lang::XServiceInfo >,
- private boost::noncopyable
+ css::lang::XServiceInfo >
{
public:
DropTarget();
virtual ~DropTarget();
+ DropTarget(const DropTarget&) = delete;
+ DropTarget& operator=(const DropTarget&) = delete;
// Overrides WeakComponentImplHelper::disposing which is called by
// WeakComponentImplHelper::dispose
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index b8c06fcf09f8..906138bccf74 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -31,12 +31,10 @@
#import <Cocoa/Cocoa.h>
#include <postmac.h>
-#include <boost/noncopyable.hpp>
#include <memory>
#include <vector>
-class OSXTransferable : public ::cppu::WeakImplHelper<css::datatransfer::XTransferable>,
- private ::boost::noncopyable
+class OSXTransferable : public ::cppu::WeakImplHelper<css::datatransfer::XTransferable>
{
public:
explicit OSXTransferable(css::uno::Reference< css::datatransfer::XMimeContentTypeFactory> rXMimeCntFactory,
@@ -44,6 +42,8 @@ public:
NSPasteboard* pasteboard);
virtual ~OSXTransferable();
+ OSXTransferable(const OSXTransferable&) = delete;
+ OSXTransferable& operator=(const OSXTransferable&) = delete;
// XTransferable
diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx
index 6ff1721a0158..2a0afd92d680 100644
--- a/vcl/osx/clipboard.hxx
+++ b/vcl/osx/clipboard.hxx
@@ -36,7 +36,6 @@
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <boost/noncopyable.hpp>
#include <list>
#include <premac.h>
@@ -65,8 +64,7 @@ class AquaClipboard;
class AquaClipboard : public ::cppu::BaseMutex,
public ::cppu::WeakComponentImplHelper< css::datatransfer::clipboard::XSystemClipboard,
css::datatransfer::clipboard::XFlushableClipboard,
- css::lang::XServiceInfo >,
- private ::boost::noncopyable
+ css::lang::XServiceInfo >
{
public:
/* Create a clipboard instance.
@@ -84,6 +82,8 @@ public:
bool bUseSystemClipboard = true);
virtual ~AquaClipboard();
+ AquaClipboard(const AquaClipboard&) = delete;
+ AquaClipboard& operator=(const AquaClipboard&) = delete;
// XClipboard