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 --- accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx | 4 ++-- .../inc/accessibility/extended/AccessibleGridControl.hxx | 4 ++-- .../inc/accessibility/extended/AccessibleGridControlBase.hxx | 4 ++-- .../inc/accessibility/extended/AccessibleGridControlTableCell.hxx | 4 ++-- .../inc/accessibility/extended/accessiblebrowseboxcell.hxx | 4 ++-- .../inc/accessibility/extended/accessibleeditbrowseboxcell.hxx | 8 ++++---- accessibility/inc/accessibility/extended/listboxaccessible.hxx | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'accessibility') diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx index d008c46a2eee..c00743bb7747 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx @@ -278,8 +278,8 @@ protected: } private: - AccessibleBrowseBoxAccess( const AccessibleBrowseBoxAccess& ) SAL_DELETED_FUNCTION; - AccessibleBrowseBoxAccess& operator=( const AccessibleBrowseBoxAccess& ) SAL_DELETED_FUNCTION; + AccessibleBrowseBoxAccess( const AccessibleBrowseBoxAccess& ) = delete; + AccessibleBrowseBoxAccess& operator=( const AccessibleBrowseBoxAccess& ) = delete; }; diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index 80a9e2763f04..1a02a194207f 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx @@ -228,8 +228,8 @@ protected: } private: - AccessibleGridControlAccess( const AccessibleGridControlAccess& ) SAL_DELETED_FUNCTION; - AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& ) SAL_DELETED_FUNCTION; + AccessibleGridControlAccess( const AccessibleGridControlAccess& ) = delete; + AccessibleGridControlAccess& operator=( const AccessibleGridControlAccess& ) = delete; }; diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index 5ab0de31e552..142847ce28a0 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx @@ -338,8 +338,8 @@ protected: throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: - GridControlAccessibleElement( const GridControlAccessibleElement& ) SAL_DELETED_FUNCTION; - GridControlAccessibleElement& operator=( const GridControlAccessibleElement& ) SAL_DELETED_FUNCTION; + GridControlAccessibleElement( const GridControlAccessibleElement& ) = delete; + GridControlAccessibleElement& operator=( const GridControlAccessibleElement& ) = delete; }; // inlines -------------------------------------------------------------------- diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx index e588a5377eab..ac020ebb4ede 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx @@ -52,8 +52,8 @@ namespace accessibility virtual ~AccessibleGridControlCell(); private: - AccessibleGridControlCell( const AccessibleGridControlCell& ) SAL_DELETED_FUNCTION; - AccessibleGridControlCell& operator=( const AccessibleGridControlCell& ) SAL_DELETED_FUNCTION; + AccessibleGridControlCell( const AccessibleGridControlCell& ) = delete; + AccessibleGridControlCell& operator=( const AccessibleGridControlCell& ) = delete; }; typedef ::cppu::ImplHelper2 < css::accessibility::XAccessibleText diff --git a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx index 8ff40e48d7a5..8115ad382da6 100644 --- a/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx +++ b/accessibility/inc/accessibility/extended/accessiblebrowseboxcell.hxx @@ -65,8 +65,8 @@ namespace accessibility virtual ~AccessibleBrowseBoxCell(); private: - AccessibleBrowseBoxCell( const AccessibleBrowseBoxCell& ) SAL_DELETED_FUNCTION; - AccessibleBrowseBoxCell& operator=( const AccessibleBrowseBoxCell& ) SAL_DELETED_FUNCTION; + AccessibleBrowseBoxCell( const AccessibleBrowseBoxCell& ) = delete; + AccessibleBrowseBoxCell& operator=( const AccessibleBrowseBoxCell& ) = delete; }; diff --git a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx index db3fd81f6afe..d1d0875af527 100644 --- a/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/accessibility/extended/accessibleeditbrowseboxcell.hxx @@ -87,8 +87,8 @@ namespace accessibility void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) throw (css::uno::RuntimeException) SAL_OVERRIDE; private: - EditBrowseBoxTableCell( const EditBrowseBoxTableCell& ) SAL_DELETED_FUNCTION; - EditBrowseBoxTableCell& operator=( const EditBrowseBoxTableCell& ) SAL_DELETED_FUNCTION; + EditBrowseBoxTableCell( const EditBrowseBoxTableCell& ) = delete; + EditBrowseBoxTableCell& operator=( const EditBrowseBoxTableCell& ) = delete; }; @@ -134,8 +134,8 @@ namespace accessibility virtual void SAL_CALL disposing() SAL_OVERRIDE; private: - EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& ) SAL_DELETED_FUNCTION; - EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ) SAL_DELETED_FUNCTION; + EditBrowseBoxTableCellAccess( const EditBrowseBoxTableCellAccess& ) = delete; + EditBrowseBoxTableCellAccess& operator=( const EditBrowseBoxTableCellAccess& ) = delete; }; } diff --git a/accessibility/inc/accessibility/extended/listboxaccessible.hxx b/accessibility/inc/accessibility/extended/listboxaccessible.hxx index 7affba94cc28..ed6e0a29d783 100644 --- a/accessibility/inc/accessibility/extended/listboxaccessible.hxx +++ b/accessibility/inc/accessibility/extended/listboxaccessible.hxx @@ -71,8 +71,8 @@ namespace accessibility DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); private: - ListBoxAccessibleBase( const ListBoxAccessibleBase& ) SAL_DELETED_FUNCTION; - ListBoxAccessibleBase& operator=( const ListBoxAccessibleBase& ) SAL_DELETED_FUNCTION; + ListBoxAccessibleBase( const ListBoxAccessibleBase& ) = delete; + ListBoxAccessibleBase& operator=( const ListBoxAccessibleBase& ) = delete; }; -- cgit