User: kz Date: 2006/10/05 06:04:37 Modified: dba/dbaccess/source/ui/dlg/tablespage.cxx
Log: INTEGRATION: CWS hsqlcsvstage1 (1.26.2); FILE MERGED 2006/09/20 11:43:59 fs 1.26.2.1: #i69696#, being stage 1 of issue #i69526#: merging changes from CWS hsqlcsv herein File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: tablespage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/tablespage.cxx?r1=1.26&r2=1.27 Delta lines: +2 -53 -------------------- --- tablespage.cxx 17 Sep 2006 07:12:12 -0000 1.26 +++ tablespage.cxx 5 Oct 2006 13:04:34 -0000 1.27 @@ -111,9 +111,6 @@ #ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" #endif -#ifndef _DBAUI_QUERYDESIGNACCESS_HXX_ -#include "querydesignaccess.hxx" -#endif #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" #endif @@ -751,54 +748,6 @@ } //------------------------------------------------------------------------ - ::rtl::OUString OTableSubscriptionPage::getComposedEntryName(SvLBoxEntry* _pEntry) - { - SvLBoxEntry* pSchema = NULL; - SvLBoxEntry* pCatalog = NULL; - SvLBoxEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry(); - ::rtl::OUString sCatalog; - ::rtl::OUString sComposedName; - if (m_aTablesList.GetModel()->HasParent(_pEntry)) - { - pSchema = m_aTablesList.GetModel()->GetParent(_pEntry); - if (pAllObjectsEntry == pSchema) - // do not want to have the root entry - pSchema = NULL; - - if (pSchema) - { // it's a real schema entry, not the "all objects" root - if (m_aTablesList.GetModel()->HasParent(pSchema)) - { - pCatalog = m_aTablesList.GetModel()->GetParent(pSchema); - if (pAllObjectsEntry == pCatalog) - // do not want to have the root entry - pCatalog = NULL; - - if (pCatalog) - { // it's a real catalog entry, not the "all objects" root - if (m_bCatalogAtStart) - { - sComposedName += m_aTablesList.GetEntryText( pCatalog ); - sComposedName += m_sCatalogSeparator; - } - else - { - sCatalog += m_sCatalogSeparator; - sCatalog += m_aTablesList.GetEntryText( pCatalog ); - } - } - } - sComposedName += m_aTablesList.GetEntryText( pSchema ); - sComposedName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); - } - } - sComposedName += m_aTablesList.GetEntryText( _pEntry ); - if (!m_bCatalogAtStart) - sComposedName += sCatalog; - - return sComposedName; - } - //------------------------------------------------------------------------ IMPL_LINK( OTableSubscriptionPage, OnTreeEntryCompare, const SvSortData*, _pSortData ) { SvLBoxEntry* pLHS = static_cast<SvLBoxEntry*>(_pSortData->pLeft); @@ -977,7 +926,7 @@ _rEvent.Accessor >>= sName; DBG_ASSERT( 0 != sName.getLength(), "OTableSubscriptionPage::_elementInserted: invalid accessor!" ); - m_aTablesList.addedTable( m_xCurrentConnection, sName, _rEvent.Element ); + m_aTablesList.addedTable( sName ); // update the checks from the table filter set on the data source try @@ -1007,7 +956,7 @@ _rEvent.Accessor >>= sName; DBG_ASSERT( 0 != sName.getLength(), "OTableSubscriptionPage::_elementRemoved: invalid accessor!" ); - m_aTablesList.removedTable( m_xCurrentConnection, sName ); + m_aTablesList.removedTable( sName ); m_aTablesList.CheckButtons(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
