[Libreoffice-commits] core.git: canvas/source include/canvas include/tools
Michael Stahl
mstahl at redhat.com
Thu Jan 28 02:36:29 PST 2016
canvas/source/cairo/cairo_canvashelper_text.cxx | 2 -
canvas/source/opengl/ogl_canvascustomsprite.cxx | 2 -
canvas/source/opengl/ogl_spritedevicehelper.cxx | 2 -
canvas/source/vcl/canvashelper.cxx | 4 +-
include/canvas/base/bitmapcanvasbase.hxx | 2 -
include/canvas/base/canvasbase.hxx | 34 ++++++++++++------------
include/canvas/base/canvascustomspritebase.hxx | 6 ++--
include/canvas/base/graphicdevicebase.hxx | 8 ++---
include/canvas/base/integerbitmapbase.hxx | 8 ++---
include/canvas/base/spritecanvasbase.hxx | 8 ++---
include/canvas/debug.hxx | 4 +-
include/canvas/verifyinput.hxx | 1
include/tools/diagnose_ex.h | 11 ++++---
13 files changed, 47 insertions(+), 45 deletions(-)
New commits:
commit 863e1f0035430316d2b52c667737905a07875438
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Jan 28 11:33:04 2016 +0100
Revert "canvas: replace BOOST_CURRENT_FUNCTION with __func__"
This reverts commit d01f7db4b5f51d1be8ba210625f4ad1ebf5c6e8f.
Revert "tools: replace BOOST_CURRENT_FUNCTION with __func__"
This reverts commit 10303054067258016fbbae018ea848f74adc4964.
Surprisingly MSVC 2013 does not support __func__ - need 2015.
Change-Id: I7084d7b79784b34a8f40fb986d10ffefbabae7fb
diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index 3d975cb..6f37f7f3 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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
const_cast<rendering::XCanvas*>(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 7170534..b410c56 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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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 e1ebe43..0932e0c 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", __func__);
+ SAL_INFO("canvas.ogl", BOOST_CURRENT_FUNCTION );
}
void SpriteDeviceHelper::show( const ::rtl::Reference< CanvasCustomSprite >& xSprite )
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 441590b..bee83b1 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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
mpDevice,
4,
bModulateColors ? 3 : 0 );
@@ -1195,7 +1195,7 @@ namespace vclcanvas
"outdev null. Are we disposed?" );
::canvas::tools::verifyInput( renderState,
- __func__,
+ BOOST_CURRENT_FUNCTION,
mpDevice,
2,
eColorType == IGNORE_COLOR ? 0 : 3 );
diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx
index b4b4936..bd144f5 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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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 1af4d92..9bb513c 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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -156,7 +156,7 @@ namespace canvas
std::exception) override
{
tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -175,7 +175,7 @@ namespace canvas
std::exception) override
{
tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -194,7 +194,7 @@ namespace canvas
std::exception) override
{
tools::verifyArgs(xPolyPolygon, viewState, renderState,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -214,7 +214,7 @@ namespace canvas
std::exception) override
{
tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -290,7 +290,7 @@ namespace canvas
std::exception) override
{
tools::verifyArgs(xPolyPolygon, viewState, renderState,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -310,7 +310,7 @@ namespace canvas
std::exception) override
{
tools::verifyArgs(xPolyPolygon, viewState, renderState, textures,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -349,7 +349,7 @@ namespace canvas
// dummy, to keep argPos in sync
fontRequest,
fontMatrix,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -364,7 +364,7 @@ namespace canvas
css::uno::RuntimeException) override
{
tools::verifyArgs(aFilter,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -384,7 +384,7 @@ namespace canvas
std::exception) override
{
tools::verifyArgs(xFont, viewState, renderState,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx
index 830bf9b..9813f5b 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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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 b679cf4..a6db316 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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -199,7 +199,7 @@ namespace canvas
css::uno::RuntimeException) override
{
tools::verifyBitmapSize(size,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -213,7 +213,7 @@ namespace canvas
std::exception) override
{
tools::verifyBitmapSize(size,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
@@ -225,7 +225,7 @@ namespace canvas
css::uno::RuntimeException) override
{
tools::verifyBitmapSize(size,
- __func__,
+ BOOST_CURRENT_FUNCTION,
static_cast< UnambiguousBaseType* >(this));
MutexType aGuard( BaseType::m_aMutex );
diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx
index 0d6440a..4995578 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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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 9656be3..ba3ae03 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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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,
- __func__,
+ BOOST_CURRENT_FUNCTION,
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 f8b8d29..308026a 100644
--- a/include/canvas/debug.hxx
+++ b/include/canvas/debug.hxx
@@ -33,7 +33,7 @@
# if OSL_DEBUG_LEVEL > 2
# include <osl/diagnose.h>
# define SHARED_PTR_LEFTOVERS(a) OSL_TRACE("%s\n%s: Unreachable objects still use %d bytes\n", \
- __func__, a, \
+ BOOST_CURRENT_FUNCTION, 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", \
- __func__, a, \
+ BOOST_CURRENT_FUNCTION, a, \
find_unreachable_objects(false) )
# endif
diff --git a/include/canvas/verifyinput.hxx b/include/canvas/verifyinput.hxx
index d8e95ac..615f529 100644
--- a/include/canvas/verifyinput.hxx
+++ b/include/canvas/verifyinput.hxx
@@ -27,6 +27,7 @@
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <algorithm>
+#include <boost/current_function.hpp>
#include <canvas/canvastoolsdllapi.h>
diff --git a/include/tools/diagnose_ex.h b/include/tools/diagnose_ex.h
index 4ece912..7dec15c 100644
--- a/include/tools/diagnose_ex.h
+++ b/include/tools/diagnose_ex.h
@@ -36,6 +36,7 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any& caughtException,
#include <cppuhelper/exc_hlp.hxx>
#include <osl/diagnose.h>
#include <osl/thread.h>
+ #include <boost/current_function.hpp>
/** reports a caught UNO exception via OSL diagnostics
@@ -43,7 +44,7 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any& caughtException,
handling is not correct ....
*/
#define DBG_UNHANDLED_EXCEPTION() \
- DbgUnhandledException( ::cppu::getCaughtException(), __func__, SAL_DETAIL_WHERE);
+ DbgUnhandledException( ::cppu::getCaughtException(), BOOST_CURRENT_FUNCTION, SAL_DETAIL_WHERE);
#else // OSL_DEBUG_LEVEL
#define DBG_UNHANDLED_EXCEPTION()
@@ -55,14 +56,14 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any& caughtException,
#define ENSURE_ARG_OR_THROW(c, m) if( !(c) ) { \
OSL_ENSURE(c, m); \
throw css::lang::IllegalArgumentException( \
- OUStringLiteral(__func__) \
+ OUStringLiteral(BOOST_CURRENT_FUNCTION) \
+ ",\n" m, \
css::uno::Reference< css::uno::XInterface >(), \
0 ); }
#define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \
OSL_ENSURE(c, m); \
throw css::lang::IllegalArgumentException( \
- OUStringLiteral(__func__) \
+ OUStringLiteral(BOOST_CURRENT_FUNCTION) \
+ ",\n" m, \
ifc, \
arg ); }
@@ -74,14 +75,14 @@ TOOLS_DLLPUBLIC void DbgUnhandledException(const css::uno::Any& caughtException,
if( !(c) ){ \
OSL_ENSURE(c, m); \
throw css::uno::RuntimeException( \
- OUStringLiteral(__func__) + ",\n" m, \
+ OUStringLiteral(BOOST_CURRENT_FUNCTION) + ",\n" m, \
css::uno::Reference< css::uno::XInterface >() ); }
#define ENSURE_OR_THROW2(c, m, ifc) \
if( !(c) ) { \
OSL_ENSURE(c, m); \
throw css::uno::RuntimeException( \
- OUStringLiteral(__func__) + ",\n" m, \
+ OUStringLiteral(BOOST_CURRENT_FUNCTION) + ",\n" m, \
ifc ); }
/** This macro asserts the given condition (in debug mode), and
More information about the Libreoffice-commits
mailing list