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

[Julien Nabet (via logerrit)]

 svx/source/svdraw/svdmodel.cxx |   22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

New commits:
commit f97a7b965be154824e108802b386e3132b0a237a
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Jun 4 21:59:50 2023 +0200
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Mon Jun 5 00:03:04 2023 +0200

    Simplify vector intialization in svx/svdmodel
    
    Change-Id: Ieaed80e4621084baf531b794323b2742ccd80310
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152594
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 82c9a92fa503..4e1ea3c78ac5 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1834,23 +1834,15 @@ void SdrModel::ReadUserDataSequenceValue(const 
beans::PropertyValue* pValue)
     }
 }
 
-template <typename T>
-static void addPair(std::vector< std::pair< OUString, uno::Any > >& aUserData, 
const OUString& name, const T val)
-{
-    aUserData.push_back(std::pair< OUString, uno::Any >(name, uno::Any(val)));
-}
-
 void SdrModel::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& 
rValues)
 {
-    std::vector< std::pair< OUString, uno::Any > > aUserData;
-    addPair(aUserData, "AnchoredTextOverflowLegacy",
-            
GetCompatibilityFlag(SdrCompatibilityFlag::AnchoredTextOverflowLegacy));
-    addPair(aUserData, "LegacySingleLineFontwork",
-            
GetCompatibilityFlag(SdrCompatibilityFlag::LegacySingleLineFontwork));
-    addPair(aUserData, "ConnectorUseSnapRect",
-            GetCompatibilityFlag(SdrCompatibilityFlag::ConnectorUseSnapRect));
-    addPair(aUserData, "IgnoreBreakAfterMultilineField",
-            
GetCompatibilityFlag(SdrCompatibilityFlag::IgnoreBreakAfterMultilineField));
+    std::vector< std::pair< OUString, uno::Any > > aUserData
+    {
+        { "AnchoredTextOverflowLegacy", 
uno::Any(GetCompatibilityFlag(SdrCompatibilityFlag::AnchoredTextOverflowLegacy))
 },
+        { "LegacySingleLineFontwork", 
uno::Any(GetCompatibilityFlag(SdrCompatibilityFlag::LegacySingleLineFontwork)) 
},
+        { "ConnectorUseSnapRect", 
uno::Any(GetCompatibilityFlag(SdrCompatibilityFlag::ConnectorUseSnapRect)) },
+        { "IgnoreBreakAfterMultilineField", 
uno::Any(GetCompatibilityFlag(SdrCompatibilityFlag::IgnoreBreakAfterMultilineField))
 }
+    };
 
     const sal_Int32 nOldLength = rValues.getLength();
     rValues.realloc(nOldLength + aUserData.size());