diff options
| author | Matthew Pottage <matthewpottage@invincitech.com> | 2014-10-28 16:50:02 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-06 23:06:58 +0100 |
| commit | 4f7a1f5b9499d5fbeff413a4914283c2bfe7c2d9 (patch) | |
| tree | d626505be68b47a1219d9838f9d5dc35c7271248 /unoxml | |
| parent | 90613f4e47e5e113e5fafb573d832bfcace314e5 (diff) | |
fdo#75757: Remove inheritance from std::vector
Deprecated comphelper/sequenceasvector.hxx.
Rewritten code using it. Using instead the functions containerToSequence and
sequenceToContainer, found in include/comphelper/sequence.hxx.
One class that inherits from it (in framework/inc/stdtypes.h), and
the code using that has been left.
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/TblStylePrHandler.hxx
writerfilter/source/dmapper/WrapPolygonHandler.hxx
Change-Id: Ice61c94ffb052e389281aebb7cdf185134221061
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/source/rdf/librdf_repository.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index b53c744edccf..869482888bca 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -58,7 +58,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/supportsservice.hxx> -#include <comphelper/sequenceasvector.hxx> +#include <comphelper/sequence.hxx> #include <comphelper/makesequence.hxx> #include <comphelper/xmltools.hxx> @@ -1252,12 +1252,12 @@ librdf_Repository::getGraphNames() throw (uno::RuntimeException, rdf::RepositoryException, std::exception) { ::osl::MutexGuard g(m_aMutex); - ::comphelper::SequenceAsVector< uno::Reference<rdf::XURI> > ret; + ::std::vector< uno::Reference<rdf::XURI> > ret; std::transform(m_NamedGraphs.begin(), m_NamedGraphs.end(), std::back_inserter(ret), boost::bind(&rdf::XNamedGraph::getName, boost::bind(&NamedGraphMap_t::value_type::second, _1))); - return ret.getAsConstList(); + return comphelper::containerToSequence(ret); } uno::Reference< rdf::XNamedGraph > SAL_CALL @@ -1667,7 +1667,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, "cannot create URI for XML ID", *this, uno::makeAny(iae)); } - ::comphelper::SequenceAsVector< rdf::Statement > ret; + ::std::vector< rdf::Statement > ret; try { const uno::Reference<container::XEnumeration> xIter( @@ -1693,7 +1693,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, ::osl::MutexGuard g(m_aMutex); // don't call i_x* with mutex locked return beans::Pair< uno::Sequence<rdf::Statement>, sal_Bool >( - ret.getAsConstList(), 0 != m_RDFaXHTMLContentSet.count(sXmlId)); + comphelper::containerToSequence(ret), 0 != m_RDFaXHTMLContentSet.count(sXmlId)); } extern "C" |