From ba688968ca55f5d5bcdeff23392f3739a6430cf0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 27 Oct 2017 16:00:39 +0200 Subject: [PATCH] Remove part of clang-cl workaround that is no longer needed ...after ColorSharedPtr is gone Change-Id: Id147e544e3b82577f4b7dbb5987472469782165f --- cppcanvas/source/wrapper/implbitmapcanvas.cxx | 3 --- cppcanvas/source/wrapper/implspritecanvas.cxx | 3 --- 2 files changed, 6 deletions(-) diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx index 67eed7d94163..fee1cf357706 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.cxx @@ -41,9 +41,6 @@ namespace cppcanvas mxBitmap( rCanvas, uno::UNO_QUERY ) { -#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641 - (void) (ColorSharedPtr()); -#endif OSL_ENSURE( mxBitmapCanvas.is(), "ImplBitmapCanvas::ImplBitmapCanvas(): Invalid canvas" ); OSL_ENSURE( mxBitmap.is(), "ImplBitmapCanvas::ImplBitmapCanvas(): Invalid bitmap" ); } diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx index fe13c2286f20..65dd9754845e 100644 --- a/cppcanvas/source/wrapper/implspritecanvas.cxx +++ b/cppcanvas/source/wrapper/implspritecanvas.cxx @@ -49,9 +49,6 @@ namespace cppcanvas mxSpriteCanvas( rCanvas ), mpTransformArbiter( new TransformationArbiter() ) { -#if defined __clang__ && defined _MSC_VER // workaround clang-cl ABI bug PR25641 - (void) (ColorSharedPtr()); -#endif OSL_ENSURE( mxSpriteCanvas.is(), "ImplSpriteCanvas::ImplSpriteCanvas(): Invalid canvas" ); }