diff options
Diffstat (limited to 'dbaccess/source/ui/control')
-rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 69 | ||||
-rw-r--r-- | dbaccess/source/ui/control/listviewitems.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/control/marktree.cxx | 20 | ||||
-rw-r--r-- | dbaccess/source/ui/control/tabletree.cxx | 54 |
4 files changed, 75 insertions, 72 deletions
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index d73a435fe9e5..1c53330cb4a4 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -108,39 +108,40 @@ DBTreeListBox::~DBTreeListBox() implStopSelectionTimer(); } //------------------------------------------------------------------------ -SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* pStart, const IEntryFilter* _pFilter ) const +SvTreeListEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvTreeListEntry* pStart, const IEntryFilter* _pFilter ) const { - SvLBoxTreeList* myModel = GetModel(); - SvTreeEntryList* pChildren = myModel->GetChildList(pStart); - SvLBoxEntry* pEntry = NULL; - if ( pChildren ) + SvTreeList* myModel = GetModel(); + std::pair<SvTreeListEntries::iterator,SvTreeListEntries::iterator> aIters = + myModel->GetChildIterators(pStart); + + SvTreeListEntry* pEntry = NULL; + SvTreeListEntries::iterator it = aIters.first, itEnd = aIters.second; + for (; it != itEnd; ++it) { - size_t nCount = pChildren->size(); - for (size_t i = 0; i < nCount; ++i) + pEntry = &(*it); + const SvLBoxString* pItem = static_cast<const SvLBoxString*>( + pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); + + if (pItem && pItem->GetText().equals(aName)) { - pEntry = static_cast<SvLBoxEntry*>((*pChildren)[ i ]); - SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); - if ( pItem->GetText().equals(aName) ) - { - if ( !_pFilter || _pFilter->includeEntry( pEntry ) ) - // found - break; - } - pEntry = NULL; + if (!_pFilter || _pFilter->includeEntry(pEntry)) + // found + break; } + pEntry = NULL; } return pEntry; } // ------------------------------------------------------------------------- -void DBTreeListBox::EnableExpandHandler(SvLBoxEntry* _pEntry) +void DBTreeListBox::EnableExpandHandler(SvTreeListEntry* _pEntry) { LINK(this, DBTreeListBox, OnResetEntry).Call(_pEntry); } // ------------------------------------------------------------------------- -void DBTreeListBox::RequestingChildren( SvLBoxEntry* pParent ) +void DBTreeListBox::RequestingChildren( SvTreeListEntry* pParent ) { if (m_aPreExpandHandler.IsSet()) { @@ -155,7 +156,7 @@ void DBTreeListBox::RequestingChildren( SvLBoxEntry* pParent ) } // ------------------------------------------------------------------------- -void DBTreeListBox::InitEntry( SvLBoxEntry* _pEntry, const XubString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp, SvLBoxButtonKind eButtonKind) +void DBTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& aStr, const Image& _rCollEntryBmp, const Image& _rExpEntryBmp, SvLBoxButtonKind eButtonKind) { SvTreeListBox::InitEntry( _pEntry, aStr, _rCollEntryBmp,_rExpEntryBmp, eButtonKind); SvLBoxItem* pTextItem(_pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING)); @@ -204,7 +205,7 @@ void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt ) } // ------------------------------------------------------------------------- -IMPL_LINK(DBTreeListBox, OnResetEntry, SvLBoxEntry*, pEntry) +IMPL_LINK(DBTreeListBox, OnResetEntry, SvTreeListEntry*, pEntry) { // set the flag which allows if the entry can be expanded pEntry->SetFlags( (pEntry->GetFlags() & ~(SV_ENTRYFLAG_NO_NODEBMP | SV_ENTRYFLAG_HAD_CHILDREN)) | SV_ENTRYFLAG_CHILDREN_ON_DEMAND ); @@ -213,29 +214,31 @@ IMPL_LINK(DBTreeListBox, OnResetEntry, SvLBoxEntry*, pEntry) return 0L; } // ----------------------------------------------------------------------------- -void DBTreeListBox::ModelHasEntryInvalidated( SvListEntry* _pEntry ) +void DBTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* _pEntry ) { SvTreeListBox::ModelHasEntryInvalidated( _pEntry ); - if ( m_aSelectedEntries.find( _pEntry ) != m_aSelectedEntries.end() ) + SvTreeListEntry* pLBEntry = static_cast<SvTreeListEntry*>(_pEntry); + if (m_aSelectedEntries.find(pLBEntry) != m_aSelectedEntries.end()) { - SvLBoxItem* pTextItem = static_cast< SvLBoxEntry* >( _pEntry )->GetFirstItem( SV_ITEM_ID_BOLDLBSTRING ); + SvLBoxItem* pTextItem = pLBEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING); if ( pTextItem && !static_cast< OBoldListboxString* >( pTextItem )->isEmphasized() ) { implStopSelectionTimer(); - m_aSelectedEntries.erase( _pEntry ); + m_aSelectedEntries.erase(pLBEntry); // ehm - why? } } } // ------------------------------------------------------------------------- -void DBTreeListBox::ModelHasRemoved( SvListEntry* _pEntry ) +void DBTreeListBox::ModelHasRemoved( SvTreeListEntry* _pEntry ) { SvTreeListBox::ModelHasRemoved(_pEntry); - if ( m_aSelectedEntries.find( _pEntry ) != m_aSelectedEntries.end() ) + SvTreeListEntry* pLBEntry = static_cast<SvTreeListEntry*>(_pEntry); + if (m_aSelectedEntries.find(pLBEntry) != m_aSelectedEntries.end()) { implStopSelectionTimer(); - m_aSelectedEntries.erase( _pEntry ); + m_aSelectedEntries.erase(pLBEntry); } } @@ -245,9 +248,9 @@ sal_Int8 DBTreeListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) sal_Int8 nDropOption = DND_ACTION_NONE; if ( m_pActionListener ) { - SvLBoxEntry* pDroppedEntry = GetEntry(_rEvt.maPosPixel); + SvTreeListEntry* pDroppedEntry = GetEntry(_rEvt.maPosPixel); // check if drag is on child entry, which is not allowed - SvLBoxEntry* pParent = NULL; + SvTreeListEntry* pParent = NULL; if ( _rEvt.mnAction & DND_ACTION_MOVE ) { if ( !m_pDragedEntry ) // no entry to move @@ -317,7 +320,7 @@ void DBTreeListBox::RequestHelp( const HelpEvent& rHEvt ) if( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if( pEntry ) { String sQuickHelpText; @@ -400,12 +403,12 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt ) SvTreeListBox::KeyInput(rKEvt); } // ----------------------------------------------------------------------------- -sal_Bool DBTreeListBox::EditingEntry( SvLBoxEntry* pEntry, Selection& /*_aSelection*/) +sal_Bool DBTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& /*_aSelection*/) { return m_aEditingHandler.Call(pEntry) != 0; } // ----------------------------------------------------------------------------- -sal_Bool DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText ) +sal_Bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText ) { DBTreeEditedEntry aEntry; aEntry.pEntry = pEntry; @@ -431,7 +434,7 @@ sal_Bool DBTreeListBox::DoubleClickHdl() // ----------------------------------------------------------------------------- void scrollWindow(DBTreeListBox* _pListBox, const Point& _rPos,sal_Bool _bUp) { - SvLBoxEntry* pEntry = _pListBox->GetEntry( _rPos ); + SvTreeListEntry* pEntry = _pListBox->GetEntry( _rPos ); if( pEntry && pEntry != _pListBox->Last() ) { _pListBox->ScrollOutputArea( _bUp ? -1 : 1 ); diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx index aaf208db812c..07b2b0aab880 100644 --- a/dbaccess/source/ui/control/listviewitems.cxx +++ b/dbaccess/source/ui/control/listviewitems.cxx @@ -28,7 +28,7 @@ namespace dbaui // class OBoldListboxString //======================================================================== //------------------------------------------------------------------------ - void OBoldListboxString::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* _pViewData) + void OBoldListboxString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* _pViewData) { SvLBoxString::InitViewData( pView, pEntry, _pViewData ); if ( !m_bEmphasized ) @@ -50,7 +50,7 @@ namespace dbaui } //------------------------------------------------------------------------ - void OBoldListboxString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ) + void OBoldListboxString::Paint(const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry ) { if (m_bEmphasized) { diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 07367d8319c5..a62ee25bc4be 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -82,7 +82,7 @@ void OMarkableTreeListBox::KeyInput( const KeyEvent& rKEvt ) // only if there are spaces if (rKEvt.GetKeyCode().GetCode() == KEY_SPACE && !rKEvt.GetKeyCode().IsShift() && !rKEvt.GetKeyCode().IsMod1()) { - SvLBoxEntry* pCurrentHandlerEntry = GetHdlEntry(); + SvTreeListEntry* pCurrentHandlerEntry = GetHdlEntry(); if(pCurrentHandlerEntry) { SvButtonState eState = GetCheckButtonState( pCurrentHandlerEntry); @@ -100,7 +100,7 @@ void OMarkableTreeListBox::KeyInput( const KeyEvent& rKEvt ) DBTreeListBox::KeyInput(rKEvt); } -SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry) +SvButtonState OMarkableTreeListBox::implDetermineState(SvTreeListEntry* _pEntry) { SvButtonState eState = GetCheckButtonState(_pEntry); if (!GetModel()->HasChildren(_pEntry)) @@ -114,7 +114,7 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry) sal_uInt16 nCheckedChildren = 0; sal_uInt16 nChildrenOverall = 0; - SvLBoxEntry* pChildLoop = GetModel()->FirstChild(_pEntry); + SvTreeListEntry* pChildLoop = GetModel()->FirstChild(_pEntry); while (pChildLoop) { #ifdef DBG_UTIL @@ -167,7 +167,7 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvLBoxEntry* _pEntry) void OMarkableTreeListBox::CheckButtons() { - SvLBoxEntry* pEntry = GetModel()->First(); + SvTreeListEntry* pEntry = GetModel()->First(); while (pEntry) { implDetermineState(pEntry); @@ -182,13 +182,13 @@ void OMarkableTreeListBox::CheckButtonHdl() m_aCheckButtonHandler.Call(this); } -void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) +void OMarkableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry) { SvButtonState eState = GetCheckButtonState( _pEntry); if (GetModel()->HasChildren(_pEntry)) // if it has children, check those too { - SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry); - SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry); + SvTreeListEntry* pChildEntry = GetModel()->Next(_pEntry); + SvTreeListEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry); while(pChildEntry && pChildEntry != pSiblingEntry) { SetCheckButtonState(pChildEntry, eState); @@ -196,14 +196,14 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) } } - SvLBoxEntry* pEntry = IsSelected(_pEntry) ? FirstSelected() : NULL; + SvTreeListEntry* pEntry = IsSelected(_pEntry) ? FirstSelected() : NULL; while(pEntry) { SetCheckButtonState(pEntry,eState); if(GetModel()->HasChildren(pEntry)) // if it has children, check those too { - SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry); - SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry); + SvTreeListEntry* pChildEntry = GetModel()->Next(pEntry); + SvTreeListEntry* pSiblingEntry = GetModel()->NextSibling(pEntry); while(pChildEntry && pChildEntry != pSiblingEntry) { SetCheckButtonState(pChildEntry,eState); diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 239a0a2511a8..a2d41151c00e 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -101,7 +101,7 @@ void OTableTreeListBox::implSetDefaultImages() } // ----------------------------------------------------------------------------- -bool OTableTreeListBox::isFolderEntry( const SvLBoxEntry* _pEntry ) const +bool OTableTreeListBox::isFolderEntry( const SvTreeListEntry* _pEntry ) const { sal_Int32 nEntryType = reinterpret_cast< sal_IntPtr >( _pEntry->GetUserData() ); if ( ( nEntryType == DatabaseObjectContainer::TABLES ) @@ -117,7 +117,7 @@ void OTableTreeListBox::notifyHiContrastChanged() { implSetDefaultImages(); - SvLBoxEntry* pEntryLoop = First(); + SvTreeListEntry* pEntryLoop = First(); while (pEntryLoop) { sal_uInt16 nCount = pEntryLoop->ItemCount(); @@ -325,13 +325,13 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn bCatalogs ? xMeta->getCatalogs() : xMeta->getSchemas(), 1 ) ); sal_Int32 nFolderType = bCatalogs ? DatabaseObjectContainer::CATALOG : DatabaseObjectContainer::SCHEMA; - SvLBoxEntry* pRootEntry = getAllObjectsEntry(); + SvTreeListEntry* pRootEntry = getAllObjectsEntry(); for ( ::std::vector< ::rtl::OUString >::const_iterator folder = aFolderNames.begin(); folder != aFolderNames.end(); ++folder ) { - SvLBoxEntry* pFolder = GetEntryPosByName( *folder, pRootEntry ); + SvTreeListEntry* pFolder = GetEntryPosByName( *folder, pRootEntry ); if ( !pFolder ) pFolder = InsertEntry( *folder, pRootEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFolderType ) ); } @@ -344,7 +344,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn } } //------------------------------------------------------------------------ -sal_Bool OTableTreeListBox::isWildcardChecked(SvLBoxEntry* _pEntry) const +sal_Bool OTableTreeListBox::isWildcardChecked(SvTreeListEntry* _pEntry) const { if (_pEntry) { @@ -356,20 +356,20 @@ sal_Bool OTableTreeListBox::isWildcardChecked(SvLBoxEntry* _pEntry) const } //------------------------------------------------------------------------ -void OTableTreeListBox::checkWildcard(SvLBoxEntry* _pEntry) +void OTableTreeListBox::checkWildcard(SvTreeListEntry* _pEntry) { SetCheckButtonState(_pEntry, SV_BUTTON_CHECKED); checkedButton_noBroadcast(_pEntry); } //------------------------------------------------------------------------ -SvLBoxEntry* OTableTreeListBox::getAllObjectsEntry() const +SvTreeListEntry* OTableTreeListBox::getAllObjectsEntry() const { return haveVirtualRoot() ? First() : NULL; } //------------------------------------------------------------------------ -void OTableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) +void OTableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry) { OMarkableTreeListBox::checkedButton_noBroadcast(_pEntry); @@ -383,7 +383,7 @@ void OTableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) } //------------------------------------------------------------------------ -void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, sal_Bool _bUpdateDescendants, sal_Bool _bUpdateAncestors) +void OTableTreeListBox::implEmphasize(SvTreeListEntry* _pEntry, sal_Bool _bChecked, sal_Bool _bUpdateDescendants, sal_Bool _bUpdateAncestors) { OSL_ENSURE(_pEntry, "OTableTreeListBox::implEmphasize: invalid entry (NULL)!"); @@ -404,7 +404,7 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, if (_bUpdateDescendants) { // remove the mark for all children of the checked entry - SvLBoxEntry* pChildLoop = FirstChild(_pEntry); + SvTreeListEntry* pChildLoop = FirstChild(_pEntry); while (pChildLoop) { if (GetModel()->HasChildren(pChildLoop)) @@ -422,7 +422,7 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked, } //------------------------------------------------------------------------ -void OTableTreeListBox::InitEntry(SvLBoxEntry* _pEntry, const XubString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) +void OTableTreeListBox::InitEntry(SvTreeListEntry* _pEntry, const OUString& _rString, const Image& _rCollapsedBitmap, const Image& _rExpandedBitmap, SvLBoxButtonKind _eButtonKind) { OMarkableTreeListBox::InitEntry(_pEntry, _rString, _rCollapsedBitmap, _rExpandedBitmap, _eButtonKind); @@ -436,7 +436,7 @@ void OTableTreeListBox::InitEntry(SvLBoxEntry* _pEntry, const XubString& _rStrin } //------------------------------------------------------------------------ -SvLBoxEntry* OTableTreeListBox::implAddEntry( +SvTreeListEntry* OTableTreeListBox::implAddEntry( const Reference< XDatabaseMetaData >& _rxMeta, const ::rtl::OUString& _rTableName, sal_Bool _bCheckName @@ -450,7 +450,7 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry( ::rtl::OUString sCatalog, sSchema, sName; qualifiedNameComponents( _rxMeta, _rTableName, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation ); - SvLBoxEntry* pParentEntry = getAllObjectsEntry(); + SvTreeListEntry* pParentEntry = getAllObjectsEntry(); // if the DB uses catalog at the start of identifiers, then our hierarchy is // catalog @@ -468,7 +468,7 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry( if ( !rFirstName.isEmpty() ) { - SvLBoxEntry* pFolder = GetEntryPosByName( rFirstName, pParentEntry ); + SvTreeListEntry* pFolder = GetEntryPosByName( rFirstName, pParentEntry ); if ( !pFolder ) pFolder = InsertEntry( rFirstName, pParentEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFirstFolderType ) ); pParentEntry = pFolder; @@ -476,13 +476,13 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry( if ( !rSecondName.isEmpty() ) { - SvLBoxEntry* pFolder = GetEntryPosByName( rSecondName, pParentEntry ); + SvTreeListEntry* pFolder = GetEntryPosByName( rSecondName, pParentEntry ); if ( !pFolder ) pFolder = InsertEntry( rSecondName, pParentEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nSecondFolderType ) ); pParentEntry = pFolder; } - SvLBoxEntry* pRet = NULL; + SvTreeListEntry* pRet = NULL; if ( !_bCheckName || !GetEntryPosByName( sName, pParentEntry ) ) { pRet = InsertEntry( sName, pParentEntry, sal_False, LIST_APPEND ); @@ -497,7 +497,7 @@ SvLBoxEntry* OTableTreeListBox::implAddEntry( } //------------------------------------------------------------------------ -NamedDatabaseObject OTableTreeListBox::describeObject( SvLBoxEntry* _pEntry ) +NamedDatabaseObject OTableTreeListBox::describeObject( SvTreeListEntry* _pEntry ) { NamedDatabaseObject aObject; @@ -511,7 +511,7 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvLBoxEntry* _pEntry ) || ( nEntryType == DatabaseObjectContainer::SCHEMA ) ) { - SvLBoxEntry* pParent = GetParent( _pEntry ); + SvTreeListEntry* pParent = GetParent( _pEntry ); sal_Int32 nParentEntryType = pParent ? reinterpret_cast< sal_IntPtr >( pParent->GetUserData() ) : -1; ::rtl::OUStringBuffer buffer; @@ -544,7 +544,7 @@ NamedDatabaseObject OTableTreeListBox::describeObject( SvLBoxEntry* _pEntry ) } //------------------------------------------------------------------------ -SvLBoxEntry* OTableTreeListBox::addedTable( const ::rtl::OUString& _rName ) +SvTreeListEntry* OTableTreeListBox::addedTable( const ::rtl::OUString& _rName ) { try { @@ -569,7 +569,7 @@ bool OTableTreeListBox::impl_getAndAssertMetaData( Reference< XDatabaseMetaData } //------------------------------------------------------------------------ -String OTableTreeListBox::getQualifiedTableName( SvLBoxEntry* _pEntry ) const +String OTableTreeListBox::getQualifiedTableName( SvTreeListEntry* _pEntry ) const { OSL_PRECOND( !isFolderEntry( _pEntry ), "OTableTreeListBox::getQualifiedTableName: folder entries not allowed here!" ); @@ -583,10 +583,10 @@ String OTableTreeListBox::getQualifiedTableName( SvLBoxEntry* _pEntry ) const ::rtl::OUString sSchema; ::rtl::OUString sTable; - SvLBoxEntry* pSchema = GetParent( _pEntry ); + SvTreeListEntry* pSchema = GetParent( _pEntry ); if ( pSchema ) { - SvLBoxEntry* pCatalog = GetParent( pSchema ); + SvTreeListEntry* pCatalog = GetParent( pSchema ); if ( pCatalog || ( xMeta->supportsCatalogsInDataManipulation() && !xMeta->supportsSchemasInDataManipulation() @@ -615,7 +615,7 @@ String OTableTreeListBox::getQualifiedTableName( SvLBoxEntry* _pEntry ) const } //------------------------------------------------------------------------ -SvLBoxEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUString& _rName ) +SvTreeListEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUString& _rName ) { try { @@ -627,9 +627,9 @@ SvLBoxEntry* OTableTreeListBox::getEntryByQualifiedName( const ::rtl::OUString& ::rtl::OUString sCatalog, sSchema, sName; qualifiedNameComponents(xMeta, _rName, sCatalog, sSchema, sName,::dbtools::eInDataManipulation); - SvLBoxEntry* pParent = getAllObjectsEntry(); - SvLBoxEntry* pCat = NULL; - SvLBoxEntry* pSchema = NULL; + SvTreeListEntry* pParent = getAllObjectsEntry(); + SvTreeListEntry* pCat = NULL; + SvTreeListEntry* pSchema = NULL; if ( !sCatalog.isEmpty() ) { pCat = GetEntryPosByName(sCatalog, pParent); @@ -657,7 +657,7 @@ void OTableTreeListBox::removedTable( const ::rtl::OUString& _rName ) { try { - SvLBoxEntry* pEntry = getEntryByQualifiedName( _rName ); + SvTreeListEntry* pEntry = getEntryByQualifiedName( _rName ); if ( pEntry ) GetModel()->Remove( pEntry ); } |