From e5356fb099d5fe0d476fa99697e4a7e04688f9ee Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 26 Aug 2020 15:44:06 +0200 Subject: [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 --- sdext/source/presenter/PresenterAccessibility.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sdext') diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 14474f224e61..951a18c5fca5 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -684,14 +684,14 @@ Reference SAL_CALL PresenterAccessible::getAccessibleContext void SAL_CALL PresenterAccessible::focusGained (const css::awt::FocusEvent&) { - SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusGained at " << this + SAL_INFO("sdext.presenter", __func__ << ": PresenterAccessible::focusGained at " << this << " and window " << mxMainWindow.get()); AccessibleFocusManager::Instance()->FocusObject(mpAccessibleConsole); } void SAL_CALL PresenterAccessible::focusLost (const css::awt::FocusEvent&) { - SAL_INFO("sdext.presenter", OSL_THIS_FUNC << ": PresenterAccessible::focusLost at " << this); + SAL_INFO("sdext.presenter", __func__ << ": PresenterAccessible::focusLost at " << this); AccessibleFocusManager::Instance()->FocusObject(nullptr); } @@ -1410,7 +1410,7 @@ Sequence SAL_CALL ThrowIfDisposed(); #if OSL_DEBUG_LEVEL > 0 - SAL_INFO( "sdext.presenter", OSL_THIS_FUNC << " at " << this << ", " << nIndex << " returns empty set" ); + SAL_INFO( "sdext.presenter", __func__ << " at " << this << ", " << nIndex << " returns empty set" ); for (sal_Int32 nAttributeIndex(0), nAttributeCount(rRequestedAttributes.getLength()); nAttributeIndex < nAttributeCount; ++nAttributeIndex) -- cgit