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 /cppcanvas | |
parent | HAVE_CXX11_DELETE is required on all supported toolchains (diff) | |
download | core-bff4c13475957863bfa7da5bc3bcf82a64a7503a.tar.gz core-bff4c13475957863bfa7da5bc3bcf82a64a7503a.zip |
Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY code
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
Diffstat (limited to 'cppcanvas')
-rw-r--r-- | cppcanvas/source/inc/implrenderer.hxx | 4 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implbitmap.hxx | 4 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implbitmapcanvas.hxx | 2 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implcanvas.hxx | 2 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implcustomsprite.hxx | 4 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implpolypolygon.hxx | 4 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implsprite.hxx | 4 | ||||
-rw-r--r-- | cppcanvas/source/wrapper/implspritecanvas.hxx | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index dbf205ddf749..9347e3793a4b 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -206,8 +206,8 @@ static float GetSwapFloat( SvStream& rSt ) void GraphicStatePop (GraphicStateMap& map, sal_Int32 index, OutDevState& rState); private: - ImplRenderer(const ImplRenderer&) SAL_DELETED_FUNCTION; - ImplRenderer& operator=( const ImplRenderer& ) SAL_DELETED_FUNCTION; + ImplRenderer(const ImplRenderer&) = delete; + ImplRenderer& operator=( const ImplRenderer& ) = delete; static void updateClipping( const ::basegfx::B2DPolyPolygon& rClipPoly, const ActionFactoryParameters& rParms, 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; |