summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx20
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx8
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx2
-rw-r--r--sw/source/ui/index/cnttab.cxx4
4 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index 8942afc698db..63bcbca4c579 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -281,7 +281,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl)
uno::Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
if(pSelect)
{
- const OUString sCommand = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
+ const OUString sCommand = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1);
if (sCommand.isEmpty())
return 0;
@@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl)
xMgr->createInstance("com.sun.star.sdb.RowSet"), UNO_QUERY);
uno::Reference<XPropertySet> xRowProperties(xRowSet, UNO_QUERY);
xRowProperties->setPropertyValue("DataSourceName",
- makeAny(m_pListLB->GetEntryText(pSelect, ITEMID_NAME - 1)));
+ makeAny(SvTabListBox::GetEntryText(pSelect, ITEMID_NAME - 1)));
xRowProperties->setPropertyValue("Command", makeAny(sCommand));
xRowProperties->setPropertyValue("CommandType", makeAny(pUserData->nCommandType));
xRowProperties->setPropertyValue("ActiveConnection", makeAny(pUserData->xConnection.getTyped()));
@@ -473,7 +473,7 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEnt
AddressUserData_Impl* pUserData = 0;
if(pSelect)
{
- const OUString sTable(pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1));
+ const OUString sTable(SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1));
if(sTable.isEmpty())
{
pThis->m_pListLB->SetEntryText(pThis->m_sConnecting, pSelect, ITEMID_TABLE - 1);
@@ -503,12 +503,12 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEnt
else
{
//otherwise set the selected db-data
- pThis->m_aDBData.sDataSource = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_NAME - 1);
- pThis->m_aDBData.sCommand = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
+ pThis->m_aDBData.sDataSource = SvTabListBox::GetEntryText(pSelect, ITEMID_NAME - 1);
+ pThis->m_aDBData.sCommand = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1);
pThis->m_aDBData.nCommandType = pUserData->nCommandType;
pThis->m_pOK->Enable(true);
}
- if(pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1) == pThis->m_sConnecting)
+ if(SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1) == pThis->m_sConnecting)
pThis->m_pListLB->SetEntryText(OUString(), pSelect, ITEMID_TABLE - 1);
}
pThis->m_pEditPB->Enable(pUserData && !pUserData->sURL.isEmpty() &&
@@ -531,7 +531,7 @@ void SwAddressListDialog::DetectTablesAndQueries(
uno::Reference<XCompletedConnection> xComplConnection;
if(!pUserData->xConnection.is())
{
- m_aDBData.sDataSource = m_pListLB->GetEntryText(pSelect, ITEMID_NAME - 1);
+ m_aDBData.sDataSource = SvTabListBox::GetEntryText(pSelect, ITEMID_NAME - 1);
m_xDBContext->getByName(m_aDBData.sDataSource) >>= xComplConnection;
pUserData->xSource = uno::Reference<XDataSource>(xComplConnection, UNO_QUERY);
@@ -563,7 +563,7 @@ void SwAddressListDialog::DetectTablesAndQueries(
{
//now call the table select dialog - if more than one table exists
boost::scoped_ptr<SwSelectDBTableDialog> pDlg(new SwSelectDBTableDialog(this, pUserData->xConnection));
- const OUString sTable = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
+ const OUString sTable = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1);
if(!sTable.isEmpty())
pDlg->SetSelectedTable(sTable, pUserData->nCommandType == CommandType::TABLE);
if(RET_OK == pDlg->Execute())
@@ -604,7 +604,7 @@ void SwAddressListDialog::DetectTablesAndQueries(
else
m_pListLB->SetEntryText(OUString(), pSelect, ITEMID_TABLE - 1);
}
- const OUString sCommand = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
+ const OUString sCommand = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1);
m_pOK->Enable(pSelect && !sCommand.isEmpty());
m_pFilterPB->Enable( pUserData->xConnection.is() && !sCommand.isEmpty() );
m_pTablePB->Enable( pUserData->nTableAndQueryCount > 1 );
@@ -625,7 +625,7 @@ IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, PushButton*, pButton)
AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData());
//only call the table select dialog if tables have not been searched for or there
//are more than 1
- const OUString sTable = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1);
+ const OUString sTable = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1);
if( pUserData->nTableAndQueryCount > 1 || pUserData->nTableAndQueryCount == -1)
{
DetectTablesAndQueries(pSelect, (pButton != 0) || sTable.isEmpty());
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index 9978bd22d6ce..1b8ca4eec2dc 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -155,7 +155,7 @@ IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton)
SvTreeListEntry* pEntry = m_pTable->FirstSelected();
if(pEntry)
{
- OUString sTableOrQuery = m_pTable->GetEntryText(pEntry, 0);
+ OUString sTableOrQuery = SvTabListBox::GetEntryText(pEntry, 0);
sal_Int32 nCommandType = 0 == pEntry->GetUserData() ? 0 : 1;
OUString sDataSourceName;
@@ -191,7 +191,7 @@ OUString SwSelectDBTableDialog::GetSelectedTable(bool& bIsTable)
{
SvTreeListEntry* pEntry = m_pTable->FirstSelected();
bIsTable = pEntry->GetUserData() ? false : true;
- return m_pTable->GetEntryText(pEntry, 0);
+ return SvTabListBox::GetEntryText(pEntry, 0);
}
void SwSelectDBTableDialog::SetSelectedTable(const OUString& rTable, bool bIsTable)
@@ -199,8 +199,8 @@ void SwSelectDBTableDialog::SetSelectedTable(const OUString& rTable, bool bIsT
SvTreeListEntry* pEntry = m_pTable->First();
while(pEntry)
{
- if((m_pTable->GetEntryText(pEntry, 0) == rTable) &&
- ((pEntry->GetUserData() == 0 ) == bIsTable))
+ if((SvTabListBox::GetEntryText(pEntry, 0) == rTable) &&
+ ((pEntry->GetUserData() == 0 ) == bIsTable))
{
m_pTable->Select(pEntry);
break;
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index faa738fb3582..fbe660f9fedc 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -908,7 +908,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl)
// because of the repositioning we have to start at the beginning again
bRestart = true;
pParent = m_pTree->GetParent(pEntry);
- m_pTree->GetModel()->Move(pChild, pParent, m_pTree->GetModel()->GetRelPos(pEntry));
+ m_pTree->GetModel()->Move(pChild, pParent, SvTreeList::GetRelPos(pEntry));
}
pRemove = pEntry;
}
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 08decd16e133..6f99aa25cebd 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -691,7 +691,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent,
if (!aName.isEmpty())
{
SvTreeListEntry* pEntry = m_pHeaderTree->First();
- while (pEntry && m_pHeaderTree->GetEntryText(pEntry, 0) != aName)
+ while (pEntry && SvTabListBox::GetEntryText(pEntry, 0) != aName)
{
pEntry = m_pHeaderTree->Next(pEntry);
}
@@ -722,7 +722,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl)
{
if(!pStyleArr[nLevel].isEmpty())
pStyleArr[nLevel] += OUString(TOX_STYLE_DELIMITER);
- pStyleArr[nLevel] += m_pHeaderTree->GetEntryText(pEntry, 0);
+ pStyleArr[nLevel] += SvTabListBox::GetEntryText(pEntry, 0);
}
pEntry = m_pHeaderTree->Next(pEntry);
}