diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 13:03:22 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-13 13:03:22 +0000 |
| commit | 2af445276ee02f4cb32801d97a805e08ee695d0d (patch) | |
| tree | cc8f45ca0646c5315d22df78978308bd6931f6c0 | |
| parent | 0d447194592fe7fd734ae75d59f3f662627f1126 (diff) | |
#i10000#: fix wrong merge conflict resolution (CWS sb102)
| -rw-r--r-- | connectivity/source/drivers/dbase/DTable.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 83e6ad35e1..0db2f41f69 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -692,9 +692,9 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s aStr.EraseTrailingChars(); if ( aStr.Len() ) - *(*(_rRow).get())[i] = ::rtl::OUString(aStr); + *(_rRow->get())[i] = ::rtl::OUString(aStr); else// keine StringLaenge, dann NULL - (*(_rRow.get()))[i]->setNull(); + (_rRow->get())[i]->setNull(); pData[nLen] = cLast; } |