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 --- include/basegfx/color/bcolormodifier.hxx | 4 ++-- include/basegfx/range/b2dconnectedranges.hxx | 4 ++-- include/basegfx/raster/bpixelraster.hxx | 4 ++-- include/basegfx/tools/unopolypolygon.hxx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'include/basegfx') diff --git a/include/basegfx/color/bcolormodifier.hxx b/include/basegfx/color/bcolormodifier.hxx index 7cf078ae562d..f495dad5b0ea 100644 --- a/include/basegfx/color/bcolormodifier.hxx +++ b/include/basegfx/color/bcolormodifier.hxx @@ -59,8 +59,8 @@ namespace basegfx class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED BColorModifier { private: - BColorModifier(const BColorModifier&) SAL_DELETED_FUNCTION; - BColorModifier& operator=(const BColorModifier&) SAL_DELETED_FUNCTION; + BColorModifier(const BColorModifier&) = delete; + BColorModifier& operator=(const BColorModifier&) = delete; protected: // no one is allowed to incarnate the abstract base class // except derivations diff --git a/include/basegfx/range/b2dconnectedranges.hxx b/include/basegfx/range/b2dconnectedranges.hxx index 6473b2ddf990..6feb867f1311 100644 --- a/include/basegfx/range/b2dconnectedranges.hxx +++ b/include/basegfx/range/b2dconnectedranges.hxx @@ -235,8 +235,8 @@ namespace basegfx } private: - B2DConnectedRanges(const B2DConnectedRanges&) SAL_DELETED_FUNCTION; - B2DConnectedRanges& operator=( const B2DConnectedRanges& ) SAL_DELETED_FUNCTION; + B2DConnectedRanges(const B2DConnectedRanges&) = delete; + B2DConnectedRanges& operator=( const B2DConnectedRanges& ) = delete; /** Current list of disjunct sets of connected components diff --git a/include/basegfx/raster/bpixelraster.hxx b/include/basegfx/raster/bpixelraster.hxx index 6f2b21b107e8..67eea7d31b15 100644 --- a/include/basegfx/raster/bpixelraster.hxx +++ b/include/basegfx/raster/bpixelraster.hxx @@ -31,8 +31,8 @@ namespace basegfx class BPixelRaster { private: - BPixelRaster(const BPixelRaster&) SAL_DELETED_FUNCTION; - BPixelRaster& operator=(const BPixelRaster&) SAL_DELETED_FUNCTION; + BPixelRaster(const BPixelRaster&) = delete; + BPixelRaster& operator=(const BPixelRaster&) = delete; protected: sal_uInt32 mnWidth; diff --git a/include/basegfx/tools/unopolypolygon.hxx b/include/basegfx/tools/unopolypolygon.hxx index 3baca23f5025..6159742a7a3f 100644 --- a/include/basegfx/tools/unopolypolygon.hxx +++ b/include/basegfx/tools/unopolypolygon.hxx @@ -96,8 +96,8 @@ namespace unotools virtual void modifying() const {} private: - UnoPolyPolygon(const UnoPolyPolygon&) SAL_DELETED_FUNCTION; - UnoPolyPolygon& operator=(const UnoPolyPolygon&) SAL_DELETED_FUNCTION; + UnoPolyPolygon(const UnoPolyPolygon&) = delete; + UnoPolyPolygon& operator=(const UnoPolyPolygon&) = delete; B2DPolyPolygon maPolyPoly; ::com::sun::star::rendering::FillRule meFillRule; -- cgit v1.2.3