Change the attribute/sprm list to a vector from a multimap

It turns out that order does matter, for example when dealing with
picture size and data. (Size must arrive first.)

1 files changed, 4 insertions, 3 deletions

diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.cxx b/writerfilter/source/rtftok/rtfreferenceproperties.cxx
index 2dfc364bd4fc..7d10af862259 100644
--- a/writerfilter/source/rtftok/rtfreferenceproperties.cxx
+++ b/writerfilter/source/rtftok/rtfreferenceproperties.cxx
@@ -4,7 +4,8 @@
 namespace writerfilter {
 namespace rtftok {
 
-RTFReferenceProperties::RTFReferenceProperties(std::multimap<Id, RTFValue::Pointer_t> rAttributes, std::multimap<Id, RTFValue::Pointer_t> rSprms)
+RTFReferenceProperties::RTFReferenceProperties(std::vector<std::pair<Id, RTFValue::Pointer_t>> rAttributes,
+        std::vector<std::pair<Id, RTFValue::Pointer_t>> rSprms)
     : m_rAttributes(rAttributes),
     m_rSprms(rSprms)
 {
@@ -16,9 +17,9 @@ RTFReferenceProperties::~RTFReferenceProperties()
 
 void RTFReferenceProperties::resolve(Properties& rHandler)
 {
-    for (std::multimap<Id, RTFValue::Pointer_t>::iterator i = m_rAttributes.begin(); i != m_rAttributes.end(); ++i)
+    for (std::vector<std::pair<Id, RTFValue::Pointer_t>>::iterator i = m_rAttributes.begin(); i != m_rAttributes.end(); ++i)
         rHandler.attribute(i->first, *i->second.get());
-    for (std::multimap<Id, RTFValue::Pointer_t>::iterator i = m_rSprms.begin(); i != m_rSprms.end(); ++i)
+    for (std::vector<std::pair<Id, RTFValue::Pointer_t>>::iterator i = m_rSprms.begin(); i != m_rSprms.end(); ++i)
     {
         RTFSprm aSprm(i->first, i->second);
         rHandler.sprm(aSprm);