summaryrefslogtreecommitdiff
path: root/connectivity/source/parse/PColumn.cxx
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2011-01-31 13:14:17 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2011-01-31 13:14:17 +0100
commit38bb869fa8db331b62853f2b2759ac4b8bedf781 (patch)
tree052905fa50ce5ad681e77c9b9d6574315e5e5027 /connectivity/source/parse/PColumn.cxx
parent315ad807a74502fc4020578f50c56edf67ef1fa4 (diff)
parent8ae7b81f9e6c994bdec7253ef13f2859af965f99 (diff)
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34b
Diffstat (limited to 'connectivity/source/parse/PColumn.cxx')
-rw-r--r--connectivity/source/parse/PColumn.cxx16
1 files changed, 9 insertions, 7 deletions
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 10f4b5b4bdcf..8f3014908b10 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -155,13 +155,15 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe
_rxResMetaData->isCurrency( _nColumnPos ),
_rxDBMetaData->supportsMixedCaseQuotedIdentifiers()
);
- pColumn->setTableName( ::dbtools::composeTableName( _rxDBMetaData,
- _rxResMetaData->getCatalogName( _nColumnPos ),
- _rxResMetaData->getSchemaName( _nColumnPos ),
- _rxResMetaData->getTableName( _nColumnPos ),
- sal_False,
- eComplete
- ) );
+ const ::rtl::OUString sTableName = _rxResMetaData->getTableName( _nColumnPos );
+ if ( sTableName.getLength() )
+ pColumn->setTableName( ::dbtools::composeTableName( _rxDBMetaData,
+ _rxResMetaData->getCatalogName( _nColumnPos ),
+ _rxResMetaData->getSchemaName( _nColumnPos ),
+ sTableName,
+ sal_False,
+ eComplete
+ ) );
pColumn->setIsSearchable( _rxResMetaData->isSearchable( _nColumnPos ) );
pColumn->setRealName(_rxResMetaData->getColumnName( _nColumnPos ));
pColumn->setLabel(sLabel);