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 /svtools | |
parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/table/tablecontrol.hxx | 4 | ||||
-rw-r--r-- | svtools/source/contnr/imivctl.hxx | 4 | ||||
-rw-r--r-- | svtools/source/control/scriptedtext.cxx | 2 | ||||
-rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 4 | ||||
-rw-r--r-- | svtools/source/graphic/descriptor.hxx | 4 | ||||
-rw-r--r-- | svtools/source/graphic/grfcache.cxx | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 004cd48dcec4..8c1521910200 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -174,8 +174,8 @@ namespace svt { namespace table DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, LinkParamNone*, void ); private: - TableControl( const TableControl& ) SAL_DELETED_FUNCTION; - TableControl& operator=( const TableControl& ) SAL_DELETED_FUNCTION; + TableControl( const TableControl& ) = delete; + TableControl& operator=( const TableControl& ) = delete; }; diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 66d0708fce55..1b3053911d14 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -317,8 +317,8 @@ class SvxIconChoiceCtrl_Impl bool IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos ) const; // Copy assignment is forbidden and not implemented. - SvxIconChoiceCtrl_Impl (const SvxIconChoiceCtrl_Impl &) SAL_DELETED_FUNCTION; - SvxIconChoiceCtrl_Impl & operator= (const SvxIconChoiceCtrl_Impl &) SAL_DELETED_FUNCTION; + SvxIconChoiceCtrl_Impl (const SvxIconChoiceCtrl_Impl &) = delete; + SvxIconChoiceCtrl_Impl & operator= (const SvxIconChoiceCtrl_Impl &) = delete; public: diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx index 565a5b551141..f74ba8c5f276 100644 --- a/svtools/source/control/scriptedtext.cxx +++ b/svtools/source/control/scriptedtext.cxx @@ -49,7 +49,7 @@ private: Size maTextSize; /// The size the text will take in the current output device. /** Assignment operator not implemented to prevent usage. */ - SvtScriptedTextHelper_Impl& operator=( const SvtScriptedTextHelper_Impl& ) SAL_DELETED_FUNCTION; + SvtScriptedTextHelper_Impl& operator=( const SvtScriptedTextHelper_Impl& ) = delete; /** Gets the font of the given script type. */ const vcl::Font& GetFont( sal_uInt16 _nScript ) const; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 62fc3085d893..b0e383fa4ce0 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -501,8 +501,8 @@ void AssignmentPersistentData::ImplCommit() } // Copy assignment is forbidden and not implemented. - AddressBookSourceDialogData (const AddressBookSourceDialogData &) SAL_DELETED_FUNCTION; - AddressBookSourceDialogData & operator= (const AddressBookSourceDialogData &) SAL_DELETED_FUNCTION; + AddressBookSourceDialogData (const AddressBookSourceDialogData &) = delete; + AddressBookSourceDialogData & operator= (const AddressBookSourceDialogData &) = delete; }; diff --git a/svtools/source/graphic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx index 94142a4d24cf..37f3ba049e5c 100644 --- a/svtools/source/graphic/descriptor.hxx +++ b/svtools/source/graphic/descriptor.hxx @@ -112,9 +112,9 @@ private: bool mbAlpha; bool mbAnimated; - GraphicDescriptor( const GraphicDescriptor& rDescriptor ) SAL_DELETED_FUNCTION; + GraphicDescriptor( const GraphicDescriptor& rDescriptor ) = delete; - GraphicDescriptor& operator=( const GraphicDescriptor& ) SAL_DELETED_FUNCTION; + GraphicDescriptor& operator=( const GraphicDescriptor& ) = delete; void implCreate( SvStream& rIStm, const OUString* pPath ); }; diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 1aa1ecbffe75..9d0e6c58ed1c 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -393,8 +393,8 @@ private: static bool IsCacheableAsBitmap( const GDIMetaFile& rMtf, OutputDevice* pOut, const Size& rSz ); // Copy assignment is forbidden and not implemented. - GraphicDisplayCacheEntry (const GraphicDisplayCacheEntry &) SAL_DELETED_FUNCTION; - GraphicDisplayCacheEntry & operator= (const GraphicDisplayCacheEntry &) SAL_DELETED_FUNCTION; + GraphicDisplayCacheEntry (const GraphicDisplayCacheEntry &) = delete; + GraphicDisplayCacheEntry & operator= (const GraphicDisplayCacheEntry &) = delete; public: |