diff options
| author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-11-06 15:07:46 -0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-07 10:43:34 -0600 |
| commit | bcb51cff22f385abe71555f8d7fdbec2697bf188 (patch) | |
| tree | 4ca8f3c2b755a018f96d03ff43da2dc0ee0f6c69 /writerfilter/source | |
| parent | d877941fc7bb690d0c5b132a914920cf65f8abb2 (diff) | |
fdo#63020: Replace ::comphelper::stl_begin()...
And use some templates inside include/com/sun/star/uno/Sequence.hxx
Change-Id: I48875fa1517751fc4cb0cf2b6c08b88975a29b47
Reviewed-on: https://gerrit.libreoffice.org/6599
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/FormControlHelper.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index aaea9e0a5713..4450a0b4840b 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -67,7 +67,6 @@ #include <map> -#include <comphelper/stlunosequence.hxx> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> #include <officecfg/Office/Common.hxx> @@ -88,7 +87,7 @@ void lcl_handleDropdownField( const uno::Reference< beans::XPropertySet >& rxFie const FFDataHandler::DropDownEntries_t& rEntries = pFFDataHandler->getDropDownEntries(); uno::Sequence< OUString > sItems( rEntries.size() ); - ::std::copy( rEntries.begin(), rEntries.end(), ::comphelper::stl_begin(sItems)); + ::std::copy( rEntries.begin(), rEntries.end(), sItems.begin()); if ( sItems.getLength() ) rxFieldProps->setPropertyValue( "Items", uno::makeAny( sItems ) ); diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx index 851cdf4991d9..74df8fb6ab71 100644 --- a/writerfilter/source/dmapper/FormControlHelper.cxx +++ b/writerfilter/source/dmapper/FormControlHelper.cxx @@ -37,7 +37,6 @@ #include "FormControlHelper.hxx" #include <xmloff/odffields.hxx> -#include <comphelper/stlunosequence.hxx> namespace writerfilter { namespace dmapper { @@ -237,7 +236,7 @@ bool FormControlHelper::processField(uno::Reference<text::XFormField> xFormField xFormField->setFieldType(ODF_FORMDROPDOWN); uno::Sequence< OUString > sItems; sItems.realloc( m_pFFData->getDropDownEntries().size() ); - ::std::copy( m_pFFData->getDropDownEntries().begin(), m_pFFData->getDropDownEntries().end(), ::comphelper::stl_begin(sItems)); + ::std::copy( m_pFFData->getDropDownEntries().begin(), m_pFFData->getDropDownEntries().end(), sItems.begin()); if ( sItems.getLength() ) { if ( xNameCont->hasByName(ODF_FORMDROPDOWN_LISTENTRY) ) |