diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 15:25:41 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:26 +0200 |
commit | bff4c13475957863bfa7da5bc3bcf82a64a7503a (patch) | |
tree | 23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /include/svl | |
parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'include/svl')
-rw-r--r-- | include/svl/SfxBroadcaster.hxx | 2 | ||||
-rw-r--r-- | include/svl/broadcast.hxx | 2 | ||||
-rw-r--r-- | include/svl/filerec.hxx | 8 | ||||
-rw-r--r-- | include/svl/inethist.hxx | 4 | ||||
-rw-r--r-- | include/svl/itempool.hxx | 2 | ||||
-rw-r--r-- | include/svl/itemset.hxx | 2 | ||||
-rw-r--r-- | include/svl/listener.hxx | 2 | ||||
-rw-r--r-- | include/svl/lstner.hxx | 2 | ||||
-rw-r--r-- | include/svl/macitem.hxx | 2 | ||||
-rw-r--r-- | include/svl/poolitem.hxx | 6 | ||||
-rw-r--r-- | include/svl/sharedstringpool.hxx | 4 | ||||
-rw-r--r-- | include/svl/svdde.hxx | 12 | ||||
-rw-r--r-- | include/svl/undo.hxx | 4 | ||||
-rw-r--r-- | include/svl/zforlist.hxx | 4 |
14 files changed, 28 insertions, 28 deletions
diff --git a/include/svl/SfxBroadcaster.hxx b/include/svl/SfxBroadcaster.hxx index fc21f37f0bd4..c44e96ded1b4 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 &) SAL_DELETED_FUNCTION; + const SfxBroadcaster& operator=(const SfxBroadcaster &) = delete; protected: void Forward(SfxBroadcaster& rBC, const SfxHint& rHint); diff --git a/include/svl/broadcast.hxx b/include/svl/broadcast.hxx index f34c0ad4c12f..934f591c3ba7 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 &) SAL_DELETED_FUNCTION; + const SvtBroadcaster& operator=(const SvtBroadcaster &) = delete; /** * Ensure that the container doesn't contain any duplicated listener diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx index fad39beded6d..3f7db59cc996 100644 --- a/include/svl/filerec.hxx +++ b/include/svl/filerec.hxx @@ -92,8 +92,8 @@ public: sal_uInt32 Close( bool bSeekToEndOfRec = true ); private: - SfxMiniRecordWriter( const SfxMiniRecordWriter& ) SAL_DELETED_FUNCTION; - SfxMiniRecordWriter& operator=(const SfxMiniRecordWriter&) SAL_DELETED_FUNCTION; + SfxMiniRecordWriter( const SfxMiniRecordWriter& ) = delete; + SfxMiniRecordWriter& operator=(const SfxMiniRecordWriter&) = delete; }; /** Reads simple record from a stream @@ -262,8 +262,8 @@ public: inline void Skip(); private: - SfxMiniRecordReader( const SfxMiniRecordReader& ) SAL_DELETED_FUNCTION; - SfxMiniRecordReader& operator=(const SfxMiniRecordReader&) SAL_DELETED_FUNCTION; + SfxMiniRecordReader( const SfxMiniRecordReader& ) = delete; + SfxMiniRecordReader& operator=(const SfxMiniRecordReader&) = delete; }; /** diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index fd4ff0356274..90a12bbb70fd 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.hxx @@ -51,8 +51,8 @@ class SVL_DLLPUBLIC INetURLHistory : public SfxBroadcaster /** Not implemented. */ - INetURLHistory (const INetURLHistory&) SAL_DELETED_FUNCTION; - INetURLHistory& operator= (const INetURLHistory&) SAL_DELETED_FUNCTION; + INetURLHistory (const INetURLHistory&) = delete; + INetURLHistory& operator= (const INetURLHistory&) = delete; public: /** GetOrCreate. diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index efc1c4a254c1..8098e415572a 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -221,7 +221,7 @@ public: static const SfxItemPool* GetStoringPool(); private: - const SfxItemPool& operator=(const SfxItemPool &) SAL_DELETED_FUNCTION; + const SfxItemPool& operator=(const SfxItemPool &) = delete; static const SfxItemPool* pStoringPool_; }; diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index f706e42fe01a..7203a5eaa876 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -60,7 +60,7 @@ public: SfxItemArray GetItems_Impl() const { return m_pItems; } private: - const SfxItemSet& operator=(const SfxItemSet &) SAL_DELETED_FUNCTION; + const SfxItemSet& operator=(const SfxItemSet &) = delete; protected: // Notification-Callback diff --git a/include/svl/listener.hxx b/include/svl/listener.hxx index ed809faa4974..8ac8e08e91b3 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 &) SAL_DELETED_FUNCTION; + const SvtListener& operator=(const SvtListener &) = delete; public: class SVL_DLLPUBLIC QueryBase diff --git a/include/svl/lstner.hxx b/include/svl/lstner.hxx index 521c1979f9f3..e3ce43ff9cf0 100644 --- a/include/svl/lstner.hxx +++ b/include/svl/lstner.hxx @@ -31,7 +31,7 @@ class SVL_DLLPUBLIC SfxListener Impl* mpImpl; private: - const SfxListener& operator=(const SfxListener &) SAL_DELETED_FUNCTION; + const SfxListener& operator=(const SfxListener &) = delete; public: TYPEINFO(); diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 8046edaea427..b60c2be13f4f 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -147,7 +147,7 @@ private: SvxMacroTableDtor aMacroTable; inline SvxMacroItem( const SvxMacroItem& ); - SvxMacroItem &operator=( const SvxMacroItem & ) SAL_DELETED_FUNCTION; + SvxMacroItem &operator=( const SvxMacroItem & ) = delete; }; inline SvxMacroItem::SvxMacroItem( const sal_uInt16 nId ) diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index ad221b1b9c3e..edd9e2e91136 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -193,7 +193,7 @@ public: virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const; private: - SfxPoolItem& operator=( const SfxPoolItem& ) SAL_DELETED_FUNCTION; + SfxPoolItem& operator=( const SfxPoolItem& ) = delete; }; inline void SfxPoolItem::SetRefCount( sal_uLong n ) @@ -250,7 +250,7 @@ inline bool IsInvalidItem(const SfxPoolItem *pItem) class SVL_DLLPUBLIC SfxVoidItem: public SfxPoolItem { - SfxVoidItem & operator=( const SfxVoidItem& ) SAL_DELETED_FUNCTION; + SfxVoidItem & operator=( const SfxVoidItem& ) = delete; public: TYPEINFO_OVERRIDE(); explicit SfxVoidItem( sal_uInt16 nWhich ); @@ -274,7 +274,7 @@ class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem { SfxItemSet *pSet; - SfxSetItem & operator=( const SfxSetItem& ) SAL_DELETED_FUNCTION; + SfxSetItem & operator=( const SfxSetItem& ) = delete; public: TYPEINFO_OVERRIDE(); diff --git a/include/svl/sharedstringpool.hxx b/include/svl/sharedstringpool.hxx index f44810b419c6..ae958ed220c4 100644 --- a/include/svl/sharedstringpool.hxx +++ b/include/svl/sharedstringpool.hxx @@ -29,8 +29,8 @@ class SVL_DLLPUBLIC SharedStringPool struct Impl; Impl* mpImpl; - SharedStringPool( const SharedStringPool& ) SAL_DELETED_FUNCTION; - SharedStringPool& operator=( const SharedStringPool& ) SAL_DELETED_FUNCTION; + SharedStringPool( const SharedStringPool& ) = delete; + SharedStringPool& operator=( const SharedStringPool& ) = delete; public: SharedStringPool( const CharClass* pCharClass ); diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index 65bb65dd56c0..c634ae135000 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& ) SAL_DELETED_FUNCTION; - const DdeTransaction& operator= ( const DdeTransaction& ) SAL_DELETED_FUNCTION; + DdeTransaction( const DdeTransaction& ) = delete; + const DdeTransaction& operator= ( const DdeTransaction& ) = delete; }; @@ -230,8 +230,8 @@ public: const OUString GetTopicName(); private: - DdeConnection( const DdeConnection& ) SAL_DELETED_FUNCTION; - const DdeConnection& operator= ( const DdeConnection& ) SAL_DELETED_FUNCTION; + DdeConnection( const DdeConnection& ) = delete; + const DdeConnection& operator= ( const DdeConnection& ) = delete; }; @@ -325,8 +325,8 @@ public: const std::vector<DdeItem*>& GetItems() const { return aItems; } private: - DdeTopic( const DdeTopic& ) SAL_DELETED_FUNCTION; - const DdeTopic& operator= ( const DdeTopic& ) SAL_DELETED_FUNCTION; + DdeTopic( const DdeTopic& ) = delete; + const DdeTopic& operator= ( const DdeTopic& ) = delete; }; diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index bbae41f66cfb..bfb7f617de71 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -73,8 +73,8 @@ public: virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const; private: - SfxUndoAction( const SfxUndoAction& ) SAL_DELETED_FUNCTION; - SfxUndoAction& operator=( const SfxUndoAction& ) SAL_DELETED_FUNCTION; + SfxUndoAction( const SfxUndoAction& ) = delete; + SfxUndoAction& operator=( const SfxUndoAction& ) = delete; }; diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index c1b79e0ddf58..8703a031a05f 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -215,8 +215,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 - NfCurrencyEntry( const NfCurrencyEntry& ) SAL_DELETED_FUNCTION; - NfCurrencyEntry& operator=( const NfCurrencyEntry& ) SAL_DELETED_FUNCTION; + NfCurrencyEntry( const NfCurrencyEntry& ) = delete; + NfCurrencyEntry& operator=( const NfCurrencyEntry& ) = delete; private: |