vcl/win/gdi/DWriteTextRenderer.cxx | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 40176bd39c94c32ac0269d9994e8e50518d84467
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Mar 29 07:57:36 2024 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Mar 29 09:30:22 2024 +0100
Simplify a bit
Change-Id: Idb10d594829eeffd9b37e5ae971283b2a9730168
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165475
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx
b/vcl/win/gdi/DWriteTextRenderer.cxx
index 1d5985dfceac..bb0f7e6b7661 100644
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -79,19 +79,15 @@ IDWriteRenderingParams* lclSetRenderingMode(IDWriteFactory*
pDWriteFactory, DWRI
}
#ifdef SAL_LOG_WARN
-HRESULT checkResult(HRESULT hr, const char* file, size_t line)
+HRESULT checkResult(HRESULT hr, const char* location)
{
- if (FAILED(hr))
- {
- OUString sLocationString = OUString::createFromAscii(file) + ":" +
OUString::number(line) + " ";
- SAL_DETAIL_LOG_STREAM(SAL_DETAIL_ENABLE_LOG_WARN,
::SAL_DETAIL_LOG_LEVEL_WARN,
- "vcl.gdi", sLocationString.toUtf8().getStr(),
- "HRESULT failed with: 0x" <<
OUString::number(hr, 16) << ": " << WindowsErrorStringFromHRESULT(hr));
- }
+ SAL_DETAIL_LOG_STREAM(SAL_DETAIL_ENABLE_LOG_WARN && FAILED(hr),
::SAL_DETAIL_LOG_LEVEL_WARN,
+ "vcl.gdi", location,
+ "HRESULT failed with: 0x" << OUString::number(hr,
16) << ": " << WindowsErrorStringFromHRESULT(hr));
return hr;
}
-#define CHECKHR(funct) checkResult(funct, __FILE__, __LINE__)
+#define CHECKHR(funct) checkResult(funct, SAL_WHERE)
#else
#define CHECKHR(funct) (funct)
#endif
