INTEGRATION: CWS extmgrui01 (1.20.24); FILE MERGED

2008/04/28 10:58:07 dv 1.20.24.5: RESYNC: (1.21-1.22); FILE MERGED
2008/03/26 14:08:24 dv 1.20.24.4: Don't hide dialog when clicking 'updates available' icon
2008/03/25 08:06:18 dv 1.20.24.3: RESYNC: (1.20-1.21); FILE MERGED
2008/02/26 07:19:53 dv 1.20.24.2: #i83902# Some strings changed for new dialog
2008/02/04 07:39:50 dv 1.20.24.1: #i83902# first version of new dialog

desktop/source/deployment/gui/dp_gui_service.cxx

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dp_gui_service.cxx,v $
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -33,6 +33,7 @@
 
 #include "dp_gui_shared.hxx"
 #include "dp_gui.h"
+#include "dp_gui_theextmgr.hxx"
 #include "cppuhelper/implbase2.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include "unotools/configmgr.hxx"
@@ -216,7 +217,7 @@ void ServiceImpl::startExecuteModal(
     bool bCloseDialog = true;  // only used if m_bShowUpdateOnly is true
     ::std::auto_ptr<Application> app;
     //ToDo: synchronize access to s_dialog !!!
-    if (! dp_gui::DialogImpl::s_dialog.is())
+    if (! dp_gui::TheExtensionManager::s_ExtMgr.is())
     {
         const bool bAppUp = (GetpApp() != 0);
         bool bOfficePipePresent;
@@ -264,24 +265,23 @@ void ServiceImpl::startExecuteModal(
         // the update notification icon in the menu bar. We must not close the extensions
         // dialog after displaying the update dialog when it has been visible before
         if ( m_bShowUpdateOnly )
-            bCloseDialog = false;
+            bCloseDialog = ! dp_gui::TheExtensionManager::s_ExtMgr->isVisible();
     }
 
     {
         const ::vos::OGuard guard( Application::GetSolarMutex() );
-        ::rtl::Reference< ::dp_gui::DialogImpl > dialog(
-            ::dp_gui::DialogImpl::get(
+        ::rtl::Reference< ::dp_gui::TheExtensionManager > dialog(
+            ::dp_gui::TheExtensionManager::get(
                 m_xComponentContext,
                 m_parent ? *m_parent : Reference<awt::XWindow>(),
-                m_extensionURL ? *m_extensionURL : OUString(),
-                m_view ? *m_view : OUString() ) );
+                m_extensionURL ? *m_extensionURL : OUString() ) );
         if (m_initialTitle.getLength() > 0) {
             dialog->SetText( m_initialTitle );
             m_initialTitle = OUString();
         }
         if ( m_bShowUpdateOnly )
         {
-            dialog->checkUpdates( false, true, !bCloseDialog );
+            dialog->checkUpdates( true, !bCloseDialog );
             if ( bCloseDialog )
                 dialog->Close();
             else