Kaydet (Commit) 9767f9be authored tarafından Miklos Vajna's avatar Miklos Vajna

Use comphelper::SequenceAsVector

Change-Id: I115b17da8cc246bf1b2502ed53ef00edad70a21d
üst 23712bcb
...@@ -135,7 +135,7 @@ void BorderHandler::lcl_sprm(Sprm & rSprm) ...@@ -135,7 +135,7 @@ void BorderHandler::lcl_sprm(Sprm & rSprm)
writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps(); writerfilter::Reference<Properties>::Pointer_t pProperties = rSprm.getProps();
if( pProperties.get()) if( pProperties.get())
{ {
std::vector<beans::PropertyValue> aSavedGrabBag; comphelper::SequenceAsVector<beans::PropertyValue> aSavedGrabBag;
if (!m_aInteropGrabBagName.isEmpty()) if (!m_aInteropGrabBagName.isEmpty())
{ {
aSavedGrabBag = m_aInteropGrabBag; aSavedGrabBag = m_aInteropGrabBag;
...@@ -202,12 +202,7 @@ beans::PropertyValue BorderHandler::getInteropGrabBag(const OUString& aName) ...@@ -202,12 +202,7 @@ beans::PropertyValue BorderHandler::getInteropGrabBag(const OUString& aName)
else else
aRet.Name = aName; aRet.Name = aName;
uno::Sequence<beans::PropertyValue> aSeq(m_aInteropGrabBag.size()); aRet.Value = uno::makeAny(m_aInteropGrabBag.getAsConstList());
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);
return aRet; return aRet;
} }
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#include <comphelper/sequenceasvector.hxx>
namespace writerfilter { namespace writerfilter {
namespace dmapper namespace dmapper
...@@ -57,7 +58,7 @@ private: ...@@ -57,7 +58,7 @@ private:
bool m_aFilledLines[BORDER_COUNT]; bool m_aFilledLines[BORDER_COUNT];
::com::sun::star::table::BorderLine2 m_aBorderLines[BORDER_COUNT]; ::com::sun::star::table::BorderLine2 m_aBorderLines[BORDER_COUNT];
OUString m_aInteropGrabBagName; 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); void appendGrabBag(const OUString& aKey, const OUString& aValue);
// Properties // Properties
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment