diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 6f37f7f310b2..3d975cba0e56 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -118,7 +118,7 @@ namespace cairocanvas ColorType eColorType ) { ::canvas::tools::verifyInput( renderState, - BOOST_CURRENT_FUNCTION, + __func__, const_cast(pOwner), // only for refcount 2, eColorType == IGNORE_COLOR ? 0 : 3 ); diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index b410c561ba8d..71705347ad5b 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -73,7 +73,7 @@ namespace oglcanvas uno::RuntimeException, std::exception) { canvas::tools::verifyArgs(aNewPos, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< ::cppu::OWeakObject* >(this)); ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 0932e0cfc8f9..e1ebe431bc86 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -380,7 +380,7 @@ namespace oglcanvas void SpriteDeviceHelper::dumpScreenContent() const { - SAL_INFO("canvas.ogl", BOOST_CURRENT_FUNCTION ); + SAL_INFO("canvas.ogl", __func__); } void SpriteDeviceHelper::show( const ::rtl::Reference< CanvasCustomSprite >& xSprite ) diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index bee83b1af78f..441590bcb51e 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -677,7 +677,7 @@ namespace vclcanvas "bitmap is NULL"); ::canvas::tools::verifyInput( renderState, - BOOST_CURRENT_FUNCTION, + __func__, mpDevice, 4, bModulateColors ? 3 : 0 ); @@ -1195,7 +1195,7 @@ namespace vclcanvas "outdev null. Are we disposed?" ); ::canvas::tools::verifyInput( renderState, - BOOST_CURRENT_FUNCTION, + __func__, mpDevice, 2, eColorType == IGNORE_COLOR ? 0 : 3 ); diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx index bd144f5c1418..b4b493682c9c 100644 --- a/include/canvas/base/bitmapcanvasbase.hxx +++ b/include/canvas/base/bitmapcanvasbase.hxx @@ -112,7 +112,7 @@ namespace canvas { tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState, destRect, destViewState, destRenderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename BaseType::UnambiguousBaseType* >(this)); typename BaseType::BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx index 9bb513c397d1..1af4d929f955 100644 --- a/include/canvas/base/canvasbase.hxx +++ b/include/canvas/base/canvasbase.hxx @@ -139,7 +139,7 @@ namespace canvas std::exception) override { tools::verifyArgs(aPoint, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -156,7 +156,7 @@ namespace canvas std::exception) override { tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -175,7 +175,7 @@ namespace canvas std::exception) override { tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -194,7 +194,7 @@ namespace canvas std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -214,7 +214,7 @@ namespace canvas std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -233,7 +233,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -253,7 +253,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -271,7 +271,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -290,7 +290,7 @@ namespace canvas std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -310,7 +310,7 @@ namespace canvas std::exception) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -328,7 +328,7 @@ namespace canvas const css::uno::Reference< css::geometry::XMapping2D >& xMapping ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -349,7 +349,7 @@ namespace canvas // dummy, to keep argPos in sync fontRequest, fontMatrix, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -364,7 +364,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(aFilter, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -384,7 +384,7 @@ namespace canvas std::exception) override { tools::verifyArgs(xFont, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); tools::verifyRange( textDirection, css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT, @@ -407,7 +407,7 @@ namespace canvas std::exception) override { tools::verifyArgs(laidOutText, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -424,7 +424,7 @@ namespace canvas const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override { tools::verifyArgs(xBitmap, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -440,7 +440,7 @@ namespace canvas const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override { tools::verifyArgs(xBitmap, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx index 9813f5b5d747..830bf9bebdbd 100644 --- a/include/canvas/base/canvascustomspritebase.hxx +++ b/include/canvas/base/canvascustomspritebase.hxx @@ -119,7 +119,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(xBitmap, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename BaseType::UnambiguousBaseType* >(this)); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -156,7 +156,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(aNewPos, viewState, renderState, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename BaseType::UnambiguousBaseType* >(this)); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -168,7 +168,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(aTransformation, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename BaseType::UnambiguousBaseType* >(this)); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx index a6db3160ea66..b679cf477752 100644 --- a/include/canvas/base/graphicdevicebase.hxx +++ b/include/canvas/base/graphicdevicebase.hxx @@ -187,7 +187,7 @@ namespace canvas std::exception) override { tools::verifyBitmapSize(size, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -199,7 +199,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyBitmapSize(size, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -213,7 +213,7 @@ namespace canvas std::exception) override { tools::verifyBitmapSize(size, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -225,7 +225,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyBitmapSize(size, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx index 4995578fa949..0d6440a979b6 100644 --- a/include/canvas/base/integerbitmapbase.hxx +++ b/include/canvas/base/integerbitmapbase.hxx @@ -45,7 +45,7 @@ namespace canvas const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override { tools::verifyArgs(rect, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename Base::UnambiguousBaseType* >(this)); tools::verifyIndexRange(rect, Base::getSize() ); @@ -60,7 +60,7 @@ namespace canvas const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override { tools::verifyArgs(bitmapLayout, rect, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename Base::UnambiguousBaseType* >(this)); tools::verifyIndexRange(rect, Base::getSize() ); @@ -74,7 +74,7 @@ namespace canvas const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override { tools::verifyArgs(bitmapLayout, pos, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename Base::UnambiguousBaseType* >(this)); tools::verifyIndexRange(pos, Base::getSize() ); @@ -87,7 +87,7 @@ namespace canvas const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override { tools::verifyArgs(pos, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename Base::UnambiguousBaseType* >(this)); tools::verifyIndexRange(pos, Base::getSize() ); diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx index ba3ae036c545..9656be3fe07d 100644 --- a/include/canvas/base/spritecanvasbase.hxx +++ b/include/canvas/base/spritecanvasbase.hxx @@ -92,7 +92,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(animation, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename BaseType::UnambiguousBaseType* >(this)); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -106,7 +106,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(animationBitmaps, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename BaseType::UnambiguousBaseType* >(this)); tools::verifyRange( interpolationMode, css::rendering::InterpolationMode::NEAREST_NEIGHBOR, @@ -121,7 +121,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifySpriteSize(spriteSize, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename BaseType::UnambiguousBaseType* >(this)); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -133,7 +133,7 @@ namespace canvas css::uno::RuntimeException) override { tools::verifyArgs(original, - BOOST_CURRENT_FUNCTION, + __func__, static_cast< typename BaseType::UnambiguousBaseType* >(this)); typename BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/debug.hxx b/include/canvas/debug.hxx index 308026a0e188..f8b8d29c9270 100644 --- a/include/canvas/debug.hxx +++ b/include/canvas/debug.hxx @@ -33,7 +33,7 @@ # if OSL_DEBUG_LEVEL > 2 # include # define SHARED_PTR_LEFTOVERS(a) OSL_TRACE("%s\n%s: Unreachable objects still use %d bytes\n", \ - BOOST_CURRENT_FUNCTION, a, \ + __func__, a, \ find_unreachable_objects(true) ) # else /** This macro shows how much memory is still used by shared_ptrs @@ -44,7 +44,7 @@ from deletion by circular references. */ # define SHARED_PTR_LEFTOVERS(a) OSL_TRACE("%s\n%s: Unreachable objects still use %d bytes\n", \ - BOOST_CURRENT_FUNCTION, a, \ + __func__, a, \ find_unreachable_objects(false) ) # endif diff --git a/include/canvas/verifyinput.hxx b/include/canvas/verifyinput.hxx index 615f5295cf25..d8e95ac5f9a1 100644 --- a/include/canvas/verifyinput.hxx +++ b/include/canvas/verifyinput.hxx @@ -27,7 +27,6 @@ #include #include -#include #include