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

[Julien Nabet]

 forms/source/component/FormattedField.cxx    |   16 ++++++++--------
 forms/source/component/refvaluecomponent.cxx |   10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 98b03cdc63bdf72a054a7fd17226673e34a3ba3e
Author: Julien Nabet <serval2...@yahoo.fr>
Date:   Wed Nov 1 20:59:57 2017 +0100

    Replace lists by vectors (forms)
    
    Change-Id: Id0215a1044f330ffe6d09875d2f0ed6d4aa0b4f0
    Reviewed-on: https://gerrit.libreoffice.org/44179
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/forms/source/component/FormattedField.cxx 
b/forms/source/component/FormattedField.cxx
index ff3ca9b054f2..c84c219cc309 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -53,7 +53,7 @@
 #include <comphelper/streamsection.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <unotools/desktopterminationobserver.hxx>
-#include <list>
+#include <vector>
 #include <algorithm>
 
 
@@ -970,26 +970,26 @@ Any OFormattedModel::translateDbColumnToControlValue()
 
 Sequence< Type > OFormattedModel::getSupportedBindingTypes()
 {
-    ::std::list< Type > aTypes;
-    aTypes.push_back( cppu::UnoType< double >::get() );
+    ::std::vector< Type > aTypes;
     switch ( m_nKeyType & ~NumberFormat::DEFINED )
     {
     case NumberFormat::DATE:
-        aTypes.push_front(cppu::UnoType< css::util::Date >::get() );
+        aTypes.push_back(cppu::UnoType< css::util::Date >::get() );
         break;
     case NumberFormat::TIME:
-        aTypes.push_front(cppu::UnoType< css::util::Time >::get() );
+        aTypes.push_back(cppu::UnoType< css::util::Time >::get() );
         break;
     case NumberFormat::DATETIME:
-        aTypes.push_front(cppu::UnoType< css::util::DateTime >::get() );
+        aTypes.push_back(cppu::UnoType< css::util::DateTime >::get() );
         break;
     case NumberFormat::TEXT:
-        aTypes.push_front(cppu::UnoType< OUString >::get() );
+        aTypes.push_back(cppu::UnoType< OUString >::get() );
         break;
     case NumberFormat::LOGICAL:
-        aTypes.push_front(cppu::UnoType< sal_Bool >::get() );
+        aTypes.push_back(cppu::UnoType< sal_Bool >::get() );
         break;
     }
+    aTypes.push_back( cppu::UnoType< double >::get() );
     return comphelper::containerToSequence(aTypes);
 }
 
diff --git a/forms/source/component/refvaluecomponent.cxx 
b/forms/source/component/refvaluecomponent.cxx
index fbb4aeed1ab6..c85fa5784503 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -21,7 +21,7 @@
 
 #include <tools/diagnose_ex.h>
 
-#include <list>
+#include <vector>
 
 
 namespace frm
@@ -162,12 +162,12 @@ namespace frm
 
     Sequence< Type > OReferenceValueComponent::getSupportedBindingTypes()
     {
-        ::std::list< Type > aTypes;
-        aTypes.push_back( cppu::UnoType<sal_Bool>::get() );
+        ::std::vector< Type > aTypes;
 
         if ( !m_sReferenceValue.isEmpty() )
-            aTypes.push_front( cppu::UnoType<OUString>::get() );
-            // push_front, because this is the preferred type
+            aTypes.push_back( cppu::UnoType<OUString>::get() );
+
+        aTypes.push_back( cppu::UnoType<sal_Bool>::get() );
 
         return comphelper::containerToSequence(aTypes);
     }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits