summaryrefslogtreecommitdiff
path: root/svtools/source
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 /svtools/source
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 'svtools/source')
-rw-r--r--svtools/source/edit/textwindowpeer.cxx6
-rw-r--r--svtools/source/misc/svtaccessiblefactory.cxx5
-rw-r--r--svtools/source/table/mousefunction.hxx6
-rw-r--r--svtools/source/uno/contextmenuhelper.cxx6
-rw-r--r--svtools/source/uno/unocontroltablemodel.hxx1
-rw-r--r--svtools/source/uno/unogridcolumnfacade.cxx4
-rw-r--r--svtools/source/uno/unogridcolumnfacade.hxx5
7 files changed, 17 insertions, 16 deletions
diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx
index 96ae2bb30a78..8ceb80d050a2 100644
--- a/svtools/source/edit/textwindowpeer.cxx
+++ b/svtools/source/edit/textwindowpeer.cxx
@@ -21,7 +21,6 @@
#include <svtaccessiblefactory.hxx>
-#include <boost/noncopyable.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/awt/XWindowPeer.hpp>
#include <com/sun/star/uno/Reference.hxx>
@@ -33,12 +32,15 @@
namespace {
-class TextWindowPeer: public VCLXWindow, private boost::noncopyable {
+class TextWindowPeer: public VCLXWindow {
public:
explicit TextWindowPeer(TextView & view);
virtual ~TextWindowPeer() {}
+ TextWindowPeer(const TextWindowPeer&) = delete;
+ TextWindowPeer& operator=(const TextWindowPeer&) = delete;
+
private:
virtual css::uno::Reference<css::accessibility::XAccessibleContext>
CreateAccessibleContext() override;
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index 97e866c41c38..03a68d03c623 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -21,7 +21,6 @@
#include "svtaccessiblefactory.hxx"
-#include <boost/noncopyable.hpp>
#include <osl/module.h>
namespace svt
@@ -44,10 +43,12 @@ namespace svt
//= AccessibleDummyFactory
class AccessibleDummyFactory:
- public IAccessibleFactory, private boost::noncopyable
+ public IAccessibleFactory
{
public:
AccessibleDummyFactory();
+ AccessibleDummyFactory(const AccessibleDummyFactory&) = delete;
+ AccessibleDummyFactory& operator=(const AccessibleDummyFactory&) = delete;
protected:
virtual ~AccessibleDummyFactory();
diff --git a/svtools/source/table/mousefunction.hxx b/svtools/source/table/mousefunction.hxx
index f819050bbb6e..4ecca061fa18 100644
--- a/svtools/source/table/mousefunction.hxx
+++ b/svtools/source/table/mousefunction.hxx
@@ -25,8 +25,6 @@
#include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
-#include <boost/noncopyable.hpp>
-
class MouseEvent;
@@ -51,10 +49,12 @@ namespace svt { namespace table
//= MouseFunction
- class MouseFunction : public ::salhelper::SimpleReferenceObject, public ::boost::noncopyable
+ class MouseFunction : public ::salhelper::SimpleReferenceObject
{
public:
MouseFunction() {}
+ MouseFunction(const MouseFunction&) = delete;
+ MouseFunction& operator=(const MouseFunction&) = delete;
virtual FunctionResult handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) = 0;
virtual FunctionResult handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) = 0;
virtual FunctionResult handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) = 0;
diff --git a/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index e661dd30d031..b245c0127cc1 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <svtools/contextmenuhelper.hxx>
#include <svtools/menuoptions.hxx>
#include <svtools/miscopt.hxx>
@@ -56,14 +55,15 @@ namespace svt
// internal helper class to retrieve status updates
class StateEventHelper : public css::frame::XStatusListener,
- public ::cppu::OWeakObject,
- private boost::noncopyable
+ public ::cppu::OWeakObject
{
public:
StateEventHelper( const uno::Reference< frame::XDispatchProvider >& xDispatchProvider,
const uno::Reference< util::XURLTransformer >& xURLTransformer,
const OUString& aCommandURL );
virtual ~StateEventHelper();
+ StateEventHelper(const StateEventHelper&) = delete;
+ StateEventHelper& operator=(const StateEventHelper&) = delete;
bool isCommandEnabled();
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index 0f859c8279cd..87ee6c7d04f0 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -34,7 +34,6 @@
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index a8a023a821b3..5492488e3204 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -33,7 +33,6 @@
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
#include <cppuhelper/implbase.hxx>
-#include <boost/noncopyable.hpp>
namespace svt { namespace table
@@ -91,10 +90,11 @@ namespace svt { namespace table
typedef ::cppu::WeakImplHelper < XGridColumnListener
> ColumnChangeMultiplexer_Base;
class ColumnChangeMultiplexer :public ColumnChangeMultiplexer_Base
- ,public ::boost::noncopyable
{
public:
explicit ColumnChangeMultiplexer( UnoGridColumnFacade& i_colImpl );
+ ColumnChangeMultiplexer(const ColumnChangeMultiplexer&) = delete;
+ ColumnChangeMultiplexer& operator=(const ColumnChangeMultiplexer&) = delete;
void dispose();
diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx
index aed237624447..0128174bdc29 100644
--- a/svtools/source/uno/unogridcolumnfacade.hxx
+++ b/svtools/source/uno/unogridcolumnfacade.hxx
@@ -29,8 +29,6 @@
#include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
-
namespace svt { namespace table
{
@@ -41,7 +39,6 @@ namespace svt { namespace table
class ColumnChangeMultiplexer;
class UnoControlTableModel;
class UnoGridColumnFacade :public IColumnModel
- ,public ::boost::noncopyable
{
public:
UnoGridColumnFacade(
@@ -49,6 +46,8 @@ namespace svt { namespace table
css::uno::Reference< css::awt::grid::XGridColumn > const & i_gridColumn
);
virtual ~UnoGridColumnFacade();
+ UnoGridColumnFacade(const UnoGridColumnFacade&) = delete;
+ UnoGridColumnFacade& operator=(const UnoGridColumnFacade&) = delete;
// IColumnModel overridables
virtual OUString getName() const override;