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 /sw/source/uibase/inc | |
| parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) | |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'sw/source/uibase/inc')
| -rw-r--r-- | sw/source/uibase/inc/swdtflvr.hxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/inc/toxmgr.hxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/inc/uinums.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/unomailmerge.hxx | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index ffaa2a936ea8..a778987903b5 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -131,8 +131,8 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper void SetDataForDragAndDrop( const Point& rSttPos ); - SwTransferable( const SwTransferable& ) SAL_DELETED_FUNCTION; - SwTransferable& operator=( const SwTransferable& ) SAL_DELETED_FUNCTION; + SwTransferable( const SwTransferable& ) = delete; + SwTransferable& operator=( const SwTransferable& ) = delete; protected: virtual void AddSupportedFormats() SAL_OVERRIDE; diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx index f81b1a8f737e..48bb27406b88 100644 --- a/sw/source/uibase/inc/toxmgr.hxx +++ b/sw/source/uibase/inc/toxmgr.hxx @@ -61,8 +61,8 @@ class SW_DLLPUBLIC SwTOXDescription //TODO: TemplateNames //const String* pTemplateName = 0, ??? - SwTOXDescription(SwTOXDescription&) SAL_DELETED_FUNCTION; - SwTOXDescription & operator= (SwTOXDescription&) SAL_DELETED_FUNCTION; + SwTOXDescription(SwTOXDescription&) = delete; + SwTOXDescription & operator= (SwTOXDescription&) = delete; public: // single argument ctors shall be explicit. @@ -185,8 +185,8 @@ class SwTOXMarkDescription OUString* pPhoneticReadingOfPrimKey; OUString* pPhoneticReadingOfSecKey; - SwTOXMarkDescription(SwTOXMarkDescription&) SAL_DELETED_FUNCTION; - SwTOXMarkDescription & operator= (SwTOXMarkDescription&) SAL_DELETED_FUNCTION; + SwTOXMarkDescription(SwTOXMarkDescription&) = delete; + SwTOXMarkDescription & operator= (SwTOXMarkDescription&) = delete; public: // single argument ctors shall be explicit. diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx index e03e03398257..6276d8094159 100644 --- a/sw/source/uibase/inc/uinums.hxx +++ b/sw/source/uibase/inc/uinums.hxx @@ -46,7 +46,7 @@ class SW_DLLPUBLIC SwNumRulesWithName sal_uInt16 nCharPoolId; std::vector<std::unique_ptr<SfxPoolItem>> m_Items; - _SwNumFormatGlobal& operator=( const _SwNumFormatGlobal& ) SAL_DELETED_FUNCTION; + _SwNumFormatGlobal& operator=( const _SwNumFormatGlobal& ) = delete; public: _SwNumFormatGlobal( const SwNumFormat& rFormat ); diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx index 14c1ad5f2f79..99f21d17a7ef 100644 --- a/sw/source/uibase/inc/unomailmerge.hxx +++ b/sw/source/uibase/inc/unomailmerge.hxx @@ -126,8 +126,8 @@ class SwXMailMerge : void launchEvent( const com::sun::star::beans::PropertyChangeEvent &rEvt ) const; - SwXMailMerge( const SwXMailMerge & ) SAL_DELETED_FUNCTION; - SwXMailMerge & operator = ( const SwXMailMerge & ) SAL_DELETED_FUNCTION; + SwXMailMerge( const SwXMailMerge & ) = delete; + SwXMailMerge & operator = ( const SwXMailMerge & ) = delete; protected: virtual ~SwXMailMerge(); public: |