mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

canvas: replace BOOST_CURRENT_FUNCTION with __func__

Browse Source 
Change-Id: I384472894288081423ae9467cc439b10d637f6e0
This commit is contained in:
Michael Stahl
2016-01-27 21:44:49 +01:00
parent 8b1fc9108f
commit d01f7db4b5
12 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
canvas/source/cairo/cairo_canvashelper_text.cxx
View File

@@ -118,7 +118,7 @@ namespace cairocanvas
ColorType eColorType ) ColorType eColorType )
{ {
::canvas::tools::verifyInput( renderState, ::canvas::tools::verifyInput( renderState,
BOOST_CURRENT_FUNCTION, __func__,
const_cast<rendering::XCanvas*>(pOwner), // only for refcount const_cast<rendering::XCanvas*>(pOwner), // only for refcount
2, 2,
eColorType == IGNORE_COLOR ? 0 : 3 ); eColorType == IGNORE_COLOR ? 0 : 3 );

2
canvas/source/opengl/ogl_canvascustomsprite.cxx
View File

@@ -73,7 +73,7 @@ namespace oglcanvas
uno::RuntimeException, std::exception) uno::RuntimeException, std::exception)
{ {
canvas::tools::verifyArgs(aNewPos, viewState, renderState, canvas::tools::verifyArgs(aNewPos, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< ::cppu::OWeakObject* >(this)); static_cast< ::cppu::OWeakObject* >(this));
::osl::MutexGuard aGuard( m_aMutex ); ::osl::MutexGuard aGuard( m_aMutex );

2
canvas/source/opengl/ogl_spritedevicehelper.cxx
View File

@@ -380,7 +380,7 @@ namespace oglcanvas
void SpriteDeviceHelper::dumpScreenContent() const void SpriteDeviceHelper::dumpScreenContent() const
{ {
SAL_INFO("canvas.ogl", BOOST_CURRENT_FUNCTION ); SAL_INFO("canvas.ogl", __func__);
} }
void SpriteDeviceHelper::show( const ::rtl::Reference< CanvasCustomSprite >& xSprite ) void SpriteDeviceHelper::show( const ::rtl::Reference< CanvasCustomSprite >& xSprite )

4
canvas/source/vcl/canvashelper.cxx
View File

@@ -677,7 +677,7 @@ namespace vclcanvas
"bitmap is NULL"); "bitmap is NULL");
::canvas::tools::verifyInput( renderState, ::canvas::tools::verifyInput( renderState,
BOOST_CURRENT_FUNCTION, __func__,
mpDevice, mpDevice,
4, 4,
bModulateColors ? 3 : 0 ); bModulateColors ? 3 : 0 );
@@ -1195,7 +1195,7 @@ namespace vclcanvas
"outdev null. Are we disposed?" ); "outdev null. Are we disposed?" );
::canvas::tools::verifyInput( renderState, ::canvas::tools::verifyInput( renderState,
BOOST_CURRENT_FUNCTION, __func__,
mpDevice, mpDevice,
2, 2,
eColorType == IGNORE_COLOR ? 0 : 3 ); eColorType == IGNORE_COLOR ? 0 : 3 );

2
include/canvas/base/bitmapcanvasbase.hxx
View File

@@ -112,7 +112,7 @@ namespace canvas
{ {
tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState, tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState,
destRect, destViewState, destRenderState, destRect, destViewState, destRenderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename BaseType::UnambiguousBaseType* >(this)); static_cast< typename BaseType::UnambiguousBaseType* >(this));
typename BaseType::BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::BaseType::MutexType aGuard( BaseType::m_aMutex );

34
include/canvas/base/canvasbase.hxx
View File

