diff options
Diffstat (limited to 'canvas/inc/base/canvasbase.hxx')
| -rw-r--r-- | canvas/inc/base/canvasbase.hxx | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/canvas/inc/base/canvasbase.hxx b/canvas/inc/base/canvasbase.hxx index 323460a10946..24737f784d59 100644 --- a/canvas/inc/base/canvasbase.hxx +++ b/canvas/inc/base/canvasbase.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/rendering/TextDirection.hpp> -#include <osl/diagnose.h> #include <osl/mutex.hxx> #include <verifyinput.hxx> @@ -146,7 +145,7 @@ namespace canvas const css::rendering::RenderState& renderState) override { tools::verifyArgs(aPoint, viewState, renderState, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -160,7 +159,7 @@ namespace canvas const css::rendering::RenderState& renderState) override { tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -176,7 +175,7 @@ namespace canvas const css::rendering::RenderState& renderState ) override { tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -192,7 +191,7 @@ namespace canvas const css::rendering::RenderState& renderState) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -209,7 +208,7 @@ namespace canvas const css::rendering::StrokeAttributes& strokeAttributes) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -227,7 +226,7 @@ namespace canvas const css::rendering::StrokeAttributes& strokeAttributes ) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -246,7 +245,7 @@ namespace canvas const css::rendering::StrokeAttributes& strokeAttributes ) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -263,7 +262,7 @@ namespace canvas const css::rendering::StrokeAttributes& strokeAttributes ) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -279,7 +278,7 @@ namespace canvas const css::rendering::RenderState& renderState) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -296,7 +295,7 @@ namespace canvas const css::uno::Sequence< css::rendering::Texture >& textures) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -314,7 +313,7 @@ namespace canvas const css::uno::Reference< css::geometry::XMapping2D >& xMapping ) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -334,7 +333,7 @@ namespace canvas // dummy, to keep argPos in sync fontRequest, fontMatrix, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -348,7 +347,7 @@ namespace canvas const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties ) override { tools::verifyArgs(aFilter, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -365,7 +364,7 @@ namespace canvas sal_Int8 textDirection) override { tools::verifyArgs(xFont, viewState, renderState, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); tools::verifyRange( textDirection, css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT, @@ -385,7 +384,7 @@ namespace canvas const css::rendering::RenderState& renderState) override { tools::verifyArgs(laidOutText, viewState, renderState, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -402,7 +401,7 @@ namespace canvas const css::rendering::RenderState& renderState ) override { tools::verifyArgs(xBitmap, viewState, renderState, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); @@ -418,7 +417,7 @@ namespace canvas const css::rendering::RenderState& renderState ) override { tools::verifyArgs(xBitmap, viewState, renderState, - OSL_THIS_FUNC, + __func__, static_cast< UnambiguousBaseType* >(this)); MutexType aGuard( BaseType::m_aMutex ); |