[Libreoffice-commits] core.git: 2 commits - desktop/source uui/source

[Jan-Marek Glogowski]

 desktop/source/deployment/misc/dp_update.cxx |   21 +++++++++++----------
 uui/source/iahndl.cxx                        |    2 --
 2 files changed, 11 insertions(+), 12 deletions(-)

New commits:
commit 2c6e7f6cf121446ef41f34e972aae205f233a191
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Oct 13 18:57:08 2017 +0200

    Log found extension updates
    
    The OSL_ASSERT doesn't make any sense, if you don't know what it
    compares. So simply log all found updates.
    
    Change-Id: I002b65cf4a658036916a217a89d0df7f0168ee70

diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx
index b4c385c61cea..828fdff2143f 100644
--- a/desktop/source/deployment/misc/dp_update.cxx
+++ b/desktop/source/deployment/misc/dp_update.cxx
@@ -94,12 +94,13 @@ void getOwnUpdateInfos(
         Sequence<OUString> urls(i->second.extension->getUpdateInformationURLs());
         if (urls.getLength())
         {
-            const OUString id =  dp_misc::getIdentifier(i->second.extension);
+            const OUString search_id = dp_misc::getIdentifier(i->second.extension);
+            SAL_INFO( "extensions.update", "Searching update for " << search_id );
             uno::Any anyError;
             //It is unclear from the idl if there can be a null reference returned.
             //However all valid information should be the same
             Sequence<Reference< xml::dom::XElement > >
-                infos(getUpdateInformation(updateInformation, urls, id, anyError));
+                infos(getUpdateInformation(updateInformation, urls, search_id, anyError));
             if (anyError.hasValue())
                 out_errors.emplace_back(i->second.extension, anyError);
 
@@ -110,15 +111,15 @@ void getOwnUpdateInfos(
                     Reference< xml::dom::XNode >(infos[j], UNO_QUERY_THROW));
                 if (!infoset.hasDescription())
                     continue;
-                boost::optional< OUString > id2(infoset.getIdentifier());
-                if (!id2)
+                boost::optional< OUString > result_id(infoset.getIdentifier());
+                if (!result_id)
                     continue;
-                OSL_ASSERT(*id2 == id);
-                if (*id2 == id)
-                {
-                    i->second.version = infoset.getVersion();
-                    i->second.info.set(infos[j], UNO_QUERY_THROW);
-                }
+                SAL_INFO( "extensions.update", "  found version "
+                          << infoset.getVersion() << " for " << *result_id );
+                if (*result_id != search_id)
+                    continue;
+                i->second.version = infoset.getVersion();
+                i->second.info.set(infos[j], UNO_QUERY_THROW);
                 break;
             }
         }
commit d3ae94f04e0cfeba49f5e0de66848743391fc336
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Fri Oct 13 18:55:01 2017 +0200

    Don't crash on extension update check
    
    We don't need to release the SolarMutex, as we don't own it.
    
    Change-Id: Id0a0ae8d478dc56d0da2ab296f8031e935920c97

diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index f3a801a47c0c..36ba5046d983 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -172,7 +172,6 @@ UUIInteractionHelper::handleRequest(
         HandleData aHD(rRequest);
         Link<void*,void> aLink(&aHD,handlerequest);
         Application::PostUserEvent(aLink,this);
-        SolarMutexReleaser aReleaser;
         aHD.wait();
         return aHD.bHandled;
     }
@@ -224,7 +223,6 @@ UUIInteractionHelper::getStringFromRequest(
         HandleData aHD(rRequest);
         Link<void*,void> aLink(&aHD,getstringfromrequest);
         Application::PostUserEvent(aLink,this);
-        SolarMutexReleaser aReleaser;
         aHD.wait();
         return aHD.m_aResult;
     }