Tag: cws_src680_hsqlcsv User: fs Date: 2008-01-17 02:22:04+0000 Modified: dba/dbaccess/source/ui/browser/dsbrowserDnD.cxx
Log: RESYNC: (1.75-1.78); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: dsbrowserDnD.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dsbrowserDnD.cxx?r1=1.73.58.2&r2=1.73.58.3 Delta lines: +1 -28 -------------------- --- dsbrowserDnD.cxx 2006-10-11 08:55:17+0000 1.73.58.2 +++ dsbrowserDnD.cxx 2008-01-17 02:22:02+0000 1.73.58.3 @@ -58,9 +58,6 @@ #ifndef _DBU_BRW_HRC_ #include "dbu_brw.hrc" #endif -#ifndef _DBAUI_MODULE_DBU_HXX_ -#include "moduledbu.hxx" -#endif #ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> #endif @@ -256,23 +253,12 @@ return 0; } // ----------------------------------------------------------------------------- - sal_Bool SbaTableQueryBrowser::isEntryCutAllowed(SvLBoxEntry* /*_pEntry*/) const - { - // at the momoent this isn't allowed - return sal_False; - } - // ----------------------------------------------------------------------------- sal_Bool SbaTableQueryBrowser::isEntryCopyAllowed(SvLBoxEntry* _pEntry) const { EntryType eType = getEntryType(_pEntry); return ( eType == etTableOrView || eType == etQuery ); } // ----------------------------------------------------------------------------- - sal_Bool SbaTableQueryBrowser::isEntryPasteAllowed(SvLBoxEntry* /*_pEntry*/) const - { - return sal_False; - } - // ----------------------------------------------------------------------------- void SbaTableQueryBrowser::copyEntry(SvLBoxEntry* _pEntry) { TransferableHelper* pTransfer = NULL; @@ -284,18 +270,6 @@ pTransfer->CopyToClipboard(getView()); } // ----------------------------------------------------------------------------- - sal_Bool SbaTableQueryBrowser::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc, sal_Bool _bCheck) - { - // first get the dest connection - ::osl::MutexGuard aGuard(m_aMutex); - - SharedConnection xDestConnection; - if ( !ensureConnection( _rDesc.pDroppedAt, xDestConnection ) ) - return sal_False; - - return m_aTableCopyHelper.copyTagTable( _rDesc, _bCheck, xDestConnection ); - } - // ----------------------------------------------------------------------------- IMPL_LINK( SbaTableQueryBrowser, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ ) { m_nAsyncDrop = 0; @@ -337,11 +311,10 @@ if ( pData->xConnection.is() ) { DBG_ASSERT( impl_isDataSourceEntry( pEntryLoop ), "SbaTableQueryBrowser::clearTreeModel: no data source entry, but a connection?" ); - // without this, pData->aController might not really be a valid ModelControllerConnector + // connections are to be stored *only* at the data source entries impl_releaseConnection( pData->xConnection ); } - pData->aController.clear(); delete pData; } pEntryLoop = m_pTreeModel->Next(pEntryLoop); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
