dbaccess/source/core/api/CacheSet.cxx | 12 ++++++------
dbaccess/source/core/api/CacheSet.hxx | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit d15d523d071df29879613e21bcb72eec6dfbe57f
Author: Noel Grandin <noelgran...@gmail.com>
Date: Sun Feb 7 17:53:59 2016 +0200
sequence->vector in OCacheSet
Change-Id: I61c6486d42dbc404355809a80943885457e79384
Reviewed-on: https://gerrit.libreoffice.org/22184
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/dbaccess/source/core/api/CacheSet.cxx
b/dbaccess/source/core/api/CacheSet.cxx
index 29be970..8853a65 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -88,12 +88,12 @@ void OCacheSet::construct( const Reference< XResultSet>&
_xDriverSet,const OUSt
if ( m_xSetMetaData.is() )
{
const sal_Int32 nCount = m_xSetMetaData->getColumnCount();
- m_aNullable.realloc(nCount);
- m_aSignedFlags.realloc(nCount);
- m_aColumnTypes.realloc(nCount);
- sal_Bool* pNullableIter = m_aNullable.getArray();
- sal_Bool* pSignedIter = m_aSignedFlags.getArray();
- sal_Int32* pColumnIter = m_aColumnTypes.getArray();
+ m_aNullable.resize(nCount);
+ m_aSignedFlags.resize(nCount);
+ m_aColumnTypes.resize(nCount);
+ auto pNullableIter = m_aNullable.begin();
+ auto pSignedIter = m_aSignedFlags.begin();
+ auto pColumnIter = m_aColumnTypes.begin();
for (sal_Int32 i=1; i <= nCount;
++i,++pSignedIter,++pColumnIter,++pNullableIter)
{
*pNullableIter = m_xSetMetaData->isNullable(i) !=
ColumnValue::NO_NULLS;
diff --git a/dbaccess/source/core/api/CacheSet.hxx
b/dbaccess/source/core/api/CacheSet.hxx
index 5047fbc..f543840 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -44,9 +44,9 @@ namespace dbaccess
css::uno::Reference< css::sdbc::XResultSetMetaData> m_xSetMetaData;
css::uno::Reference< css::sdbc::XConnection> m_xConnection;
- css::uno::Sequence<sal_Bool> m_aNullable;
- css::uno::Sequence<sal_Bool> m_aSignedFlags;
- css::uno::Sequence<sal_Int32> m_aColumnTypes;
+ std::vector<bool> m_aNullable;
+ std::vector<bool> m_aSignedFlags;
+ std::vector<sal_Int32> m_aColumnTypes;
OUString m_aComposedTableName;
sal_Int32 m_nMaxRows;
bool m_bInserted;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
