Kaydet (Commit) a507d54e authored tarafından Mike Kaganski's avatar Mike Kaganski

Use std::set::count instead of std::set::find + iterator comparison

std::set::contains from C++20 is not here yet :-)

Change-Id: I50b5db2d44cb0effa64ab89a16205145883ce374
Reviewed-on: https://gerrit.libreoffice.org/68922
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 732d630c
......@@ -279,8 +279,6 @@ void XclExpXmlPivotCaches::SavePivotCacheXml( XclExpXmlStream& rStrm, const Entr
}
}
auto aDPTypeEnd = aDPTypes.cend();
auto pAttList = sax_fastparser::FastSerializerHelper::createAttrList();
// TODO In same cases, disable listing of items, as it is done in MS Excel.
// Exporting savePivotCacheRecordsXml method needs to be updated accordingly
......@@ -289,10 +287,10 @@ void XclExpXmlPivotCaches::SavePivotCacheXml( XclExpXmlStream& rStrm, const Entr
std::set<ScDPItemData::Type> aDPTypesWithoutBlank = aDPTypes;
aDPTypesWithoutBlank.erase(ScDPItemData::Empty);
const bool isContainsString
= aDPTypesWithoutBlank.find(ScDPItemData::String) != aDPTypesWithoutBlank.end();
bool isContainsBlank = aDPTypes.find(ScDPItemData::Empty) != aDPTypeEnd;
bool isContainsNumber = !isContainsDate && aDPTypesWithoutBlank.find(ScDPItemData::Value) != aDPTypesWithoutBlank.end();
const bool isContainsString = aDPTypesWithoutBlank.count(ScDPItemData::String) > 0;
const bool isContainsBlank = aDPTypes.count(ScDPItemData::Empty) > 0;
const bool isContainsNumber
= !isContainsDate && aDPTypesWithoutBlank.count(ScDPItemData::Value) > 0;
bool isContainsNonDate = !(isContainsDate && aDPTypesWithoutBlank.size() <= 1);
// XML_containsSemiMixedTypes possible values:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment