Kaydet (Commit) c0a709e9 authored tarafından Miklos Vajna's avatar Miklos Vajna

Avoid manual realloc()

Change-Id: I456a2d29daecf8dee14d109ca39a97c5bf461539
üst 7d860f61
...@@ -1888,9 +1888,9 @@ void DocxAttributeOutput::WriteCollectedRunProperties() ...@@ -1888,9 +1888,9 @@ void DocxAttributeOutput::WriteCollectedRunProperties()
m_pSerializer->singleElementNS( XML_w, XML_lang, xAttrList ); m_pSerializer->singleElementNS( XML_w, XML_lang, xAttrList );
} }
if (m_aTextEffectsGrabBag.getLength() > 0) if (!m_aTextEffectsGrabBag.empty())
{ {
for (sal_Int32 i=0; i < m_aTextEffectsGrabBag.getLength(); ++i) for (size_t i = 0; i < m_aTextEffectsGrabBag.size(); ++i)
{ {
boost::optional<sal_Int32> aElementId = lclGetElementIdForName(m_aTextEffectsGrabBag[i].Name); boost::optional<sal_Int32> aElementId = lclGetElementIdForName(m_aTextEffectsGrabBag[i].Name);
if(aElementId) if(aElementId)
...@@ -1900,7 +1900,7 @@ void DocxAttributeOutput::WriteCollectedRunProperties() ...@@ -1900,7 +1900,7 @@ void DocxAttributeOutput::WriteCollectedRunProperties()
lclProcessRecursiveGrabBag(*aElementId, aGrabBagSeq, m_pSerializer); lclProcessRecursiveGrabBag(*aElementId, aGrabBagSeq, m_pSerializer);
} }
} }
m_aTextEffectsGrabBag.realloc(0); m_aTextEffectsGrabBag.clear();
} }
} }
...@@ -8138,9 +8138,7 @@ void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem ) ...@@ -8138,9 +8138,7 @@ void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem )
{ {
beans::PropertyValue aPropertyValue; beans::PropertyValue aPropertyValue;
i->second >>= aPropertyValue; i->second >>= aPropertyValue;
sal_Int32 aLength = m_aTextEffectsGrabBag.getLength(); m_aTextEffectsGrabBag.push_back(aPropertyValue);
m_aTextEffectsGrabBag.realloc(m_aTextEffectsGrabBag.getLength() + 1);
m_aTextEffectsGrabBag[aLength] = aPropertyValue;
} }
else if (i->first == "SdtEndBefore") else if (i->first == "SdtEndBefore")
{ {
......
...@@ -788,7 +788,7 @@ private: ...@@ -788,7 +788,7 @@ private:
std::map<OUString, std::vector<OString> > m_aSeqBookmarksNames; std::map<OUString, std::vector<OString> > m_aSeqBookmarksNames;
/// GrabBag for text effexts like glow, shadow, ... /// GrabBag for text effexts like glow, shadow, ...
css::uno::Sequence<css::beans::PropertyValue> m_aTextEffectsGrabBag; std::vector<css::beans::PropertyValue> m_aTextEffectsGrabBag;
/// The current table helper /// The current table helper
SwWriteTable *m_pTableWrt; SwWriteTable *m_pTableWrt;
......
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