diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-29 09:18:26 +0200 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-29 17:56:32 +0200 |
| commit | 03919cfa7904be4c6312b0ecdd7129990fa554c6 (patch) | |
| tree | 4a11c67c84b834e3440d8d23f0b76038abe8a696 | |
| parent | 4f27ff917237be96eec897d4af90a3379be904c6 (diff) | |
Use column name for getColumnLabel (firebird-sdbc).
Change-Id: I2e92c5dbdfe4cb9d8441e2d120b139fe97209d3e
| -rw-r--r-- | connectivity/source/drivers/firebird/FResultSet.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/drivers/firebird/FResultSetMetaData.cxx | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/connectivity/source/drivers/firebird/FResultSet.cxx b/connectivity/source/drivers/firebird/FResultSet.cxx index fd9843fbff89..ca0ded148373 100644 --- a/connectivity/source/drivers/firebird/FResultSet.cxx +++ b/connectivity/source/drivers/firebird/FResultSet.cxx @@ -321,6 +321,10 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& columnName) break; } + // TODO: add appropriate error + if (i > nLen) + throw SQLException(); + return i; } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx b/connectivity/source/drivers/firebird/FResultSetMetaData.cxx index 4a23f9914e1f..a833085463ad 100644 --- a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/firebird/FResultSetMetaData.cxx @@ -120,8 +120,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) throw(SQLException, RuntimeException) { // TODO: clarify what this is -- probably not the alias - (void) column; - return OUString(); + return getColumnName(column); } OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) |