summaryrefslogtreecommitdiffstats
path: root/sfx2
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-06-08 08:50:52 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-06-08 08:14:16 +0000
commit42dae96f97bfcc44d5e6ccf727e1cdb178123d56 (patch)
treecbf5a3c3f63b58c4f4b16c39c7c636e95f36c711 /sfx2
parentopengl: batch drawing of polylines (diff)
downloadcore-42dae96f97bfcc44d5e6ccf727e1cdb178123d56.tar.gz
core-42dae96f97bfcc44d5e6ccf727e1cdb178123d56.zip
sfx2 classification: use auto where it improves code readability
std::map<OUString, basegfx::BColor>::iterator itColor = aColors.find(aLevel); vs auto itColor = aColors.find(aLevel); and so on. (And do the same at two other places as well.) Change-Id: I538998c8b8afdf18a7eb139fa4d469205c561370 Reviewed-on: https://gerrit.libreoffice.org/26046 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/view/classificationhelper.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/sfx2/source/view/classificationhelper.cxx b/sfx2/source/view/classificationhelper.cxx
index 120470fc6dc2..f7357a461eec 100644
--- a/sfx2/source/view/classificationhelper.cxx
+++ b/sfx2/source/view/classificationhelper.cxx
@@ -390,7 +390,7 @@ void SfxClassificationHelper::Impl::setStartValidity(SfxClassificationPolicyType
return;
SfxClassificationCategory& rCategory = itCategory->second;
- std::map<OUString, OUString>::iterator it = rCategory.m_aLabels.find(policyTypeToString(eType) + PROP_STARTVALIDITY());
+ auto it = rCategory.m_aLabels.find(policyTypeToString(eType) + PROP_STARTVALIDITY());
if (it != rCategory.m_aLabels.end())
{
if (it->second == PROP_NONE())
@@ -554,7 +554,7 @@ bool SfxClassificationHelper::HasImpactLevel()
return false;
SfxClassificationCategory& rCategory = itCategory->second;
- std::map<OUString, OUString>::iterator it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_IMPACTSCALE());
+ auto it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_IMPACTSCALE());
if (it == rCategory.m_aLabels.end())
return false;
@@ -572,7 +572,7 @@ bool SfxClassificationHelper::HasDocumentHeader()
return false;
SfxClassificationCategory& rCategory = itCategory->second;
- std::map<OUString, OUString>::iterator it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_DOCHEADER());
+ auto it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_DOCHEADER());
if (it == rCategory.m_aLabels.end() || it->second.isEmpty())
return false;
@@ -586,7 +586,7 @@ bool SfxClassificationHelper::HasDocumentFooter()
return false;
SfxClassificationCategory& rCategory = itCategory->second;
- std::map<OUString, OUString>::iterator it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_DOCFOOTER());
+ auto it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_DOCFOOTER());
if (it == rCategory.m_aLabels.end() || it->second.isEmpty())
return false;
@@ -602,7 +602,7 @@ basegfx::BColor SfxClassificationHelper::GetImpactLevelColor()
return aRet;
SfxClassificationCategory& rCategory = itCategory->second;
- std::map<OUString, OUString>::iterator it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_IMPACTSCALE());
+ auto it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_IMPACTSCALE());
if (it == rCategory.m_aLabels.end())
return aRet;
OUString aScale = it->second;
@@ -624,7 +624,7 @@ basegfx::BColor SfxClassificationHelper::GetImpactLevelColor()
aColors["2"] = basegfx::BColor(1.0, 0.5, 0.0);
aColors["3"] = basegfx::BColor(0.5, 0.0, 0.0);
}
- std::map<OUString, basegfx::BColor>::iterator itColor = aColors.find(aLevel);
+ auto itColor = aColors.find(aLevel);
if (itColor == aColors.end())
return aRet;
aRet = itColor->second;
@@ -639,7 +639,7 @@ basegfx::BColor SfxClassificationHelper::GetImpactLevelColor()
aColors["Moderate"] = basegfx::BColor(1.0, 0.5, 0.0);
aColors["High"] = basegfx::BColor(0.5, 0.0, 0.0);
}
- std::map<OUString, basegfx::BColor>::iterator itColor = aColors.find(aLevel);
+ auto itColor = aColors.find(aLevel);
if (itColor == aColors.end())
return aRet;
aRet = itColor->second;
@@ -657,7 +657,7 @@ sal_Int32 SfxClassificationHelper::GetImpactLevel()
return nRet;
SfxClassificationCategory& rCategory = itCategory->second;
- std::map<OUString, OUString>::iterator it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_IMPACTSCALE());
+ auto it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_IMPACTSCALE());
if (it == rCategory.m_aLabels.end())
return nRet;
OUString aScale = it->second;
@@ -683,7 +683,7 @@ sal_Int32 SfxClassificationHelper::GetImpactLevel()
aValues["Moderate"] = 1;
aValues["High"] = 2;
}
- std::map<OUString, sal_Int32>::iterator itValues = aValues.find(aLevel);
+ auto itValues = aValues.find(aLevel);
if (itValues == aValues.end())
return nRet;
nRet = itValues->second;
@@ -699,7 +699,7 @@ OUString SfxClassificationHelper::GetImpactScale()
return OUString();
SfxClassificationCategory& rCategory = itCategory->second;
- std::map<OUString, OUString>::iterator it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_IMPACTSCALE());
+ auto it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_IMPACTSCALE());
if (it != rCategory.m_aLabels.end())
return it->second;
@@ -713,7 +713,7 @@ OUString SfxClassificationHelper::GetDocumentWatermark()
return OUString();
SfxClassificationCategory& rCategory = itCategory->second;
- std::map<OUString, OUString>::iterator it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_DOCWATERMARK());
+ auto it = rCategory.m_aLabels.find(PROP_PREFIX_INTELLECTUALPROPERTY() + PROP_DOCWATERMARK());
if (it != rCategory.m_aLabels.end())
return it->second;
@@ -738,7 +738,7 @@ void SfxClassificationHelper::SetBACName(const OUString& rName, SfxClassificatio
if (m_pImpl->m_aCategories.empty())
m_pImpl->parsePolicy();
- std::vector<SfxClassificationCategory>::iterator it = std::find_if(m_pImpl->m_aCategories.begin(), m_pImpl->m_aCategories.end(), [&](const SfxClassificationCategory& rCategory)
+ auto it = std::find_if(m_pImpl->m_aCategories.begin(), m_pImpl->m_aCategories.end(), [&](const SfxClassificationCategory& rCategory)
{
return rCategory.m_aName == rName;
});