mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

separate variables by scoping instead of reusing

Browse Source 
Change-Id: I2cc889628f9ab25e382a9e891b99a795cd7d4c59
This commit is contained in:
Lionel Elie Mamane
2015-07-23 13:52:55 +02:00
parent b12c835d4d
commit ca2ed039d8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
desktop/source/deployment/registry/package/dp_package.cxx
View File

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