diff options
Diffstat (limited to 'sw/source/ui/envelp')
| -rw-r--r-- | sw/source/ui/envelp/envlop1.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/envelp/label1.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/envelp/labelexp.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/envelp/mailmrge.cxx | 2 |
4 files changed, 7 insertions, 10 deletions
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 6747f745cfe8..9369b79660b1 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -254,7 +254,7 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl) { OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." + m_pTableLB->GetSelectEntry() + "." + - OUString(m_pTableLB->GetEntryData(m_pTableLB->GetSelectEntryPos()) == 0 ? '0' : '1') + "." + + OUString(m_pTableLB->GetSelectEntryData() == 0 ? '0' : '1') + "." + m_pDBFieldLB->GetSelectEntry() + ">"); m_pAddrEdit->ReplaceSelected(aStr); Selection aSel = m_pAddrEdit->GetSelection(); diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index f217acdb2d6d..98bdf99e7757 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -326,7 +326,7 @@ IMPL_LINK_NOARG(SwLabPage, FieldHdl) { OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." + m_pTableLB->GetSelectEntry() + "." + - (m_pTableLB->GetEntryData(m_pTableLB->GetSelectEntryPos()) == 0 ? OUString("0") : OUString("1")) + "." + + (m_pTableLB->GetSelectEntryData() == 0 ? OUString("0") : OUString("1")) + "." + m_pDBFieldLB->GetSelectEntry() + ">"); m_pWritingEdit->ReplaceSelected(aStr); Selection aSel = m_pWritingEdit->GetSelection(); @@ -614,8 +614,7 @@ int SwVisitingCardPage::DeactivatePage(SfxItemSet* _pSet) bool SwVisitingCardPage::FillItemSet(SfxItemSet* rSet) { - const OUString* pGroup = (const OUString*)m_pAutoTextGroupLB->GetEntryData( - m_pAutoTextGroupLB->GetSelectEntryPos()); + const OUString* pGroup = (const OUString*)m_pAutoTextGroupLB->GetSelectEntryData(); OSL_ENSURE(pGroup, "no group selected?"); if (pGroup) diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index ba14f0e17ae6..0babacb2b69c 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -79,7 +79,7 @@ void SwVisitingCardPage::InitFrameControl() if(LISTBOX_ENTRY_NOTFOUND == m_pAutoTextGroupLB->GetSelectEntryPos()) m_pAutoTextGroupLB->SelectEntryPos(0); const OUString *pCurGroupName( - (const OUString*)m_pAutoTextGroupLB->GetEntryData(m_pAutoTextGroupLB->GetSelectEntryPos())); + (const OUString*)m_pAutoTextGroupLB->GetSelectEntryData()); if(m_xAutoText->hasByName(*pCurGroupName)) { uno::Any aGroup = m_xAutoText->getByName(*pCurGroupName); @@ -112,8 +112,7 @@ IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl) if(LISTBOX_ENTRY_NOTFOUND != m_pAutoTextGroupLB->GetSelectEntryPos()) { - const OUString *pGroup( (const OUString*)m_pAutoTextGroupLB->GetEntryData( - m_pAutoTextGroupLB->GetSelectEntryPos() ) ); + const OUString *pGroup( (const OUString*)m_pAutoTextGroupLB->GetSelectEntryData() ); uno::Any aGroup = m_xAutoText->getByName(*pGroup); uno::Reference< text::XAutoTextGroup > xGroup; aGroup >>= xGroup; @@ -140,8 +139,7 @@ IMPL_LINK( SwVisitingCardPage, AutoTextSelectHdl, void*, pBox ) { if (m_pAutoTextGroupLB == pBox) { - const OUString *pGroup( (const OUString*)m_pAutoTextGroupLB->GetEntryData( - m_pAutoTextGroupLB->GetSelectEntryPos())); + const OUString *pGroup( (const OUString*)m_pAutoTextGroupLB->GetSelectEntryData()); uno::Any aGroup = m_xAutoText->getByName(*pGroup); uno::Reference< text::XAutoTextGroup > xGroup; aGroup >>= xGroup; diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 9adfbb84a758..aa5918d3f446 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -518,7 +518,7 @@ bool SwMailMergeDlg::ExecQryShell() pMgr->SetEMailColumn(m_pColumnLB->GetSelectEntry()); pModOpt->SetNameFromColumn(m_pColumnLB->GetSelectEntry()); if( m_pFilterLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) - m_sSaveFilter = *static_cast<const OUString*>(m_pFilterLB->GetEntryData( m_pFilterLB->GetSelectEntryPos() )); + m_sSaveFilter = *static_cast<const OUString*>(m_pFilterLB->GetSelectEntryData()); } else { |