summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2016-04-10 21:41:44 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-04-11 07:15:35 +0000
commitc210bf4510585b554e0e9a371f27fa27e2874762 (patch)
tree62f8c45ab415da97af398508e3ea64329268e7a3 /sc
parentcf81f3ba0602eeffad8907a1bb9cdd24e62c2d1e (diff)
tdf#94306 replace boost::noncopyable r.. to sdext
... in modules reportdesign to sdext Replace with C++11 delete copy-constructur and copy-assignment. Remove boost/noncopyable.hpp includes. Make some overloaded ctors explicit (most in sd slidesorter). Add deleted copy-assignment in sc/inc/chart2uno.hxx. Change-Id: I21d4209f0ddb00063ca827474516a05ab4bb2f9a Reviewed-on: https://gerrit.libreoffice.org/23970 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/chart2uno.hxx14
-rw-r--r--sc/inc/dptabsrc.hxx9
-rw-r--r--sc/inc/table.hxx5
3 files changed, 16 insertions, 12 deletions
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx
index 44df1e7037fc..3d2a61fe33af 100644
--- a/sc/inc/chart2uno.hxx
+++ b/sc/inc/chart2uno.hxx
@@ -50,7 +50,6 @@
#include <memory>
#include <unordered_set>
#include <vector>
-#include <boost/noncopyable.hpp>
class ScDocument;
@@ -235,8 +234,7 @@ class ScChart2DataSequence : public
css::util::XModifyBroadcaster,
css::beans::XPropertySet,
css::lang::XServiceInfo>,
- public SfxListener,
- private boost::noncopyable
+ public SfxListener
{
public:
explicit ScChart2DataSequence( ScDocument* pDoc,
@@ -244,6 +242,9 @@ public:
::std::vector<ScTokenRef>&& rTokens, bool bIncludeHiddenCells );
virtual ~ScChart2DataSequence();
+ ScChart2DataSequence(const ScChart2DataSequence&) = delete;
+ ScChart2DataSequence& operator=(const ScChart2DataSequence&) = delete;
+
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
// XDataSequence
@@ -364,21 +365,20 @@ private:
DECL_LINK_TYPED( ValueListenerHdl, const SfxHint&, void );
private:
- ScChart2DataSequence(const ScChart2DataSequence& r) = delete;
-
class ExternalRefListener : public ScExternalRefManager::LinkListener
{
public:
ExternalRefListener(ScChart2DataSequence& rParent, ScDocument* pDoc);
virtual ~ExternalRefListener();
+ ExternalRefListener(const ExternalRefListener&) = delete;
+ ExternalRefListener& operator=(const ExternalRefListener&) = delete;
+
virtual void notify(sal_uInt16 nFileId, ScExternalRefManager::LinkUpdateType eType) override;
void addFileId(sal_uInt16 nFileId);
void removeFileId(sal_uInt16 nFileId);
const std::unordered_set<sal_uInt16>& getAllFileIds() { return maFileIds;}
private:
- ExternalRefListener(const ExternalRefListener& r) = delete;
-
ScChart2DataSequence& mrParent;
std::unordered_set<sal_uInt16> maFileIds;
ScDocument* mpDoc;
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index e6966232acec..035ba282ef9d 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -47,7 +47,6 @@
#include "dpglobal.hxx"
#include "dpresfilter.hxx"
-#include <boost/noncopyable.hpp>
#include <list>
#include <memory>
#include <unordered_map>
@@ -299,7 +298,7 @@ public:
ScDPDimension* getByIndex(long nIndex) const;
};
-class ScDPDimension : private boost::noncopyable, public cppu::WeakImplHelper<
+class ScDPDimension : public cppu::WeakImplHelper<
css::sheet::XHierarchiesSupplier,
css::container::XNamed,
css::util::XCloneable,
@@ -325,6 +324,8 @@ class ScDPDimension : private boost::noncopyable, public cppu::WeakImplHelper<
public:
ScDPDimension( ScDPSource* pSrc, long nD );
virtual ~ScDPDimension();
+ ScDPDimension(const ScDPDimension&) = delete;
+ ScDPDimension& operator=(const ScDPDimension&) = delete;
long GetDimension() const { return nDim; } // dimension index in source
long GetSourceDim() const { return nSourceDim; } // >=0 if dup'ed
@@ -706,7 +707,7 @@ public:
SCROW GetSrcItemsCount();
};
-class ScDPMember : private boost::noncopyable, public cppu::WeakImplHelper<
+class ScDPMember : public cppu::WeakImplHelper<
css::container::XNamed,
css::beans::XPropertySet,
css::lang::XServiceInfo >
@@ -727,6 +728,8 @@ private:
public:
ScDPMember(ScDPSource* pSrc, long nD, long nH, long nL, SCROW nIndex);
virtual ~ScDPMember();
+ ScDPMember(const ScDPMember&) = delete;
+ ScDPMember& operator=(const ScDPMember&) = delete;
OUString GetNameStr() const;
void FillItemData( ScDPItemData& rData ) const;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index fb8589655309..57075d8a5d7f 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -38,7 +38,6 @@
#include <set>
#include <map>
#include <memory>
-#include <boost/noncopyable.hpp>
namespace utl {
class TextSearch;
@@ -115,7 +114,7 @@ class ScDBData;
class ScDocumentImport;
class ScHint;
-class ScTable : private boost::noncopyable
+class ScTable
{
private:
typedef ::std::vector< ScRange > ScRangeVec;
@@ -228,6 +227,8 @@ public:
ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName,
bool bColInfo = true, bool bRowInfo = true );
~ScTable();
+ ScTable(const ScTable&) = delete;
+ ScTable& operator=(const ScTable&) = delete;
ScDocument& GetDoc() { return *pDocument;}
const ScDocument& GetDoc() const { return *pDocument;}