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

Lionel Elie Mamane lionel at mamane.lu
Thu Jul 23 02:28:39 PDT 2015


 desktop/source/deployment/registry/package/dp_package.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a2ae1723990520ce2f459f288719b6f17cae6485
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Jul 22 18:52:49 2015 +0200

    fix regression introduced by 21834f14c97071c5bcf13ef02bf940dc1922663f
    
    Change-Id: I75b6329e2d308bd0d24201169dcef72301358d81
    Reviewed-on: https://gerrit.libreoffice.org/17305
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 0d0ccfc..e28db99 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1473,7 +1473,7 @@ void BackendImpl::PackageImpl::scanBundle(
         if (! INetContentTypes::parse( mediaType, type, subType, &params ))
             continue;
 
-        auto const iter = params.find("platform");
+        auto iter = params.find("platform");
         if (iter != params.end() && !platform_fits(iter->second.m_sValue))
             continue;
         const OUString url( makeURL( packageRootURL, fullPath ) );
@@ -1483,8 +1483,8 @@ void BackendImpl::PackageImpl::scanBundle(
             subType.equalsIgnoreAsciiCase( "vnd.sun.star.package-bundle-description"))
         {
             // check locale:
-            auto const iterLocale = params.find("locale");
-            if (iterLocale == params.end())
+            iter = params.find("locale");
+            if (iter == params.end())
             {
                 if (descrFile.isEmpty())
                     descrFile = url;


More information about the Libreoffice-commits mailing list