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 /sfx2 | |
parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/imestatuswindow.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/inc/statcach.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/menu/thessubmenu.hxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx index 6b7a882c3af1..ba965fd2fff0 100644 --- a/sfx2/source/appl/imestatuswindow.hxx +++ b/sfx2/source/appl/imestatuswindow.hxx @@ -88,8 +88,8 @@ public: using ImeStatusWindow_Impl::operator delete; private: - ImeStatusWindow(ImeStatusWindow &) SAL_DELETED_FUNCTION; - void operator =(const ImeStatusWindow&) SAL_DELETED_FUNCTION; + ImeStatusWindow(ImeStatusWindow &) = delete; + void operator =(const ImeStatusWindow&) = delete; virtual ~ImeStatusWindow(); diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index b5163ba098e8..01552194d9bb 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -76,7 +76,7 @@ friend class BindDispatch_Impl; bool bItemDirty; // Validity of pLastItem private: - SfxStateCache( const SfxStateCache& rOrig ) SAL_DELETED_FUNCTION; + SfxStateCache( const SfxStateCache& rOrig ) = delete; void SetState_Impl( SfxItemState, const SfxPoolItem*, bool bMaybeDirty=false ); public: diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx index a08947f8c841..08a0cd4ea891 100644 --- a/sfx2/source/menu/thessubmenu.hxx +++ b/sfx2/source/menu/thessubmenu.hxx @@ -33,8 +33,8 @@ class SfxThesSubMenuHelper css::uno::Reference< css::linguistic2::XThesaurus > m_xThesarus; private: - SfxThesSubMenuHelper( const SfxThesSubMenuHelper & ) SAL_DELETED_FUNCTION; - SfxThesSubMenuHelper & operator = ( const SfxThesSubMenuHelper & ) SAL_DELETED_FUNCTION; + SfxThesSubMenuHelper( const SfxThesSubMenuHelper & ) = delete; + SfxThesSubMenuHelper & operator = ( const SfxThesSubMenuHelper & ) = delete; public: SfxThesSubMenuHelper(); |