writerfilter/source/dmapper/FormControlHelper.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
New commits: commit fb1c08589e68d394832fc67d54274827cc209189 Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Thu Feb 4 09:20:57 2016 +0100 writerfilter: no need to manually realloc here Change-Id: I1663109adfa83bcc191953ffeefad1b563e03c14 diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx index 22f7bb6..5a3ec8d 100644 --- a/writerfilter/source/dmapper/FormControlHelper.cxx +++ b/writerfilter/source/dmapper/FormControlHelper.cxx @@ -37,6 +37,7 @@ #include "FormControlHelper.hxx" #include <xmloff/odffields.hxx> +#include <comphelper/sequence.hxx> namespace writerfilter { namespace dmapper { @@ -233,15 +234,13 @@ void FormControlHelper::processField(uno::Reference<text::XFormField> const& xFo else if (m_pImpl->m_eFieldId == FIELD_FORMDROPDOWN ) { xFormField->setFieldType(ODF_FORMDROPDOWN); - uno::Sequence< OUString > sItems; - sItems.realloc( m_pFFData->getDropDownEntries().size() ); - ::std::copy( m_pFFData->getDropDownEntries().begin(), m_pFFData->getDropDownEntries().end(), sItems.begin()); - if ( sItems.getLength() ) + const FFDataHandler::DropDownEntries_t& rEntries = m_pFFData->getDropDownEntries(); + if (!rEntries.empty()) { if ( xNameCont->hasByName(ODF_FORMDROPDOWN_LISTENTRY) ) - xNameCont->replaceByName(ODF_FORMDROPDOWN_LISTENTRY, uno::makeAny( sItems ) ); + xNameCont->replaceByName(ODF_FORMDROPDOWN_LISTENTRY, uno::makeAny(comphelper::containerToSequence(rEntries))); else - xNameCont->insertByName(ODF_FORMDROPDOWN_LISTENTRY, uno::makeAny( sItems ) ); + xNameCont->insertByName(ODF_FORMDROPDOWN_LISTENTRY, uno::makeAny(comphelper::containerToSequence(rEntries))); sal_Int32 nResult = m_pFFData->getDropDownResult().toInt32(); if ( nResult ) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits