Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code

Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3

7 files changed, 11 insertions, 11 deletions

diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index 2a21bbd12ce4..f6c75cb4d04d 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -55,8 +55,8 @@ namespace cppcanvas
             virtual css::uno::Reference< css::rendering::XBitmap >  getUNOBitmap() const SAL_OVERRIDE;
 
         private:
-            ImplBitmap(const ImplBitmap&) SAL_DELETED_FUNCTION;
-            ImplBitmap& operator=( const ImplBitmap& ) SAL_DELETED_FUNCTION;
+            ImplBitmap(const ImplBitmap&) = delete;
+            ImplBitmap& operator=( const ImplBitmap& ) = delete;
 
             const css::uno::Reference< css::rendering::XBitmap > mxBitmap;
             BitmapCanvasSharedPtr                                mpBitmapCanvas;
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 08ea31f52fa0..cf176ee8ab7f 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -47,7 +47,7 @@ namespace cppcanvas
             //ImplBitmapCanvas(const ImplBitmapCanvas&);
 
         private:
-            ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) SAL_DELETED_FUNCTION;
+            ImplBitmapCanvas& operator=( const ImplBitmapCanvas& ) = delete;
 
             const css::uno::Reference< css::rendering::XBitmapCanvas >    mxBitmapCanvas;
             const css::uno::Reference< css::rendering::XBitmap >          mxBitmap;
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 7c8920cb65e9..f7b971d699aa 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -75,7 +75,7 @@ namespace cppcanvas
             //ImplCanvas(const ImplCanvas&);
 
         private:
-            ImplCanvas& operator=( const ImplCanvas& ) SAL_DELETED_FUNCTION;
+            ImplCanvas& operator=( const ImplCanvas& ) = delete;
 
             mutable css::rendering::ViewState                    maViewState;
             boost::optional<basegfx::B2DPolyPolygon>             maClipPolyPolygon;
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index 4e6674dcffbc..fcf12d7eb5ee 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -44,8 +44,8 @@ namespace cppcanvas
             virtual CanvasSharedPtr getContentCanvas() const SAL_OVERRIDE;
 
         private:
-            ImplCustomSprite(const ImplCustomSprite&) SAL_DELETED_FUNCTION;
-            ImplCustomSprite& operator=( const ImplCustomSprite& ) SAL_DELETED_FUNCTION;
+            ImplCustomSprite(const ImplCustomSprite&) = delete;
+            ImplCustomSprite& operator=( const ImplCustomSprite& ) = delete;
 
             mutable CanvasSharedPtr                                    mpLastCanvas;
             const css::uno::Reference< css::rendering::XCustomSprite > mxCustomSprite;
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index 606c92e915c0..4db158ac8eab 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -61,8 +61,8 @@ namespace cppcanvas
                 css::rendering::XPolyPolygon2D > getUNOPolyPolygon() const SAL_OVERRIDE;
 
         private:
-            ImplPolyPolygon(const ImplPolyPolygon&) SAL_DELETED_FUNCTION;
-            ImplPolyPolygon& operator= ( const ImplPolyPolygon& ) SAL_DELETED_FUNCTION;
+            ImplPolyPolygon(const ImplPolyPolygon&) = delete;
+            ImplPolyPolygon& operator= ( const ImplPolyPolygon& ) = delete;
 
             const css::uno::Reference< css::rendering::XPolyPolygon2D > mxPolyPoly;
 
diff --git a/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index e5aeb29c0283..d06931592250 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.hxx
@@ -57,8 +57,8 @@ namespace cppcanvas
                 css::rendering::XSprite >  getUNOSprite() const SAL_OVERRIDE;
 
         private:
-            ImplSprite(const ImplSprite&) SAL_DELETED_FUNCTION;
-            ImplSprite& operator=( const ImplSprite& ) SAL_DELETED_FUNCTION;
+            ImplSprite(const ImplSprite&) = delete;
+            ImplSprite& operator=( const ImplSprite& ) = delete;
 
             css::uno::Reference< css::rendering::XGraphicDevice >         mxGraphicDevice;
             const css::uno::Reference< css::rendering::XSprite >          mxSprite;
diff --git a/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index 51374bfcf904..3ba92ee69e74 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.hxx
@@ -73,7 +73,7 @@ namespace cppcanvas
             typedef std::shared_ptr< TransformationArbiter > TransformationArbiterSharedPtr;
 
         private:
-            ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) SAL_DELETED_FUNCTION;
+            ImplSpriteCanvas& operator=( const ImplSpriteCanvas& ) = delete;
 
             const css::uno::Reference< css::rendering::XSpriteCanvas > mxSpriteCanvas;
             TransformationArbiterSharedPtr                             mpTransformArbiter;