From 3e727eeb92ec7d0b03933c9f66d96e72d91f3f24 Mon Sep 17 00:00:00 2001
From: "Ocke Janssen [oj]" <Ocke.Janssen@oracle.com>
Date: Wed, 5 Jan 2011 10:27:09 +0100
Subject: dba34c: #i110584# fix for FN escape function and check if table name
 is empty

---
 connectivity/source/parse/PColumn.cxx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'connectivity/source/parse/PColumn.cxx')

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);
-- 
cgit