OSL_THIS_FUNC is a rip-off of BOOST_CURRENT_FUNCTION so we can use that

as a direct drop in I guess

Change-Id: I3add63f1459f4e659019bd6db54da2f5431958ce
Reviewed-on: https://gerrit.libreoffice.org/21941
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

29 files changed, 7 insertions, 37 deletions

diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx
index 9cc594c2d22f..8410c6d9ffc4 100644
--- a/accessibility/inc/pch/precompiled_acc.hxx
+++ b/accessibility/inc/pch/precompiled_acc.hxx
@@ -52,7 +52,6 @@
 #include <typeinfo>
 #include <utility>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index ee9952a5f18a..0da4c042141d 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -55,7 +55,6 @@
 #include <utility>
 #include <vector>
 #include <boost/checked_delete.hpp>
-#include <boost/current_function.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/optional.hpp>
diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx
index 92f700935906..95cf1c51e764 100644
--- a/comphelper/inc/pch/precompiled_comphelper.hxx
+++ b/comphelper/inc/pch/precompiled_comphelper.hxx
@@ -38,7 +38,6 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index 9a2d6e819334..a30b041a0c8f 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -32,9 +32,6 @@
 #include <osl/diagnose.h>
 #include <osl/thread.h>
 
-#include <boost/current_function.hpp>
-
-
 namespace comphelper {
 
 
@@ -162,7 +159,7 @@ namespace comphelper {
             caught >>= exception;
             sMessage += OString( exception.Message.getStr(), exception.Message.getLength(), osl_getThreadTextEncoding() );
             sMessage += "\nin function:\n";
-            sMessage += BOOST_CURRENT_FUNCTION;
+            sMessage += OSL_THIS_FUNC;
             sMessage += "\n";
             OSL_FAIL( sMessage.getStr() );
         }
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index bc83276a3a14..4e7a035b9e2c 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -46,8 +46,6 @@
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/storagehelper.hxx>
 
-#include <boost/current_function.hpp>
-
 using namespace ::com::sun::star;
 
 namespace comphelper {
@@ -277,7 +275,7 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
     else
     {
         // the mediatype is not known
-        OUString aMsg(BOOST_CURRENT_FUNCTION);
+        OUString aMsg(OSL_THIS_FUNC);
         aMsg += ":";
         aMsg += OUString::number(__LINE__);
         aMsg += ": unknown media type '";
diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
index df8fe04d6f34..1097ef285c46 100644
--- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
+++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
@@ -46,7 +46,6 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 6885b901a881..976d2848e65c 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -54,7 +54,6 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/optional.hpp>
diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx
index ae602125a715..e0c606f97638 100644
--- a/dbaccess/inc/pch/precompiled_dbmm.hxx
+++ b/dbaccess/inc/pch/precompiled_dbmm.hxx
@@ -47,7 +47,6 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <osl/diagnose.h>
diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
index b3756d1a94dd..8ed9ff93c5ca 100644
--- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
+++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx
@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <osl/diagnose.h>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index afc4ed02e71e..f9498b196d44 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -49,7 +49,6 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/ref.hpp>
diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx
index b26229ffd2ae..e6e0d092bf64 100644
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ b/framework/inc/pch/precompiled_fwe.hxx
@@ -49,7 +49,6 @@
 #include <utility>
 #include <vector>
 #include <boost/bind.hpp>
-#include <boost/current_function.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <osl/conditn.hxx>
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index 530cc3adaeb9..022786f5ce67 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -53,7 +53,6 @@
 #include <utility>
 #include <vector>
 #include <boost/bind.hpp>
-#include <boost/current_function.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/noncopyable.hpp>
diff --git a/reportdesign/inc/pch/precompiled_rptxml.hxx b/reportdesign/inc/pch/precompiled_rptxml.hxx
index 46e8f8f0de1e..06858fe3809b 100644
--- a/reportdesign/inc/pch/precompiled_rptxml.hxx
+++ b/reportdesign/inc/pch/precompiled_rptxml.hxx
@@ -27,7 +27,6 @@
 #include <unordered_set>
 #include <vector>
 #include <boost/bind.hpp>
-#include <boost/current_function.hpp>
 #include <boost/noncopyable.hpp>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 2be112c912ab..505a163ecdc7 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -58,7 +58,6 @@
 #include <vector>
 #include <boost/bind.hpp>
 #include <boost/checked_delete.hpp>
-#include <boost/current_function.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/math/special_functions/log1p.hpp>
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 79eb9fee59eb..8fac4564fe31 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -26,7 +26,6 @@
 #include <cppuhelper/weakref.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <boost/noncopyable.hpp>
-#include <boost/current_function.hpp>
 #include <vcl/scrbar.hxx>
 #include "sddllapi.h"
 #include <memory>
diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx
index 8af7a5af9afd..8d36b9675164 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -53,7 +53,6 @@
 #include <typeinfo>
 #include <utility>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/intrusive_ptr.hpp>
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 18ff749ef7d7..1380dbaf0d31 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <boost/current_function.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/gdimtf.hxx>
diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx
index b17cd6626aa5..8f10a551d219 100644
--- a/slideshow/source/engine/transitions/transitionfactorytab.cxx
+++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <boost/current_function.hpp>
 #include <basegfx/numeric/ftools.hxx>
 #include <com/sun/star/animations/TransitionType.hpp>
 #include <com/sun/star/animations/TransitionSubType.hpp>
diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx
index 5e4209ab8d51..e278d609c464 100644
--- a/slideshow/source/engine/waitsymbol.cxx
+++ b/slideshow/source/engine/waitsymbol.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <boost/current_function.hpp>
 #include <canvas/canvastools.hxx>
 
 #include <comphelper/anytostring.hxx>
diff --git a/slideshow/source/inc/delayevent.hxx b/slideshow/source/inc/delayevent.hxx
index 8cf7c5c6aecd..2e99ab711004 100644
--- a/slideshow/source/inc/delayevent.hxx
+++ b/slideshow/source/inc/delayevent.hxx
@@ -126,10 +126,10 @@ inline EventSharedPtr makeDelay_(
 }
 
 #define makeDelay(f, t, d) makeDelay_(f, t,                   \
-        BOOST_CURRENT_FUNCTION, __FILE__, __LINE__,           \
+        OSL_THIS_FUNC, __FILE__, __LINE__,           \
         d)
 #define makeEvent(f, d) makeDelay_(f, 0.0,                  \
-        BOOST_CURRENT_FUNCTION, __FILE__, __LINE__,         \
+        OSL_THIS_FUNC, __FILE__, __LINE__,         \
         d)
 
 #endif // OSL_DEBUG_LEVEL <= 1
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index e518cfcf10b6..8075743d3ad4 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <comphelper/random.hxx>
+#include <osl/diagnose.h>
 #include <vector>
 
 #include <cppcanvas/color.hxx>
@@ -37,7 +38,6 @@
 #include "hslcolor.hxx"
 
 #include <boost/shared_ptr.hpp>
-#include <boost/current_function.hpp>
 
 #include <functional>
 #include <cstdlib>
@@ -323,7 +323,7 @@ namespace slideshow
                     OSL_TRACE( "%s: while retrieving property %s, cannot extract Any of type %s\n",
                                OUStringToOString( propName,
                                                          RTL_TEXTENCODING_ASCII_US ).getStr(),
-                               BOOST_CURRENT_FUNCTION,
+                               OSL_THIS_FUNC,
                                OUStringToOString( a.getValueTypeRef()->pTypeName,
                                                          RTL_TEXTENCODING_ASCII_US ).getStr() );
 #endif
@@ -356,7 +356,7 @@ namespace slideshow
                     OSL_TRACE( "%s: while retrieving property %s, cannot extract Any of type %s to interface\n",
                                OUStringToOString( propName,
                                                          RTL_TEXTENCODING_ASCII_US ).getStr(),
-                               BOOST_CURRENT_FUNCTION,
+                               OSL_THIS_FUNC,
                                OUStringToOString( a.getValueTypeRef()->pTypeName,
                                                          RTL_TEXTENCODING_ASCII_US ).getStr() );
 #endif
diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx
index c4ee8a0492ec..8dcde82152ac 100644
--- a/starmath/inc/pch/precompiled_sm.hxx
+++ b/starmath/inc/pch/precompiled_sm.hxx
@@ -40,7 +40,6 @@
 #include <unordered_map>
 #include <vector>
 #include <boost/checked_delete.hpp>
-#include <boost/current_function.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/optional.hpp>
 #include <boost/optional/optional.hpp>
diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx
index a7ade9bc6cee..a4bd883e673a 100644
--- a/svl/inc/pch/precompiled_svl.hxx
+++ b/svl/inc/pch/precompiled_svl.hxx
@@ -29,7 +29,6 @@
 #include <stddef.h>
 #include <string.h>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <osl/diagnose.h>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 0ec82a82788d..4284e8ddcf2b 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -51,7 +51,6 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/optional.hpp>
diff --git a/tools/inc/pch/precompiled_tl.hxx b/tools/inc/pch/precompiled_tl.hxx
index a9619afb0549..7cf7eb750973 100644
--- a/tools/inc/pch/precompiled_tl.hxx
+++ b/tools/inc/pch/precompiled_tl.hxx
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <vector>
 #include <boost/checked_delete.hpp>
-#include <boost/current_function.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/optional/optional.hpp>
 #include <boost/rational.hpp>
diff --git a/unotools/inc/pch/precompiled_utl.hxx b/unotools/inc/pch/precompiled_utl.hxx
index 960dae732673..97ed1b6d5777 100644
--- a/unotools/inc/pch/precompiled_utl.hxx
+++ b/unotools/inc/pch/precompiled_utl.hxx
@@ -34,7 +34,6 @@
 #include <string.h>
 #include <unordered_map>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/optional.hpp>
 #include <osl/detail/file.h>
 #include <osl/diagnose.h>
diff --git a/uui/inc/pch/precompiled_uui.hxx b/uui/inc/pch/precompiled_uui.hxx
index afb7828e8a14..08168691660d 100644
--- a/uui/inc/pch/precompiled_uui.hxx
+++ b/uui/inc/pch/precompiled_uui.hxx
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/noncopyable.hpp>
 #include <osl/conditn.hxx>
 #include <osl/diagnose.h>
diff --git a/vbahelper/inc/pch/precompiled_vbahelper.hxx b/vbahelper/inc/pch/precompiled_vbahelper.hxx
index 0631256b4d90..1c336d21655c 100644
--- a/vbahelper/inc/pch/precompiled_vbahelper.hxx
+++ b/vbahelper/inc/pch/precompiled_vbahelper.hxx
@@ -31,7 +31,6 @@
 #include <unordered_map>
 #include <utility>
 #include <vector>
-#include <boost/current_function.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <osl/diagnose.h>
diff --git a/xmlscript/inc/pch/precompiled_xmlscript.hxx b/xmlscript/inc/pch/precompiled_xmlscript.hxx
index 0852cd05f559..8b31fb6d4355 100644
--- a/xmlscript/inc/pch/precompiled_xmlscript.hxx
+++ b/xmlscript/inc/pch/precompiled_xmlscript.hxx
@@ -20,7 +20,6 @@
  ./bin/update_pch_bisect ./xmlscript/inc/pch/precompiled_xmlscript.hxx "/opt/lo/bin/make xmlscript.build" --find-conflicts
 */
 
-#include <boost/current_function.hpp>
 #include <osl/diagnose.h>
 #include <rtl/instance.hxx>
 #include <rtl/unload.h>