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 /starmath | |
parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/inc/parse.hxx | 4 | ||||
-rw-r--r-- | starmath/source/accessibility.hxx | 22 | ||||
-rw-r--r-- | starmath/source/cfgitem.hxx | 8 | ||||
-rw-r--r-- | starmath/source/tmpdevice.hxx | 4 |
4 files changed, 19 insertions, 19 deletions
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx index 0ae01efa7f6e..0ae45d3f7e00 100644 --- a/starmath/inc/parse.hxx +++ b/starmath/inc/parse.hxx @@ -50,8 +50,8 @@ class SmParser //! locale where '.' is decimal separator! ::com::sun::star::lang::Locale m_aDotLoc; - SmParser(const SmParser&) SAL_DELETED_FUNCTION; - SmParser& operator=(const SmParser&) SAL_DELETED_FUNCTION; + SmParser(const SmParser&) = delete; + SmParser& operator=(const SmParser&) = delete; #if OSL_DEBUG_LEVEL > 1 bool IsDelimiter( const OUString &rTxt, sal_Int32 nPos ); diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx index d547f8b0c7c2..82c45acee0da 100644 --- a/starmath/source/accessibility.hxx +++ b/starmath/source/accessibility.hxx @@ -72,8 +72,8 @@ class SmGraphicAccessible : VclPtr<SmGraphicWindow> pWin; - SmGraphicAccessible( const SmGraphicAccessible & ) SAL_DELETED_FUNCTION; - SmGraphicAccessible & operator = ( const SmGraphicAccessible & ) SAL_DELETED_FUNCTION; + SmGraphicAccessible( const SmGraphicAccessible & ) = delete; + SmGraphicAccessible & operator = ( const SmGraphicAccessible & ) = delete; protected: SmDocShell * GetDoc_Impl(); @@ -162,8 +162,8 @@ class SmViewForwarder : { SmEditAccessible & rEditAcc; - SmViewForwarder( const SmViewForwarder & ) SAL_DELETED_FUNCTION; - SmViewForwarder & operator = ( const SmViewForwarder & ) SAL_DELETED_FUNCTION; + SmViewForwarder( const SmViewForwarder & ) = delete; + SmViewForwarder & operator = ( const SmViewForwarder & ) = delete; public: explicit SmViewForwarder( SmEditAccessible &rAcc ); @@ -184,8 +184,8 @@ class SmTextForwarder : /* analog to SvxEditEngineForwarder */ DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); - SmTextForwarder( const SmTextForwarder & ) SAL_DELETED_FUNCTION; - SmTextForwarder & operator = ( const SmTextForwarder & ) SAL_DELETED_FUNCTION; + SmTextForwarder( const SmTextForwarder & ) = delete; + SmTextForwarder & operator = ( const SmTextForwarder & ) = delete; public: SmTextForwarder( SmEditAccessible& rAcc, SmEditSource & rSource ); @@ -250,8 +250,8 @@ class SmEditViewForwarder : /* analog to SvxEditEngineViewForwarder */ { SmEditAccessible& rEditAcc; - SmEditViewForwarder( const SmEditViewForwarder & ) SAL_DELETED_FUNCTION; - SmEditViewForwarder & operator = ( const SmEditViewForwarder & ) SAL_DELETED_FUNCTION; + SmEditViewForwarder( const SmEditViewForwarder & ) = delete; + SmEditViewForwarder & operator = ( const SmEditViewForwarder & ) = delete; public: explicit SmEditViewForwarder( SmEditAccessible& rAcc ); @@ -282,7 +282,7 @@ class SmEditSource : SmEditAccessible& rEditAcc; SmEditSource( const SmEditSource &rSrc ); - SmEditSource & operator = ( const SmEditSource & ) SAL_DELETED_FUNCTION; + SmEditSource & operator = ( const SmEditSource & ) = delete; public: SmEditSource( SmEditWindow *pWin, SmEditAccessible &rAcc ); @@ -317,8 +317,8 @@ class SmEditAccessible : ::accessibility::AccessibleTextHelper *pTextHelper; VclPtr<SmEditWindow> pWin; - SmEditAccessible( const SmEditAccessible & ) SAL_DELETED_FUNCTION; - SmEditAccessible & operator = ( const SmEditAccessible & ) SAL_DELETED_FUNCTION; + SmEditAccessible( const SmEditAccessible & ) = delete; + SmEditAccessible & operator = ( const SmEditAccessible & ) = delete; public: explicit SmEditAccessible( SmEditWindow *pEditWin ); diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx index 8bdfc668c3cc..bfc6d37a6d55 100644 --- a/starmath/source/cfgitem.hxx +++ b/starmath/source/cfgitem.hxx @@ -70,8 +70,8 @@ class SmFontFormatList std::deque<SmFntFmtListEntry> aEntries; bool bModified; - SmFontFormatList(const SmFontFormatList&) SAL_DELETED_FUNCTION; - SmFontFormatList& operator=(const SmFontFormatList&) SAL_DELETED_FUNCTION; + SmFontFormatList(const SmFontFormatList&) = delete; + SmFontFormatList& operator=(const SmFontFormatList&) = delete; public: SmFontFormatList(); @@ -102,8 +102,8 @@ class SmMathConfig : public utl::ConfigItem, public SfxBroadcaster bool bIsFormatModified; SmFontPickList vFontPickList[7]; - SmMathConfig(const SmMathConfig&) SAL_DELETED_FUNCTION; - SmMathConfig& operator=(const SmMathConfig&) SAL_DELETED_FUNCTION; + SmMathConfig(const SmMathConfig&) = delete; + SmMathConfig& operator=(const SmMathConfig&) = delete; void StripFontFormatList( const std::vector< SmSym > &rSymbols ); diff --git a/starmath/source/tmpdevice.hxx b/starmath/source/tmpdevice.hxx index 34638da946e1..6c10666d1980 100644 --- a/starmath/source/tmpdevice.hxx +++ b/starmath/source/tmpdevice.hxx @@ -28,8 +28,8 @@ class SmTmpDevice { OutputDevice &rOutDev; - SmTmpDevice(const SmTmpDevice&) SAL_DELETED_FUNCTION; - SmTmpDevice& operator=(const SmTmpDevice&) SAL_DELETED_FUNCTION; + SmTmpDevice(const SmTmpDevice&) = delete; + SmTmpDevice& operator=(const SmTmpDevice&) = delete; Color Impl_GetColor( const Color& rColor ); |