summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/svl/SfxBroadcaster.hxx2
-rw-r--r--include/svl/broadcast.hxx2
-rw-r--r--include/svl/filerec.hxx10
-rw-r--r--include/svl/inethist.hxx4
-rw-r--r--include/svl/itempool.hxx2
-rw-r--r--include/svl/itemset.hxx2
-rw-r--r--include/svl/listener.hxx2
-rw-r--r--include/svl/lstner.hxx2
-rw-r--r--include/svl/macitem.hxx2
-rw-r--r--include/svl/poolitem.hxx6
-rw-r--r--include/svl/sharedstringpool.hxx5
-rw-r--r--include/svl/svdde.hxx12
-rw-r--r--include/svl/undo.hxx4
-rw-r--r--include/svl/zforlist.hxx6
-rw-r--r--svl/unx/source/svdde/ddedummy.cxx10
15 files changed, 28 insertions, 43 deletions
diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx
index 60727de9c5aa..fc21f37f0bd4 100644
--- a/include/svl/SfxBroadcaster.hxx
+++ b/include/svl/SfxBroadcaster.hxx
@@ -34,7 +34,7 @@ class SVL_DLLPUBLIC SfxBroadcaster
private:
void AddListener( SfxListener& rListener );
void RemoveListener( SfxListener& rListener );
- const SfxBroadcaster& operator=(const SfxBroadcaster &); // verboten
+ const SfxBroadcaster& operator=(const SfxBroadcaster &) SAL_DELETED_FUNCTION;
protected:
void Forward(SfxBroadcaster& rBC, const SfxHint& rHint);
diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx
index a73abea3956e..f34c0ad4c12f 100644
--- a/include/svl/broadcast.hxx
+++ b/include/svl/broadcast.hxx
@@ -34,7 +34,7 @@ public:
typedef std::vector<SvtListener*> ListenersType;
private:
- const SvtBroadcaster& operator=(const SvtBroadcaster &); // verboten
+ const SvtBroadcaster& operator=(const SvtBroadcaster &) SAL_DELETED_FUNCTION;
/**
* Ensure that the container doesn't contain any duplicated listener
diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 1a9b2e685f47..413e2090c211 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -90,9 +90,8 @@ public:
sal_uInt32 Close( bool bSeekToEndOfRec = true );
private:
- /// not implementend, not allowed
- SfxMiniRecordWriter( const SfxMiniRecordWriter& );
- SfxMiniRecordWriter& operator=(const SfxMiniRecordWriter&);
+ SfxMiniRecordWriter( const SfxMiniRecordWriter& ) SAL_DELETED_FUNCTION;
+ SfxMiniRecordWriter& operator=(const SfxMiniRecordWriter&) SAL_DELETED_FUNCTION;
};
/** Reads simple record from a stream
@@ -264,9 +263,8 @@ public:
inline void Skip();
private:
- /// not implementend, not allowed
- SfxMiniRecordReader( const SfxMiniRecordReader& );
- SfxMiniRecordReader& operator=(const SfxMiniRecordReader&);
+ SfxMiniRecordReader( const SfxMiniRecordReader& ) SAL_DELETED_FUNCTION;
+ SfxMiniRecordReader& operator=(const SfxMiniRecordReader&) SAL_DELETED_FUNCTION;
};
/**
diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx
index ced2c83990e7..a21db8a4732e 100644
--- a/include/svl/inethist.hxx
+++ b/include/svl/inethist.hxx
@@ -51,8 +51,8 @@ class SVL_DLLPUBLIC INetURLHistory : public SfxBroadcaster
/** Not implemented.
*/
- SAL_DLLPRIVATE INetURLHistory (const INetURLHistory&);
- SAL_DLLPRIVATE INetURLHistory& operator= (const INetURLHistory&);
+ INetURLHistory (const INetURLHistory&) SAL_DELETED_FUNCTION;
+ INetURLHistory& operator= (const INetURLHistory&) SAL_DELETED_FUNCTION;
public:
/** GetOrCreate.
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index c458cef78443..b6944dbae57e 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -213,7 +213,7 @@ public:
static const SfxItemPool* GetStoringPool();
private:
- const SfxItemPool& operator=(const SfxItemPool &); // n.i.!!
+ const SfxItemPool& operator=(const SfxItemPool &) SAL_DELETED_FUNCTION;
static const SfxItemPool* pStoringPool_;
};
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 5184e9b940be..55c26647a9ba 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -60,7 +60,7 @@ public:
SfxItemArray GetItems_Impl() const { return _aItems; }
private:
- const SfxItemSet& operator=(const SfxItemSet &); // n.i.!!
+ const SfxItemSet& operator=(const SfxItemSet &) SAL_DELETED_FUNCTION;
protected:
// Notification-Callback
diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx
index a148c959fe72..1dbf15a698c7 100644
--- a/include/svl/listener.hxx
+++ b/include/svl/listener.hxx
@@ -31,7 +31,7 @@ class SVL_DLLPUBLIC SvtListener
typedef std::unordered_set<SvtBroadcaster*> BroadcastersType;
BroadcastersType maBroadcasters;
- const SvtListener& operator=(const SvtListener &); // n.i., ist verboten
+ const SvtListener& operator=(const SvtListener &) SAL_DELETED_FUNCTION;
public:
class SVL_DLLPUBLIC QueryBase
diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx
index 8792c01ff041..cc1e842c6661 100644
--- a/include/svl/lstner.hxx
+++ b/include/svl/lstner.hxx
@@ -34,7 +34,7 @@ class SVL_DLLPUBLIC SfxListener
Impl* mpImpl;
private:
- const SfxListener& operator=(const SfxListener &); // n.i., ist verboten
+ const SfxListener& operator=(const SfxListener &) SAL_DELETED_FUNCTION;
public:
TYPEINFO();
diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx
index 1fa3f4c8d116..cf130d465502 100644
--- a/include/svl/macitem.hxx
+++ b/include/svl/macitem.hxx
@@ -151,7 +151,7 @@ private:
SvxMacroTableDtor aMacroTable;
inline SvxMacroItem( const SvxMacroItem& );
- SvxMacroItem &operator=( const SvxMacroItem & );
+ SvxMacroItem &operator=( const SvxMacroItem & ) SAL_DELETED_FUNCTION;
};
inline SvxMacroItem::SvxMacroItem( const sal_uInt16 nId )
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index bc5180ba15d0..93f6bf96789f 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -197,7 +197,7 @@ public:
virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
private:
- SfxPoolItem& operator=( const SfxPoolItem& ); // not implemented!!
+ SfxPoolItem& operator=( const SfxPoolItem& ) SAL_DELETED_FUNCTION;
};
@@ -260,7 +260,7 @@ inline bool IsInvalidItem(const SfxPoolItem *pItem)
class SVL_DLLPUBLIC SfxVoidItem: public SfxPoolItem
{
- SfxVoidItem & operator=( const SfxVoidItem& ); // not implemented.
+ SfxVoidItem & operator=( const SfxVoidItem& ) SAL_DELETED_FUNCTION;
public:
TYPEINFO_OVERRIDE();
explicit SfxVoidItem( sal_uInt16 nWhich );
@@ -287,7 +287,7 @@ class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem
{
SfxItemSet *pSet;
- SfxSetItem & operator=( const SfxSetItem& ); // not implemented.
+ SfxSetItem & operator=( const SfxSetItem& ) SAL_DELETED_FUNCTION;
public:
TYPEINFO_OVERRIDE();
diff --git a/include/svl/sharedstringpool.hxx b/include/svl/sharedstringpool.hxx
index 16841f9491ec..f44810b419c6 100644
--- a/include/svl/sharedstringpool.hxx
+++ b/include/svl/sharedstringpool.hxx
@@ -29,9 +29,8 @@ class SVL_DLLPUBLIC SharedStringPool
struct Impl;
Impl* mpImpl;
- SharedStringPool(); // disabled
- SharedStringPool( const SharedStringPool& ); // disabled
- SharedStringPool& operator=( const SharedStringPool& ); // disabled
+ SharedStringPool( const SharedStringPool& ) SAL_DELETED_FUNCTION;
+ SharedStringPool& operator=( const SharedStringPool& ) SAL_DELETED_FUNCTION;
public:
SharedStringPool( const CharClass* pCharClass );
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 57f69a86e2c7..74e1c9637377 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -127,8 +127,8 @@ private:
friend class DdeInternal;
friend class DdeConnection;
- DdeTransaction( const DdeTransaction& );
- const DdeTransaction& operator= ( const DdeTransaction& );
+ DdeTransaction( const DdeTransaction& ) SAL_DELETED_FUNCTION;
+ const DdeTransaction& operator= ( const DdeTransaction& ) SAL_DELETED_FUNCTION;
};
@@ -230,8 +230,8 @@ public:
const OUString GetTopicName();
private:
- DdeConnection( const DdeConnection& );
- const DdeConnection& operator= ( const DdeConnection& );
+ DdeConnection( const DdeConnection& ) SAL_DELETED_FUNCTION;
+ const DdeConnection& operator= ( const DdeConnection& ) SAL_DELETED_FUNCTION;
};
@@ -344,8 +344,8 @@ public:
const std::vector<DdeItem*>& GetItems() const { return aItems; }
private:
- DdeTopic( const DdeTopic& );
- const DdeTopic& operator= ( const DdeTopic& );
+ DdeTopic( const DdeTopic& ) SAL_DELETED_FUNCTION;
+ const DdeTopic& operator= ( const DdeTopic& ) SAL_DELETED_FUNCTION;
};
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 903bbc8a61a3..d0132daf9d6c 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -74,8 +74,8 @@ public:
virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
private:
- SfxUndoAction( const SfxUndoAction& ); // disabled
- SfxUndoAction& operator=( const SfxUndoAction& ); // disabled
+ SfxUndoAction( const SfxUndoAction& ) SAL_DELETED_FUNCTION;
+ SfxUndoAction& operator=( const SfxUndoAction& ) SAL_DELETED_FUNCTION;
};
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index ee6dbf57a619..4683f1d9bbdc 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -232,10 +232,8 @@ class SVL_DLLPUBLIC NfCurrencyEntry
sal_uInt16 nDigits; /// count of decimal digits
sal_Unicode cZeroChar; /// which character is used for zeros as last decimal digits
- /// not implemented, prevent usage
- NfCurrencyEntry( const NfCurrencyEntry& );
- /// not implemented, prevent usage
- NfCurrencyEntry& operator=( const NfCurrencyEntry& );
+ NfCurrencyEntry( const NfCurrencyEntry& ) SAL_DELETED_FUNCTION;
+ NfCurrencyEntry& operator=( const NfCurrencyEntry& ) SAL_DELETED_FUNCTION;
private:
diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx
index de726e7d2433..33600249c321 100644
--- a/svl/unx/source/svdde/ddedummy.cxx
+++ b/svl/unx/source/svdde/ddedummy.cxx
@@ -104,16 +104,6 @@ DdeTransaction::DdeTransaction( DdeConnection& rConnection, const OUString&, lon
{
}
-DdeTransaction::DdeTransaction( const DdeTransaction& rTransaction )
- : rDde( rTransaction.rDde )
- , pName(NULL)
- , nType(0)
- , nId(0)
- , nTime(0)
- , bBusy(false)
-{
-}
-
void DdeTransaction::Execute()
{
}