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 /cui | |
parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/eventdlg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/cuisrchdlg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/passwdomdlg.hxx | 4 | ||||
-rw-r--r-- | cui/source/inc/thesdlg.hxx | 12 |
4 files changed, 12 insertions, 12 deletions
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index c1f283f52b57..d415ce84db84 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -39,8 +39,8 @@ class SvxEventConfigPage : public _SvxMacroTabPage DECL_LINK_TYPED( SelectHdl_Impl, ListBox&, void ); - SvxEventConfigPage (const SvxEventConfigPage &) SAL_DELETED_FUNCTION; - SvxEventConfigPage & operator= (const SvxEventConfigPage &) SAL_DELETED_FUNCTION; + SvxEventConfigPage (const SvxEventConfigPage &) = delete; + SvxEventConfigPage & operator= (const SvxEventConfigPage &) = delete; public: diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index be75242a8238..06ffc6862e20 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -39,8 +39,8 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog sal_Int32 nInitialTlFlags; VclPtr<SvxJSearchOptionsPage> pPage; - SvxJSearchOptionsDialog( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION; - SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ) SAL_DELETED_FUNCTION; + SvxJSearchOptionsDialog( const SvxJSearchOptionsDialog & ) = delete; + SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ) = delete; public: SvxJSearchOptionsDialog(vcl::Window *pParent, diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 59fd9e479a78..75a9f9566104 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -32,8 +32,8 @@ class PasswordToOpenModifyDialog : public SfxModalDialog { std::unique_ptr< PasswordToOpenModifyDialog_Impl > m_pImpl; - PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ) SAL_DELETED_FUNCTION; - PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ) SAL_DELETED_FUNCTION; + PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ) = delete; + PasswordToOpenModifyDialog & operator = ( const PasswordToOpenModifyDialog & ) = delete; public: PasswordToOpenModifyDialog( vcl::Window * pParent, sal_uInt16 nMinPasswdLen, diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index a598f2e53575..a80177783dd3 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -37,8 +37,8 @@ class LookUpComboBox : public ComboBox Idle m_aModifyIdle; VclPtr<SvxThesaurusDialog> m_pDialog; - LookUpComboBox( const LookUpComboBox & ) SAL_DELETED_FUNCTION; - LookUpComboBox& operator = ( const LookUpComboBox & ) SAL_DELETED_FUNCTION; + LookUpComboBox( const LookUpComboBox & ) = delete; + LookUpComboBox& operator = ( const LookUpComboBox & ) = delete; public: LookUpComboBox(vcl::Window *pParent); @@ -78,8 +78,8 @@ class ThesaurusAlternativesCtrl typedef std::map< const SvTreeListEntry *, AlternativesExtraData > UserDataMap_t; UserDataMap_t m_aUserData; - ThesaurusAlternativesCtrl( const ThesaurusAlternativesCtrl & ) SAL_DELETED_FUNCTION; - ThesaurusAlternativesCtrl & operator = ( const ThesaurusAlternativesCtrl & ) SAL_DELETED_FUNCTION; + ThesaurusAlternativesCtrl( const ThesaurusAlternativesCtrl & ) = delete; + ThesaurusAlternativesCtrl & operator = ( const ThesaurusAlternativesCtrl & ) = delete; public: ThesaurusAlternativesCtrl(vcl::Window* pParent); @@ -102,8 +102,8 @@ class ReplaceEdit : public Edit { VclPtr<Button> m_pBtn; - ReplaceEdit( const ReplaceEdit & ) SAL_DELETED_FUNCTION; - ReplaceEdit & operator = ( const ReplaceEdit & ) SAL_DELETED_FUNCTION; + ReplaceEdit( const ReplaceEdit & ) = delete; + ReplaceEdit & operator = ( const ReplaceEdit & ) = delete; public: ReplaceEdit(vcl::Window *pParent); |