From bff4c13475957863bfa7da5bc3bcf82a64a7503a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 15:25:41 +0200 Subject: Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3 --- include/filter/msfilter/mstoolbar.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/filter/msfilter/mstoolbar.hxx') diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index 8d3704e3a5d8..efe06121754d 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -118,8 +118,8 @@ class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase sal_Int8 tbcu; sal_Int8 tbmg; - TBCExtraInfo(const TBCExtraInfo&) SAL_DELETED_FUNCTION; - TBCExtraInfo& operator = ( const TBCExtraInfo&) SAL_DELETED_FUNCTION; + TBCExtraInfo(const TBCExtraInfo&) = delete; + TBCExtraInfo& operator = ( const TBCExtraInfo&) = delete; public: TBCExtraInfo(); virtual ~TBCExtraInfo(){} @@ -283,8 +283,8 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase TBCHeader rHeader; TBCGeneralInfo controlGeneralInfo; std::shared_ptr< TBBase > controlSpecificInfo; // can be one of TBCBSpecific, TBCMenuSpecific or TBCComboDropdow nSpecific depending on the control type specified by TBCHeader.tct - TBCData(const TBCData&) SAL_DELETED_FUNCTION; - TBCData& operator = ( const TBCData&) SAL_DELETED_FUNCTION; + TBCData(const TBCData&) = delete; + TBCData& operator = ( const TBCData&) = delete; public: TBCData( const TBCHeader& Header ); virtual ~TBCData(){} -- cgit