diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-08-26 15:44:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-08-26 20:49:22 +0200 |
| commit | e5356fb099d5fe0d476fa99697e4a7e04688f9ee (patch) | |
| tree | 8e551a762d03451896315507b68d72551c1bc6b6 /comphelper | |
| parent | d84e590486e2c26212931de80a84181d7aca7bbe (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 'comphelper')
| -rw-r--r-- | comphelper/source/misc/documentinfo.cxx | 2 | ||||
| -rw-r--r-- | comphelper/source/misc/storagehelper.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx index 102766778f95..3b191f956866 100644 --- a/comphelper/source/misc/documentinfo.cxx +++ b/comphelper/source/misc/documentinfo.cxx @@ -152,7 +152,7 @@ namespace comphelper { caught >>= exception; SAL_WARN( "comphelper", "caught an exception!\ntype : " << caught.getValueTypeName() << "\nmessage: " << exception - << "\nin function:\n" << OSL_THIS_FUNC); + << "\nin function:\n" << __func__); } return sTitle; diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 01cec5831223..9c2f47444513 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -284,7 +284,7 @@ sal_Int32 OStorageHelper::GetXStorageFormat( else { // the mediatype is not known - OUString aMsg = OUStringLiteral(OSL_THIS_FUNC) + OUString aMsg = OUStringLiteral(__func__) + ":" + OUString::number(__LINE__) + ": unknown media type '" |