Tag: cws_dev300_dba30d User: fs Date: 2008-06-01 20:57:51+0000 Modified: dba/dbaccess/source/ui/browser/dsEntriesNoExp.cxx dba/dbaccess/source/ui/browser/dsbrowserDnD.cxx
Log: minor re-factoring during #i80943# File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: dsEntriesNoExp.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dsEntriesNoExp.cxx?r1=1.22&r2=1.22.12.1 Delta lines: +10 -10 --------------------- --- dsEntriesNoExp.cxx 2008-04-22 15:19:30+0000 1.22 +++ dsEntriesNoExp.cxx 2008-06-01 20:57:49+0000 1.22.12.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dsEntriesNoExp.cxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.12.1 $ * * This file is part of OpenOffice.org. * @@ -86,7 +86,7 @@ // ----------------------------------------------------------------------------- String SbaTableQueryBrowser::GetEntryText( SvLBoxEntry* _pEntry ) const { - return m_pTreeView->getListBox()->GetEntryText(_pEntry); + return m_pTreeView->getListBox().GetEntryText(_pEntry); } // ----------------------------------------------------------------------------- @@ -95,15 +95,15 @@ if (!_pEntry) return etUnknown; - SvLBoxEntry* pRootEntry = m_pTreeView->getListBox()->GetRootLevelParent(_pEntry); - SvLBoxEntry* pEntryParent = m_pTreeView->getListBox()->GetParent(_pEntry); - SvLBoxEntry* pTables = m_pTreeView->getListBox()->GetEntry(pRootEntry, CONTAINER_TABLES); - SvLBoxEntry* pQueries = m_pTreeView->getListBox()->GetEntry(pRootEntry, CONTAINER_QUERIES); + SvLBoxEntry* pRootEntry = m_pTreeView->getListBox().GetRootLevelParent(_pEntry); + SvLBoxEntry* pEntryParent = m_pTreeView->getListBox().GetParent(_pEntry); + SvLBoxEntry* pTables = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_TABLES); + SvLBoxEntry* pQueries = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_QUERIES); #ifdef DBG_UTIL String sTest; - if (pTables) sTest = m_pTreeView->getListBox()->GetEntryText(pTables); - if (pQueries) sTest = m_pTreeView->getListBox()->GetEntryText(pQueries); + if (pTables) sTest = m_pTreeView->getListBox().GetEntryText(pTables); + if (pQueries) sTest = m_pTreeView->getListBox().GetEntryText(pQueries); #endif if (pRootEntry == _pEntry) @@ -219,7 +219,7 @@ SvLBoxEntry* pEntryLoop = m_pTreeModel->First(); while ( pEntryLoop ) { - DBTreeListModel::DBTreeListUserData* pData = static_cast<DBTreeListModel::DBTreeListUserData*>(pEntryLoop->GetUserData()); + DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pEntryLoop->GetUserData()); if ( !pData ) { pEntryLoop = m_pTreeModel->Next(pEntryLoop); File [changed]: dsbrowserDnD.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dsbrowserDnD.cxx?r1=1.80&r2=1.80.10.1 Delta lines: +10 -9 -------------------- --- dsbrowserDnD.cxx 2008-05-05 15:52:51+0000 1.80 +++ dsbrowserDnD.cxx 2008-06-01 20:57:49+0000 1.80.10.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dsbrowserDnD.cxx,v $ - * $Revision: 1.80 $ + * $Revision: 1.80.10.1 $ * * This file is part of OpenOffice.org. * @@ -50,6 +50,7 @@ #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <svtools/treelist.hxx> #include <svx/dataaccessdescriptor.hxx> #include <tools/diagnose_ex.h> @@ -84,7 +85,7 @@ ::osl::MutexGuard aGuard(m_aEntryMutex); ::rtl::OUString aName = GetEntryText( _pApplyTo ); - ::rtl::OUString aDSName = getDataSourceAcessor( m_pTreeView->getListBox()->GetRootLevelParent( _pApplyTo ) ); + ::rtl::OUString aDSName = getDataSourceAcessor( m_pTreeView->getListBox().GetRootLevelParent( _pApplyTo ) ); ODataClipboard* pData = NULL; SharedConnection xConnection; @@ -114,7 +115,7 @@ sal_Int8 SbaTableQueryBrowser::queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ) { // check if we're a table or query container - SvLBoxEntry* pHitEntry = m_pTreeView->getListBox()->GetEntry( _rEvt.maPosPixel ); + SvLBoxEntry* pHitEntry = m_pTreeView->getListBox().GetEntry( _rEvt.maPosPixel ); if ( pHitEntry ) // no drop if no entry was hit .... { @@ -136,7 +137,7 @@ // ----------------------------------------------------------------------------- sal_Int8 SbaTableQueryBrowser::executeDrop( const ExecuteDropEvent& _rEvt ) { - SvLBoxEntry* pHitEntry = m_pTreeView->getListBox()->GetEntry( _rEvt.maPosPixel ); + SvLBoxEntry* pHitEntry = m_pTreeView->getListBox().GetEntry( _rEvt.maPosPixel ); EntryType eEntryType = getEntryType( pHitEntry ); if (!isContainer(eEntryType)) { @@ -198,7 +199,7 @@ { // get the affected list entry // ensure that the entry which the user clicked at is selected - SvLBoxEntry* pHitEntry = m_pTreeView->getListBox()->GetEntry( _rPosPixel ); + SvLBoxEntry* pHitEntry = m_pTreeView->getListBox().GetEntry( _rPosPixel ); if (!pHitEntry) // no drag of no entry was hit .... return sal_False; @@ -212,7 +213,7 @@ Reference< XTransferable> xEnsureDelete = pTransfer; if (pTransfer) - pTransfer->StartDrag( m_pTreeView->getListBox(), DND_ACTION_COPY ); + pTransfer->StartDrag( &m_pTreeView->getListBox(), DND_ACTION_COPY ); return NULL != pTransfer; } @@ -253,7 +254,7 @@ SharedConnection xDestConnection; if ( ensureConnection( m_aAsyncDrop.pDroppedAt, xDestConnection ) && xDestConnection.is() ) { - SvLBoxEntry* pDataSourceEntry = m_pTreeView->getListBox()->GetRootLevelParent(m_aAsyncDrop.pDroppedAt); + SvLBoxEntry* pDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent(m_aAsyncDrop.pDroppedAt); m_aTableCopyHelper.asyncCopyTagTable( m_aAsyncDrop, getDataSourceAcessor( pDataSourceEntry ), xDestConnection ); } } @@ -271,7 +272,7 @@ SvLBoxEntry* pEntryLoop = m_pTreeModel->First(); while (pEntryLoop) { - DBTreeListModel::DBTreeListUserData* pData = static_cast<DBTreeListModel::DBTreeListUserData*>(pEntryLoop->GetUserData()); + DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pEntryLoop->GetUserData()); if(pData) { pEntryLoop->SetUserData(NULL); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
