[API CHANGE] Drop OSL_THIS_FUNC, directly use C++11 __func__

It had been documented as "the macro OSL_THIS_FUNC is intended to be an office
internal macro for now", so take the liberty of removing it, even if technically
that can be considered an incompatible API change.

Change-Id: I7580a932e1da54845934378a650e894f3f3a9062
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101406
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

10 files changed, 38 insertions, 38 deletions

diff --git a/canvas/inc/base/bitmapcanvasbase.hxx b/canvas/inc/base/bitmapcanvasbase.hxx
index efbf58f55902..1293f301fdb1 100644
--- a/canvas/inc/base/bitmapcanvasbase.hxx
+++ b/canvas/inc/base/bitmapcanvasbase.hxx
@@ -112,7 +112,7 @@ namespace canvas
         {
             tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState,
                               destRect, destViewState, destRenderState,
-                              OSL_THIS_FUNC,
+                              __func__,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::BaseType::MutexType aGuard( BaseType::m_aMutex );
diff --git a/canvas/inc/base/canvasbase.hxx b/canvas/inc/base/canvasbase.hxx
index 323460a10946..b0f244e5951c 100644
--- a/canvas/inc/base/canvasbase.hxx
+++ b/canvas/inc/base/canvasbase.hxx
@@ -146,7 +146,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 +160,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 +176,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 +192,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 +209,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 +227,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 +246,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 +263,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 +279,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 +296,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 +314,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 +334,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 +348,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 +365,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 +385,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 +402,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 +418,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 );
diff --git a/canvas/inc/base/canvascustomspritebase.hxx b/canvas/inc/base/canvascustomspritebase.hxx
index c47f232e0301..8379a54d935b 100644
--- a/canvas/inc/base/canvascustomspritebase.hxx
+++ b/canvas/inc/base/canvascustomspritebase.hxx
@@ -117,7 +117,7 @@ namespace canvas
                         const css::rendering::RenderState&                                 renderState ) override
         {
             tools::verifyArgs(xBitmap, viewState, renderState,
-                              OSL_THIS_FUNC,
+                              __func__,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -152,7 +152,7 @@ namespace canvas
                                     const css::rendering::RenderState& renderState ) override
         {
             tools::verifyArgs(aNewPos, viewState, renderState,
-                              OSL_THIS_FUNC,
+                              __func__,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -163,7 +163,7 @@ namespace canvas
         virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) override
         {
             tools::verifyArgs(aTransformation,
-                              OSL_THIS_FUNC,
+                              __func__,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
diff --git a/canvas/inc/base/graphicdevicebase.hxx b/canvas/inc/base/graphicdevicebase.hxx
index 3a7c49834447..151a39a9f153 100644
--- a/canvas/inc/base/graphicdevicebase.hxx
+++ b/canvas/inc/base/graphicdevicebase.hxx
@@ -185,7 +185,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const css::geometry::IntegerSize2D& size ) override
         {
             tools::verifyBitmapSize(size,
-                                    OSL_THIS_FUNC,
+                                    __func__,
                                     static_cast< UnambiguousBaseType* >(this));
 
             MutexType aGuard( BaseType::m_aMutex );
@@ -196,7 +196,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const css::geometry::IntegerSize2D& size ) override
         {
             tools::verifyBitmapSize(size,
-                                    OSL_THIS_FUNC,
+                                    __func__,
                                     static_cast< UnambiguousBaseType* >(this));
 
             MutexType aGuard( BaseType::m_aMutex );
@@ -207,7 +207,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const css::geometry::IntegerSize2D& size ) override
         {
             tools::verifyBitmapSize(size,
-                                    OSL_THIS_FUNC,
+                                    __func__,
                                     static_cast< UnambiguousBaseType* >(this));
 
             MutexType aGuard( BaseType::m_aMutex );
@@ -218,7 +218,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const css::geometry::IntegerSize2D& size ) override
         {
             tools::verifyBitmapSize(size,
-                                    OSL_THIS_FUNC,
+                                    __func__,
                                     static_cast< UnambiguousBaseType* >(this));
 
             MutexType aGuard( BaseType::m_aMutex );
diff --git a/canvas/inc/base/integerbitmapbase.hxx b/canvas/inc/base/integerbitmapbase.hxx
index aca2551f2322..d485233d45c7 100644
--- a/canvas/inc/base/integerbitmapbase.hxx
+++ b/canvas/inc/base/integerbitmapbase.hxx
@@ -45,7 +45,7 @@ namespace canvas
                                                                               const css::geometry::IntegerRectangle2D& rect ) override
         {
             tools::verifyArgs(rect,
-                              OSL_THIS_FUNC,
+                              __func__,
                               static_cast< typename Base::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(rect, Base::getSize() );
 
@@ -60,7 +60,7 @@ namespace canvas
                                        const css::geometry::IntegerRectangle2D&   rect ) override
         {
             tools::verifyArgs(bitmapLayout, rect,
-                              OSL_THIS_FUNC,
+                              __func__,
                               static_cast< typename Base::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(rect, Base::getSize() );
 
@@ -74,7 +74,7 @@ namespace canvas
                                         const css::geometry::IntegerPoint2D&       pos ) override
         {
             tools::verifyArgs(bitmapLayout, pos,
-                              OSL_THIS_FUNC,
+                              __func__,
                               static_cast< typename Base::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(pos, Base::getSize() );
 
@@ -87,7 +87,7 @@ namespace canvas
                                                                   const css::geometry::IntegerPoint2D& pos ) override
         {
             tools::verifyArgs(pos,
-                              OSL_THIS_FUNC,
+                              __func__,
                               static_cast< typename Base::UnambiguousBaseType* >(this));
             tools::verifyIndexRange(pos, Base::getSize() );
 
diff --git a/canvas/inc/base/spritecanvasbase.hxx b/canvas/inc/base/spritecanvasbase.hxx
index 041a6d3be7dc..0a0d952a2955 100644
--- a/canvas/inc/base/spritecanvasbase.hxx
+++ b/canvas/inc/base/spritecanvasbase.hxx
@@ -95,7 +95,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) override
         {
             tools::verifyArgs(animation,
-                              OSL_THIS_FUNC,
+                              __func__,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -107,7 +107,7 @@ namespace canvas
                                                                                                                                    sal_Int8                                                                                                           interpolationMode ) override
         {
             tools::verifyArgs(animationBitmaps,
-                              OSL_THIS_FUNC,
+                              __func__,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
             tools::verifyRange( interpolationMode,
                                 css::rendering::InterpolationMode::NEAREST_NEIGHBOR,
@@ -121,7 +121,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) override
         {
             tools::verifySpriteSize(spriteSize,
-                                    OSL_THIS_FUNC,
+                                    __func__,
                                     static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -132,7 +132,7 @@ namespace canvas
         virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) override
         {
             tools::verifyArgs(original,
-                              OSL_THIS_FUNC,
+                              __func__,
                               static_cast< typename BaseType::UnambiguousBaseType* >(this));
 
             typename BaseType::MutexType aGuard( BaseType::m_aMutex );
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 830388775670..258ba6a3166f 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.cxx
@@ -116,7 +116,7 @@ namespace cairocanvas
                       const rendering::RenderState& renderState )
     {
         ::canvas::tools::verifyInput( renderState,
-                                      OSL_THIS_FUNC,
+                                      __func__,
                                       const_cast<rendering::XCanvas*>(pOwner), // only for refcount
                                       2,
                                       3 /* text */ );
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index 903a0edfc93b..2e930611f5bf 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -69,7 +69,7 @@ namespace oglcanvas
                                             const rendering::RenderState& renderState )
     {
         canvas::tools::verifyArgs(aNewPos, viewState, renderState,
-                                  OSL_THIS_FUNC,
+                                  __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 57b0875c3f4e..230a34edea06 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -371,7 +371,7 @@ namespace oglcanvas
 
     void SpriteDeviceHelper::dumpScreenContent() const
     {
-        SAL_INFO("canvas.ogl", OSL_THIS_FUNC );
+        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 fcfabb8e033d..5cc5f3c42b73 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -651,7 +651,7 @@ namespace vclcanvas
                              "bitmap is NULL");
 
         ::canvas::tools::verifyInput( renderState,
-                                      OSL_THIS_FUNC,
+                                      __func__,
                                       mpDevice,
                                       4,
                                       bModulateColors ? 3 : 0 );
@@ -995,7 +995,7 @@ namespace vclcanvas
                          "outdev null. Are we disposed?" );
 
         ::canvas::tools::verifyInput( renderState,
-                                      OSL_THIS_FUNC,
+                                      __func__,
                                       mpDevice,
                                       2,
                                       eColorType == IGNORE_COLOR ? 0 : 3 );