summaryrefslogtreecommitdiff
path: root/svx
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 /svx
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 'svx')
-rw-r--r--svx/inc/AccessibleTableShape.hxx11
-rw-r--r--svx/source/accessibility/lookupcolorname.cxx5
-rw-r--r--svx/source/form/fmscriptingenv.cxx5
-rw-r--r--svx/source/sdr/contact/viewcontactofunocontrol.cxx1
-rw-r--r--svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx7
-rw-r--r--svx/source/sidebar/PanelFactory.cxx7
-rw-r--r--svx/source/table/accessiblecell.hxx12
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx1
-rw-r--r--svx/source/xml/xmlgrhlp.cxx9
9 files changed, 29 insertions, 29 deletions
diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx
index ea152b56f34e..d026af7b813c 100644
--- a/svx/inc/AccessibleTableShape.hxx
+++ b/svx/inc/AccessibleTableShape.hxx
@@ -34,8 +34,6 @@
#include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
#include <cppuhelper/compbase.hxx>
-#include <boost/noncopyable.hpp>
-
namespace sdr { namespace table {
class SvxTableController;
} }
@@ -51,11 +49,13 @@ namespace accessibility
> AccessibleTableShape_Base;
/** @descr
*/
-class AccessibleTableShape : private boost::noncopyable, public AccessibleTableShape_Base, public css::accessibility::XAccessibleTableSelection
+class AccessibleTableShape : public AccessibleTableShape_Base, public css::accessibility::XAccessibleTableSelection
{
public:
AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo );
virtual ~AccessibleTableShape( );
+ AccessibleTableShape(const AccessibleTableShape&) = delete;
+ AccessibleTableShape& operator=(const AccessibleTableShape&) = delete;
virtual void Init() override;
@@ -159,14 +159,15 @@ typedef ::cppu::WeakImplHelper<
css::accessibility::XAccessibleTableSelection >
AccessibleTableHeaderShape_BASE;
-class AccessibleTableHeaderShape : private boost::noncopyable,
- public MutexOwner,
+class AccessibleTableHeaderShape : public MutexOwner,
public AccessibleTableHeaderShape_BASE
{
public:
// bRow, true means rowheader, false means columnheader
AccessibleTableHeaderShape( AccessibleTableShape* pTable, bool bRow );
virtual ~AccessibleTableHeaderShape();
+ AccessibleTableHeaderShape(const AccessibleTableHeaderShape&) = delete;
+ AccessibleTableHeaderShape& operator=(const AccessibleTableHeaderShape&) = delete;
// XAccessible
virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx
index dafe833d4d70..06cfee79327b 100644
--- a/svx/source/accessibility/lookupcolorname.cxx
+++ b/svx/source/accessibility/lookupcolorname.cxx
@@ -19,7 +19,6 @@
#include "sal/config.h"
-#include "boost/noncopyable.hpp"
#include "com/sun/star/container/XNameAccess.hpp"
#include "com/sun/star/container/XNameContainer.hpp"
#include "com/sun/star/drawing/ColorTable.hpp"
@@ -38,9 +37,11 @@
namespace {
-class ColorNameMap: private boost::noncopyable {
+class ColorNameMap {
public:
ColorNameMap();
+ ColorNameMap(const ColorNameMap&) = delete;
+ ColorNameMap& operator=(const ColorNameMap&) = delete;
OUString lookUp(long color) const;
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index f12265025ff6..3f3c8e0ddafd 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -39,7 +39,6 @@
#include <sfx2/app.hxx>
#include <basic/basmgr.hxx>
-#include <boost/noncopyable.hpp>
#include <boost/assign/list_of.hpp>
#include <memory>
#include <set>
@@ -140,7 +139,7 @@ namespace svxform
};
class FormScriptingEnvironment:
- public IFormScriptingEnvironment, private boost::noncopyable
+ public IFormScriptingEnvironment
{
private:
typedef rtl::Reference<FormScriptListener> ListenerImplementation;
@@ -154,6 +153,8 @@ namespace svxform
public:
explicit FormScriptingEnvironment( FmFormModel& _rModel );
virtual ~FormScriptingEnvironment();
+ FormScriptingEnvironment(const FormScriptingEnvironment&) = delete;
+ FormScriptingEnvironment& operator=(const FormScriptingEnvironment&) = delete;
// callback for FormScriptListener
void doFireScriptEvent( const ScriptEvent& _rEvent, Any* _pSynchronousResult );
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index ef6ac445b0b9..2050c27afc24 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <sdr/contact/viewcontactofunocontrol.hxx>
#include <sdr/contact/viewobjectcontactofunocontrol.hxx>
#include <sdr/contact/objectcontactofpageview.hxx>
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
*/
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index 3c2d80d66977..4b954ec8e2be 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -42,8 +42,6 @@
#include <com/sun/star/ui/XSidebar.hpp>
#include <com/sun/star/ui/XUIElementFactory.hpp>
-#include <boost/noncopyable.hpp>
-
using namespace css;
using namespace css::uno;
using namespace svx::sidebar;
@@ -60,13 +58,14 @@ typedef ::cppu::WeakComponentImplHelper< css::ui::XUIElementFactory, css::lang::
PanelFactoryInterfaceBase;
class PanelFactory
- : private ::boost::noncopyable,
- private ::cppu::BaseMutex,
+ : private ::cppu::BaseMutex,
public PanelFactoryInterfaceBase
{
public:
PanelFactory();
virtual ~PanelFactory();
+ PanelFactory(const PanelFactory&) = delete;
+ PanelFactory& operator=(const PanelFactory&) = delete;
// XUIElementFactory
css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement (
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index edc8e8fc2c23..0aa17a227b47 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -38,8 +38,6 @@
#include "cell.hxx"
-#include <boost/noncopyable.hpp>
-
namespace accessibility
{
@@ -48,11 +46,15 @@ class AccessibleShapeTreeInfo;
typedef ::cppu::ImplInheritanceHelper< AccessibleContextBase, css::accessibility::XAccessibleExtendedComponent > AccessibleCellBase;
-class AccessibleCell : private boost::noncopyable, public AccessibleCellBase, public AccessibleComponentBase, public IAccessibleViewForwarderListener
+class AccessibleCell : public AccessibleCellBase
+ , public AccessibleComponentBase
+ , public IAccessibleViewForwarderListener
{
public:
AccessibleCell( const css::uno::Reference< css::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo);
virtual ~AccessibleCell();
+ AccessibleCell(const AccessibleCell&) = delete;
+ AccessibleCell& operator=(const AccessibleCell&) = delete;
void Init();
@@ -127,10 +129,6 @@ protected:
virtual void SAL_CALL disposing() override;
AccessibleTableShape *pAccTable;
-
-private:
- AccessibleCell(const AccessibleCell&) = delete;
- AccessibleCell& operator=(const AccessibleCell&) = delete;
};
} // end of namespace accessibility
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index e5141f15324c..ca300c45be28 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <tools/debug.hxx>
#include <sal/types.h>
#include <vcl/lstbox.hxx>
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index fc6e86ce9802..7ae6fa222871 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <boost/noncopyable.hpp>
#include <comphelper/string.hxx>
#include <sal/macros.h>
#include <com/sun/star/embed/XTransactedObject.hpp>
@@ -74,7 +73,7 @@ const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf )
}
class SvXMLGraphicInputStream:
- public cppu::WeakImplHelper<XInputStream>, private boost::noncopyable
+ public cppu::WeakImplHelper<XInputStream>
{
private:
@@ -93,6 +92,8 @@ public:
explicit SvXMLGraphicInputStream( const OUString& rGraphicId );
virtual ~SvXMLGraphicInputStream();
+ SvXMLGraphicInputStream(const SvXMLGraphicInputStream&) = delete;
+ SvXMLGraphicInputStream& operator=(const SvXMLGraphicInputStream&) = delete;
bool Exists() const { return mxStmWrapper.is(); }
};
@@ -200,7 +201,7 @@ void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException
}
class SvXMLGraphicOutputStream:
- public cppu::WeakImplHelper<XOutputStream>, private boost::noncopyable
+ public cppu::WeakImplHelper<XOutputStream>
{
private:
@@ -221,6 +222,8 @@ public:
SvXMLGraphicOutputStream();
virtual ~SvXMLGraphicOutputStream();
+ SvXMLGraphicOutputStream(const SvXMLGraphicOutputStream&) = delete;
+ SvXMLGraphicOutputStream& operator=(const SvXMLGraphicOutputStream&) = delete;
bool Exists() const { return mxStmWrapper.is(); }
const GraphicObject& GetGraphicObject();