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

Use comphelper::containerToSequence

Change-Id: I76d25ef32a154d92f7ea9b9d0aa3af09908873d2
üst c74d1812
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/settings.hxx> #include <vcl/settings.hxx>
#include <svx/dialogs.hrc> #include <svx/dialogs.hrc>
#include <comphelper/sequence.hxx>
#include <iostream> #include <iostream>
...@@ -554,7 +555,7 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream) ...@@ -554,7 +555,7 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream)
bool bFound = false; bool bFound = false;
sal_Int32 counter = 0; sal_Int32 counter = 0;
uno::Sequence< uno::Sequence< beans::StringPair > >aSeqs = xRelationshipAccess->getAllRelationships(); uno::Sequence< uno::Sequence< beans::StringPair > >aSeqs = xRelationshipAccess->getAllRelationships();
uno::Sequence<uno::Reference<xml::dom::XDocument> > xCustomXmlDomListTemp(aSeqs.getLength()); std::vector< uno::Reference<xml::dom::XDocument> > aCustomXmlDomList;
uno::Sequence<uno::Reference<xml::dom::XDocument> > xCustomXmlDomPropsListTemp(aSeqs.getLength()); uno::Sequence<uno::Reference<xml::dom::XDocument> > xCustomXmlDomPropsListTemp(aSeqs.getLength());
for (sal_Int32 j = 0; j < aSeqs.getLength(); j++) for (sal_Int32 j = 0; j < aSeqs.getLength(); j++)
{ {
...@@ -581,7 +582,7 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream) ...@@ -581,7 +582,7 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream)
// grabbag list. // grabbag list.
if(mxCustomXmlProsDom.is() && customXmlTemp.is()) if(mxCustomXmlProsDom.is() && customXmlTemp.is())
{ {
xCustomXmlDomListTemp[counter] = customXmlTemp; aCustomXmlDomList.push_back(customXmlTemp);
xCustomXmlDomPropsListTemp[counter] = mxCustomXmlProsDom; xCustomXmlDomPropsListTemp[counter] = mxCustomXmlProsDom;
counter++; counter++;
resolveFastSubStream(rStream, OOXMLStream::CUSTOMXML); resolveFastSubStream(rStream, OOXMLStream::CUSTOMXML);
...@@ -590,9 +591,8 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream) ...@@ -590,9 +591,8 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream & rStream)
} }
} }
xCustomXmlDomListTemp.realloc(counter);
xCustomXmlDomPropsListTemp.realloc(counter); xCustomXmlDomPropsListTemp.realloc(counter);
mxCustomXmlDomList = xCustomXmlDomListTemp; mxCustomXmlDomList = comphelper::containerToSequence(aCustomXmlDomList);
mxCustomXmlDomPropsList = xCustomXmlDomPropsListTemp; mxCustomXmlDomPropsList = xCustomXmlDomPropsListTemp;
} }
} }
......
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