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 /svx/inc/sdr | |
parent | 27491c28cb67ada0a4c5eaa90eaf589425990582 (diff) |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'svx/inc/sdr')
-rw-r--r-- | svx/inc/sdr/contact/viewcontactofunocontrol.hxx | 4 | ||||
-rw-r--r-- | svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx index 9544170bc834..3e271d1bde79 100644 --- a/svx/inc/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewcontactofunocontrol.hxx @@ -73,8 +73,8 @@ namespace sdr { namespace contact { virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) SAL_OVERRIDE; private: - ViewContactOfUnoControl( const ViewContactOfUnoControl& ) SAL_DELETED_FUNCTION; - ViewContactOfUnoControl& operator=( const ViewContactOfUnoControl& ) SAL_DELETED_FUNCTION; + ViewContactOfUnoControl( const ViewContactOfUnoControl& ) = delete; + ViewContactOfUnoControl& operator=( const ViewContactOfUnoControl& ) = delete; protected: // This method is responsible for creating the graphical visualisation data diff --git a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx index 2d461f849b1d..25a7229c5200 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -100,8 +100,8 @@ namespace sdr { namespace contact { void impl_onControlChangedOrModified(); private: - ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& ) SAL_DELETED_FUNCTION; - ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ) SAL_DELETED_FUNCTION; + ViewObjectContactOfUnoControl( const ViewObjectContactOfUnoControl& ) = delete; + ViewObjectContactOfUnoControl& operator=( const ViewObjectContactOfUnoControl& ) = delete; }; class SVX_DLLPRIVATE UnoControlPrintOrPreviewContact : public ViewObjectContactOfUnoControl @@ -111,8 +111,8 @@ namespace sdr { namespace contact { virtual ~UnoControlPrintOrPreviewContact(); private: - UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& ) SAL_DELETED_FUNCTION; - UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ) SAL_DELETED_FUNCTION; + UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& ) = delete; + UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ) = delete; virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const SAL_OVERRIDE; }; |