[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit c13f5bc2bcf7c7229896312ab8704840780d6675
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Thu Nov 26 08:53:46 2015 +0100

    Use comphelper::containerToSequence()
    
    Change-Id: I8c8277d47c2ab0e2bf5fad68bbfc45dea71d6c34

diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 76942d7..812f0d9 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -556,7 +556,7 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & 
rStream)
         sal_Int32 counter = 0;
         uno::Sequence< uno::Sequence< beans::StringPair > >aSeqs = 
xRelationshipAccess->getAllRelationships();
         std::vector< uno::Reference<xml::dom::XDocument> > aCustomXmlDomList;
-        uno::Sequence<uno::Reference<xml::dom::XDocument> > 
xCustomXmlDomPropsListTemp(aSeqs.getLength());
+        std::vector< uno::Reference<xml::dom::XDocument> > 
aCustomXmlDomPropsList;
         for (sal_Int32 j = 0; j < aSeqs.getLength(); j++)
         {
             uno::Sequence< beans::StringPair > aSeq = aSeqs[j];
@@ -583,7 +583,7 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & 
rStream)
                 if(mxCustomXmlProsDom.is() && customXmlTemp.is())
                 {
                     aCustomXmlDomList.push_back(customXmlTemp);
-                    xCustomXmlDomPropsListTemp[counter] = mxCustomXmlProsDom;
+                    aCustomXmlDomPropsList.push_back(mxCustomXmlProsDom);
                     counter++;
                     resolveFastSubStream(rStream, OOXMLStream::CUSTOMXML);
                 }
@@ -591,9 +591,8 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & 
rStream)
             }
         }
 
-        xCustomXmlDomPropsListTemp.realloc(counter);
         mxCustomXmlDomList = 
comphelper::containerToSequence(aCustomXmlDomList);
-        mxCustomXmlDomPropsList = xCustomXmlDomPropsListTemp;
+        mxCustomXmlDomPropsList = 
comphelper::containerToSequence(aCustomXmlDomPropsList);
     }
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits