Tag: cws_src680_hsqlcsv User: fs Date: 2006/09/14 04:51:56 Modified: dba/dbaccess/source/ui/dlg/tablespage.cxx dba/dbaccess/source/ui/dlg/tablespage.hxx
Log: getComposedEntryName was not used (since #i69526# part of the TableTrreeListBox, anyway) 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.25&r2=1.25.58.1 Delta lines: +5 -53 -------------------- --- tablespage.cxx 20 Jun 2006 03:10:17 -0000 1.25 +++ tablespage.cxx 14 Sep 2006 11:51:53 -0000 1.25.58.1 @@ -4,9 +4,9 @@ * * $RCSfile: tablespage.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.25.58.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:10:17 $ + * last change: $Author: fs $ $Date: 2006/09/14 11:51:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -748,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); @@ -974,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 @@ -1004,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(); } File [changed]: tablespage.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/tablespage.hxx?r1=1.11&r2=1.11.58.1 Delta lines: +3 -9 ------------------- --- tablespage.hxx 20 Jun 2006 03:10:32 -0000 1.11 +++ tablespage.hxx 14 Sep 2006 11:51:53 -0000 1.11.58.1 @@ -4,9 +4,9 @@ * * $RCSfile: tablespage.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.58.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 03:10:32 $ + * last change: $Author: fs $ $Date: 2006/09/14 11:51:53 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -123,12 +123,6 @@ private: - - /** get the composed name of the entry given - @param _pEntry - the entry which's name is to be retrieved. Must be a leaf entry. - */ - ::rtl::OUString getComposedEntryName(SvLBoxEntry* _pEntry); /** check the tables in <member>m_aTablesList</member> according to <arg>_rTables</arg> */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
