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

[Julien Nabet]

 connectivity/source/drivers/dbase/DTable.cxx         |    2 +-
 connectivity/source/inc/resource/sharedresources.hxx |    4 ++--
 connectivity/source/resource/sharedresources.cxx     |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 39c6112b5b493eda042078447bf6c67bb7bd8a34
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Aug 31 19:55:37 2017 +0200

    Replace list by vector for getResourceStringWithSubstitution
    
    Change-Id: I0b09a575971286ecc4d3bbc40926b949e9ab28c0
    Reviewed-on: https://gerrit.libreoffice.org/41768
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 8f8f0f0543dc..bed2e67af14b 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1892,7 +1892,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo
                         m_pColumns->getByIndex(i) >>= xCol;
                         OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!");
                         xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
-                        std::list< std::pair<const sal_Char* , OUString > > aStringToSubstitutes;
+                        std::vector< std::pair<const sal_Char* , OUString > > aStringToSubstitutes;
                         aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$columnname$", aColName));
                         aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$precision$", OUString::number(nLen)));
                         aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$scale$", OUString::number(nScale)));
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index c284b4a9e59a..535e71469e6c 100644
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_RESOURCE_SHAREDRESOURCES_HXX
 
 #include <rtl/ustring.hxx>
-#include <list>
+#include <vector>
 #include <connectivity/dbtoolsdllapi.hxx>
 
 
@@ -140,7 +140,7 @@ namespace connectivity
                 the string from the resource file, with applied string substitution
         */
         OUString getResourceStringWithSubstitution( const char* pResId,
-                    const std::list< std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const;
+                    const std::vector< std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const;
     };
 
 
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 65090fd8d483..f2fe28801ada 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -172,11 +172,11 @@ namespace connectivity
     }
 
     OUString SharedResources::getResourceStringWithSubstitution(const char* pResId,
-                    const std::list< std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const
+                    const std::vector< std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const
     {
         OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );
-        std::list< std::pair<const sal_Char* , OUString > >::const_iterator aIter = _rStringToSubstitutes.begin();
-        std::list< std::pair<const sal_Char* , OUString > >::const_iterator aEnd  = _rStringToSubstitutes.end();
+        std::vector< std::pair<const sal_Char* , OUString > >::const_iterator aIter = _rStringToSubstitutes.begin();
+        std::vector< std::pair<const sal_Char* , OUString > >::const_iterator aEnd  = _rStringToSubstitutes.end();
         for(;aIter != aEnd; ++aIter)
             OSL_VERIFY( lcl_substitute( sString, aIter->first, aIter->second ) );