[Libreoffice-commits] core.git: include/sal vcl/win
Jan-Marek Glogowski (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jan 28 14:13:23 UTC 2021
include/sal/log-areas.dox | 2 +-
vcl/win/dtrans/DOTransferable.cxx | 8 ++++----
vcl/win/dtrans/MtaOleClipb.cxx | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit f974f3941ce593005a99d75f3ef0307000313235
Author: Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Jan 28 10:34:48 2021 +0100
Commit: Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Thu Jan 28 15:12:44 2021 +0100
WIN move dtrans log to vcl.win.dtrans
Missing from commit 9613165239ade3f0b4d3d06e238430aabc9fcff3
("WIN move dtrans code into vcl/win/dtrans").
Change-Id: I257017ae617f72c3ce48828ee34e9246af08fd8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110073
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 0d286366d598..647f5c1902ec 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -506,6 +506,7 @@ certain functionality.
@li @c vcl.virdev
@li @c vcl.watchdog
@li @c vcl.window
+ at li @c vcl.win.dtrans
@li @c vcl.wmf
@section winaccessibility
@@ -607,7 +608,6 @@ certain functionality.
@li @c configmgr.dconf
@li @c cppcanvas
@li @c cppcanvas.emf
- at li @c dtrans
@li @c helpcompiler
@li @c idl
@li @c javaunohelper
diff --git a/vcl/win/dtrans/DOTransferable.cxx b/vcl/win/dtrans/DOTransferable.cxx
index 409c671e3de4..0c61ddcccc77 100644
--- a/vcl/win/dtrans/DOTransferable.cxx
+++ b/vcl/win/dtrans/DOTransferable.cxx
@@ -92,7 +92,7 @@ void clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, CDOTransferable::
HRESULT hr = pStream->Stat(&aStat, STATFLAG_NONAME);
if (FAILED(hr))
{
- SAL_WARN("dtrans", "clipDataToByteStream: Stat() failed");
+ SAL_WARN("vcl.win.dtrans", "clipDataToByteStream: Stat() failed");
return;
}
@@ -103,18 +103,18 @@ void clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, CDOTransferable::
hr = pStream->Seek(li, STREAM_SEEK_SET, nullptr);
if (FAILED(hr))
{
- SAL_WARN("dtrans", "clipDataToByteStream: Seek() failed");
+ SAL_WARN("vcl.win.dtrans", "clipDataToByteStream: Seek() failed");
}
ULONG nRead = 0;
hr = pStream->Read(aByteSequence.getArray(), nMemSize, &nRead);
if (FAILED(hr))
{
- SAL_WARN("dtrans", "clipDataToByteStream: Read() failed");
+ SAL_WARN("vcl.win.dtrans", "clipDataToByteStream: Read() failed");
}
if (nRead < nMemSize)
{
- SAL_WARN("dtrans", "clipDataToByteStream: Read() was partial");
+ SAL_WARN("vcl.win.dtrans", "clipDataToByteStream: Read() was partial");
}
return;
diff --git a/vcl/win/dtrans/MtaOleClipb.cxx b/vcl/win/dtrans/MtaOleClipb.cxx
index d894ae7b5a48..6fc789e27d9d 100644
--- a/vcl/win/dtrans/MtaOleClipb.cxx
+++ b/vcl/win/dtrans/MtaOleClipb.cxx
@@ -239,7 +239,7 @@ CMtaOleClipboard::CMtaOleClipboard( ) :
m_ClipboardChangedEventCount( 0 )
{
OSL_ASSERT( nullptr != m_hEvtThrdReady );
- SAL_WARN_IF(!m_hEvtWndDisposed, "dtrans", "CreateEventW failed: m_hEvtWndDisposed is nullptr");
+ SAL_WARN_IF(!m_hEvtWndDisposed, "vcl.win.dtrans", "CreateEventW failed: m_hEvtWndDisposed is nullptr");
s_theMtaOleClipboardInst = this;
@@ -520,7 +520,7 @@ LRESULT CMtaOleClipboard::sendMessage( UINT msg, WPARAM wParam, LPARAM lParam )
bool CMtaOleClipboard::postMessage( UINT msg, WPARAM wParam, LPARAM lParam )
{
bool const ret = PostMessageW(m_hwndMtaOleReqWnd, msg, wParam, lParam);
- SAL_WARN_IF(!ret, "dtrans", "ERROR: PostMessage() failed!");
+ SAL_WARN_IF(!ret, "vcl.win.dtrans", "ERROR: PostMessage() failed!");
return ret;
}
@@ -576,7 +576,7 @@ LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARA
case MSG_REGCLIPVIEWER:
{
MsgCtx* pMsgCtx = reinterpret_cast<MsgCtx*>(lParam);
- SAL_WARN_IF(!pMsgCtx, "dtrans", "pMsgCtx is nullptr");
+ SAL_WARN_IF(!pMsgCtx, "vcl.win.dtrans", "pMsgCtx is nullptr");
pImpl->onRegisterClipViewer(
reinterpret_cast<CMtaOleClipboard::LPFNC_CLIPVIEWER_CALLBACK_t>(wParam));
More information about the Libreoffice-commits
mailing list