summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-09 17:07:54 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-04-11 07:22:50 +0000
commitd84ef731d8f5d8c1e896ecda3d03d4bb9129578d (patch)
tree582bdc8fc22114031c5564e2abb1691ef56acfe0 /editeng
parent2553c5b95d4596fc1ef679a42073d5bc62737914 (diff)
tdf#94306 replace boost::noncopyable ...
... in modules editeng to oox. Replace with C++11 delete copy-constructur and copy-assignment. Remove boost/noncopyable.hpp includes and one unused boost/checked_delete.hpp include in linguistic. Change-Id: I5a38d8e5ac1b4286bdeb3858d56490a53d13fe80 Reviewed-on: https://gerrit.libreoffice.org/23928 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/editattr.hxx7
-rw-r--r--editeng/source/editeng/editdoc.hxx6
-rw-r--r--editeng/source/editeng/editobj2.hxx10
-rw-r--r--editeng/source/editeng/impedit.hxx5
4 files changed, 17 insertions, 11 deletions
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index 6db6fd6c0960..13bf5a297f66 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -23,8 +23,6 @@
#include <editeng/eeitem.hxx>
#include <svl/poolitem.hxx>
-#include <boost/noncopyable.hpp>
-
class Color;
class SvxFont;
class SvxFontItem;
@@ -65,7 +63,7 @@ class SfxGrabBagItem;
// bFeature: Attribute must not expand/shrink, length is always 1
// bEdge: Attribute will not expand, if you want to expand just on the edge
-class EditCharAttrib : private boost::noncopyable
+class EditCharAttrib
{
protected:
const SfxPoolItem* pItem;
@@ -79,6 +77,9 @@ public:
EditCharAttrib( const SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
virtual ~EditCharAttrib();
+ EditCharAttrib(const EditCharAttrib&) = delete;
+ EditCharAttrib& operator=(const EditCharAttrib&) = delete;
+
sal_uInt16 Which() const { return pItem->Which(); }
const SfxPoolItem* GetItem() const { return pItem; }
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 024c4b4148bd..a18a682b5b67 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -35,8 +35,6 @@
#include <memory>
#include <vector>
-#include <boost/noncopyable.hpp>
-
class ImpEditEngine;
class SvxTabStop;
@@ -233,7 +231,7 @@ public:
// class ContentNode
-class ContentNode : private boost::noncopyable
+class ContentNode
{
private:
OUString maString;
@@ -247,6 +245,8 @@ public:
ContentNode( SfxItemPool& rItemPool );
ContentNode( const OUString& rStr, const ContentAttribs& rContentAttribs );
~ContentNode();
+ ContentNode(const ContentNode&) = delete;
+ ContentNode& operator=(const ContentNode&) = delete;
ContentAttribs& GetContentAttribs() { return aContentAttribs; }
const ContentAttribs& GetContentAttribs() const { return aContentAttribs; }
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 6f9fae2d6076..aeeab195b27a 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -28,7 +28,6 @@
#include "svl/sharedstring.hxx"
#include <svl/languageoptions.hxx>
-#include <boost/noncopyable.hpp>
#include <memory>
#include <vector>
@@ -107,7 +106,7 @@ public:
};
-class ContentInfo : private boost::noncopyable
+class ContentInfo
{
friend class EditTextObjectImpl;
public:
@@ -127,6 +126,8 @@ private:
public:
~ContentInfo();
+ ContentInfo(const ContentInfo&) = delete;
+ ContentInfo& operator=(const ContentInfo&) = delete;
void NormalizeString( svl::SharedStringPool& rPool );
const svl::SharedString& GetSharedString() const { return maText;}
@@ -155,7 +156,7 @@ public:
#endif
};
-class EditTextObjectImpl : private boost::noncopyable
+class EditTextObjectImpl
{
public:
typedef std::vector<std::unique_ptr<ContentInfo> > ContentInfosType;
@@ -188,6 +189,9 @@ public:
EditTextObjectImpl( EditTextObject* pFront, const EditTextObjectImpl& r );
~EditTextObjectImpl();
+ EditTextObjectImpl(const EditTextObjectImpl&) = delete;
+ EditTextObjectImpl& operator=(const EditTextObjectImpl&) = delete;
+
sal_uInt16 GetUserType() const { return nUserType;}
void SetUserType( sal_uInt16 n );
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index ff7d3286cead..7ab03f84e03a 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -57,7 +57,6 @@
#include <rtl/ref.hxx>
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
-#include <boost/noncopyable.hpp>
#include <memory>
#include <vector>
@@ -387,7 +386,7 @@ public:
// ImpEditEngine
-class ImpEditEngine : public SfxListener, private boost::noncopyable
+class ImpEditEngine : public SfxListener
{
friend class EditEngine;
friend class EditDbg;
@@ -700,6 +699,8 @@ protected:
public:
virtual ~ImpEditEngine();
+ ImpEditEngine(const ImpEditEngine&) = delete;
+ ImpEditEngine& operator=(const ImpEditEngine&) = delete;
inline EditUndoManager& GetUndoManager();
inline ::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew);