diff options
Diffstat (limited to 'sw/source/ui')
33 files changed, 119 insertions, 119 deletions
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 54170ad8b34e..870418d871b6 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -49,7 +49,7 @@ void SwBreakDlg::Apply() const sal_Int32 nPos = m_pPageCollBox->GetSelectEntryPos(); if(0 != nPos && LISTBOX_ENTRY_NOTFOUND != nPos) { - aTemplate = m_pPageCollBox->GetSelectEntry(); + aTemplate = m_pPageCollBox->GetSelectedEntry(); oPgNum = boost::none; if (m_pPageNumBox->IsChecked()) { @@ -97,7 +97,7 @@ IMPL_LINK_NOARG(SwBreakDlg, OkHdl, Button*, void) // position 0 says 'Without'. const SwPageDesc *pPageDesc; if ( 0 != nPos && LISTBOX_ENTRY_NOTFOUND != nPos ) - pPageDesc = rSh.FindPageDescByName( m_pPageCollBox->GetSelectEntry(), + pPageDesc = rSh.FindPageDescByName( m_pPageCollBox->GetSelectedEntry(), true ); else pPageDesc = &rSh.GetPageDesc(rSh.GetCurPageDesc()); diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 0c07015ec6f6..7bc95f16a9c7 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -270,11 +270,11 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet) bModified = bURLModified || bNameModified || bTargetModified; // set valid settings first - OUString sEntry = m_pVisitedLB->GetSelectEntry(); + OUString sEntry = m_pVisitedLB->GetSelectedEntry(); sal_uInt16 nId = SwStyleNameMapper::GetPoolIdFromUIName( sEntry, SwGetPoolIdFromName::ChrFmt); aINetFormat.SetVisitedFormatAndId( sEntry, nId ); - sEntry = m_pNotVisitedLB->GetSelectEntry(); + sEntry = m_pNotVisitedLB->GetSelectedEntry(); nId = SwStyleNameMapper::GetPoolIdFromUIName( sEntry, SwGetPoolIdFromName::ChrFmt); aINetFormat.SetINetFormatAndId( sEntry, nId ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 876f0ca98202..1d5d4cc1c326 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -298,7 +298,7 @@ void SwDropCapsPict::UpdatePaintSettings() { // query Font at character template SwCharFormat *pFormat = mpPage->rSh.GetCharStyle( - mpPage->m_pTemplateBox->GetSelectEntry(), + mpPage->m_pTemplateBox->GetSelectedEntry(), SwWrtShell::GETSTYLE_CREATEANY ); OSL_ENSURE(pFormat, "character style doesn't exist!"); const SvxFontItem &rFormatFont = pFormat->GetFont(); @@ -788,7 +788,7 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet ) // template if (m_pTemplateBox->GetSelectEntryPos()) - aFormat.SetCharFormat(rSh.GetCharStyle(m_pTemplateBox->GetSelectEntry())); + aFormat.SetCharFormat(rSh.GetCharStyle(m_pTemplateBox->GetSelectedEntry())); } else { diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index a529b83a7cb4..f0303ec5d781 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -149,7 +149,7 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) { OUString aStyle; if(m_pNumberStyleLB->GetSelectEntryPos()) - aStyle = m_pNumberStyleLB->GetSelectEntry(); + aStyle = m_pNumberStyleLB->GetSelectedEntry(); const SfxStringItem* pOldRule = static_cast<const SfxStringItem*>(GetOldItem( *rSet, SID_ATTR_PARA_NUMRULE)); SfxStringItem* pRule = pOldRule ? static_cast<SfxStringItem*>(pOldRule->Clone()) : nullptr; if (pRule) @@ -339,7 +339,7 @@ IMPL_LINK_NOARG( SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, ListBox&, vo IMPL_LINK_NOARG(SwParagraphNumTabPage, EditNumStyleHdl_Impl, Button*, void) { - OUString aTemplName(m_pNumberStyleLB->GetSelectEntry()); + OUString aTemplName(m_pNumberStyleLB->GetSelectedEntry()); ExecuteEditNumStyle_Impl( SID_STYLE_EDIT, aTemplName, OUString(), SfxStyleFamily::Pseudo ); } diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 0156e6017e93..e80658e1ecfa 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -258,7 +258,7 @@ void SwCondCollPage::AssignRemove(void const * pBtn) m_pAssignPB->Enable( !bAssEnabled ); m_pRemovePB->Enable( bAssEnabled ); if ( bAssEnabled ) - sSel += m_pStyleLB->GetSelectEntry(); + sSel += m_pStyleLB->GetSelectedEntry(); m_pTbLinks->SetUpdateMode(false); m_pTbLinks->GetModel()->Remove(pE); @@ -303,7 +303,7 @@ void SwCondCollPage::SelectHdl(void const * pBox) const OUString sTbEntry = pE ? m_pTbLinks->GetEntryText(pE).getToken(1, '\t') : OUString(); - const OUString sStyle = m_pStyleLB->GetSelectEntry(); + const OUString sStyle = m_pStyleLB->GetSelectedEntry(); m_pAssignPB->Enable( sStyle != sTbEntry && m_pConditionCB->IsChecked() ); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 731d9d2f25cd..7d4af067ef98 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -828,7 +828,7 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry const * pEntry) if(!m_pCharStyleLB->GetSelectEntryPos()) pOpt->SetCharacterStyle(""); else - pOpt->SetCharacterStyle(m_pCharStyleLB->GetSelectEntry()); + pOpt->SetCharacterStyle(m_pCharStyleLB->GetSelectedEntry()); pOpt->CopyAttributes() = m_pApplyBorderCB->IsChecked(); } } diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index cfbe7cfcf538..c51a3f6905ba 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -444,7 +444,7 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet ) if (m_pInMarginsRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts = SwPostItMode::InMargins; - const OUString sFax = m_pFaxLB->GetSelectEntry(); + const OUString sFax = m_pFaxLB->GetSelectedEntry(); aAddPrinterAttr.m_sFaxName = sNone == sFax ? aEmptyOUStr : sFax; rCoreSet->Put(aAddPrinterAttr); } diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index d1ebf8a4360f..a644749f6794 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -490,7 +490,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, Button*, pButton, void ) : *m_pLbTableCol ) : *m_pLbTextDbColumn; - SwInsDBColumn aSrch( rBox.GetSelectEntry() ); + SwInsDBColumn aSrch( rBox.GetSelectedEntry() ); SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch ); bool bFromDB = m_pRbDbFormatFromDb == pButton; @@ -591,7 +591,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void ) { bChgEnable = false; // move data to Edit: - OUString aField( m_pLbTextDbColumn->GetSelectEntry() ); + OUString aField( m_pLbTextDbColumn->GetSelectedEntry() ); if( !aField.isEmpty() ) { OUString aStr( m_pEdDbText->GetText() ); @@ -798,7 +798,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, SelectHdl, ListBox&, rBox, void ) : m_pLbTextDbColumn.get() ) : &rBox; - SwInsDBColumn aSrch( pGetBox->GetSelectEntry() ); + SwInsDBColumn aSrch( pGetBox->GetSelectedEntry() ); SwInsDBColumns::const_iterator it = aDBColumns.find( &aSrch ); if( &rBox == m_pLbDbFormatFromUsr ) @@ -1220,7 +1220,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection, SwTextFormatColl* pColl = nullptr; { - const OUString sTmplNm( m_pLbDbParaColl->GetSelectEntry() ); + const OUString sTmplNm( m_pLbDbParaColl->GetSelectedEntry() ); if( sNoTmpl != sTmplNm ) { pColl = rSh.FindTextFormatCollByName( sTmplNm ); @@ -1592,7 +1592,7 @@ void SwInsertDBColAutoPilot::ImplCommit() if (!sTmp.isEmpty()) pValues[4].Value <<= sTmp; - if( sNoTmpl != (sTmp = m_pLbDbParaColl->GetSelectEntry()) ) + if( sNoTmpl != (sTmp = m_pLbDbParaColl->GetSelectedEntry()) ) pValues[5].Value <<= sTmp; if( pTAutoFormat ) diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 425bb4d85468..802309818f5d 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -929,9 +929,9 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem) pNewLB->SelectEntry(rHeader); //then the preview can be filled accordingly if(xColAccess.is() && pNewLB->GetSelectEntryPos() > 0 && - xColAccess->hasByName(pNewLB->GetSelectEntry())) + xColAccess->hasByName(pNewLB->GetSelectedEntry())) { - uno::Any aCol = xColAccess->getByName(pNewLB->GetSelectEntry()); + uno::Any aCol = xColAccess->getByName(pNewLB->GetSelectedEntry()); uno::Reference< XColumn > xColumn; aCol >>= xColumn; if(xColumn.is()) @@ -1111,7 +1111,7 @@ IMPL_LINK(SwAssignFieldsControl, ScrollHdl_Impl, ScrollBar*, pScroll, void) IMPL_LINK(SwAssignFieldsControl, MatchHdl_Impl, ListBox&, rBox, void) { - const OUString sColumn = rBox.GetSelectEntry(); + const OUString sColumn = rBox.GetSelectedEntry(); uno::Reference< XColumnsSupplier > xColsSupp( m_rConfigItem->GetResultSet(), uno::UNO_QUERY); uno::Reference <XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : nullptr; OUString sPreview; @@ -1230,7 +1230,7 @@ uno::Sequence< OUString > SwAssignFieldsDialog::CreateAssignments() aLBIter != m_pFieldsControl->m_aMatches.end(); ++aLBIter, ++nIndex) { - const OUString sSelect = (*aLBIter)->GetSelectEntry(); + const OUString sSelect = (*aLBIter)->GetSelectedEntry(); pAssignments[nIndex] = (m_sNone != sSelect) ? sSelect : OUString(); } return aAssignments; diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index e8df54a1838c..7d0a2cdfc93f 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -181,7 +181,7 @@ bool SwMailMergeDocSelectPage::commitPage( ::svt::WizardTypes::CommitPageReason m_pNewDocRB->IsChecked() || (!(sReloadDocument = m_sLoadFileName).isEmpty() && m_pLoadDocRB->IsChecked() )|| (!(sReloadDocument = m_sLoadTemplateName).isEmpty() && m_pLoadTemplateRB->IsChecked())|| - (m_pRecentDocRB->IsChecked() && !(sReloadDocument = m_pRecentDocLB->GetSelectEntry()).isEmpty()); + (m_pRecentDocRB->IsChecked() && !(sReloadDocument = m_pRecentDocLB->GetSelectedEntry()).isEmpty()); if( _eReason == ::svt::WizardTypes::eValidate ) m_pWizard->SetDocumentLoad(!m_pCurrentDocRB->IsChecked()); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 36ce5d02934a..5f9a4636b13a 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -131,7 +131,7 @@ void SwGreetingsHandler::UpdatePreview() IMPL_LINK(SwMailMergeGreetingsPage, AssignHdl_Impl, Button*, pButton, void) { - const OUString sPreview(m_pFemaleLB->GetSelectEntry() + "\n" + m_pMaleLB->GetSelectEntry()); + const OUString sPreview(m_pFemaleLB->GetSelectedEntry() + "\n" + m_pMaleLB->GetSelectedEntry()); ScopedVclPtr<SwAssignFieldsDialog> pDlg( VclPtr<SwAssignFieldsDialog>::Create(pButton, m_rConfigItem, sPreview, false)); if(RET_OK == pDlg->Execute()) @@ -163,7 +163,7 @@ void SwMailMergeGreetingsPage::UpdatePreview() if( !bNoValue ) { const OUString sFemaleValue = m_pFemaleFieldCB->GetText(); - const OUString sFemaleColumn = m_pFemaleColumnLB->GetSelectEntry(); + const OUString sFemaleColumn = m_pFemaleColumnLB->GetSelectedEntry(); Reference< sdbcx::XColumnsSupplier > xColsSupp( m_rConfigItem.GetResultSet(), UNO_QUERY); Reference < container::XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : nullptr; if(!sFemaleValue.isEmpty() && !sFemaleColumn.isEmpty() && @@ -200,8 +200,8 @@ void SwMailMergeGreetingsPage::UpdatePreview() } } - OUString sPreview = bFemale ? m_pFemaleLB->GetSelectEntry() : - bNoValue ? m_pNeutralCB->GetText() : m_pMaleLB->GetSelectEntry(); + OUString sPreview = bFemale ? m_pFemaleLB->GetSelectedEntry() : + bNoValue ? m_pNeutralCB->GetText() : m_pMaleLB->GetSelectedEntry(); sPreview = SwAddressPreview::FillData(sPreview, m_rConfigItem); m_pPreviewWIN->SetAddress(sPreview); @@ -342,7 +342,7 @@ bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason Sequence< OUString> aAssignment = m_rConfigItem.GetColumnAssignment( rDBData ); if(aAssignment.getLength() <= MM_PART_GENDER) aAssignment.realloc(MM_PART_GENDER + 1); - aAssignment[MM_PART_GENDER] = m_pFemaleColumnLB->GetSelectEntry(); + aAssignment[MM_PART_GENDER] = m_pFemaleColumnLB->GetSelectedEntry(); m_rConfigItem.SetColumnAssignment( rDBData, aAssignment ); } if (m_pFemaleFieldCB->IsValueChangedFromSaved()) @@ -505,7 +505,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl, Button*, void) if(aAssignment.getLength() < MM_PART_GENDER) aAssignment.realloc(MM_PART_GENDER); if( nPos > 0 ) - aAssignment[MM_PART_GENDER] = m_pFemaleColumnLB->GetSelectEntry(); + aAssignment[MM_PART_GENDER] = m_pFemaleColumnLB->GetSelectedEntry(); else aAssignment[MM_PART_GENDER].clear(); m_rConfigItem.SetColumnAssignment( rDBData, aAssignment ); diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index c4000892c7bc..d803c6a194c6 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -764,7 +764,7 @@ IMPL_LINK(SwMMResultPrintDialog, PrinterChangeHdl_Impl, ListBox&, rBox, void) assert(xConfigItem); if (rBox.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) { - const QueueInfo* pInfo = Printer::GetQueueInfo( rBox.GetSelectEntry(), false ); + const QueueInfo* pInfo = Printer::GetQueueInfo( rBox.GetSelectedEntry(), false ); if( pInfo ) { @@ -790,7 +790,7 @@ IMPL_LINK(SwMMResultPrintDialog, PrinterChangeHdl_Impl, ListBox&, rBox, void) else m_pPrinterSettingsPB->Disable(); - xConfigItem->SetSelectedPrinter(rBox.GetSelectEntry()); + xConfigItem->SetSelectedPrinter(rBox.GetSelectedEntry()); } IMPL_LINK(SwMMResultPrintDialog, PrintHdl_Impl, Button*, pButton, void) @@ -1040,7 +1040,7 @@ IMPL_LINK(SwMMResultEmailDialog, SendDocumentsHdl_Impl, Button*, pButton, void) else return; // back to the dialog } - OUString sEMailColumn = m_pMailToLB->GetSelectEntry(); + OUString sEMailColumn = m_pMailToLB->GetSelectedEntry(); OSL_ENSURE( !sEMailColumn.isEmpty(), "No email column selected"); Reference< sdbcx::XColumnsSupplier > xColsSupp( xConfigItem->GetResultSet(), UNO_QUERY); Reference < container::XNameAccess> xColAccess = xColsSupp.is() ? xColsSupp->getColumns() : nullptr; diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 9df58439fc64..8f81eb63d70e 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -269,7 +269,7 @@ void SwAsciiFilterDlg::FillOptions( SwAsciiOptions& rOptions ) LanguageType nLng = LANGUAGE_SYSTEM; if( m_pFontLB->IsVisible() ) { - sFont = m_pFontLB->GetSelectEntry(); + sFont = m_pFontLB->GetSelectedEntry(); nLng = m_pLanguageLB->GetSelectLanguage(); } diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index abe2e68dcc3e..f13299c85db5 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -254,24 +254,24 @@ IMPL_LINK( SwEnvPage, DatabaseHdl, ListBox&, rListBox, void ) if (&rListBox == m_pDatabaseLB) { - sActDBName = rListBox.GetSelectEntry(); + sActDBName = rListBox.GetSelectedEntry(); pSh->GetDBManager()->GetTableNames(m_pTableLB, sActDBName); sActDBName += OUStringLiteral1(DB_DELIM); } else { - sActDBName = comphelper::string::setToken(sActDBName, 1, DB_DELIM, m_pTableLB->GetSelectEntry()); + sActDBName = comphelper::string::setToken(sActDBName, 1, DB_DELIM, m_pTableLB->GetSelectedEntry()); } - pSh->GetDBManager()->GetColumnNames(m_pDBFieldLB, m_pDatabaseLB->GetSelectEntry(), - m_pTableLB->GetSelectEntry()); + pSh->GetDBManager()->GetColumnNames(m_pDBFieldLB, m_pDatabaseLB->GetSelectedEntry(), + m_pTableLB->GetSelectedEntry()); } IMPL_LINK_NOARG(SwEnvPage, FieldHdl, Button*, void) { - OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." + - m_pTableLB->GetSelectEntry() + "." + + OUString aStr("<" + m_pDatabaseLB->GetSelectedEntry() + "." + + m_pTableLB->GetSelectedEntry() + "." + OUString(m_pTableLB->GetSelectEntryData() == nullptr ? '0' : '1') + "." + - m_pDBFieldLB->GetSelectEntry() + ">"); + m_pDBFieldLB->GetSelectedEntry() + ">"); m_pAddrEdit->ReplaceSelected(aStr); Selection aSel = m_pAddrEdit->GetSelection(); m_pAddrEdit->GrabFocus(); diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 77aa46bfdff7..18f77a30fbb5 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -335,22 +335,22 @@ IMPL_LINK_NOARG(SwLabPage, AddrHdl, Button*, void) IMPL_LINK( SwLabPage, DatabaseHdl, ListBox&, rListBox, void ) { - sActDBName = m_pDatabaseLB->GetSelectEntry(); + sActDBName = m_pDatabaseLB->GetSelectedEntry(); WaitObject aObj( GetParentSwLabDlg() ); if (&rListBox == m_pDatabaseLB) GetDBManager()->GetTableNames(m_pTableLB, sActDBName); - GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectEntry()); + GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectedEntry()); } IMPL_LINK_NOARG(SwLabPage, FieldHdl, Button*, void) { - OUString aStr("<" + m_pDatabaseLB->GetSelectEntry() + "." + - m_pTableLB->GetSelectEntry() + "." + + OUString aStr("<" + m_pDatabaseLB->GetSelectedEntry() + "." + + m_pTableLB->GetSelectedEntry() + "." + (m_pTableLB->GetSelectEntryData() == nullptr ? OUString("0") : OUString("1")) + "." + - m_pDBFieldLB->GetSelectEntry() + ">"); + m_pDBFieldLB->GetSelectedEntry() + ">"); m_pWritingEdit->ReplaceSelected(aStr); Selection aSel = m_pWritingEdit->GetSelection(); m_pWritingEdit->GrabFocus(); @@ -370,7 +370,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, ListBox&, void) m_pHiddenSortTypeBox->Clear(); GetParentSwLabDlg()->TypeIds().clear(); - const OUString aMake = m_pMakeBox->GetSelectEntry(); + const OUString aMake = m_pMakeBox->GetSelectedEntry(); GetParentSwLabDlg()->ReplaceGroup( aMake ); aItem.m_aLstMake = aMake; @@ -418,7 +418,7 @@ IMPL_LINK_NOARG(SwLabPage, MakeHdl, ListBox&, void) IMPL_LINK_NOARG(SwLabPage, TypeHdl, ListBox&, void) { DisplayFormat(); - aItem.m_aType = m_pTypeBox->GetSelectEntry(); + aItem.m_aType = m_pTypeBox->GetSelectedEntry(); } void SwLabPage::DisplayFormat() @@ -448,7 +448,7 @@ void SwLabPage::DisplayFormat() SwLabRec* SwLabPage::GetSelectedEntryPos() { - OUString sSelEntry(m_pTypeBox->GetSelectEntry()); + OUString sSelEntry(m_pTypeBox->GetSelectedEntry()); return GetParentSwLabDlg()->GetRecord(sSelEntry, m_pContButton->IsChecked()); } @@ -498,15 +498,15 @@ void SwLabPage::FillItem(SwLabItem& rItem) rItem.m_bAddr = m_pAddrBox->IsChecked(); rItem.m_aWriting = m_pWritingEdit->GetText(); rItem.m_bCont = m_pContButton->IsChecked(); - rItem.m_aMake = m_pMakeBox->GetSelectEntry(); - rItem.m_aType = m_pTypeBox->GetSelectEntry(); + rItem.m_aMake = m_pMakeBox->GetSelectedEntry(); + rItem.m_aType = m_pTypeBox->GetSelectedEntry(); rItem.m_sDBName = sActDBName; SwLabRec* pRec = GetSelectedEntryPos(); pRec->FillItem( rItem ); - rItem.m_aLstMake = m_pMakeBox->GetSelectEntry(); - rItem.m_aLstType = m_pTypeBox->GetSelectEntry(); + rItem.m_aLstMake = m_pMakeBox->GetSelectedEntry(); + rItem.m_aLstType = m_pTypeBox->GetSelectedEntry(); } bool SwLabPage::FillItemSet(SfxItemSet* rSet) diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 76d8422f4406..b9caab70328d 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -513,7 +513,7 @@ bool SwMailMergeDlg::ExecQryShell() pModOpt->SetIsNameFromColumn(m_pGenerateFromDataBaseCB->IsChecked()); if (!AskUserFilename()) { - pModOpt->SetNameFromColumn(m_pColumnLB->GetSelectEntry()); + pModOpt->SetNameFromColumn(m_pColumnLB->GetSelectedEntry()); if( m_pFilterLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) m_sSaveFilter = *static_cast<const OUString*>(m_pFilterLB->GetSelectEntryData()); m_sFilename = OUString(); diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 9d624e81d88a..f72d9a696cec 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -101,7 +101,7 @@ void sw::DropDownFieldDialog::Apply() { if(pDropField) { - OUString sSelect = m_pListItemsLB->GetSelectEntry(); + OUString sSelect = m_pListItemsLB->GetSelectedEntry(); if(pDropField->GetPar1() != sSelect) { rSh.StartAllAction(); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index f958cfb12870..fb7632e91cad 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -417,7 +417,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, SelectHdl, ListBox&, void) const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); if( TYP_MACROFLD == nTypeId ) - m_pNameED->SetText( m_pSelectionLB->GetSelectEntry() ); + m_pNameED->SetText( m_pSelectionLB->GetSelectedEntry() ); } IMPL_LINK_NOARG(SwFieldFuncPage, InsertMacroHdl, ListBox&, void) @@ -456,7 +456,7 @@ void SwFieldFuncPage::ListModifyHdl(Control const * pControl) { if(nSelPos) { - const OUString sEntry = m_pListItemsLB->GetSelectEntry(); + const OUString sEntry = m_pListItemsLB->GetSelectedEntry(); m_pListItemsLB->RemoveEntry(nSelPos); nSelPos--; m_pListItemsLB->InsertEntry(sEntry, nSelPos); @@ -467,7 +467,7 @@ void SwFieldFuncPage::ListModifyHdl(Control const * pControl) { if(nSelPos < m_pListItemsLB->GetEntryCount() - 1) { - const OUString sEntry = m_pListItemsLB->GetSelectEntry(); + const OUString sEntry = m_pListItemsLB->GetSelectedEntry(); m_pListItemsLB->RemoveEntry(nSelPos); nSelPos++; m_pListItemsLB->InsertEntry(sEntry, nSelPos); diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index b1bdd9ec7784..fc9c2882ffac 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -282,7 +282,7 @@ void SwFieldPage::InsertField(sal_uInt16 nTypeId, sal_uInt16 nSubType, const OUS void SwFieldPage::SavePos( const ListBox* pLst1 ) { if( pLst1 && pLst1->GetEntryCount() ) - m_aLstStrArr[ 0 ] = pLst1->GetSelectEntry(); + m_aLstStrArr[ 0 ] = pLst1->GetSelectedEntry(); else m_aLstStrArr[ 0 ].clear(); m_aLstStrArr[ 1 ].clear(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index da6482c55f41..fba7a511d820 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -455,7 +455,7 @@ void SwFieldRefPage::SubTypeHdl() case TYP_GETREFFLD: if (!IsFieldEdit() || m_pSelectionLB->GetSelectEntryCount()) { - m_pNameED->SetText(m_pSelectionLB->GetSelectEntry()); + m_pNameED->SetText(m_pSelectionLB->GetSelectedEntry()); ModifyHdl(*m_pNameED); } break; @@ -486,7 +486,7 @@ void SwFieldRefPage::SubTypeHdl() default: if (!IsFieldEdit() || m_pSelectionLB->GetSelectEntryCount()) - m_pNameED->SetText(m_pSelectionLB->GetSelectEntry()); + m_pNameED->SetText(m_pSelectionLB->GetSelectedEntry()); break; } } @@ -923,7 +923,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* ) else if (REFFLDFLAG_FOOTNOTE == nTypeId) // footnotes { SwSeqFieldList aArr; - SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 ); + SeqFieldLstElem aElem( m_pSelectionLB->GetSelectedEntry(), 0 ); size_t nPos = 0; @@ -944,7 +944,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* ) else if (REFFLDFLAG_ENDNOTE == nTypeId) // endnotes { SwSeqFieldList aArr; - SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 ); + SeqFieldLstElem aElem( m_pSelectionLB->GetSelectedEntry(), 0 ); size_t nPos = 0; @@ -1013,7 +1013,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* ) if( pType ) { SwSeqFieldList aArr; - SeqFieldLstElem aElem( m_pSelectionLB->GetSelectEntry(), 0 ); + SeqFieldLstElem aElem( m_pSelectionLB->GetSelectedEntry(), 0 ); size_t nPos = 0; diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 0ceb902b183c..e7899ba4caa8 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -335,7 +335,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox) { if (nSelPos != LISTBOX_ENTRY_NOTFOUND) { - OUString sName(m_pSelectionLB->GetSelectEntry()); + OUString sName(m_pSelectionLB->GetSelectedEntry()); m_pNameED->SetText(sName); if (!IsFieldDlgHtmlMode()) @@ -385,7 +385,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox) if (nSelPos != LISTBOX_ENTRY_NOTFOUND) { - OUString sName(m_pSelectionLB->GetSelectEntry()); + OUString sName(m_pSelectionLB->GetSelectedEntry()); if (!IsFieldEdit()) m_pNameED->SetText(sName); @@ -423,7 +423,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox) OUString sName; - sName = m_pSelectionLB->GetSelectEntry(); + sName = m_pSelectionLB->GetSelectedEntry(); m_pNameED->SetText( sName ); // User- or SetField ? @@ -506,7 +506,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox) GetFormula() ); if( IsFieldEdit() || pBox ) // only when interacting via mouse - m_pNameED->SetText( m_pSelectionLB->GetSelectEntry() ); + m_pNameED->SetText( m_pSelectionLB->GetSelectedEntry() ); if( pFieldTyp ) { @@ -581,7 +581,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox) nSelData = static_cast<size_t>(reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nSelPos))); if (nSelData != SIZE_MAX && pBox && !bInit) { - m_pValueED->ReplaceSelected(m_pSelectionLB->GetSelectEntry()); + m_pValueED->ReplaceSelected(m_pSelectionLB->GetSelectedEntry()); ModifyHdl(*m_pNameED); } } @@ -961,7 +961,7 @@ IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) if (nCurId == m_nDeleteId) { if( nTypeId == TYP_USERFLD ) - GetFieldMgr().RemoveFieldType(SwFieldIds::User, m_pSelectionLB->GetSelectEntry()); + GetFieldMgr().RemoveFieldType(SwFieldIds::User, m_pSelectionLB->GetSelectedEntry()); else { SwFieldIds nWhich; @@ -977,7 +977,7 @@ IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) break; } - GetFieldMgr().RemoveFieldType(nWhich, m_pSelectionLB->GetSelectEntry()); + GetFieldMgr().RemoveFieldType(nWhich, m_pSelectionLB->GetSelectedEntry()); } UpdateSubType(); @@ -1159,7 +1159,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* ) { nSubType = (nFormat == ULONG_MAX) ? nsSwGetSetExpType::GSE_STRING : nsSwGetSetExpType::GSE_EXPR; - if (nFormat == ULONG_MAX && m_pNumFormatLB->GetSelectEntry() == SwResId(FMT_USERVAR_CMD)) + if (nFormat == ULONG_MAX && m_pNumFormatLB->GetSelectedEntry() == SwResId(FMT_USERVAR_CMD)) nSubType |= nsSwExtendedSubType::SUB_CMD; if (m_pInvisibleCB->IsChecked()) diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 20b8ccfa0904..dcead58ebc91 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -513,7 +513,7 @@ void SwSequenceOptionDialog::Apply() OUString SwSequenceOptionDialog::GetCharacterStyle() const { if(m_pLbCharStyle->GetSelectEntryPos()) - return m_pLbCharStyle->GetSelectEntry(); + return m_pLbCharStyle->GetSelectedEntry(); return OUString(); } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 9a7bdbad64ba..ab0b5340a2b2 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1403,7 +1403,7 @@ sal_Int32 SwFramePage::FillPosLB(const FrameMap* _pMap, ListBox& _rLB ) { OUString sSelEntry; - const OUString sOldEntry = _rLB.GetSelectEntry(); + const OUString sOldEntry = _rLB.GetSelectedEntry(); _rLB.Clear(); @@ -1470,7 +1470,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap, { if (_pMap == aVAsCharHtmlMap || _pMap == aVAsCharMap) { - const OUString sOldEntry(_rLB.GetSelectEntry()); + const OUString sOldEntry(_rLB.GetSelectedEntry()); SvxSwFramePosString::StringId eStrId = _pMap[_nLBSelPos].eStrId; for (size_t nMapPos = 0; nMapPos < nMapCount; nMapPos++) @@ -1684,7 +1684,7 @@ sal_Int32 SwFramePage::GetMapPos( const FrameMap *pMap, ListBox const &rAlignLB if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap) { const size_t nMapCount = ::lcl_GetFrameMapCount(pMap); - const OUString sSelEntry(rAlignLB.GetSelectEntry()); + const OUString sSelEntry(rAlignLB.GetSelectedEntry()); for (size_t i = 0; i < nMapCount; i++) { @@ -3162,9 +3162,9 @@ bool SwFrameAddPage::FillItemSet(SfxItemSet *rSet) { OUString sCurrentPrevChain, sCurrentNextChain; if(m_pPrevLB->GetSelectEntryPos()) - sCurrentPrevChain = m_pPrevLB->GetSelectEntry(); + sCurrentPrevChain = m_pPrevLB->GetSelectedEntry(); if(m_pNextLB->GetSelectEntryPos()) - sCurrentNextChain = m_pNextLB->GetSelectEntry(); + sCurrentNextChain = m_pNextLB->GetSelectedEntry(); const SwFormatChain &rChain = pFormat->GetChain(); const SwFlyFrameFormat* pFlyFormat; OUString sNextChain, sPrevChain; @@ -3216,9 +3216,9 @@ IMPL_LINK(SwFrameAddPage, ChainModifyHdl, ListBox&, rBox, void) { OUString sCurrentPrevChain, sCurrentNextChain; if(m_pPrevLB->GetSelectEntryPos()) - sCurrentPrevChain = m_pPrevLB->GetSelectEntry(); + sCurrentPrevChain = m_pPrevLB->GetSelectedEntry(); if(m_pNextLB->GetSelectEntryPos()) - sCurrentNextChain = m_pNextLB->GetSelectEntry(); + sCurrentNextChain = m_pNextLB->GetSelectedEntry(); SwFrameFormat* pFormat = m_pWrtSh->GetFlyFrameFormat(); if (pFormat) { diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 42e364be0f54..56e02a7fa898 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1154,7 +1154,7 @@ void SwTOXSelectTabPage::FillTOXDescription() break; case TOX_USER: { - rDesc.SetTOUName(m_pTypeLB->GetSelectEntry()); + rDesc.SetTOUName(m_pTypeLB->GetSelectedEntry()); if(m_pFromOLECB->IsChecked()) nContentOptions |= SwTOXElement::Ole; @@ -1191,7 +1191,7 @@ void SwTOXSelectTabPage::FillTOXDescription() case TOX_ILLUSTRATIONS: case TOX_TABLES : rDesc.SetCreateFromObjectNames(m_pFromObjectNamesRB->IsChecked()); - rDesc.SetSequenceName(m_pCaptionSequenceLB->GetSelectEntry()); + rDesc.SetSequenceName(m_pCaptionSequenceLB->GetSelectedEntry()); rDesc.SetCaptionDisplay((SwCaptionDisplay)m_pDisplayTypeLB->GetSelectEntryPos()); break; case TOX_OBJECTS: @@ -1212,7 +1212,7 @@ void SwTOXSelectTabPage::FillTOXDescription() case TOX_BIBLIOGRAPHY : { if(m_pBracketLB->GetSelectEntryPos()) - rDesc.SetAuthBrackets(m_pBracketLB->GetSelectEntry()); + rDesc.SetAuthBrackets(m_pBracketLB->GetSelectedEntry()); else rDesc.SetAuthBrackets(aEmptyOUStr); rDesc.SetAuthSequence(m_pSequenceCB->IsChecked()); @@ -2206,7 +2206,7 @@ void SwTOXEntryTabPage::UpdateDescriptor() SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(aLastTOXType); if(TOX_INDEX == aLastTOXType.eType) { - const OUString sTemp(m_pMainEntryStyleLB->GetSelectEntry()); + const OUString sTemp(m_pMainEntryStyleLB->GetSelectedEntry()); rDesc.SetMainEntryCharStyle(sNoCharStyle == sTemp ? aEmptyOUStr : sTemp); SwTOIOptions nIdxOptions = rDesc.GetIndexOptions() & ~SwTOIOptions::AlphaDelimiter; if(m_pAlphaDelimCB->IsChecked()) @@ -2250,7 +2250,7 @@ IMPL_LINK_NOARG(SwTOXEntryTabPage, EditStyleHdl, Button*, void) { if( LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectEntryPos()) { - SfxStringItem aStyle(SID_STYLE_EDIT, m_pCharStyleLB->GetSelectEntry()); + SfxStringItem aStyle(SID_STYLE_EDIT, m_pCharStyleLB->GetSelectedEntry()); SfxUInt16Item aFamily(SID_STYLE_FAMILY, (sal_uInt16)SfxStyleFamily::Char); static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(). GetView().GetViewFrame()->GetDispatcher()->ExecuteList(SID_STYLE_EDIT, @@ -2265,7 +2265,7 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, Button*, pButton, void) if(bInsert) { sal_Int32 nSelPos = m_pAuthFieldsLB->GetSelectEntryPos(); - const OUString sToInsert(m_pAuthFieldsLB->GetSelectEntry()); + const OUString sToInsert(m_pAuthFieldsLB->GetSelectedEntry()); SwFormToken aInsert(TOKEN_AUTHORITY); aInsert.nAuthorityField = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pAuthFieldsLB->GetEntryData(nSelPos)); m_pTokenWIN->InsertAtSelection(SwForm::GetFormAuth(), aInsert); @@ -2456,7 +2456,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) else m_pCharStyleLB->SelectEntry(sNoCharStyle); - const OUString sEntry = m_pCharStyleLB->GetSelectEntry(); + const OUString sEntry = m_pCharStyleLB->GetSelectedEntry(); m_pEditStylePB->Enable(sEntry != sNoCharStyle); if(rToken.eTokenType == TOKEN_CHAPTER_INFO) @@ -2557,14 +2557,14 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken&, rToken, void) if(m_pAuthInsertPB->IsVisible()) { bool bText = TOKEN_TEXT == rToken.eTokenType; - m_pAuthInsertPB->Enable(bText && !m_pAuthFieldsLB->GetSelectEntry().isEmpty()); + m_pAuthInsertPB->Enable(bText && !m_pAuthFieldsLB->GetSelectedEntry().isEmpty()); m_pAuthRemovePB->Enable(!bText); } } IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void) { - OUString sEntry = rBox.GetSelectEntry(); + OUString sEntry = rBox.GetSelectedEntry(); const sal_uInt16 nId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rBox.GetSelectEntryData()); const bool bEqualsNoCharStyle = sEntry == sNoCharStyle; m_pEditStylePB->Enable(!bEqualsNoCharStyle); @@ -3778,7 +3778,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, Button *, void) { if( LISTBOX_ENTRY_NOTFOUND != m_pParaLayLB->GetSelectEntryPos()) { - SfxStringItem aStyle(SID_STYLE_EDIT, m_pParaLayLB->GetSelectEntry()); + SfxStringItem aStyle(SID_STYLE_EDIT, m_pParaLayLB->GetSelectedEntry()); SfxUInt16Item aFamily(SID_STYLE_FAMILY, (sal_uInt16)SfxStyleFamily::Para); SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(); rSh.GetView().GetViewFrame()->GetDispatcher()->ExecuteList(SID_STYLE_EDIT, @@ -3797,10 +3797,10 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl, Button*, void) { const OUString aStr(m_pLevelLB->GetEntry(nLevPos).getToken(0, aDeliStart) + OUStringLiteral1(aDeliStart) - + m_pParaLayLB->GetSelectEntry() + + m_pParaLayLB->GetSelectedEntry() + OUStringLiteral1(aDeliEnd)); - m_pCurrentForm->SetTemplate(nLevPos, m_pParaLayLB->GetSelectEntry()); + m_pCurrentForm->SetTemplate(nLevPos, m_pParaLayLB->GetSelectedEntry()); m_pLevelLB->RemoveEntry(nLevPos); m_pLevelLB->InsertEntry(aStr, nLevPos); @@ -3825,7 +3825,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl, Button*, void) IMPL_LINK_NOARG(SwTOXStylesTabPage, DoubleClickHdl, ListBox&, void) { - const OUString aTmpName( m_pParaLayLB->GetSelectEntry() ); + const OUString aTmpName( m_pParaLayLB->GetSelectedEntry() ); SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(); if(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND && @@ -3839,7 +3839,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl, ListBox&, void) m_pStdBT->Enable(m_pLevelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND); SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(); - const OUString aTmpName(m_pParaLayLB->GetSelectEntry()); + const OUString aTmpName(m_pParaLayLB->GetSelectedEntry()); m_pAssignBT->Enable(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND && LISTBOX_ENTRY_NOTFOUND != m_pLevelLB->GetSelectEntryPos() && (m_pLevelLB->GetSelectEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName))); diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 0e2296701967..958e28055ecd 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -177,7 +177,7 @@ void SwIndexMarkPane::InitControls() OSL_ENSURE(pType, "No directory type !!"); OUString sTmpTypeSelection; if(m_pTypeDCB->GetSelectEntryCount()) - sTmpTypeSelection = m_pTypeDCB->GetSelectEntry(); + sTmpTypeSelection = m_pTypeDCB->GetSelectedEntry(); m_pTypeDCB->Clear(); m_pTypeDCB->InsertEntry(pType->GetTypeName()); @@ -423,7 +423,7 @@ void SwIndexMarkPane::InsertUpdate() pSh->EndAllAction(); pSh->EndUndo(bDel ? SwUndoId::INDEX_ENTRY_DELETE : SwUndoId::INDEX_ENTRY_INSERT); - if((nTypePos = m_pTypeDCB->GetEntryPos(m_pTypeDCB->GetSelectEntry())) == LISTBOX_ENTRY_NOTFOUND) + if((nTypePos = m_pTypeDCB->GetEntryPos(m_pTypeDCB->GetSelectedEntry())) == LISTBOX_ENTRY_NOTFOUND) nTypePos = 0; nKey1Pos = m_pKey1DCB->GetEntryPos(m_pKey1DCB->GetText()); @@ -457,7 +457,7 @@ static void lcl_SelectSameStrings(SwWrtShell& rSh, bool bWordOnly, bool bCaseSen void SwIndexMarkPane::InsertMark() { - sal_Int32 nPos = m_pTypeDCB->GetEntryPos(m_pTypeDCB->GetSelectEntry()); + sal_Int32 nPos = m_pTypeDCB->GetEntryPos(m_pTypeDCB->GetSelectedEntry()); TOXTypes eType = nPos == POS_CONTENT ? TOX_CONTENT : nPos == POS_INDEX ? TOX_INDEX : TOX_USER; @@ -480,7 +480,7 @@ void SwIndexMarkPane::InsertMark() break; default: // Userdefined index mark { - aDesc.SetTOUName(m_pTypeDCB->GetSelectEntry()); + aDesc.SetTOUName(m_pTypeDCB->GetSelectedEntry()); } } if (aOrgStr != m_pEntryED->GetText()) @@ -516,7 +516,7 @@ void SwIndexMarkPane::UpdateMark() UpdateKeyBoxes(); - sal_Int32 nPos = m_pTypeDCB->GetEntryPos(m_pTypeDCB->GetSelectEntry()); + sal_Int32 nPos = m_pTypeDCB->GetEntryPos(m_pTypeDCB->GetSelectedEntry()); TOXTypes eType = TOX_USER; if(POS_CONTENT == nPos) eType = TOX_CONTENT; @@ -656,7 +656,7 @@ void SwIndexMarkPane::ModifyHdl(Control const * pBox) if (m_pTypeDCB == pBox) { // set index type - sal_Int32 nPos = m_pTypeDCB->GetEntryPos(m_pTypeDCB->GetSelectEntry()); + sal_Int32 nPos = m_pTypeDCB->GetEntryPos(m_pTypeDCB->GetSelectedEntry()); bool bLevelEnable = false, bKeyEnable = false, bSetKey2 = false, @@ -1157,7 +1157,7 @@ static OUString lcl_FindColumnEntry(const beans::PropertyValue* pFields, sal_Int IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox&, rBox, void) { - const OUString sEntry(rBox.GetSelectEntry()); + const OUString sEntry(rBox.GetSelectedEntry()); if(bIsFromComponent) { if(xBibAccess.is() && !sEntry.isEmpty()) @@ -1190,7 +1190,7 @@ IMPL_LINK( SwAuthorMarkPane, CompEntryHdl, ListBox&, rBox, void) pEntry->GetAuthorField((ToxAuthorityField)i) : OUString(); } } - if (rBox.GetSelectEntry().isEmpty()) + if (rBox.GetSelectedEntry().isEmpty()) { for(OUString & s : m_sFields) s.clear(); diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index c7daf0657d32..ebe8748c8def 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -365,15 +365,15 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) pInf->SetSuffix(m_pSuffixED->GetText().replaceAll("\\t", "\t")); pInf->SetCharFormat( lcl_GetCharFormat( pSh, - m_pFootnoteCharTextTemplBox->GetSelectEntry() ) ); + m_pFootnoteCharTextTemplBox->GetSelectedEntry() ) ); pInf->SetAnchorCharFormat( lcl_GetCharFormat( pSh, - m_pFootnoteCharAnchorTemplBox->GetSelectEntry() ) ); + m_pFootnoteCharAnchorTemplBox->GetSelectedEntry() ) ); // paragraph template sal_Int32 nPos = m_pParaTemplBox->GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) { - const OUString aFormatName( m_pParaTemplBox->GetSelectEntry() ); + const OUString aFormatName( m_pParaTemplBox->GetSelectedEntry() ); SwTextFormatColl *pColl = pSh->GetParaStyle(aFormatName, SwWrtShell::GETSTYLE_CREATEANY); OSL_ENSURE(pColl, "paragraph style not found"); pInf->SetFootnoteTextColl(*pColl); @@ -381,7 +381,7 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) // page template pInf->ChgPageDesc( pSh->FindPageDescByName( - m_pPageTemplBox->GetSelectEntry(), true ) ); + m_pPageTemplBox->GetSelectedEntry(), true ) ); if ( bEndNote ) { diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index ab0dd1b8dae0..de294a1e90c7 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -220,10 +220,10 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl, Button*, void) + OUString::number(m_pPathLB->GetSelectEntryPos()); OSL_ENSURE(!pGlosHdl->FindGroupName(sGroup), "group already available!"); m_InsertedArr.push_back(sGroup); - const OUString sTemp(m_pNameED->GetText() + "\t" + m_pPathLB->GetSelectEntry()); + const OUString sTemp(m_pNameED->GetText() + "\t" + m_pPathLB->GetSelectedEntry()); SvTreeListEntry* pEntry = m_pGroupTLB->InsertEntry(sTemp); GlosBibUserData* pData = new GlosBibUserData; - pData->sPath = m_pPathLB->GetSelectEntry(); + pData->sPath = m_pPathLB->GetSelectedEntry(); pData->sGroupName = sGroup; pData->sGroupTitle = m_pNameED->GetText(); pEntry->SetUserData(pData); @@ -315,9 +315,9 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl, Button*, void) delete static_cast<GlosBibUserData*>(pEntry->GetUserData()); m_pGroupTLB->GetModel()->Remove(pEntry); pEntry = m_pGroupTLB->InsertEntry(m_pNameED->GetText() + "\t" - + m_pPathLB->GetSelectEntry()); + + m_pPathLB->GetSelectedEntry()); GlosBibUserData* pData = new GlosBibUserData; - pData->sPath = m_pPathLB->GetSelectEntry(); + pData->sPath = m_pPathLB->GetSelectedEntry(); pData->sGroupName = sNewName; pData->sGroupTitle = sNewTitle; pEntry->SetUserData(pData); diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 7077e8c4b7db..90b1c529c35b 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -197,7 +197,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl, Button*, void) SwLineNumberInfo aInf(pSh->GetLineNumberInfo()); // char styles - OUString sCharFormatName(m_pCharStyleLB->GetSelectEntry()); + OUString sCharFormatName(m_pCharStyleLB->GetSelectedEntry()); SwCharFormat *pCharFormat = pSh->FindCharFormatByName(sCharFormatName); if (!pCharFormat) diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 9c806ba0a929..3efaf233abdf 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -93,7 +93,7 @@ void SwNumNamesDlg::dispose() // remember selected entry IMPL_LINK( SwNumNamesDlg, SelectHdl, ListBox&, rBox, void ) { - m_pFormEdit->SetText(rBox.GetSelectEntry()); + m_pFormEdit->SetText(rBox.GetSelectedEntry()); m_pFormEdit->SetSelection(Selection(0, SELECTION_MAX)); } @@ -605,7 +605,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelect, ListBox&, rBox, void ) { sal_uInt8 i; - const OUString aCollName(rBox.GetSelectEntry()); + const OUString aCollName(rBox.GetSelectedEntry()); //0xFFFF not allowed here (disable) sal_uInt16 nTmpLevel = lcl_BitToLevel(nActLevel); OUString sOldName( pCollNames[nTmpLevel] ); @@ -702,7 +702,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, Edit&, rEdit, void ) IMPL_LINK_NOARG(SwOutlineSettingsTabPage, CharFormatHdl, ListBox&, void) { - OUString sEntry = m_pCharFormatLB->GetSelectEntry(); + OUString sEntry = m_pCharFormatLB->GetSelectedEntry(); sal_uInt16 nMask = 1; bool bFormatNone = sEntry == SwViewShell::GetShellRes()->aStrNone; SwCharFormat* pFormat = nullptr; diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index abc6a0d186a0..0087e359fcd6 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -311,7 +311,7 @@ void SwSortDlg::Apply() SwSortOptions aOptions; if( bCheck1 ) { - OUString sEntry( m_pTypDLB1->GetSelectEntry() ); + OUString sEntry( m_pTypDLB1->GetSelectedEntry() ); if( sEntry == aNumericText ) sEntry.clear(); else if( nullptr != (pUserData = m_pTypDLB1->GetSelectEntryData()) ) @@ -324,7 +324,7 @@ void SwSortDlg::Apply() if( bCheck2 ) { - OUString sEntry( m_pTypDLB2->GetSelectEntry() ); + OUString sEntry( m_pTypDLB2->GetSelectedEntry() ); if( sEntry == aNumericText ) sEntry.clear(); else if( nullptr != (pUserData = m_pTypDLB2->GetSelectEntryData()) ) @@ -337,7 +337,7 @@ void SwSortDlg::Apply() if( bCheck3 ) { - OUString sEntry( m_pTypDLB3->GetSelectEntry() ); + OUString sEntry( m_pTypDLB3->GetSelectedEntry() ); if( sEntry == aNumericText ) sEntry.clear(); else if( nullptr != (pUserData = m_pTypDLB3->GetSelectEntryData()) ) diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx index 62c175901346..9a176b95c986 100644 --- a/sw/source/ui/misc/titlepage.cxx +++ b/sw/source/ui/misc/titlepage.cxx @@ -289,7 +289,7 @@ void SwTitlePageDlg::dispose() IMPL_LINK_NOARG(SwTitlePageDlg, EditHdl, Button*, void) { SwView& rView = mpSh->GetView(); - rView.GetDocShell()->FormatPage(m_pPagePropertiesLB->GetSelectEntry(), "page", *mpSh); + rView.GetDocShell()->FormatPage(m_pPagePropertiesLB->GetSelectedEntry(), "page", *mpSh); rView.InvalidateRulerPos(); } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 515e7b3945cf..2a5214c82a37 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1350,7 +1350,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet ) if ( bState ) { - sPage = m_pPageCollLB->GetSelectEntry(); + sPage = m_pPageCollLB->GetSelectedEntry(); } sal_uInt16 nPgNum = static_cast< sal_uInt16 >(m_pPageNoNF->GetValue()); bool const usePageNo(bState && m_pPageNoCB->IsChecked()); diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index bac50df87ebe..82476761d9c5 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -372,7 +372,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RemoveHdl, Button*, void) { OUString aMessage = aStrDelMsg; aMessage += "\n\n"; - aMessage += m_pLbFormat->GetSelectEntry(); + aMessage += m_pLbFormat->GetSelectedEntry(); aMessage += "\n"; VclPtrInstance<MessBox> pBox( this, MessBoxStyle::OkCancel, 0, @@ -409,7 +409,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl, Button*, void) while( !bOk ) { VclPtrInstance<SwStringInputDlg> pDlg( this, aStrRenameTitle, - m_pLbFormat->GetSelectEntry(), + m_pLbFormat->GetSelectedEntry(), OUString() ); if( pDlg->Execute() == RET_OK ) { |