summaryrefslogtreecommitdiff
path: root/include/canvas
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/canvas
parent27491c28cb67ada0a4c5eaa90eaf589425990582 (diff)
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'include/canvas')
-rw-r--r--include/canvas/base/cachedprimitivebase.hxx4
-rw-r--r--include/canvas/base/canvasbase.hxx4
-rw-r--r--include/canvas/base/canvascustomspritehelper.hxx4
-rw-r--r--include/canvas/base/graphicdevicebase.hxx4
4 files changed, 8 insertions, 8 deletions
diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx
index 4afc2ce14bc4..32e5ecde4ffa 100644
--- a/include/canvas/base/cachedprimitivebase.hxx
+++ b/include/canvas/base/cachedprimitivebase.hxx
@@ -80,8 +80,8 @@ namespace canvas
virtual ~CachedPrimitiveBase(); // we're a ref-counted UNO class. _We_ destroy ourselves.
private:
- CachedPrimitiveBase( const CachedPrimitiveBase& ) SAL_DELETED_FUNCTION;
- CachedPrimitiveBase& operator=( const CachedPrimitiveBase& ) SAL_DELETED_FUNCTION;
+ CachedPrimitiveBase( const CachedPrimitiveBase& ) = delete;
+ CachedPrimitiveBase& operator=( const CachedPrimitiveBase& ) = delete;
/** Actually perform the requested redraw.
diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx
index 4d710a537dde..2cb129d90bc1 100644
--- a/include/canvas/base/canvasbase.hxx
+++ b/include/canvas/base/canvasbase.hxx
@@ -465,8 +465,8 @@ namespace canvas
mutable bool mbSurfaceDirty;
private:
- CanvasBase( const CanvasBase& ) SAL_DELETED_FUNCTION;
- CanvasBase& operator=( const CanvasBase& ) SAL_DELETED_FUNCTION;
+ CanvasBase( const CanvasBase& ) = delete;
+ CanvasBase& operator=( const CanvasBase& ) = delete;
};
}
diff --git a/include/canvas/base/canvascustomspritehelper.hxx b/include/canvas/base/canvascustomspritehelper.hxx
index fe29f5c5146b..a81a0b6026f0 100644
--- a/include/canvas/base/canvascustomspritehelper.hxx
+++ b/include/canvas/base/canvascustomspritehelper.hxx
@@ -196,8 +196,8 @@ namespace canvas
void visibilityUpdated() const { mbVisibilityDirty=false; }
private:
- CanvasCustomSpriteHelper( const CanvasCustomSpriteHelper& ) SAL_DELETED_FUNCTION;
- CanvasCustomSpriteHelper& operator=( const CanvasCustomSpriteHelper& ) SAL_DELETED_FUNCTION;
+ CanvasCustomSpriteHelper( const CanvasCustomSpriteHelper& ) = delete;
+ CanvasCustomSpriteHelper& operator=( const CanvasCustomSpriteHelper& ) = delete;
/** Called to convert an API polygon to a basegfx polygon
diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx
index 83b5adc69fd4..9e34eab460ae 100644
--- a/include/canvas/base/graphicdevicebase.hxx
+++ b/include/canvas/base/graphicdevicebase.hxx
@@ -363,8 +363,8 @@ namespace canvas
bool mbDumpScreenContent;
private:
- GraphicDeviceBase( const GraphicDeviceBase& ) SAL_DELETED_FUNCTION;
- GraphicDeviceBase& operator=( const GraphicDeviceBase& ) SAL_DELETED_FUNCTION;
+ GraphicDeviceBase( const GraphicDeviceBase& ) = delete;
+ GraphicDeviceBase& operator=( const GraphicDeviceBase& ) = delete;
};
}