[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |   11 +++++------
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |    3 ++-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 25b02fffbb6f68d0d60a1a421b9ae17dac00482d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jul 7 11:44:52 2014 +0200

    Use comphelper::SequenceAsVector
    
    Change-Id: I5458687f9a63b91c43c6ecce2cb4535e50e4a23e

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 021a626..7d71537 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 d8e7134..eba6ef5 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;
 };