diff options
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLPropertySet.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx index b7b50d1bf20f..da8a3dd1bf23 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx @@ -395,17 +395,14 @@ void OOXMLPropertySet::add(const OOXMLProperty::Pointer_t& pProperty) void OOXMLPropertySet::add(const OOXMLPropertySet::Pointer_t& pPropertySet) { - if (pPropertySet.get() != nullptr) + OOXMLPropertySet * pSet = pPropertySet.get(); + + if (pSet != nullptr) { - OOXMLPropertySet * pSet = pPropertySet.get(); - - if (pSet != nullptr) - { - mProperties.resize(mProperties.size() + pSet->mProperties.size()); - for (OOXMLProperties_t::iterator aIt = pSet->mProperties.begin(); - aIt != pSet->mProperties.end(); ++aIt) - add(*aIt); - } + mProperties.resize(mProperties.size() + pSet->mProperties.size()); + for (OOXMLProperties_t::iterator aIt = pSet->mProperties.begin(); + aIt != pSet->mProperties.end(); ++aIt) + add(*aIt); } } |