CWS-TOOLING: integrate CWS dv21

2 files changed, 84 insertions, 32 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 9f5d400e68..5f1b35932b 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -363,26 +363,28 @@ bool ExtBoxWithBtns_Impl::HandleTabKey( bool bReverse )
 // -----------------------------------------------------------------------
 MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long nPos )
 {
-    if ( nPos >= (long) getItemCount() )
-        return CMD_NONE;
+    if ( ( nPos >= 0 ) && ( nPos < (long) getItemCount() ) )
+    {
+        if ( ! GetEntryData( nPos )->m_bLocked )
+        {
+            PopupMenu aPopup;
 
-    PopupMenu aPopup;
+            aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) );
 
-    aPopup.InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) );
+            if ( GetEntryData( nPos )->m_bUser )
+            {
+                if ( GetEntryData( nPos )->m_eState == REGISTERED )
+                    aPopup.InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) );
+                else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE )
+                    aPopup.InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) );
+            }
 
-    if ( ! GetEntryData( nPos )->m_bLocked )
-    {
-        if ( GetEntryData( nPos )->m_bUser )
-        {
-            if ( GetEntryData( nPos )->m_eState == REGISTERED )
-                aPopup.InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) );
-            else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE )
-                aPopup.InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) );
+            aPopup.InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) );
+
+            return (MENU_COMMAND) aPopup.Execute( this, rPos );
         }
-        aPopup.InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) );
     }
-
-    return (MENU_COMMAND) aPopup.Execute( this, rPos );
+    return CMD_NONE;
 }
 
 //------------------------------------------------------------------------------
diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index 112eb5917b..43571483bf 100755..100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -90,8 +90,6 @@ getUpdateInformation( Reference<deployment::XUpdateInformationProvider > const &
         Sequence<Reference< xml::dom::XElement > >();
 }
 
-//Put in anonymous namespace
-
 void getOwnUpdateInfos(
         Reference<uno::XComponentContext> const & xContext,
         Reference<deployment::XUpdateInformationProvider > const &  updateInformation,
@@ -185,6 +183,56 @@ void getDefaultUpdateInfos(
     }
 }
 
+bool containsBundledOnly(Sequence<Reference<deployment::XPackage> > const & sameIdExtensions)
+{
+    OSL_ASSERT(sameIdExtensions.getLength() == 3);
+    if (!sameIdExtensions[0].is() && !sameIdExtensions[1].is() && sameIdExtensions[2].is())
+        return true;
+    else
+        return false;
+}
+/** Returns true if the list of extensions are bundled extensions and there are no
+    other extensions with the same identifier in the shared or user repository.
+    If extensionList is NULL, then it is checked if there are only bundled extensions.
+*/
+bool onlyBundledExtensions(
+    Reference<deployment::XExtensionManager> const & xExtMgr,
+    std::vector< Reference<deployment::XPackage > > const * extensionList)
+{
+    OSL_ASSERT(xExtMgr.is());
+    bool onlyBundled = true;
+    if (extensionList)
+    {
+        typedef std::vector<Reference<deployment::XPackage > >::const_iterator CIT;
+        for (CIT i = extensionList->begin(); i != extensionList->end(); i++)
+        {
+            Sequence<Reference<deployment::XPackage> > seqExt = xExtMgr->getExtensionsWithSameIdentifier(
+                dp_misc::getIdentifier(*i), (*i)->getName(), Reference<ucb::XCommandEnvironment>());
+
+            if (!containsBundledOnly(seqExt))
+            {
+                onlyBundled = false;
+                break;
+            }
+            
+        }
+    }
+    else
+    {
+        const uno::Sequence< uno::Sequence< Reference<deployment::XPackage > > > seqAllExt =
+            xExtMgr->getAllExtensions(Reference<task::XAbortChannel>(), Reference<ucb::XCommandEnvironment>());
+        
+        for (int pos = seqAllExt.getLength(); pos --; )
+        {
+            if (!containsBundledOnly(seqAllExt[pos]))
+            {
+                onlyBundled = false;
+                break;
+            }
+        }
+    }
+    return onlyBundled;
+}
 
 } // anon namespace
 
@@ -233,13 +281,14 @@ UPDATE_SOURCE isUpdateUserExtension(
                 retVal = UPDATE_SOURCE_ONLINE;
             
         }
-        else if (bundledVersion.getLength())
-        {
-            int index = determineHighestVersion(
-                OUString(), OUString(), bundledVersion, onlineVersion);
-            if (index == 3)
-                retVal = UPDATE_SOURCE_ONLINE;
-        }
+        //No update for bundled extensions, they are updated only by the setup
+        //else if (bundledVersion.getLength())
+        //{
+        //    int index = determineHighestVersion(
+        //        OUString(), OUString(), bundledVersion, onlineVersion);
+        //    if (index == 3)
+        //        retVal = UPDATE_SOURCE_ONLINE;
+        //}
     }
     else
     {
@@ -278,13 +327,14 @@ UPDATE_SOURCE isUpdateSharedExtension(
         else if (index == 3)
             retVal = UPDATE_SOURCE_ONLINE;
     }
-    else if (bundledVersion.getLength())
-    {
-        int index = determineHighestVersion(
-            OUString(), OUString(), bundledVersion, onlineVersion);
-        if (index == 3)
-            retVal = UPDATE_SOURCE_ONLINE;
-    }
+    //No update for bundled extensions, they are updated only by the setup
+    //else if (bundledVersion.getLength())
+    //{
+    //    int index = determineHighestVersion(
+    //        OUString(), OUString(), bundledVersion, onlineVersion);
+    //    if (index == 3)
+    //        retVal = UPDATE_SOURCE_ONLINE;
+    //}
     return retVal;
 }
 
@@ -332,7 +382,7 @@ UpdateInfoMap getOnlineUpdateInfos(
 {
     OSL_ASSERT(xExtMgr.is());
     UpdateInfoMap infoMap;
-    if (!xExtMgr.is())
+    if (!xExtMgr.is() || onlyBundledExtensions(xExtMgr, extensionList))
         return infoMap;
 
     if (!extensionList)