diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-30 16:06:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-31 12:29:07 +0000 |
| commit | e9a2e0460e3941e9741b368eeaf58b5afbae09bf (patch) | |
| tree | 6d6d0cc3a1f98560ca479d301c629a04c9a1de91 /slideshow | |
| parent | 1ef9f3988ee4dcbc77e1fdefa20442e044a67d4d (diff) | |
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>
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/inc/pch/precompiled_slideshow.hxx | 1 | ||||
| -rw-r--r-- | slideshow/source/engine/rehearsetimingsactivity.cxx | 1 | ||||
| -rw-r--r-- | slideshow/source/engine/transitions/transitionfactorytab.cxx | 1 | ||||
| -rw-r--r-- | slideshow/source/engine/waitsymbol.cxx | 1 | ||||
| -rw-r--r-- | slideshow/source/inc/delayevent.hxx | 4 | ||||
| -rw-r--r-- | slideshow/source/inc/tools.hxx | 6 |
6 files changed, 5 insertions, 9 deletions
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 |