@@ -139,7 +139,7 @@ namespace canvas
std::exception) override std::exception) override
{ {
tools::verifyArgs(aPoint, viewState, renderState, tools::verifyArgs(aPoint, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -156,7 +156,7 @@ namespace canvas
std::exception) override std::exception) override
{ {
tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState, tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -175,7 +175,7 @@ namespace canvas
std::exception) override std::exception) override
{ {
tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState, tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -194,7 +194,7 @@ namespace canvas
std::exception) override std::exception) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, tools::verifyArgs(xPolyPolygon, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -214,7 +214,7 @@ namespace canvas
std::exception) override std::exception) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -233,7 +233,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -253,7 +253,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes, tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -271,7 +271,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -290,7 +290,7 @@ namespace canvas
std::exception) override std::exception) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, tools::verifyArgs(xPolyPolygon, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -310,7 +310,7 @@ namespace canvas
std::exception) override std::exception) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, tools::verifyArgs(xPolyPolygon, viewState, renderState, textures,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); 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 const css::uno::Reference< css::geometry::XMapping2D >& xMapping ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override
{ {
tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -349,7 +349,7 @@ namespace canvas
// dummy, to keep argPos in sync // dummy, to keep argPos in sync
fontRequest, fontRequest,
fontMatrix, fontMatrix,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -364,7 +364,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(aFilter, tools::verifyArgs(aFilter,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -384,7 +384,7 @@ namespace canvas
std::exception) override std::exception) override
{ {
tools::verifyArgs(xFont, viewState, renderState, tools::verifyArgs(xFont, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
tools::verifyRange( textDirection, tools::verifyRange( textDirection,
css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT, css::rendering::TextDirection::WEAK_LEFT_TO_RIGHT,
@@ -407,7 +407,7 @@ namespace canvas
std::exception) override std::exception) override
{ {
tools::verifyArgs(laidOutText, viewState, renderState, tools::verifyArgs(laidOutText, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -424,7 +424,7 @@ namespace canvas
const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override
{ {
tools::verifyArgs(xBitmap, viewState, renderState, tools::verifyArgs(xBitmap, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -440,7 +440,7 @@ namespace canvas
const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override
{ {
tools::verifyArgs(xBitmap, viewState, renderState, tools::verifyArgs(xBitmap, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );

6
include/canvas/base/canvascustomspritebase.hxx
View File

@@ -119,7 +119,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(xBitmap, viewState, renderState, tools::verifyArgs(xBitmap, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename BaseType::UnambiguousBaseType* >(this)); static_cast< typename BaseType::UnambiguousBaseType* >(this));
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -156,7 +156,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(aNewPos, viewState, renderState, tools::verifyArgs(aNewPos, viewState, renderState,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename BaseType::UnambiguousBaseType* >(this)); static_cast< typename BaseType::UnambiguousBaseType* >(this));
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -168,7 +168,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(aTransformation, tools::verifyArgs(aTransformation,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename BaseType::UnambiguousBaseType* >(this)); static_cast< typename BaseType::UnambiguousBaseType* >(this));
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );

8
include/canvas/base/graphicdevicebase.hxx
View File

@@ -187,7 +187,7 @@ namespace canvas
std::exception) override std::exception) override
{ {
tools::verifyBitmapSize(size, tools::verifyBitmapSize(size,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -199,7 +199,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyBitmapSize(size, tools::verifyBitmapSize(size,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -213,7 +213,7 @@ namespace canvas
std::exception) override std::exception) override
{ {
tools::verifyBitmapSize(size, tools::verifyBitmapSize(size,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );
@@ -225,7 +225,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyBitmapSize(size, tools::verifyBitmapSize(size,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< UnambiguousBaseType* >(this)); static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex ); MutexType aGuard( BaseType::m_aMutex );

8
include/canvas/base/integerbitmapbase.hxx
View File

@@ -45,7 +45,7 @@ namespace canvas
const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override
{ {
tools::verifyArgs(rect, tools::verifyArgs(rect,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename Base::UnambiguousBaseType* >(this)); static_cast< typename Base::UnambiguousBaseType* >(this));
tools::verifyIndexRange(rect, Base::getSize() ); 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 const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override
{ {
tools::verifyArgs(bitmapLayout, rect, tools::verifyArgs(bitmapLayout, rect,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename Base::UnambiguousBaseType* >(this)); static_cast< typename Base::UnambiguousBaseType* >(this));
tools::verifyIndexRange(rect, Base::getSize() ); 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 const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override
{ {
tools::verifyArgs(bitmapLayout, pos, tools::verifyArgs(bitmapLayout, pos,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename Base::UnambiguousBaseType* >(this)); static_cast< typename Base::UnambiguousBaseType* >(this));
tools::verifyIndexRange(pos, Base::getSize() ); 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 const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override
{ {
tools::verifyArgs(pos, tools::verifyArgs(pos,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename Base::UnambiguousBaseType* >(this)); static_cast< typename Base::UnambiguousBaseType* >(this));
tools::verifyIndexRange(pos, Base::getSize() ); tools::verifyIndexRange(pos, Base::getSize() );

8
include/canvas/base/spritecanvasbase.hxx
View File

@@ -92,7 +92,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(animation, tools::verifyArgs(animation,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename BaseType::UnambiguousBaseType* >(this)); static_cast< typename BaseType::UnambiguousBaseType* >(this));
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -106,7 +106,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(animationBitmaps, tools::verifyArgs(animationBitmaps,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename BaseType::UnambiguousBaseType* >(this)); static_cast< typename BaseType::UnambiguousBaseType* >(this));
tools::verifyRange( interpolationMode, tools::verifyRange( interpolationMode,
css::rendering::InterpolationMode::NEAREST_NEIGHBOR, css::rendering::InterpolationMode::NEAREST_NEIGHBOR,
@@ -121,7 +121,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifySpriteSize(spriteSize, tools::verifySpriteSize(spriteSize,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename BaseType::UnambiguousBaseType* >(this)); static_cast< typename BaseType::UnambiguousBaseType* >(this));
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );
@@ -133,7 +133,7 @@ namespace canvas
css::uno::RuntimeException) override css::uno::RuntimeException) override
{ {
tools::verifyArgs(original, tools::verifyArgs(original,
BOOST_CURRENT_FUNCTION, __func__,
static_cast< typename BaseType::UnambiguousBaseType* >(this)); static_cast< typename BaseType::UnambiguousBaseType* >(this));
typename BaseType::MutexType aGuard( BaseType::m_aMutex ); typename BaseType::MutexType aGuard( BaseType::m_aMutex );

4
include/canvas/debug.hxx
View File

@@ -33,7 +33,7 @@
# if OSL_DEBUG_LEVEL > 2 # if OSL_DEBUG_LEVEL > 2
# include <osl/diagnose.h> # include <osl/diagnose.h>
# define SHARED_PTR_LEFTOVERS(a) OSL_TRACE("%s\n%s: Unreachable objects still use %d bytes\n", \ # 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) ) find_unreachable_objects(true) )
# else # else
/** This macro shows how much memory is still used by shared_ptrs /** This macro shows how much memory is still used by shared_ptrs
@@ -44,7 +44,7 @@
from deletion by circular references. from deletion by circular references.
*/ */
# define SHARED_PTR_LEFTOVERS(a) OSL_TRACE("%s\n%s: Unreachable objects still use %d bytes\n", \ # 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) ) find_unreachable_objects(false) )
# endif # endif

1
include/canvas/verifyinput.hxx
View File

@@ -27,7 +27,6 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <algorithm> #include <algorithm>
#include <boost/current_function.hpp>
#include <canvas/canvastoolsdllapi.h> #include <canvas/canvastoolsdllapi.h>