diff options
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLPropertySet.cxx | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx index bd80f8dc5112..d4b7d1284af7 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx @@ -329,8 +329,8 @@ OOXMLValue * OOXMLInputStreamValue::clone() const */ OOXMLPropertySet::OOXMLPropertySet() + : maType("OOXMLPropertySet") { - maType = "OOXMLPropertySet"; } OOXMLPropertySet::~OOXMLPropertySet() @@ -343,10 +343,8 @@ void OOXMLPropertySet::resolve(Properties & rHandler) // be appended to mProperties. I don't think it can cause elements // to be deleted. But let's check with < here just to be safe that // the indexing below works. - for (size_t nIt = 0; nIt < mProperties.size(); ++nIt) + for (OOXMLProperty::Pointer_t & pProp : mProperties) { - OOXMLProperty::Pointer_t pProp = mProperties[nIt]; - if (pProp.get() != nullptr) pProp->resolve(rHandler); } @@ -747,23 +745,17 @@ OOXMLTable::~OOXMLTable() void OOXMLTable::resolve(Table & rTable) { - Table * pTable = &rTable; - int nPos = 0; - PropertySets_t::iterator it = mPropertySets.begin(); - PropertySets_t::iterator itEnd = mPropertySets.end(); - - while (it != itEnd) + for (const ValuePointer_t & it : mPropertySets) { writerfilter::Reference<Properties>::Pointer_t pProperties - ((*it)->getProperties()); + (it->getProperties()); if (pProperties.get() != nullptr) - pTable->entry(nPos, pProperties); + rTable.entry(nPos, pProperties); ++nPos; - ++it; } } |