summaryrefslogtreecommitdiffstats
path: root/dbaccess/source/ui/dlg/adtabdlg.cxx
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-11-11 18:24:14 +0100
committerAndras Timar <atimar@suse.com>2012-11-11 18:24:14 +0100
commit06ec1c089519ef3249464aa09eadf03a8db93a39 (patch)
tree85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /dbaccess/source/ui/dlg/adtabdlg.cxx
parentAdd some check to renewpo (diff)
parentoox: ZipStorage: better exception tracing (diff)
downloadcore-06ec1c089519ef3249464aa09eadf03a8db93a39.tar.gz
core-06ec1c089519ef3249464aa09eadf03a8db93a39.zip
Merge branch 'master' into feature/killsdf
Conflicts: Repository.mk RepositoryFixes.mk connectivity/prj/build.lst extensions/prj/build.lst filter/prj/build.lst fpicker/prj/build.lst l10ntools/StaticLibrary_transex.mk saxon/build.xml shell/prj/build.lst solenv/gbuild/AllLangResTarget.mk solenv/gbuild/Configuration.mk solenv/gbuild/UI.mk ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'dbaccess/source/ui/dlg/adtabdlg.cxx')
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 580791a345a0..55fbf4b1dfff 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -96,15 +96,15 @@ TableListFacade::~TableListFacade()
String TableListFacade::getSelectedName( String& _out_rAliasName ) const
{
- SvLBoxEntry* pEntry = m_rTableList.FirstSelected();
+ SvTreeListEntry* pEntry = m_rTableList.FirstSelected();
if ( !pEntry )
return String();
::rtl::OUString aCatalog, aSchema, aTableName;
- SvLBoxEntry* pSchema = m_rTableList.GetParent(pEntry);
+ SvTreeListEntry* pSchema = m_rTableList.GetParent(pEntry);
if(pSchema && pSchema != m_rTableList.getAllObjectsEntry())
{
- SvLBoxEntry* pCatalog = m_rTableList.GetParent(pSchema);
+ SvTreeListEntry* pCatalog = m_rTableList.GetParent(pSchema);
if(pCatalog && pCatalog != m_rTableList.getAllObjectsEntry())
aCatalog = m_rTableList.GetEntryText(pCatalog);
aSchema = m_rTableList.GetEntryText(pSchema);
@@ -200,7 +200,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
}
m_rTableList.UpdateTableList( m_xConnection, sTables, sViews );
- SvLBoxEntry* pEntry = m_rTableList.First();
+ SvTreeListEntry* pEntry = m_rTableList.First();
while( pEntry && m_rTableList.GetModel()->HasChildren( pEntry ) )
{
m_rTableList.Expand( pEntry );
@@ -217,7 +217,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
bool TableListFacade::isLeafSelected() const
{
- SvLBoxEntry* pEntry = m_rTableList.FirstSelected();
+ SvTreeListEntry* pEntry = m_rTableList.FirstSelected();
return pEntry && !m_rTableList.GetModel()->HasChildren( pEntry );
}
@@ -306,7 +306,7 @@ void QueryListFacade::updateTableObjectList( bool /*_bAllowViews*/ )
String QueryListFacade::getSelectedName( String& _out_rAliasName ) const
{
String sSelected;
- SvLBoxEntry* pEntry = m_rQueryList.FirstSelected();
+ SvTreeListEntry* pEntry = m_rQueryList.FirstSelected();
if ( pEntry )
sSelected = _out_rAliasName = m_rQueryList.GetEntryText( pEntry );
return sSelected;
@@ -314,7 +314,7 @@ String QueryListFacade::getSelectedName( String& _out_rAliasName ) const
bool QueryListFacade::isLeafSelected() const
{
- SvLBoxEntry* pEntry = m_rQueryList.FirstSelected();
+ SvTreeListEntry* pEntry = m_rQueryList.FirstSelected();
return pEntry && !m_rQueryList.GetModel()->HasChildren( pEntry );
}