summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-08-22 16:32:46 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-08-22 16:37:30 +0200
commit9767f9becc689be6405dbbfc6cd9921d8cbac4d3 (patch)
treeac0634966dd623bb9007200a17e0d701267f694f
parent23712bcb7d255a102225a78c0727b3cfb37a9149 (diff)
Use comphelper::SequenceAsVector
Change-Id: I115b17da8cc246bf1b2502ed53ef00edad70a21d
-rw-r--r--writerfilter/source/dmapper/BorderHandler.cxx9
-rw-r--r--writerfilter/source/dmapper/BorderHandler.hxx3
2 files changed, 4 insertions, 8 deletions
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index 7e03c3d59fc5..68418b8afd6f 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -135,7 +135,7 @@ void BorderHandler::lcl_sprm(Sprm & rSprm)
writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
if( pProperties.get())
{
- std::vector<beans::PropertyValue> aSavedGrabBag;
+ comphelper::SequenceAsVector<beans::PropertyValue> aSavedGrabBag;
if (!m_aInteropGrabBagName.isEmpty())
{
aSavedGrabBag = m_aInteropGrabBag;
@@ -202,12 +202,7 @@ beans::PropertyValue BorderHandler::getInteropGrabBag(const OUString& aName)
else
aRet.Name = aName;
- uno::Sequence<beans::PropertyValue> aSeq(m_aInteropGrabBag.size());
- beans::PropertyValue* pSeq = aSeq.getArray();
- for (std::vector<beans::PropertyValue>::iterator i = m_aInteropGrabBag.begin(); i != m_aInteropGrabBag.end(); ++i)
- *pSeq++ = *i;
-
- aRet.Value = uno::makeAny(aSeq);
+ aRet.Value = uno::makeAny(m_aInteropGrabBag.getAsConstList());
return aRet;
}
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 0368a934f3c2..4f2ce9cdad52 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -24,6 +24,7 @@
#include <boost/shared_ptr.hpp>
#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
+#include <comphelper/sequenceasvector.hxx>
namespace writerfilter {
namespace dmapper
@@ -57,7 +58,7 @@ private:
bool m_aFilledLines[BORDER_COUNT];
::com::sun::star::table::BorderLine2 m_aBorderLines[BORDER_COUNT];
OUString m_aInteropGrabBagName;
- std::vector<css::beans::PropertyValue> m_aInteropGrabBag;
+ comphelper::SequenceAsVector<css::beans::PropertyValue> m_aInteropGrabBag;
void appendGrabBag(const OUString& aKey, const OUString& aValue);
// Properties