INTEGRATION: CWS jl104 (1.2.36); FILE MERGED

2008/06/23 11:11:21 jl 1.2.36.1: #i87507# use CoInitializeEx when using service com.sun.star.system.SystemShellExecute to open the web browser

1 files changed, 21 insertions, 1 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 505b9dd2db..0ffe2f0690 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -8,7 +8,7 @@
  *
  * $RCSfile: dp_gui_extensioncmdqueue.cxx,v $
  *
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -32,6 +32,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_desktop.hxx"
 
+
+
+
 #include "sal/config.h"
 
 #include <cstddef>
@@ -109,6 +112,14 @@
 
 #endif
 
+
+#ifdef WNT
+#include "tools/prewin.h"
+#include <objbase.h>
+#include "tools/postwin.h"
+#endif
+
+
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
@@ -770,6 +781,12 @@ ExtensionCmdQueue::Thread::~Thread() {}
 //------------------------------------------------------------------------------
 void ExtensionCmdQueue::Thread::execute() 
 {
+#ifdef WNT
+    //Needed for use of the service "com.sun.star.system.SystemShellExecute" in 
+    //ExtMgrDialog::openWebBrowser
+    CoUninitialize();
+    HRESULT r = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+#endif
     for (;;) 
     {
         if ( m_wakeup.wait() != osl::Condition::result_ok )
@@ -903,6 +920,9 @@ void ExtensionCmdQueue::Thread::execute()
     //enable all buttons
 //     m_pDialog->m_bAddingExtensions = false;
 //     m_pDialog->updateButtonStates();
+#ifdef WNT
+    CoUninitialize();
+#endif
 }
 
 //------------------------------------------------------------------------------