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

Miklos Vajna vmiklos at collabora.co.uk
Thu Nov 26 23:36:17 PST 2015


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

New commits:
commit dc269d07e8e5d71818bc0a546c3daef4d50eb1c7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Nov 27 08:34:41 2015 +0100

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

diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 812f0d9..12ad491 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -624,7 +624,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
     {
 
         uno::Sequence< uno::Sequence< beans::StringPair > >aSeqs = xRelationshipAccess->getAllRelationships();
-        uno::Sequence<uno::Sequence< uno::Any> > xGlossaryDomListTemp(aSeqs.getLength());
+        std::vector< uno::Sequence<uno::Any> > aGlossaryDomList;
          sal_Int32 counter = 0;
          for (sal_Int32 j = 0; j < aSeqs.getLength(); j++)
          {
@@ -694,13 +694,12 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
                       glossaryTuple[2] = uno::makeAny(gType);
                       glossaryTuple[3] = uno::makeAny(gTarget);
                       glossaryTuple[4] = uno::makeAny(contentType);
-                      xGlossaryDomListTemp[counter] = glossaryTuple;
+                      aGlossaryDomList.push_back(glossaryTuple);
                       counter++;
                   }
               }
           }
-          xGlossaryDomListTemp.realloc(counter);
-          mxGlossaryDomList = xGlossaryDomListTemp;
+          mxGlossaryDomList = comphelper::containerToSequence(aGlossaryDomList);
       }
 }
 


More information about the Libreoffice-commits mailing list