diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-01-12 09:12:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-01-12 10:19:01 +0100 |
| commit | 694b400f56842cd29ad1a960853cde5aef91e4f0 (patch) | |
| tree | e74a9287eb3a9460e307466274d3cd16ddd091e5 /vcl/win/dtrans/WinClipboard.hxx | |
| parent | 71d04d705b7880410c8a8db1c4974a51e4b62447 (diff) | |
Revert "WIN replace clipboard update thread with Idle" et al
This reverts commit 9617bc9544cd569066ff187c3672a87fe28fe17f "WIN replace
clipboard update thread with Idle" plus follow-up commits
f5ab8bcbfd20ecce4a358f62ee3f81b8b968a5de "WIN don't notify clipboard change with
SolarMutex" and c921f9bd64187823af2356d7a8ceb77444c17219 "Release solar mutex
before using an apartment-threaded COM object".
The Gerrit Jenkins Windows builds had started to abort after timeout for almost
all builds now. Going back to before the youngest of the above three commits,
c921f9bd64187823af2356d7a8ceb77444c17219 "Release solar mutex before using an
apartment-threaded COM object" did not improve things (see the
<https://gerrit.libreoffice.org/c/core/+/109100> "Test build #1, DO NOT SUBMIT"
chain, where three out of three of the Gerrit Jenkins Windows builds timed out).
But going back to before the oldest of the above three commits,
9617bc9544cd569066ff187c3672a87fe28fe17f "WIN replace clipboard update thread
with Idle", does look promising (see the
<https://gerrit.libreoffice.org/c/core/+/109155> "Test build #7, DO NOT SUBMIT"
chain, where three out of three of the Gerrit Jenkins Windows builds succeeded).
So the hope is that reverting all three commits brings back a green master,
allowing us to understand and fix the actual issue later.
Change-Id: Ie83ba742f216396b49f561d19c2cda7758740502
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109158
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/win/dtrans/WinClipboard.hxx')
| -rw-r--r-- | vcl/win/dtrans/WinClipboard.hxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vcl/win/dtrans/WinClipboard.hxx b/vcl/win/dtrans/WinClipboard.hxx index 06bcdce0fc64..1b0a05a3450d 100644 --- a/vcl/win/dtrans/WinClipboard.hxx +++ b/vcl/win/dtrans/WinClipboard.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <osl/conditn.hxx> -#include <vcl/Idle.hxx> #include "MtaOleClipb.hxx" @@ -71,7 +70,6 @@ class CWinClipboard final CXNotifyingDataObject* m_pCurrentClipContent; com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> m_foreignContent; osl::Mutex m_ClipContentMutex; - Idle m_aNotifyClipboardChangeIdle; static osl::Mutex s_aMutex; static CWinClipboard* s_pCWinClipbImpl; @@ -82,8 +80,7 @@ class CWinClipboard final void registerClipboardViewer(); void unregisterClipboardViewer(); - static void WINAPI onWM_CLIPBOARDUPDATE(); - DECL_DLLPRIVATE_LINK(ClipboardContentChangedHdl, Timer*, void); + static void WINAPI onClipboardContentChanged(); public: CWinClipboard(const css::uno::Reference<css::uno::XComponentContext>& rxContext, |