diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-28 14:05:40 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-08-28 14:05:40 +0000 |
| commit | 2e163d8e6d8739f1a4486c7a5b6b8efe6e393c76 (patch) | |
| tree | 450d63405dc8a373a7c15657f3010ed75d6079c5 /dbaccess/source/ui/app/AppDetailPageHelper.cxx | |
| parent | 5a364717bba887faf3c51ee48a4eb6cb47a01ee6 (diff) | |
INTEGRATION: CWS dba205a (1.14.10); FILE MERGED
2006/07/28 13:03:08 oj 1.14.10.2: #i67014# replaceElement now uses the correct name for table/view
2006/07/27 12:28:37 oj 1.14.10.1: #i41826# check for schema was missing
Diffstat (limited to 'dbaccess/source/ui/app/AppDetailPageHelper.cxx')
| -rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 7d3ae25f2..74d0bbbca 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -4,9 +4,9 @@ * * $RCSfile: AppDetailPageHelper.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: obo $ $Date: 2006-07-10 15:23:24 $ + * last change: $Author: ihi $ $Date: 2006-08-28 15:05:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -452,7 +452,7 @@ void OAppDetailPageHelper::getSelectionElementNames(::std::vector< ::rtl::OUStri if ( pSchema ) { SvLBoxEntry* pCatalog = rTree.GetParent(pSchema); - if ( pCatalog || _xMetaData->supportsCatalogsInDataManipulation() ) // here we support catalog but no schema + if ( pCatalog || (_xMetaData->supportsCatalogsInDataManipulation() && !_xMetaData->supportsSchemasInDataManipulation()) ) // here we support catalog but no schema { if ( pCatalog == NULL ) { @@ -764,7 +764,8 @@ sal_Bool OAppDetailPageHelper::isFilled() const void OAppDetailPageHelper::elementReplaced(ElementType _eType ,const ::rtl::OUString& _rOldName ,const ::rtl::OUString& _rNewName - ,const Reference< XConnection >& _rxConn ) + ,const Reference< XConnection >& _rxConn + ,const Reference<XInterface>& _xObject) { DBTreeListBox* pTreeView = getCurrentView(); if ( pTreeView ) @@ -776,7 +777,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType case E_TABLE: OSL_ENSURE(_rxConn.is(),"Connection is NULL! ->GPF"); static_cast<OTableTreeListBox*>(pTreeView)->removedTable(_rxConn,_rOldName); - static_cast<OTableTreeListBox*>(pTreeView)->addedTable(_rxConn,_rNewName, Any()); + static_cast<OTableTreeListBox*>(pTreeView)->addedTable(_rxConn,_rNewName, makeAny(_xObject)); return; case E_QUERY: |