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

[Lionel Elie Mamane]

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

New commits:
commit ca2ed039d833ff3f9b988dc2e24758c3942f2b8f
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Jul 23 13:52:55 2015 +0200

    separate variables by scoping instead of reusing
    
    Change-Id: I2cc889628f9ab25e382a9e891b99a795cd7d4c59

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