User: ihi Date: 2006/08/28 08:05:43 Modified: dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx
Log: 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 File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppDetailPageHelper.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailPageHelper.cxx?r1=1.14&r2=1.15 Delta lines: +4 -3 ------------------- --- AppDetailPageHelper.cxx 10 Jul 2006 15:23:24 -0000 1.14 +++ AppDetailPageHelper.cxx 28 Aug 2006 15:05:40 -0000 1.15 @@ -452,7 +452,7 @@ 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 @@ 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 @@ 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: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
