Kaydet (Commit) 39c6112b authored tarafından Julien Nabet's avatar Julien Nabet

Replace list by vector for getResourceStringWithSubstitution

Change-Id: I0b09a575971286ecc4d3bbc40926b949e9ab28c0
Reviewed-on: https://gerrit.libreoffice.org/41768Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst 70b9aa7b
...@@ -1892,7 +1892,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo ...@@ -1892,7 +1892,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo
m_pColumns->getByIndex(i) >>= xCol; m_pColumns->getByIndex(i) >>= xCol;
OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!"); OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!");
xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName; 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 >("$columnname$", aColName));
aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$precision$", OUString::number(nLen))); 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))); aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$scale$", OUString::number(nScale)));
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define INCLUDED_CONNECTIVITY_SOURCE_INC_RESOURCE_SHAREDRESOURCES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_RESOURCE_SHAREDRESOURCES_HXX
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <list> #include <vector>
#include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/dbtoolsdllapi.hxx>
...@@ -140,7 +140,7 @@ namespace connectivity ...@@ -140,7 +140,7 @@ namespace connectivity
the string from the resource file, with applied string substitution the string from the resource file, with applied string substitution
*/ */
OUString getResourceStringWithSubstitution( const char* pResId, 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;
}; };
......
...@@ -172,11 +172,11 @@ namespace connectivity ...@@ -172,11 +172,11 @@ namespace connectivity
} }
OUString SharedResources::getResourceStringWithSubstitution(const char* pResId, 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) ); OUString sString( SharedResources_Impl::getInstance().getResourceString(pResId) );
std::list< std::pair<const sal_Char* , OUString > >::const_iterator aIter = _rStringToSubstitutes.begin(); std::vector< 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 aEnd = _rStringToSubstitutes.end();
for(;aIter != aEnd; ++aIter) for(;aIter != aEnd; ++aIter)
OSL_VERIFY( lcl_substitute( sString, aIter->first, aIter->second ) ); OSL_VERIFY( lcl_substitute( sString, aIter->first, aIter->second ) );
......
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