summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-07-07 11:44:52 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-07-07 11:53:47 +0200
commit25b02fffbb6f68d0d60a1a421b9ae17dac00482d (patch)
tree62491a824616563528e922c9a19c27c8d9bc56b3
parentee42c384009cfb21375d0ea01af7d712ee80158a (diff)
Use comphelper::SequenceAsVector
Change-Id: I5458687f9a63b91c43c6ecce2cb4535e50e4a23e
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx11
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.hxx3
2 files changed, 7 insertions, 7 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 021a626db252..7d71537205d4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4400,30 +4400,29 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
if (nParam >= 0)
{
m_aStates.top().aDrawingObject.nPolyLineCount = nParam;
- m_aStates.top().aDrawingObject.aPolyLinePoints.realloc(nParam);
}
break;
case RTF_DPPTX:
{
RTFDrawingObject& rDrawingObject = m_aStates.top().aDrawingObject;
- if (!rDrawingObject.aPolyLinePoints.hasElements())
+ if (rDrawingObject.aPolyLinePoints.empty())
dispatchValue(RTF_DPPOLYCOUNT, 2);
- rDrawingObject.aPolyLinePoints[rDrawingObject.aPolyLinePoints.getLength() - rDrawingObject.nPolyLineCount].X = convertTwipToMm100(nParam);
+ rDrawingObject.aPolyLinePoints.push_back(awt::Point(convertTwipToMm100(nParam), 0));
}
break;
case RTF_DPPTY:
{
RTFDrawingObject& rDrawingObject = m_aStates.top().aDrawingObject;
- if (rDrawingObject.aPolyLinePoints.hasElements())
+ if (!rDrawingObject.aPolyLinePoints.empty())
{
- rDrawingObject.aPolyLinePoints[rDrawingObject.aPolyLinePoints.getLength() - rDrawingObject.nPolyLineCount].Y = convertTwipToMm100(nParam);
+ rDrawingObject.aPolyLinePoints.back().Y = convertTwipToMm100(nParam);
rDrawingObject.nPolyLineCount--;
if (rDrawingObject.nPolyLineCount == 0)
{
uno::Sequence< uno::Sequence<awt::Point> >aPointSequenceSequence(1);
- aPointSequenceSequence[0] = rDrawingObject.aPolyLinePoints;
+ aPointSequenceSequence[0] = rDrawingObject.aPolyLinePoints.getAsConstList();
rDrawingObject.xPropertySet->setPropertyValue("PolyPolygon", uno::Any(aPointSequenceSequence));
}
}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index d8e71343f1c3..eba6ef5a3586 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -21,6 +21,7 @@
#include <oox/helper/graphichelper.hxx>
#include <oox/mathml/importutils.hxx>
#include <rtl/strbuf.hxx>
+#include <comphelper/sequenceasvector.hxx>
#include <rtftok/RTFDocument.hxx>
#include <rtfreferencetable.hxx>
@@ -153,7 +154,7 @@ public:
sal_Int32 nDhgt;
sal_Int32 nFLine;
sal_Int32 nPolyLineCount;
- css::uno::Sequence<css::awt::Point> aPolyLinePoints;
+ comphelper::SequenceAsVector<css::awt::Point> aPolyLinePoints;
bool bHadShapeText;
};