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 /sw/source/filter/ww8 | |
| 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 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 8a17fd144b74..98cdff3d5877 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -30,7 +30,9 @@ #include <docxattributeoutput.hxx> #include <docxexportfilter.hxx> #include <comphelper/seqstream.hxx> -#include <comphelper/sequenceasvector.hxx> +#include <comphelper/sequence.hxx> + + #include <IDocumentDrawModelAccess.hxx> using namespace com::sun::star; @@ -667,8 +669,8 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS XML_edited, "0", FSEND); drawing::PointSequenceSequence aSeqSeq = it->second.get< drawing::PointSequenceSequence >(); - comphelper::SequenceAsVector<awt::Point> aPoints(aSeqSeq[0]); - for (comphelper::SequenceAsVector<awt::Point>::iterator i = aPoints.begin(); i != aPoints.end(); ++i) + std::vector<awt::Point> aPoints(comphelper::sequenceToContainer<std::vector<awt::Point> >(aSeqSeq[0])); + for (std::vector<awt::Point>::iterator i = aPoints.begin(); i != aPoints.end(); ++i) { awt::Point& rPoint = *i; m_pImpl->m_pSerializer->singleElementNS(XML_wp, (i == aPoints.begin() ? XML_start : XML_lineTo), |