summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2012-08-31 18:14:59 +0200
committerLionel Elie Mamane <lionel@mamane.lu>2012-08-31 18:18:03 +0200
commitcdadb1b4fb207392961a24788d44bd7ffa529046 (patch)
tree939a6421c9b69cae31f011abe48b17a9c0ecaf7a
parent363c1edea638a1d2cbf42e49c2021ec581740caa (diff)
fdo#53557: use metadata's idea of column count to allocate a row
m_pColumnNames contains only the columns that come straight from a table, not calculated columns Change-Id: I2706790e8c1447d1c4e144bbdef773deeca3e2e8
-rw-r--r--dbaccess/source/core/api/KeySet.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 6d8f58ed52ce..c2dadcdf5893 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1441,11 +1441,12 @@ sal_Bool OKeySet::fetchRow()
bRet = m_xDriverSet->next();
if ( bRet )
{
+ const int cc = m_xSetMetaData->getColumnCount();
+
ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >((*m_pKeyColumnNames).size() + m_pForeignColumnNames->size());
- ORowSetRow aFullRow = new connectivity::ORowVector< ORowSetValue >(m_pColumnNames->size());
+ ORowSetRow aFullRow = new connectivity::ORowVector< ORowSetValue >(cc);
// Fetch the columns only once and in order, to satisfy restrictive backends such as ODBC
- const int cc = m_xSetMetaData->getColumnCount();
connectivity::ORowVector< ORowSetValue >::Vector::iterator aFRIter = aFullRow->get().begin();
// Column 0 is reserved for the bookmark; unused here.
++aFRIter;