diff options
Diffstat (limited to 'dbaccess/source/ui/app')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/AppController.hxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 56 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.hxx | 10 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/AppDetailView.cxx | 36 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/AppDetailView.hxx | 22 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/AppView.hxx | 10 |
8 files changed, 76 insertions, 76 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 72520aa7e42f..bf46021f7237 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2436,7 +2436,7 @@ Any OApplicationController::getCurrentSelection( Control& _rControl ) const } // ----------------------------------------------------------------------------- -sal_Bool OApplicationController::requestQuickHelp( const SvLBoxEntry* /*_pEntry*/, String& /*_rText*/ ) const +sal_Bool OApplicationController::requestQuickHelp( const SvTreeListEntry* /*_pEntry*/, String& /*_rText*/ ) const { return sal_False; } @@ -2485,7 +2485,7 @@ sal_Int8 OApplicationController::queryDrop( const AcceptDropEvent& _rEvt, const sal_Int8 nAction = OComponentTransferable::canExtractComponentDescriptor(_rFlavors,eType == E_FORM) ? DND_ACTION_COPY : DND_ACTION_NONE; if ( nAction != DND_ACTION_NONE ) { - SvLBoxEntry* pHitEntry = pView->getEntry(_rEvt.maPosPixel); + SvTreeListEntry* pHitEntry = pView->getEntry(_rEvt.maPosPixel); ::rtl::OUString sName; if ( pHitEntry ) { @@ -2553,7 +2553,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) else if ( OComponentTransferable::canExtractComponentDescriptor(aDroppedData.GetDataFlavorExVector(),m_aAsyncDrop.nType == E_FORM) ) { m_aAsyncDrop.aDroppedData = OComponentTransferable::extractComponentDescriptor(aDroppedData); - SvLBoxEntry* pHitEntry = pView->getEntry(_rEvt.maPosPixel); + SvTreeListEntry* pHitEntry = pView->getEntry(_rEvt.maPosPixel); if ( pHitEntry ) m_aAsyncDrop.aUrl = pView->getQualifiedName( pHitEntry ); diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 3f0eb1ab9ff9..6cdb65c2cf29 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -47,7 +47,7 @@ #include <memory> -class SvLBoxEntry; +class SvTreeListEntry; class SvTreeListBox; class TransferableHelper; class TransferableClipboardListener; @@ -523,7 +523,7 @@ namespace dbaui virtual bool interceptUserInput( const NotifyEvent& _rEvent ); // IControlActionListener overridables - virtual sal_Bool requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const; + virtual sal_Bool requestQuickHelp( const SvTreeListEntry* _pEntry, String& _rText ) const; virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 1f827f31b1bf..dfcea23ffa12 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -88,13 +88,13 @@ namespace dbaui namespace { - SvLBoxEntry* lcl_findEntry_impl(DBTreeListBox& rTree,const ::rtl::OUString& _rName,SvLBoxEntry* _pFirst) + SvTreeListEntry* lcl_findEntry_impl(DBTreeListBox& rTree,const ::rtl::OUString& _rName,SvTreeListEntry* _pFirst) { - SvLBoxEntry* pReturn = NULL; + SvTreeListEntry* pReturn = NULL; sal_Int32 nIndex = 0; String sName( _rName.getToken(0,'/',nIndex) ); - SvLBoxEntry* pEntry = _pFirst; + SvTreeListEntry* pEntry = _pFirst; while( pEntry ) { if ( rTree.GetEntryText(pEntry) == sName ) @@ -115,7 +115,7 @@ namespace } return pReturn; } - SvLBoxEntry* lcl_findEntry(DBTreeListBox& rTree,const ::rtl::OUString& _rName,SvLBoxEntry* _pFirst) + SvTreeListEntry* lcl_findEntry(DBTreeListBox& rTree,const ::rtl::OUString& _rName,SvTreeListEntry* _pFirst) { sal_Int32 nIndex = 0; ::rtl::OUString sErase = _rName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part @@ -286,7 +286,7 @@ void OAppDetailPageHelper::selectAll() void OAppDetailPageHelper::sort(int _nPos,SvSortMode _eSortMode ) { OSL_ENSURE(m_pLists[_nPos],"List can not be NULL! ->GPF"); - SvLBoxTreeList* pModel = m_pLists[_nPos]->GetModel(); + SvTreeList* pModel = m_pLists[_nPos]->GetModel(); SvSortMode eOldSortMode = pModel->GetSortMode(); pModel->SetSortMode(_eSortMode); if ( eOldSortMode != _eSortMode ) @@ -299,7 +299,7 @@ sal_Bool OAppDetailPageHelper::isSortUp() const int nPos = getVisibleControlIndex(); if ( nPos < E_ELEMENT_TYPE_COUNT ) { - SvLBoxTreeList* pModel = m_pLists[nPos]->GetModel(); + SvTreeList* pModel = m_pLists[nPos]->GetModel(); eSortMode = pModel->GetSortMode(); } return eSortMode == SortAscending; @@ -327,7 +327,7 @@ void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< ::rtl::OUStr DBTreeListBox& rTree = *m_pLists[nPos]; sal_Int32 nCount = rTree.GetEntryCount(); _rNames.reserve(nCount); - SvLBoxEntry* pEntry = rTree.FirstSelected(); + SvTreeListEntry* pEntry = rTree.FirstSelected(); ElementType eType = getElementType(); while( pEntry ) { @@ -339,7 +339,7 @@ void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< ::rtl::OUStr else { ::rtl::OUString sName = rTree.GetEntryText(pEntry); - SvLBoxEntry* pParent = rTree.GetParent(pEntry); + SvTreeListEntry* pParent = rTree.GetParent(pEntry); while(pParent) { sName = rTree.GetEntryText(pParent) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sName; @@ -379,7 +379,7 @@ void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _e ::std::vector< NamedDatabaseObject > aSelected; - SvLBoxEntry* pEntry = pList->FirstSelected(); + SvTreeListEntry* pEntry = pList->FirstSelected(); while( pEntry ) { NamedDatabaseObject aObject; @@ -400,7 +400,7 @@ void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _e case E_REPORT: { ::rtl::OUString sName = pList->GetEntryText(pEntry); - SvLBoxEntry* pParent = pList->GetParent(pEntry); + SvTreeListEntry* pParent = pList->GetParent(pEntry); while ( pParent ) { ::rtl::OUStringBuffer buffer; @@ -448,14 +448,14 @@ void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& _aNa const ::rtl::OUString* pEnd = pIter + _aNames.getLength(); for(;pIter != pEnd;++pIter) { - SvLBoxEntry* pEntry = rTree.GetEntryPosByName(*pIter); + SvTreeListEntry* pEntry = rTree.GetEntryPosByName(*pIter); if ( pEntry ) rTree.Select(pEntry); } } } // ----------------------------------------------------------------------------- -::rtl::OUString OAppDetailPageHelper::getQualifiedName( SvLBoxEntry* _pEntry ) const +::rtl::OUString OAppDetailPageHelper::getQualifiedName( SvTreeListEntry* _pEntry ) const { int nPos = getVisibleControlIndex(); ::rtl::OUString sComposedName; @@ -466,7 +466,7 @@ void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& _aNa OSL_ENSURE(m_pLists[nPos],"Tables tree view is NULL! -> GPF"); DBTreeListBox& rTree = *m_pLists[nPos]; - SvLBoxEntry* pEntry = _pEntry; + SvTreeListEntry* pEntry = _pEntry; if ( !pEntry ) pEntry = rTree.FirstSelected(); @@ -481,7 +481,7 @@ void OAppDetailPageHelper::selectElements(const Sequence< ::rtl::OUString>& _aNa else { sComposedName = rTree.GetEntryText(pEntry); - SvLBoxEntry* pParent = rTree.GetParent(pEntry); + SvTreeListEntry* pParent = rTree.GetParent(pEntry); while(pParent) { sComposedName = rTree.GetEntryText(pParent) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sComposedName; @@ -505,7 +505,7 @@ sal_Int32 OAppDetailPageHelper::getSelectionCount() if ( nPos < E_ELEMENT_TYPE_COUNT ) { DBTreeListBox& rTree = *m_pLists[nPos]; - SvLBoxEntry* pEntry = rTree.FirstSelected(); + SvTreeListEntry* pEntry = rTree.FirstSelected(); while( pEntry ) { ++nCount; @@ -553,7 +553,7 @@ void OAppDetailPageHelper::paste() { } // ----------------------------------------------------------------------------- -bool OAppDetailPageHelper::isLeaf(SvLBoxEntry* _pEntry) const +bool OAppDetailPageHelper::isLeaf(SvTreeListEntry* _pEntry) const { if ( !_pEntry ) return false; @@ -577,7 +577,7 @@ sal_Bool OAppDetailPageHelper::isALeafSelected() const if ( nPos < E_ELEMENT_TYPE_COUNT ) { DBTreeListBox& rTree = *m_pLists[nPos]; - SvLBoxEntry* pEntry = rTree.FirstSelected( ); + SvTreeListEntry* pEntry = rTree.FirstSelected( ); while( !bLeafSelected && pEntry ) { bLeafSelected = isLeaf( pEntry ); @@ -587,9 +587,9 @@ sal_Bool OAppDetailPageHelper::isALeafSelected() const return bLeafSelected; } // ----------------------------------------------------------------------------- -SvLBoxEntry* OAppDetailPageHelper::getEntry( const Point& _aPosPixel) const +SvTreeListEntry* OAppDetailPageHelper::getEntry( const Point& _aPosPixel) const { - SvLBoxEntry* pReturn = NULL; + SvTreeListEntry* pReturn = NULL; int nPos = getVisibleControlIndex(); if ( nPos < E_ELEMENT_TYPE_COUNT ) pReturn = m_pLists[nPos]->GetEntry( _aPosPixel,sal_True ); @@ -621,7 +621,7 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon { static_cast<OTableTreeListBox*>(m_pLists[E_TABLE])->UpdateTableList(_xConnection); - SvLBoxEntry* pEntry = m_pLists[E_TABLE]->First(); + SvTreeListEntry* pEntry = m_pLists[E_TABLE]->First(); if ( pEntry ) m_pLists[E_TABLE]->Expand(pEntry); m_pLists[E_TABLE]->SelectAll(sal_False); @@ -734,7 +734,7 @@ namespace // ----------------------------------------------------------------------------- void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContainer, const ElementType _eType, - const sal_uInt16 _nImageId, SvLBoxEntry* _pParent ) + const sal_uInt16 _nImageId, SvTreeListEntry* _pParent ) { OSL_ENSURE(_xContainer.is(),"Data source is NULL! -> GPF"); OSL_ENSURE( ( _eType >= E_TABLE ) && ( _eType < E_ELEMENT_TYPE_COUNT ), "OAppDetailPageHelper::fillNames: invalid type!" ); @@ -753,7 +753,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; Reference<XNameAccess> xSubElements(_xContainer->getByName(*pIter),UNO_QUERY); if ( xSubElements.is() ) { @@ -834,7 +834,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType if ( pTreeView ) { ::rtl::OUString sNewName = _rNewName; - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; switch( _eType ) { case E_TABLE: @@ -860,9 +860,9 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType } } // ----------------------------------------------------------------------------- -SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) +SvTreeListEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) { - SvLBoxEntry* pRet = NULL; + SvTreeListEntry* pRet = NULL; DBTreeListBox* pTreeView = m_pLists[_eType]; if( _eType == E_TABLE && pTreeView ) { @@ -871,7 +871,7 @@ SvLBoxEntry* OAppDetailPageHelper::elementAdded(ElementType _eType,const ::rtl:: else if ( pTreeView ) { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; Reference<XChild> xChild(_rObject,UNO_QUERY); if ( xChild.is() && E_QUERY != _eType ) { @@ -918,7 +918,7 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const ::rtl::OUStr case E_QUERY: if ( pTreeView ) { - SvLBoxEntry* pEntry = lcl_findEntry_impl(*pTreeView,_rName,pTreeView->First()); + SvTreeListEntry* pEntry = lcl_findEntry_impl(*pTreeView,_rName,pTreeView->First()); if ( pEntry ) pTreeView->GetModel()->Remove(pEntry); } @@ -928,7 +928,7 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const ::rtl::OUStr { if ( pTreeView ) { - SvLBoxEntry* pEntry = lcl_findEntry(*pTreeView,_rName,pTreeView->First()); + SvTreeListEntry* pEntry = lcl_findEntry(*pTreeView,_rName,pTreeView->First()); if ( pEntry ) pTreeView->GetModel()->Remove(pEntry); } diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 8b34d8c4a6ff..ba3971f930d4 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -125,7 +125,7 @@ namespace dbaui void fillNames( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer, const ElementType _eType, const sal_uInt16 _nImageId, - SvLBoxEntry* _pParent ); + SvTreeListEntry* _pParent ); /** sets the detail page @param _pWindow @@ -250,7 +250,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvLBoxEntry* _pEntry ) const; + ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /// return the element of currently select entry ElementType getElementType() const; @@ -267,7 +267,7 @@ namespace dbaui @return <TRUE/> if the entry is a leaf, otherwise <FALSE/> */ - bool isLeaf(SvLBoxEntry* _pEntry) const; + bool isLeaf(SvTreeListEntry* _pEntry) const; /** returns if one of the selected entries is a leaf @return @@ -275,7 +275,7 @@ namespace dbaui */ sal_Bool isALeafSelected() const; - SvLBoxEntry* getEntry( const Point& _aPosPixel ) const; + SvTreeListEntry* getEntry( const Point& _aPosPixel ) const; /// clears the detail pages void clearPages(); @@ -293,7 +293,7 @@ namespace dbaui @param _rxConn If we insert a table, the connection must be set. */ - SvLBoxEntry* elementAdded(ElementType eType + SvTreeListEntry* elementAdded(ElementType eType ,const ::rtl::OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 7ebc0993aa64..d3da7bbf5c0d 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -98,7 +98,7 @@ void OCreationList::Paint( const Rectangle& _rRect ) } // ----------------------------------------------------------------------------- -void OCreationList::PreparePaint( SvLBoxEntry* _pEntry ) +void OCreationList::PreparePaint( SvTreeListEntry* _pEntry ) { Wallpaper aEntryBackground( m_aOriginalBackgroundColor ); if ( _pEntry ) @@ -128,7 +128,7 @@ void OCreationList::PreparePaint( SvLBoxEntry* _pEntry ) // ----------------------------------------------------------------------------- void OCreationList::SelectSearchEntry( const void* _pEntry ) { - SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) ); + SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pEntry ) ); OSL_ENSURE( pEntry, "OCreationList::SelectSearchEntry: invalid entry!" ); if ( pEntry ) @@ -141,7 +141,7 @@ void OCreationList::SelectSearchEntry( const void* _pEntry ) // ----------------------------------------------------------------------------- void OCreationList::ExecuteSearchEntry( const void* _pEntry ) const { - SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) ); + SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pEntry ) ); OSL_ENSURE( pEntry, "OCreationList::ExecuteSearchEntry: invalid entry!" ); OSL_ENSURE( pEntry == GetCurEntry(), "OCreationList::ExecuteSearchEntry: SelectSearchEntry should have been called before!" ); @@ -150,7 +150,7 @@ void OCreationList::ExecuteSearchEntry( const void* _pEntry ) const } // ----------------------------------------------------------------------------- -Rectangle OCreationList::GetFocusRect( SvLBoxEntry* _pEntry, long _nLine ) +Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ) { Rectangle aRect = SvTreeListBox::GetFocusRect( _pEntry, _nLine ); aRect.Left() = 0; @@ -220,7 +220,7 @@ void OCreationList::MouseMove( const MouseEvent& rMEvt ) } else if ( !rMEvt.IsSynthetic() ) { - SvLBoxEntry* pEntry = GetEntry( rMEvt.GetPosPixel() ); + SvTreeListEntry* pEntry = GetEntry( rMEvt.GetPosPixel() ); if ( m_pMouseDownEntry ) { @@ -253,7 +253,7 @@ void OCreationList::MouseMove( const MouseEvent& rMEvt ) // ----------------------------------------------------------------------------- void OCreationList::MouseButtonUp( const MouseEvent& rMEvt ) { - SvLBoxEntry* pEntry = GetEntry( rMEvt.GetPosPixel() ); + SvTreeListEntry* pEntry = GetEntry( rMEvt.GetPosPixel() ); bool bExecute = false; // Was the mouse released over the active entry? // (i.e. the entry which was under the mouse when the button went down) @@ -278,7 +278,7 @@ void OCreationList::MouseButtonUp( const MouseEvent& rMEvt ) onSelected( pEntry ); } // ----------------------------------------------------------------------------- -bool OCreationList::setCurrentEntryInvalidate( SvLBoxEntry* _pEntry ) +bool OCreationList::setCurrentEntryInvalidate( SvTreeListEntry* _pEntry ) { if ( GetCurEntry() != _pEntry ) { @@ -304,7 +304,7 @@ void OCreationList::updateHelpText() m_rTaskWindow.setHelpText( nHelpTextId ); } // ----------------------------------------------------------------------------- -void OCreationList::onSelected( SvLBoxEntry* _pEntry ) const +void OCreationList::onSelected( SvTreeListEntry* _pEntry ) const { OSL_ENSURE( _pEntry, "OCreationList::onSelected: invalid entry!" ); URL aCommand; @@ -319,15 +319,15 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt ) { if ( rCode.GetCode() == KEY_RETURN ) { - SvLBoxEntry* pEntry = GetCurEntry() ? GetCurEntry() : FirstSelected(); + SvTreeListEntry* pEntry = GetCurEntry() ? GetCurEntry() : FirstSelected(); if ( pEntry ) onSelected( pEntry ); return; } } - SvLBoxEntry* pOldCurrent = GetCurEntry(); + SvTreeListEntry* pOldCurrent = GetCurEntry(); SvTreeListBox::KeyInput(rKEvt); - SvLBoxEntry* pNewCurrent = GetCurEntry(); + SvTreeListEntry* pNewCurrent = GetCurEntry(); if ( pOldCurrent != pNewCurrent ) { @@ -439,7 +439,7 @@ void OTasksWindow::setHelpText(sal_uInt16 _nId) IMPL_LINK(OTasksWindow, OnEntrySelectHdl, SvTreeListBox*, /*_pTreeBox*/) { DBG_CHKTHIS(OTasksWindow,NULL); - SvLBoxEntry* pEntry = m_aCreation.GetHdlEntry(); + SvTreeListEntry* pEntry = m_aCreation.GetHdlEntry(); if ( pEntry ) m_aHelpText.SetText( ModuleRes( reinterpret_cast< TaskEntry* >( pEntry->GetUserData() )->nHelpID ) ); return 1L; @@ -498,7 +498,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList ) for ( TaskEntryList::const_iterator pTask = _rList.begin(); pTask != aEnd; ++pTask, ++pImages ) { - SvLBoxEntry* pEntry = m_aCreation.InsertEntry( pTask->sTitle ); + SvTreeListEntry* pEntry = m_aCreation.InsertEntry( pTask->sTitle ); pEntry->SetUserData( reinterpret_cast< void* >( new TaskEntry( *pTask ) ) ); Image aImage = Image( *pImages ); @@ -523,7 +523,7 @@ void OTasksWindow::Clear() { DBG_CHKTHIS(OTasksWindow,NULL); m_aCreation.resetLastActive(); - SvLBoxEntry* pEntry = m_aCreation.First(); + SvTreeListEntry* pEntry = m_aCreation.First(); while ( pEntry ) { delete reinterpret_cast< TaskEntry* >( pEntry->GetUserData() ); @@ -764,13 +764,13 @@ void OApplicationDetailView::impl_fillTaskPaneData( ElementType _eType, TaskPane } // ----------------------------------------------------------------------------- -::rtl::OUString OApplicationDetailView::getQualifiedName( SvLBoxEntry* _pEntry ) const +::rtl::OUString OApplicationDetailView::getQualifiedName( SvTreeListEntry* _pEntry ) const { DBG_CHKTHIS(OApplicationDetailView,NULL); return m_pControlHelper->getQualifiedName( _pEntry ); } // ----------------------------------------------------------------------------- -sal_Bool OApplicationDetailView::isLeaf(SvLBoxEntry* _pEntry) const +sal_Bool OApplicationDetailView::isLeaf(SvTreeListEntry* _pEntry) const { DBG_CHKTHIS(OApplicationDetailView,NULL); return m_pControlHelper->isLeaf(_pEntry); @@ -857,7 +857,7 @@ void OApplicationDetailView::selectElements(const Sequence< ::rtl::OUString>& _a m_pControlHelper->selectElements( _aNames ); } // ----------------------------------------------------------------------------- -SvLBoxEntry* OApplicationDetailView::getEntry( const Point& _aPoint ) const +SvTreeListEntry* OApplicationDetailView::getEntry( const Point& _aPoint ) const { DBG_CHKTHIS(OApplicationDetailView,NULL); return m_pControlHelper->getEntry(_aPoint); @@ -882,7 +882,7 @@ void OApplicationDetailView::paste() m_pControlHelper->paste(); } // ----------------------------------------------------------------------------- -SvLBoxEntry* OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) +SvTreeListEntry* OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) { DBG_CHKTHIS(OApplicationDetailView,NULL); return m_pControlHelper->elementAdded(_eType,_rName, _rObject ); diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 220b31f10f2a..f8bb55627901 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -35,7 +35,7 @@ #include <vector> -class SvLBoxEntry; +class SvTreeListEntry; namespace dbaui { @@ -49,8 +49,8 @@ namespace dbaui OTasksWindow& m_rTaskWindow; // members related to drawing the currently hovered/selected entry - SvLBoxEntry* m_pMouseDownEntry; - SvLBoxEntry* m_pLastActiveEntry; + SvTreeListEntry* m_pMouseDownEntry; + SvTreeListEntry* m_pLastActiveEntry; Color m_aOriginalBackgroundColor; Font m_aOriginalFont; @@ -71,8 +71,8 @@ namespace dbaui void updateHelpText(); protected: - virtual void PreparePaint( SvLBoxEntry* _pEntry ); - virtual Rectangle GetFocusRect( SvLBoxEntry* _pEntry, long _nLine ); + virtual void PreparePaint( SvTreeListEntry* _pEntry ); + virtual Rectangle GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ); virtual void ModelHasCleared(); // IMnemonicEntryList @@ -80,11 +80,11 @@ namespace dbaui virtual void ExecuteSearchEntry( const void* _pEntry ) const; private: - void onSelected( SvLBoxEntry* _pEntry ) const; + void onSelected( SvTreeListEntry* _pEntry ) const; /** sets a new current entry, and invalidates the old and the new one, if necessary @return <TRUE/> if and only if the "current entry" changed */ - bool setCurrentEntryInvalidate( SvLBoxEntry* _pEntry ); + bool setCurrentEntryInvalidate( SvTreeListEntry* _pEntry ); }; struct TaskEntry @@ -206,7 +206,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvLBoxEntry* _pEntry ) const; + ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /** returns if an entry is a leaf @param _pEntry @@ -214,7 +214,7 @@ namespace dbaui @return <TRUE/> if the entry is a leaf, otherwise <FALSE/> */ - sal_Bool isLeaf(SvLBoxEntry* _pEntry) const; + sal_Bool isLeaf(SvTreeListEntry* _pEntry) const; /** returns if one of the selected entries is a leaf @return @@ -289,7 +289,7 @@ namespace dbaui @param _rxConn If we insert a table, the connection must be set. */ - SvLBoxEntry* elementAdded(ElementType eType + SvTreeListEntry* elementAdded(ElementType eType ,const ::rtl::OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); @@ -352,7 +352,7 @@ namespace dbaui const ::rtl::OUString& _sName, sal_Bool _bTable); - SvLBoxEntry* getEntry( const Point& _aPoint ) const; + SvTreeListEntry* getEntry( const Point& _aPoint ) const; Window* getTreeWindow() const; private: diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 69658324ed40..3e3469d7ce11 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -362,13 +362,13 @@ void OApplicationView::paste() pTest->paste(); } // ----------------------------------------------------------------------------- -::rtl::OUString OApplicationView::getQualifiedName( SvLBoxEntry* _pEntry ) const +::rtl::OUString OApplicationView::getQualifiedName( SvTreeListEntry* _pEntry ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->getQualifiedName( _pEntry ); } // ----------------------------------------------------------------------------- -sal_Bool OApplicationView::isLeaf(SvLBoxEntry* _pEntry) const +sal_Bool OApplicationView::isLeaf(SvTreeListEntry* _pEntry) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->isLeaf(_pEntry); @@ -452,7 +452,7 @@ void OApplicationView::selectElements(const Sequence< ::rtl::OUString>& _aNames) getDetailView()->selectElements( _aNames ); } // ----------------------------------------------------------------------------- -SvLBoxEntry* OApplicationView::elementAdded(ElementType eType,const ::rtl::OUString& _rName, const Any& _rObject ) +SvTreeListEntry* OApplicationView::elementAdded(ElementType eType,const ::rtl::OUString& _rName, const Any& _rObject ) { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->elementAdded(eType,_rName,_rObject); @@ -486,7 +486,7 @@ void OApplicationView::selectContainer(ElementType _eType) getPanel()->selectContainer(_eType); } // ----------------------------------------------------------------------------- -SvLBoxEntry* OApplicationView::getEntry( const Point& _aPosPixel ) const +SvTreeListEntry* OApplicationView::getEntry( const Point& _aPosPixel ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); return getDetailView()->getEntry(_aPosPixel); diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index f9d0940d0252..ab2c3ff50452 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -32,7 +32,7 @@ namespace com{ namespace sun { namespace star { namespace beans { class XPropertySet; } } } } class Control; -class SvLBoxEntry; +class SvTreeListEntry; class MnemonicGenerator; namespace dbaui @@ -141,7 +141,7 @@ namespace dbaui @return the qualified name */ - ::rtl::OUString getQualifiedName( SvLBoxEntry* _pEntry ) const; + ::rtl::OUString getQualifiedName( SvTreeListEntry* _pEntry ) const; /** returns if an entry is a leaf @param _pEntry @@ -149,7 +149,7 @@ namespace dbaui @return <TRUE/> if the entry is a leaf, otherwise <FALSE/> */ - sal_Bool isLeaf(SvLBoxEntry* _pEntry) const; + sal_Bool isLeaf(SvTreeListEntry* _pEntry) const; /** returns if one of the selected entries is a leaf @return @@ -224,7 +224,7 @@ namespace dbaui @param _rxConn If we insert a table, the connection must be set. */ - SvLBoxEntry* elementAdded(ElementType _eType + SvTreeListEntry* elementAdded(ElementType _eType ,const ::rtl::OUString& _rName ,const ::com::sun::star::uno::Any& _rObject ); @@ -296,7 +296,7 @@ namespace dbaui const ::rtl::OUString& _sName, sal_Bool _bTable); - SvLBoxEntry* getEntry( const Point& _aPosPixel ) const; + SvTreeListEntry* getEntry( const Point& _aPosPixel ) const; }; } #endif // DBAUI_APPVIEW_HXX |