summaryrefslogtreecommitdiff
path: root/include/basegfx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 15:25:41 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:26 +0200
commitbff4c13475957863bfa7da5bc3bcf82a64a7503a (patch)
tree23530ecc27cb8d46b26d5d4aea6b058e5fbaf9db /include/basegfx
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'include/basegfx')
-rw-r--r--include/basegfx/color/bcolormodifier.hxx4
-rw-r--r--include/basegfx/range/b2dconnectedranges.hxx4
-rw-r--r--include/basegfx/raster/bpixelraster.hxx4
-rw-r--r--include/basegfx/tools/unopolypolygon.hxx4
4 files changed, 8 insertions, 8 deletions
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;