mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Caolán McNamara
2016-01-30 16:06:11 +00:00
parent 1ef9f3988e
commit e9a2e0460e
29 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
accessibility/inc/pch/precompiled_acc.hxx
View File

@@ -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>

1
chart2/inc/pch/precompiled_chartcontroller.hxx
View File

@@ -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>

1
comphelper/inc/pch/precompiled_comphelper.hxx
View File

@@ -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>

5
comphelper/source/misc/documentinfo.cxx
View File

@@ -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() );
}

4
comphelper/source/misc/storagehelper.cxx
View File

@@ -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 '";

1
cppcanvas/inc/pch/precompiled_cppcanvas.hxx
View File

@@ -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>

1
cui/inc/pch/precompiled_cui.hxx
View File

@@ -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>

1
dbaccess/inc/pch/precompiled_dbmm.hxx
View File

@@ -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>

1
drawinglayer/inc/pch/precompiled_drawinglayer.hxx
View File

@@ -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>

1
editeng/inc/pch/precompiled_editeng.hxx
View File

@@ -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>

1
framework/inc/pch/precompiled_fwe.hxx
View File

@@ -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>

1
framework/inc/pch/precompiled_fwk.hxx
View File

@@ -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>

1
reportdesign/inc/pch/precompiled_rptxml.hxx
View File

@@ -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>

1
sc/inc/pch/precompiled_sc.hxx
View File

@@ -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>

1
sd/source/ui/inc/SlideSorter.hxx
View File

@@ -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>

1
slideshow/inc/pch/precompiled_slideshow.hxx
View File

@@ -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>

1
slideshow/source/engine/rehearsetimingsactivity.cxx
View File

@@ -18,7 +18,6 @@
*/
#include <boost/current_function.hpp>
#include <rtl/ustrbuf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/gdimtf.hxx>

1
slideshow/source/engine/transitions/transitionfactorytab.cxx
View File

@@ -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>

1
slideshow/source/engine/waitsymbol.cxx
View File

@@ -18,7 +18,6 @@
*/
#include <boost/current_function.hpp>
#include <canvas/canvastools.hxx>
#include <comphelper/anytostring.hxx>

4
slideshow/source/inc/delayevent.hxx
View File

@@ -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

6
slideshow/source/inc/tools.hxx
View File

@@ -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

1
starmath/inc/pch/precompiled_sm.hxx
View File

@@ -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>

1
svl/inc/pch/precompiled_svl.hxx
View File

@@ -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>

1
sw/inc/pch/precompiled_sw.hxx
View File

@@ -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>

1
tools/inc/pch/precompiled_tl.hxx
View File

@@ -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>

1
unotools/inc/pch/precompiled_utl.hxx
View File

@@ -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>

1
uui/inc/pch/precompiled_uui.hxx
View File

@@ -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>

1
vbahelper/inc/pch/precompiled_vbahelper.hxx
View File

@@ -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>

1
xmlscript/inc/pch/precompiled_xmlscript.hxx
View File

@@ -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>