summaryrefslogtreecommitdiff
path: root/slideshow/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-08-26 15:44:06 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-08-26 20:49:22 +0200
commite5356fb099d5fe0d476fa99697e4a7e04688f9ee (patch)
tree8e551a762d03451896315507b68d72551c1bc6b6 /slideshow/source
parentd84e590486e2c26212931de80a84181d7aca7bbe (diff)
[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>
Diffstat (limited to 'slideshow/source')
-rw-r--r--slideshow/source/inc/delayevent.hxx4
-rw-r--r--slideshow/source/inc/tools.hxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx
index 27bdd5aab403..631553915dca 100644
--- a/slideshow/source/inc/delayevent.hxx
+++ b/slideshow/source/inc/delayevent.hxx
@@ -125,10 +125,10 @@ inline EventSharedPtr makeDelay_(
}
#define makeDelay(f, t, d) makeDelay_(f, t, \
- OSL_THIS_FUNC, __FILE__, __LINE__, \
+ __func__, __FILE__, __LINE__, \
d)
#define makeEvent(f, d) makeDelay_(f, 0.0, \
- OSL_THIS_FUNC, __FILE__, __LINE__, \
+ __func__, __FILE__, __LINE__, \
d)
#endif // OSL_DEBUG_LEVEL <= 1
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index 632933feecd6..801cdf025d69 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -289,7 +289,7 @@ namespace slideshow
bool const bRet = css::uno::fromAny(a, &rValue);
#if OSL_DEBUG_LEVEL > 0
if( !bRet )
- SAL_INFO("slideshow", OSL_THIS_FUNC << ": while retrieving property " << propName << ", cannot extract Any of type "
+ SAL_INFO("slideshow", __func__ << ": while retrieving property " << propName << ", cannot extract Any of type "
<< a.getValueTypeRef()->pTypeName);
#endif
return bRet;
@@ -318,7 +318,7 @@ namespace slideshow
bool const bRet = rIfc.is();
#if OSL_DEBUG_LEVEL > 0
if( !bRet )
- SAL_INFO("slideshow", OSL_THIS_FUNC << ": while retrieving property " << propName << ", cannot extract Any of type "
+ SAL_INFO("slideshow", __func__ << ": while retrieving property " << propName << ", cannot extract Any of type "
<< a.getValueTypeRef()->pTypeName << " to interface");
#endif
return bRet;