diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-06-07 13:56:04 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2020-06-08 11:45:04 +0200 |
| commit | db0669653444c604bf201115bddb6dc51e2c6980 (patch) | |
| tree | eb4fe63c7c8923aa7196e39924ba01f7238b8e87 | |
| parent | 64814781193cbfcb3535ae4061cbdf2be0ba02e3 (diff) | |
Use o3tl::safeCoInitializeEx and counterpart (dp_gui_extensioncmdqueue)
Change-Id: I10f041367f94fd9391554b2b6a06b74f70aa8333
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95665
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 00ed69d515de..19a3585689bd 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -80,6 +80,7 @@ #if !defined WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif +#include <o3tl/safeCoInitUninit.hxx> #include <windows.h> #include <objbase.h> #endif @@ -681,8 +682,8 @@ void ExtensionCmdQueue::Thread::execute() #ifdef _WIN32 //Needed for use of the service "com.sun.star.system.SystemShellExecute" in //DialogHelper::openWebBrowser - CoUninitialize(); - (void) CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + int nNbCallCoInitializeExForReinit = 0; + o3tl::safeCoInitializeEx(COINIT_APARTMENTTHREADED, nNbCallCoInitializeExForReinit); #endif for (;;) { @@ -833,7 +834,7 @@ void ExtensionCmdQueue::Thread::execute() } //end for #ifdef _WIN32 - CoUninitialize(); + o3tl::safeCoUninitializeReinit(COINIT_MULTITHREADED, nNbCallCoInitializeExForReinit); #endif } |