diff options
| author | Ocke Janssen <oj@openoffice.org> | 2010-03-17 06:17:26 +0000 |
|---|---|---|
| committer | Ocke Janssen <oj@openoffice.org> | 2010-03-17 06:17:26 +0000 |
| commit | 2b23d6e5b7fafc0c8ba7136d7e66dd7b246f8f8a (patch) | |
| tree | e12e12ff4238c0265232fc43eb58f437b2b89dd4 /dbaccess | |
| parent | e4416c73ca10c002ed39fe8f69395d627652f162 (diff) | |
#i109766# apply for patch for unhandled exception
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/control/tabletree.cxx | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 5dc8fe2ecba6..0d9b35bea9b2 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -638,37 +638,45 @@ String OTableTreeListBox::getQualifiedTableName( SvLBoxEntry* _pEntry ) const { OSL_PRECOND( !isFolderEntry( _pEntry ), "OTableTreeListBox::getQualifiedTableName: folder entries not allowed here!" ); - Reference< XDatabaseMetaData > xMeta; - if ( !impl_getAndAssertMetaData( xMeta ) ) - return String(); + try + { + Reference< XDatabaseMetaData > xMeta; + if ( !impl_getAndAssertMetaData( xMeta ) ) + return String(); - ::rtl::OUString sCatalog; - ::rtl::OUString sSchema; - ::rtl::OUString sTable; + ::rtl::OUString sCatalog; + ::rtl::OUString sSchema; + ::rtl::OUString sTable; - SvLBoxEntry* pSchema = GetParent( _pEntry ); - if ( pSchema ) - { - SvLBoxEntry* pCatalog = GetParent( pSchema ); - if ( pCatalog - || ( xMeta->supportsCatalogsInDataManipulation() - && !xMeta->supportsSchemasInDataManipulation() - ) // here we support catalog but no schema - ) + SvLBoxEntry* pSchema = GetParent( _pEntry ); + if ( pSchema ) { - if ( pCatalog == NULL ) + SvLBoxEntry* pCatalog = GetParent( pSchema ); + if ( pCatalog + || ( xMeta->supportsCatalogsInDataManipulation() + && !xMeta->supportsSchemasInDataManipulation() + ) // here we support catalog but no schema + ) { - pCatalog = pSchema; - pSchema = NULL; + if ( pCatalog == NULL ) + { + pCatalog = pSchema; + pSchema = NULL; + } + sCatalog = GetEntryText( pCatalog ); } - sCatalog = GetEntryText( pCatalog ); + if ( pSchema ) + sSchema = GetEntryText(pSchema); } - if ( pSchema ) - sSchema = GetEntryText(pSchema); - } - sTable = GetEntryText( _pEntry ); + sTable = GetEntryText( _pEntry ); - return ::dbtools::composeTableName( xMeta, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation ); + return ::dbtools::composeTableName( xMeta, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation ); + } + catch( const Exception& ) + { + DBG_UNHANDLED_EXCEPTION(); + } + return String(), } //------------------------------------------------------------------------ |