diff options
171 files changed, 440 insertions, 440 deletions
diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index 326efa878934..a6a2138532ca 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -55,7 +55,7 @@ OUString VCLXAccessibleTextField::implGetText() OUString aText; VclPtr< ListBox > pListBox = GetAs< ListBox >(); if (pListBox && !pListBox->IsInDropDown()) - aText = pListBox->GetSelectEntry(); + aText = pListBox->GetSelectedEntry(); return aText; } diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 9ce006ac6532..e184dd74dc75 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -167,7 +167,7 @@ void LibBox::Update( const SfxStringItem* pItem ) aCurText = IDEResId(RID_STR_ALL); } - if ( GetSelectEntry() != aCurText ) + if ( GetSelectedEntry() != aCurText ) SelectEntry( aCurText ); } @@ -191,7 +191,7 @@ void LibBox::FillBox() SetUpdateMode(false); bIgnoreSelect = true; - aCurText = GetSelectEntry(); + aCurText = GetSelectedEntry(); SelectEntryPos( 0 ); ClearBox(); @@ -217,7 +217,7 @@ void LibBox::FillBox() if ( !GetSelectEntryCount() ) { SelectEntryPos( GetEntryCount() ); - aCurText = GetSelectEntry(); + aCurText = GetSelectedEntry(); } bIgnoreSelect = false; } @@ -387,7 +387,7 @@ void LanguageBox::FillBox() { SetUpdateMode(false); m_bIgnoreSelect = true; - m_sCurrentText = GetSelectEntry(); + m_sCurrentText = GetSelectedEntry(); ClearBox(); std::shared_ptr<LocalizationMgr> pCurMgr(GetShell()->GetCurLocalizationMgr()); @@ -421,7 +421,7 @@ void LanguageBox::FillBox() if ( nSelPos != LISTBOX_ENTRY_NOTFOUND ) { SelectEntryPos( nSelPos ); - m_sCurrentText = GetSelectEntry(); + m_sCurrentText = GetSelectedEntry(); } } else @@ -501,7 +501,7 @@ void LanguageBox::Update( const SfxStringItem* pItem ) if ( pItem && !pItem->GetValue().isEmpty() ) { m_sCurrentText = pItem->GetValue(); - if ( GetSelectEntry() != m_sCurrentText ) + if ( GetSelectedEntry() != m_sCurrentText ) SelectEntry( m_sCurrentText ); } } diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 5500db055e5f..47d1ece3a936 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -2628,16 +2628,16 @@ void CodeCompleteListBox::InsertSelectedEntry() GetParentEditView()->SetSelection( pCodeCompleteWindow->pParent->GetLastHighlightPortionTextSelection() ); GetParentEditView()->DeleteSelected(); - if( !GetSelectEntry().isEmpty() ) + if( !GetSelectedEntry().isEmpty() ) {//if the user selected something - GetParentEditView()->InsertText( GetSelectEntry() ); + GetParentEditView()->InsertText( GetSelectedEntry() ); } } else { - if( !GetSelectEntry().isEmpty() ) + if( !GetSelectedEntry().isEmpty() ) {//if the user selected something - GetParentEditView()->InsertText( GetSelectEntry() ); + GetParentEditView()->InsertText( GetSelectedEntry() ); } } HideAndRestoreFocus(); @@ -2718,7 +2718,7 @@ void CodeCompleteListBox::KeyInput( const KeyEvent& rKeyEvt ) GetParentEditView()->SetSelection( aTextSelection ); GetParentEditView()->DeleteSelected(); - GetParentEditView()->InsertText( GetSelectEntry() ); + GetParentEditView()->InsertText( GetSelectedEntry() ); } } break; diff --git a/compilerplugins/clang/constantparam.booleans.results b/compilerplugins/clang/constantparam.booleans.results index ee4452d710c9..84a931a9d561 100644 --- a/compilerplugins/clang/constantparam.booleans.results +++ b/compilerplugins/clang/constantparam.booleans.results @@ -2867,7 +2867,7 @@ vbahelper/source/vbahelper/vbacommandbarcontrols.hxx:45 int nStyle 0 vcl/inc/listbox.hxx:133 - class rtl::OUString ImplEntryList::GetSelectEntry(int) const + class rtl::OUString ImplEntryList::GetSelectedEntry(int) const int nIndex 0 vcl/inc/listbox.hxx:309 diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 3c5cb0db239a..c3183a8909df 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -466,9 +466,9 @@ IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn, void ) //if it's not the 'no suggestions' entry if(sWrong == sCurrentErrorText && m_pSuggestionLB->IsEnabled() && m_pSuggestionLB->GetSelectEntryCount() > 0 && - m_sNoSuggestionsST != m_pSuggestionLB->GetSelectEntry()) + m_sNoSuggestionsST != m_pSuggestionLB->GetSelectedEntry()) { - sCurrentErrorText = m_pSuggestionLB->GetSelectEntry(); + sCurrentErrorText = m_pSuggestionLB->GetSelectedEntry(); } if(sWrong != sCurrentErrorText) { @@ -530,8 +530,8 @@ OUString SpellDialog::getReplacementString() const if(m_pSuggestionLB->IsEnabled() && m_pSuggestionLB->GetSelectEntryCount()>0 && - m_sNoSuggestionsST != m_pSuggestionLB->GetSelectEntry()) - sReplacement = m_pSuggestionLB->GetSelectEntry(); + m_sNoSuggestionsST != m_pSuggestionLB->GetSelectedEntry()) + sReplacement = m_pSuggestionLB->GetSelectedEntry(); return getDotReplacementString(sOrigString, sReplacement); } diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index ad9225903ff7..0227d3699cfc 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -421,7 +421,7 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void) sal_Int32 nCurrentContext = m_plbForm->GetSelectEntryPos(); if (nCurrentContext != LISTBOX_ENTRY_NOTFOUND) - m_arrContextFields[nCurrentContext] = m_plbField->GetSelectEntry(); + m_arrContextFields[nCurrentContext] = m_plbField->GetSelectedEntry(); } IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox&, rBox, void) @@ -850,7 +850,7 @@ void FmSearchDialog::SaveParams() const for (sal_Int32 i=0; i<m_pcmbSearchText->GetEntryCount(); ++i, ++pHistory) *pHistory = m_pcmbSearchText->GetEntry(i); - aCurrentSettings.sSingleSearchField = m_plbField->GetSelectEntry(); + aCurrentSettings.sSingleSearchField = m_plbField->GetSelectedEntry(); aCurrentSettings.bAllFields = m_prbAllFields->IsChecked(); aCurrentSettings.nPosition = m_pSearchEngine->GetPosition(); aCurrentSettings.bUseFormatter = m_pSearchEngine->GetFormatterUsing(); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 063e311f2b66..a6f3ff16084c 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -1052,7 +1052,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl, Button*, void) void TPGalleryThemeProperties::DoPreview() { - OUString aString( m_pLbxFound->GetSelectEntry() ); + OUString aString( m_pLbxFound->GetSelectedEntry() ); if( aString != aPreviewString ) { diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 14ee6ef92616..d28cf058215c 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -532,9 +532,9 @@ namespace svx { return m_aListBox->GetEntry( nPos ); } - OUString SuggestionDisplay::GetSelectEntry() const + OUString SuggestionDisplay::GetSelectedEntry() const { - return m_aListBox->GetSelectEntry(); + return m_aListBox->GetSelectedEntry(); } void SuggestionDisplay::SetHelpIds() { @@ -711,7 +711,7 @@ namespace svx IMPL_LINK_NOARG( HangulHanjaConversionDialog, OnSuggestionSelected, SuggestionDisplay&, void ) { - m_pWordInput->SetText( m_pSuggestions->GetSelectEntry() ); + m_pWordInput->SetText( m_pSuggestions->GetSelectedEntry() ); OnSuggestionModified( *m_pWordInput ); } diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index a1a14b327c6a..798a2398772f 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -208,7 +208,7 @@ short SvInsertOleDlg::Execute() if ( bCreateNew ) { // create and insert new embedded object - OUString aServerName = m_pLbObjecttype->GetSelectEntry(); + OUString aServerName = m_pLbObjecttype->GetSelectedEntry(); const SvObjectServer* pS = m_pServers->Get( aServerName ); if ( pS ) { diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 4fce88395494..19f86c41b5de 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -348,7 +348,7 @@ IMPL_LINK( SvxThesaurusDialog, LeftBtnHdl_Impl, Button *, pBtn, void ) IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, ListBox&, rLB, void ) { - OUString aLangText( rLB.GetSelectEntry() ); + OUString aLangText( rLB.GetSelectedEntry() ); LanguageType nLang = SvtLanguageTable::GetLanguageType( aLangText ); DBG_ASSERT( nLang != LANGUAGE_NONE && nLang != LANGUAGE_DONTKNOW, "failed to get language" ); if (xThesaurus->hasLocale( LanguageTag::convertToLocale( nLang ) )) diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 209c1d9d5e4b..a300da3c30ed 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -67,7 +67,7 @@ namespace svx sal_uInt16 GetEntryCount() const; OUString GetEntry( sal_uInt16 nPos ) const; - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; virtual void StateChanged( StateChangedType nStateChange ) override; diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index f059f064f8c8..0dfb9adcca7b 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -188,7 +188,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) comphelper::ConfigurationChanges::create()); if(m_pFontHeightLB->IsValueChangedFromSaved()) officecfg::Office::Common::Font::SourceViewFont::FontHeight::set( - static_cast< sal_Int16 >(m_pFontHeightLB->GetSelectEntry().toInt32()), + static_cast< sal_Int16 >(m_pFontHeightLB->GetSelectedEntry().toInt32()), batch); if(m_pNonPropFontsOnlyCB->IsValueChangedFromSaved()) officecfg::Office::Common::Font::SourceViewFont:: @@ -197,7 +197,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) //font name changes cannot be detected by saved values OUString sFontName; if(m_pFontNameLB->GetSelectEntryPos()) - sFontName = m_pFontNameLB->GetSelectEntry(); + sFontName = m_pFontNameLB->GetSelectedEntry(); officecfg::Office::Common::Font::SourceViewFont::FontName::set( boost::optional< OUString >(sFontName), batch); batch->commit(); @@ -345,7 +345,7 @@ void SvxFontSubstTabPage::SelectHdl(vcl::Window const * pWin) IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, Button*, pBox, void) { - OUString sFontName = m_pFontNameLB->GetSelectEntry(); + OUString sFontName = m_pFontNameLB->GetSelectedEntry(); bool bNonPropOnly = static_cast<CheckBox*>(pBox)->IsChecked(); m_pFontNameLB->Clear(); FontList aFntLst( Application::GetDefaultDevice() ); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index dc74bcaa36cf..030dd28a4739 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -334,7 +334,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void) sal_Int32 nIdx = m_pLbChartColors->GetSelectEntryPos(); if( nIdx != LISTBOX_ENTRY_NOTFOUND ) { - const XColorEntry aEntry( m_pValSetColorBox->GetItemColor( m_pValSetColorBox->GetSelectItemId() ), m_pLbChartColors->GetSelectEntry() ); + const XColorEntry aEntry( m_pValSetColorBox->GetItemColor( m_pValSetColorBox->GetSelectItemId() ), m_pLbChartColors->GetSelectedEntry() ); ModifyColorEntry(aEntry, nIdx); pColorConfig->ReplaceColorByIndex( nIdx, aEntry ); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index eb47a81dee74..7223e2f4b1a2 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1097,8 +1097,8 @@ void SvxColorOptionsTabPage::UpdateColorConfig() IMPL_LINK(SvxColorOptionsTabPage, SchemeChangedHdl_Impl, ListBox&, rBox, void) { - pColorConfig->LoadScheme(rBox.GetSelectEntry()); - pExtColorConfig->LoadScheme(rBox.GetSelectEntry()); + pColorConfig->LoadScheme(rBox.GetSelectedEntry()); + pExtColorConfig->LoadScheme(rBox.GetSelectedEntry()); UpdateColorConfig(); } @@ -1134,7 +1134,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void ) aQuery->SetText(CuiResId(RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE)); if(RET_YES == aQuery->Execute()) { - OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry()); + OUString sDeleteScheme(m_pColorSchemeLB->GetSelectedEntry()); m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectEntryPos()); m_pColorSchemeLB->SelectEntryPos(0); m_pColorSchemeLB->GetSelectHdl().Call(*m_pColorSchemeLB); diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index 9f2c1707e152..feb5326cdffe 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -451,7 +451,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void) { ScopedVclPtrInstance< MessageDialog > aBox(this, CuiResId( RID_SVXSTR_CONFIRM_SET_LANGUAGE), VclMessageType::Question, VclButtonsType::YesNo); OUString sTxt(aBox->get_primary_text()); - sTxt = sTxt.replaceFirst( "%1", pAllDictsLB->GetSelectEntry() ); + sTxt = sTxt.replaceFirst( "%1", pAllDictsLB->GetSelectedEntry() ); aBox->set_primary_text(sTxt); if ( aBox->Execute() == RET_YES ) diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index a23b5d5942c5..5bd4b65ad062 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -809,7 +809,7 @@ void SvxJavaParameterDlg::EditParameter() if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { ScopedVclPtrInstance< InputDialog > pParamEditDlg(CuiResId(RID_SVXSTR_JAVA_START_PARAM), this); - OUString editableClassPath = m_pAssignedList->GetSelectEntry(); + OUString editableClassPath = m_pAssignedList->GetSelectedEntry(); pParamEditDlg->SetEntryText( editableClassPath ); pParamEditDlg->HideHelpBtn(); @@ -914,7 +914,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) OUString sFolder; if ( m_pPathList->GetSelectEntryCount() > 0 ) { - INetURLObject aObj( m_pPathList->GetSelectEntry(), FSysStyle::Detect ); + INetURLObject aObj( m_pPathList->GetSelectedEntry(), FSysStyle::Detect ); sFolder = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } else @@ -949,7 +949,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) OUString sOldFolder; if ( m_pPathList->GetSelectEntryCount() > 0 ) { - INetURLObject aObj( m_pPathList->GetSelectEntry(), FSysStyle::Detect ); + INetURLObject aObj( m_pPathList->GetSelectedEntry(), FSysStyle::Detect ); sOldFolder = aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ); } else diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index b1f59667294d..9876b2afa36a 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -612,7 +612,7 @@ IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void ) } else { - OUString sSelect = rBox.GetSelectEntry(); + OUString sSelect = rBox.GetSelectedEntry(); const OUString* pFilters = pImpl->aFilterArr[nData].getConstArray(); OUString* pUIFilters = pImpl->aUIFilterArr[nData].getArray(); for(int i = 0; i < pImpl->aUIFilterArr[nData].getLength(); i++) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 976725c6e78b..5512f1a583b3 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1701,13 +1701,13 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void) { if (&rBox == m_pAbbrevLB) { - m_pAbbrevED->SetText(rBox.GetSelectEntry()); + m_pAbbrevED->SetText(rBox.GetSelectedEntry()); m_pNewAbbrevPB->Enable(false); m_pDelAbbrevPB->Enable(); } else { - m_pDoubleCapsED->SetText(rBox.GetSelectEntry()); + m_pDoubleCapsED->SetText(rBox.GetSelectedEntry()); m_pNewDoublePB->Enable(false); m_pDelDoublePB->Enable(); } @@ -1715,22 +1715,22 @@ IMPL_LINK(OfaAutocorrExceptPage, SelectHdl, ListBox&, rBox, void) IMPL_LINK(OfaAutocorrExceptPage, ModifyHdl, Edit&, rEdt, void) { -// sal_Bool bSame = pEdt->GetText() == ->GetSelectEntry(); +// sal_Bool bSame = pEdt->GetText() == ->GetSelectedEntry(); const OUString& sEntry = rEdt.GetText(); bool bEntryLen = !sEntry.isEmpty(); if(&rEdt == m_pAbbrevED) { bool bSame = lcl_FindEntry(*m_pAbbrevLB, sEntry, *pCompareClass); - if(bSame && sEntry != m_pAbbrevLB->GetSelectEntry()) - rEdt.SetText(m_pAbbrevLB->GetSelectEntry()); + if(bSame && sEntry != m_pAbbrevLB->GetSelectedEntry()) + rEdt.SetText(m_pAbbrevLB->GetSelectedEntry()); m_pNewAbbrevPB->Enable(!bSame && bEntryLen); m_pDelAbbrevPB->Enable(bSame && bEntryLen); } else { bool bSame = lcl_FindEntry(*m_pDoubleCapsLB, sEntry, *pCompareClass); - if(bSame && sEntry != m_pDoubleCapsLB->GetSelectEntry()) - rEdt.SetText(m_pDoubleCapsLB->GetSelectEntry()); + if(bSame && sEntry != m_pDoubleCapsLB->GetSelectedEntry()) + rEdt.SetText(m_pDoubleCapsLB->GetSelectedEntry()); m_pNewDoublePB->Enable(!bSame && bEntryLen); m_pDelDoublePB->Enable(bSame && bEntryLen); } @@ -2395,7 +2395,7 @@ void OfaAutoCompleteTabPage::CopyToClipboard() const for( sal_Int32 n = 0; n < nSelCnt; ++n ) { - sData.append(OUStringToOString(m_pLBEntries->GetSelectEntry(n), + sData.append(OUStringToOString(m_pLBEntries->GetSelectedEntry(n), nEncode)); #if defined(_WIN32) sData.append("\015\012"); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 0703d70ea751..7ca6d1931571 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -3340,9 +3340,9 @@ bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet* rSet ) const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_CHAR_TWO_LINES ); bool bOn = m_pTwoLinesBtn->IsChecked(); sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 ) - ? m_pStartBracketLB->GetSelectEntry()[0] : 0; + ? m_pStartBracketLB->GetSelectedEntry()[0] : 0; sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectEntryPos() > 0 ) - ? m_pEndBracketLB->GetSelectEntry()[0] : 0; + ? m_pEndBracketLB->GetSelectedEntry()[0] : 0; if ( pOld ) { @@ -3366,9 +3366,9 @@ bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet* rSet ) void SvxCharTwoLinesPage::UpdatePreview_Impl() { sal_Unicode cStart = m_pStartBracketLB->GetSelectEntryPos() > 0 - ? m_pStartBracketLB->GetSelectEntry()[0] : 0; + ? m_pStartBracketLB->GetSelectedEntry()[0] : 0; sal_Unicode cEnd = m_pEndBracketLB->GetSelectEntryPos() > 0 - ? m_pEndBracketLB->GetSelectEntry()[0] : 0; + ? m_pEndBracketLB->GetSelectedEntry()[0] : 0; m_pPreviewWin->SetBrackets(cStart, cEnd); m_pPreviewWin->SetTwoLines(m_pTwoLinesBtn->IsChecked()); m_pPreviewWin->Invalidate(); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 12378a6b356a..6503b48fe9bb 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -807,7 +807,7 @@ bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) if(m_pLbLanguage->IsVisible() && LISTBOX_ENTRY_NOTFOUND != m_pLbLanguage->GetEntryPos(sAutomaticEntry)) rCoreAttrs->Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ADD_AUTO, - m_pLbLanguage->GetSelectEntry() == sAutomaticEntry)); + m_pLbLanguage->GetSelectedEntry() == sAutomaticEntry)); } return bDataChanged; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 0a3f2857c39c..9705062e4f77 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2213,7 +2213,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox&, void) { bAutomaticCharStyles = false; sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectEntryPos(); - OUString sEntry = m_pCharFmtLB->GetSelectEntry(); + OUString sEntry = m_pCharFmtLB->GetSelectedEntry(); sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) { diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 4cc33b7178f4..70b67024317f 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -850,7 +850,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) { bModified = true; rSet->Put(SfxStringItem(SID_SWREGISTER_COLLECTION, - m_pRegisterLB->GetSelectEntry())); + m_pRegisterLB->GetSelectedEntry())); } } @@ -894,7 +894,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) // already filled return; - OUString aOldName = m_pPaperTrayBox->GetSelectEntry(); + OUString aOldName = m_pPaperTrayBox->GetSelectedEntry(); m_pPaperTrayBox->SetUpdateMode( false ); m_pPaperTrayBox->Clear(); sal_Int32 nEntryPos = m_pPaperTrayBox->InsertEntry( diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 3b5bf8930333..37d33d456e3a 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1427,7 +1427,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) { if ( eState == TRISTATE_TRUE ) { - sPage = m_pApplyCollBox->GetSelectEntry(); + sPage = m_pApplyCollBox->GetSelectedEntry(); bIsPageModel = !sPage.isEmpty(); } pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_MODEL ); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 2decad5333fa..399f674306cf 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1455,7 +1455,7 @@ sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox const &rAlignLB) if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap) { std::size_t nMapCount = ::lcl_GetFrmMapCount(pMap); - OUString sSelEntry(rAlignLB.GetSelectEntry()); + OUString sSelEntry(rAlignLB.GetSelectedEntry()); for (std::size_t i = 0; i < nMapCount; i++) { @@ -1672,7 +1672,7 @@ void SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, sal_uInt16 nMapPos, sal_uInt16 { if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap) { - OUString sOldEntry(rLB.GetSelectEntry()); + OUString sOldEntry(rLB.GetSelectedEntry()); SvxSwFramePosString::StringId eStrId = pMap[nMapPos].eStrId; for (std::size_t _nMapPos = 0; _nMapPos < nMapCount; _nMapPos++) @@ -1806,7 +1806,7 @@ sal_uInt16 SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, ListBox &_rLB) { OUString sSelEntry, sOldEntry; - sOldEntry = _rLB.GetSelectEntry(); + sOldEntry = _rLB.GetSelectedEntry(); _rLB.Clear(); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 33422103baaa..c6d9eab34265 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -271,7 +271,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) rSet->Put( XFillBackgroundItem( m_pCbBackgroundColor->IsChecked() ) ); if (m_pCbBackgroundColor->IsChecked()) { - NamedColor aColor = m_pLbBackgroundColor->GetSelectEntry(); + NamedColor aColor = m_pLbBackgroundColor->GetSelectedEntry(); rSet->Put(XFillColorItem(aColor.second, aColor.first)); } return true; diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index cc4929af3ef4..6c4d2c1a8dce 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -701,7 +701,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) // For added security if( m_pDashList->Count() > (long) ( nPos - 2 ) ) { - XLineDashItem aDashItem( m_pLbLineStyle->GetSelectEntry(), + XLineDashItem aDashItem( m_pLbLineStyle->GetSelectedEntry(), m_pDashList->GetDash( nPos - 2 )->GetDash() ); pOld = GetOldItem( *rAttrs, XATTR_LINEDASH ); if ( !pOld || !( *static_cast<const XLineDashItem*>(pOld) == aDashItem ) ) @@ -756,7 +756,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) // Line color { - NamedColor aColor = m_pLbColor->GetSelectEntry(); + NamedColor aColor = m_pLbColor->GetSelectedEntry(); XLineColorItem aItem(aColor.second, aColor.first); pOld = GetOldItem( *rAttrs, XATTR_LINECOLOR ); if ( !pOld || !( *static_cast<const XLineColorItem*>(pOld) == aItem ) ) @@ -776,7 +776,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) if( nPos == 0 ) pItem.reset(new XLineStartItem()); else if( m_pLineEndList->Count() > (long) ( nPos - 1 ) ) - pItem.reset(new XLineStartItem( m_pLbStartStyle->GetSelectEntry(), m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); + pItem.reset(new XLineStartItem( m_pLbStartStyle->GetSelectedEntry(), m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); pOld = GetOldItem( *rAttrs, XATTR_LINESTART ); if( pItem && ( !pOld || !( *static_cast<const XLineEndItem*>(pOld) == *pItem ) ) ) { @@ -792,7 +792,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) if( nPos == 0 ) pItem.reset(new XLineEndItem()); else if( m_pLineEndList->Count() > (long) ( nPos - 1 ) ) - pItem.reset(new XLineEndItem( m_pLbEndStyle->GetSelectEntry(), m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); + pItem.reset(new XLineEndItem( m_pLbEndStyle->GetSelectedEntry(), m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); pOld = GetOldItem( *rAttrs, XATTR_LINEEND ); if( pItem && ( !pOld || !( *static_cast<const XLineEndItem*>(pOld) == *pItem ) ) ) @@ -978,7 +978,7 @@ void SvxLineTabPage::FillXLSet_Impl() nPos = m_pLbLineStyle->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { - m_rXLSet.Put( XLineDashItem( m_pLbLineStyle->GetSelectEntry(), + m_rXLSet.Put( XLineDashItem( m_pLbLineStyle->GetSelectedEntry(), m_pDashList->GetDash( nPos - 2 )->GetDash() ) ); } } @@ -989,7 +989,7 @@ void SvxLineTabPage::FillXLSet_Impl() if( nPos == 0 ) m_rXLSet.Put( XLineStartItem() ); else - m_rXLSet.Put( XLineStartItem( m_pLbStartStyle->GetSelectEntry(), + m_rXLSet.Put( XLineStartItem( m_pLbStartStyle->GetSelectedEntry(), m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ) ); } nPos = m_pLbEndStyle->GetSelectEntryPos(); @@ -998,7 +998,7 @@ void SvxLineTabPage::FillXLSet_Impl() if( nPos == 0 ) m_rXLSet.Put( XLineEndItem() ); else - m_rXLSet.Put( XLineEndItem( m_pLbEndStyle->GetSelectEntry(), + m_rXLSet.Put( XLineEndItem( m_pLbEndStyle->GetSelectedEntry(), m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ) ); } @@ -1058,7 +1058,7 @@ void SvxLineTabPage::FillXLSet_Impl() m_rXLSet.Put( XLineEndWidthItem( GetCoreValue( *m_pMtrEndWidth, m_ePoolUnit ) ) ); m_rXLSet.Put( XLineWidthItem( GetCoreValue( *m_pMtrLineWidth, m_ePoolUnit ) ) ); - NamedColor aColor = m_pLbColor->GetSelectEntry(); + NamedColor aColor = m_pLbColor->GetSelectedEntry(); m_rXLSet.Put(XLineColorItem(aColor.second, aColor.first)); // Centered line end diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 01bd02642051..ccf38b72114b 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -286,7 +286,7 @@ bool SvxLineDefTabPage::FillItemSet( SfxItemSet* rAttrs ) { FillDash_Impl(); - OUString aString( m_pLbLineStyles->GetSelectEntry() ); + OUString aString( m_pLbLineStyles->GetSelectedEntry() ); rAttrs->Put( XLineStyleItem( drawing::LineStyle_DASH ) ); rAttrs->Put( XLineDashItem( aString, aDash ) ); } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index e3ada8dc504b..db2ddeed56df 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -199,7 +199,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() { OUString aString = m_pEdtName->GetText(); - if( aString != m_pLbLineEnds->GetSelectEntry() ) + if( aString != m_pLbLineEnds->GetSelectedEntry() ) { ScopedVclPtrInstance<MessageDialog> aQueryBox( GetParentDialog() ,"AskChangeLineEndDialog" @@ -245,7 +245,7 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos); - m_pEdtName->SetText( m_pLbLineEnds->GetSelectEntry() ); + m_pEdtName->SetText( m_pLbLineEnds->GetSelectedEntry() ); rXLSet.Put( XLineStartItem( OUString(), pEntry->GetLineEnd() ) ); rXLSet.Put( XLineEndItem( OUString(), pEntry->GetLineEnd() ) ); @@ -286,7 +286,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void) const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos); - m_pEdtName->SetText( m_pLbLineEnds->GetSelectEntry() ); + m_pEdtName->SetText( m_pLbLineEnds->GetSelectedEntry() ); rXLSet.Put( XLineStartItem( OUString(), pEntry->GetLineEnd() ) ); rXLSet.Put( XLineEndItem( OUString(), pEntry->GetLineEnd() ) ); diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 4308f7f780a2..88c54db98731 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -457,7 +457,7 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r case FIELD_PROPERTY_BOOL_DEFAULT: if (pBoolDefault) { - OUString sOld = pBoolDefault->GetSelectEntry(); + OUString sOld = pBoolDefault->GetSelectedEntry(); pBoolDefault->SelectEntry(rText); if (sOld != rText) LINK(this, OFieldDescControl, ChangeHdl).Call(*pBoolDefault); @@ -489,7 +489,7 @@ void OFieldDescControl::SetControlText( sal_uInt16 nControlId, const OUString& r case FIELD_PROPERTY_AUTOINC: if (pAutoIncrement) { - OUString sOld = pAutoIncrement->GetSelectEntry(); + OUString sOld = pAutoIncrement->GetSelectedEntry(); pAutoIncrement->SelectEntry(rText); if (sOld != rText) LINK(this, OFieldDescControl, ChangeHdl).Call(*pAutoIncrement); @@ -1302,7 +1302,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) else pBoolDefault->SelectEntry(sDef); - pFieldDescr->SetControlDefault(makeAny(BoolStringPersistent(pBoolDefault->GetSelectEntry()))); + pFieldDescr->SetControlDefault(makeAny(BoolStringPersistent(pBoolDefault->GetSelectedEntry()))); } else if(pBoolDefault->GetEntryCount() < 3) { @@ -1467,7 +1467,7 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr ) } else if (pBoolDefault) { - sDefault = BoolStringPersistent(pBoolDefault->GetSelectEntry()); + sDefault = BoolStringPersistent(pBoolDefault->GetSelectedEntry()); } if ( !sDefault.isEmpty() ) diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 57a5e79f4064..b2948824a191 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -224,7 +224,7 @@ namespace dbaui long nRow = GetCurRow(); if ( nRow != BROWSER_ENDOFSELECTION ) { - OUString sFieldName(m_pListCell->GetSelectEntry()); + OUString sFieldName(m_pListCell->GetSelectedEntry()); OConnectionLineDataVec& rLines = m_pConnData->GetConnLineDataList(); if ( rLines.size() <= static_cast<OConnectionLineDataVec::size_type>(nRow) ) { @@ -313,7 +313,7 @@ namespace dbaui fillListBox(xDef); OUString sName = GetCellText( nRow, nColumnId ); m_pListCell->SelectEntry( sName ); - if ( m_pListCell->GetSelectEntry() != sName ) + if ( m_pListCell->GetSelectedEntry() != sName ) { m_pListCell->InsertEntry( sName ); m_pListCell->SelectEntry( sName ); @@ -515,7 +515,7 @@ namespace dbaui IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox&, rListBox, void ) { - OUString strSelected(rListBox.GetSelectEntry()); + OUString strSelected(rListBox.GetSelectedEntry()); OTableWindow* pLeft = nullptr; OTableWindow* pRight = nullptr; @@ -534,7 +534,7 @@ namespace dbaui ++aIter; OTableWindow* pSecond = aIter->second; - if ( m_pLeftTable->GetSelectEntry() == pFirst->GetName() ) + if ( m_pLeftTable->GetSelectedEntry() == pFirst->GetName() ) { pLeft = pFirst; pRight = pSecond; @@ -564,7 +564,7 @@ namespace dbaui pLeft = pLoop; - OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pRightTable->GetSelectEntry()); + OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pRightTable->GetSelectedEntry()); OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name"); if ( aIter != m_pTableMap->end() ) pRight = aIter->second; @@ -580,7 +580,7 @@ namespace dbaui m_strCurrentRight = strSelected; pRight = pLoop; - OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pLeftTable->GetSelectEntry()); + OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_pLeftTable->GetSelectedEntry()); OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name"); if ( aIter != m_pTableMap->end() ) pLeft = aIter->second; diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index c4fffa78dd01..f5c1f7f7855a 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -75,7 +75,7 @@ namespace dbaui bool bChangedSomething = false; if ( IsValueChangedFromSaved() ) { - OCharsetDisplay::const_iterator aFind = m_aCharSets.findDisplayName( GetSelectEntry() ); + OCharsetDisplay::const_iterator aFind = m_aCharSets.findDisplayName( GetSelectedEntry() ); OSL_ENSURE( aFind != m_aCharSets.end(), "CharSetListBox::StoreSelectedCharSet: could not translate the selected character set!" ); if ( aFind != m_aCharSets.end() ) { diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 7d9bb184e5dc..a266c6db50be 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -285,7 +285,7 @@ IMPL_LINK_NOARG( OUserAdmin, ListDblClickHdl, ListBox&, void ) OUString OUserAdmin::GetUser() { - return m_pUSER->GetSelectEntry(); + return m_pUSER->GetSelectedEntry(); } void OUserAdmin::fillControls(std::vector< ISaveValueWrapper* >& /*_rControlList*/) diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 4c05e8664599..a3bceb671db1 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -193,7 +193,7 @@ IMPL_LINK_NOARG( ODbaseIndexDialog, OKClickHdl, Button*, void ) IMPL_LINK_NOARG( ODbaseIndexDialog, AddClickHdl, Button*, void ) { - OUString aSelection = m_pLB_FreeIndexes->GetSelectEntry(); + OUString aSelection = m_pLB_FreeIndexes->GetSelectedEntry(); OUString aTableName = m_pCB_Tables->GetText(); OTableIndex aIndex = RemoveFreeIndex( aSelection, true ); InsertTableIndex( aTableName, aIndex ); @@ -203,7 +203,7 @@ IMPL_LINK_NOARG( ODbaseIndexDialog, AddClickHdl, Button*, void ) IMPL_LINK_NOARG( ODbaseIndexDialog, RemoveClickHdl, Button*, void ) { - OUString aSelection = m_pLB_TableIndexes->GetSelectEntry(); + OUString aSelection = m_pLB_TableIndexes->GetSelectedEntry(); OUString aTableName = m_pCB_Tables->GetText(); OTableIndex aIndex = RemoveTableIndex( aTableName, aSelection ); InsertFreeIndex( aIndex ); diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 4e84f26691df..78bc4d23f311 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -141,7 +141,7 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) { OUString sSelected; if (m_pDatasource->GetEntryCount()) - sSelected = m_pDatasource->GetSelectEntry(); + sSelected = m_pDatasource->GetSelectedEntry(); m_pDatasource->Clear(); // fill the list for ( StringBag::const_iterator aDS = _rDatasources.begin(); diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index a2ad2b40c2d5..edac249d7ad1 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -55,7 +55,7 @@ public: virtual ~ODatasourceSelectDialog() override; virtual void dispose() override; OUString GetSelected() const { - return m_pDatasource->GetSelectEntry(); + return m_pDatasource->GetSelectedEntry(); } void Select( const OUString& _rEntry ) { m_pDatasource->SelectEntry(_rEntry); diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 7545c7e62392..68eebc4c7c51 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -292,7 +292,7 @@ namespace dbaui { case COLUMN_ID_FIELDNAME: { - OUString sFieldSelected = m_pFieldNameCell->GetSelectEntry(); + OUString sFieldSelected = m_pFieldNameCell->GetSelectedEntry(); bool bEmptySelected = sFieldSelected.isEmpty(); if (isNewField()) { @@ -384,7 +384,7 @@ namespace dbaui { // a field has been selected if (GetCurRow() >= GetRowCount() - 2) { // and we're in one of the last two rows - OUString sSelectedEntry = m_pFieldNameCell->GetSelectEntry(); + OUString sSelectedEntry = m_pFieldNameCell->GetSelectedEntry(); sal_Int32 nCurrentRow = GetCurRow(); sal_Int32 rowCount = GetRowCount(); diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 445cf70886fc..498fcd80667c 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -213,7 +213,7 @@ void DlgFilterCrit::dispose() ModalDialog::dispose(); } -#define LbText(x) ((x).GetSelectEntry()) +#define LbText(x) ((x).GetSelectedEntry()) #define LbPos(x) ((x).GetSelectEntryPos()) sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const @@ -316,7 +316,7 @@ bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rComp,co try { OUString sTableName; - _rFilter.Name = _rField.GetSelectEntry(); + _rFilter.Name = _rField.GetSelectedEntry(); Reference< XPropertySet > xColumn = getQueryColumn(_rFilter.Name); if ( xColumn.is() ) { @@ -361,7 +361,7 @@ bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rComp,co { } - _rFilter.Handle = GetOSQLPredicateType( _rComp.GetSelectEntry() ); + _rFilter.Handle = GetOSQLPredicateType( _rComp.GetSelectedEntry() ); if ( SQLFilterOperator::SQLNULL != _rFilter.Handle && _rFilter.Handle != SQLFilterOperator::NOT_SQLNULL ) { OUString sPredicateValue; @@ -436,15 +436,15 @@ Reference< XPropertySet > DlgFilterCrit::getMatchingColumn( const Edit& _rValueI OUString sField; if ( &_rValueInput == m_pET_WHEREVALUE1 ) { - sField = m_pLB_WHEREFIELD1->GetSelectEntry(); + sField = m_pLB_WHEREFIELD1->GetSelectedEntry(); } else if ( &_rValueInput == m_pET_WHEREVALUE2 ) { - sField = m_pLB_WHEREFIELD2->GetSelectEntry(); + sField = m_pLB_WHEREFIELD2->GetSelectedEntry(); } else if ( &_rValueInput == m_pET_WHEREVALUE3 ) { - sField = m_pLB_WHEREFIELD3->GetSelectEntry(); + sField = m_pLB_WHEREFIELD3->GetSelectedEntry(); } else { OSL_FAIL( "DlgFilterCrit::getMatchingColumn: invalid event source!" ); diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 83f2d84fb7dc..5e96fe2b3854 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -228,7 +228,7 @@ OUString DlgOrderCrit::GetOrderList( ) const if(!sOrder.isEmpty()) sOrder += ","; - OUString sName = m_aColumnList[i]->GetSelectEntry(); + OUString sName = m_aColumnList[i]->GetSelectedEntry(); sOrder += ::dbtools::quoteName(sQuote,sName); if(m_aValueList[i]->GetSelectEntryPos()) sOrder += " DESC "; diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 84e5d30dc434..c474bf597b56 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -226,10 +226,10 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) if(!bAll) { for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i) - moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase); + moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectedEntry(i),sExtraChars,nMaxNameLen,aCase); for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; --j) - pLeft->RemoveEntry(pLeft->GetSelectEntry(j-1)); + pLeft->RemoveEntry(pLeft->GetSelectedEntry(j-1)); } else { @@ -270,9 +270,9 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox&, rListBox, void ) fillColumns(pRight,aRightColumns); for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i) - moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase); + moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectedEntry(i),sExtraChars,nMaxNameLen,aCase); for(sal_Int32 j=pLeft->GetSelectEntryCount(); j ; ) - pLeft->RemoveEntry(pLeft->GetSelectEntry(--j)); + pLeft->RemoveEntry(pLeft->GetSelectedEntry(--j)); enableButtons(); } diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index d8b3cc499afe..2a15f19e4fb6 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -280,7 +280,7 @@ OUString OWizTypeSelect::GetTitle() const IMPL_LINK_NOARG( OWizTypeSelect, ColumnSelectHdl, ListBox&, void ) { - OUString aColumnName( m_pColumnNames->GetSelectEntry() ); + OUString aColumnName( m_pColumnNames->GetSelectedEntry() ); OFieldDescription* pField = static_cast<OFieldDescription*>(m_pColumnNames->GetEntryData(m_pColumnNames->GetEntryPos(aColumnName))); if(pField) @@ -325,7 +325,7 @@ void OWizTypeSelect::ActivatePage( ) bool OWizTypeSelect::LeavePage() { - OUString aColumnName( m_pColumnNames->GetSelectEntry() ); + OUString aColumnName( m_pColumnNames->GetSelectedEntry() ); bool bDuplicateName = false; OFieldDescription* pField = static_cast<OFieldDescription*>(m_pColumnNames->GetEntryData(m_pColumnNames->GetEntryPos(aColumnName))); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 9ca82f428876..0d5dd0d05c47 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -980,7 +980,7 @@ bool OSelectionBrowseBox::SaveModified() case BROW_TABLE_ROW: { - OUString aAliasName = m_pTableCell->GetSelectEntry(); + OUString aAliasName = m_pTableCell->GetSelectedEntry(); strOldCellContents = pEntry->GetAlias(); if ( m_pTableCell->GetSelectEntryPos() != 0 ) { diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx index 8cd92bb9a892..c8c2447a7a38 100644 --- a/extensions/source/abpilot/tableselectionpage.cxx +++ b/extensions/source/abpilot/tableselectionpage.cxx @@ -99,7 +99,7 @@ namespace abp return false; AddressSettings& rSettings = getSettings(); - rSettings.sSelectedTable = m_pTableList->GetSelectEntry(); + rSettings.sSelectedTable = m_pTableList->GetSelectedEntry(); return true; } diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 54a00a7462a2..de05ae1df728 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -437,7 +437,7 @@ IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl, Button*, void) BibConfig* pConfig = BibModul::GetConfig(); for(sal_uInt16 nEntry = 0; nEntry < COLUMN_COUNT; nEntry++) { - OUString sSel = aListBoxes[nEntry]->GetSelectEntry(); + OUString sSel = aListBoxes[nEntry]->GetSelectedEntry(); if(sSel != sNone) { aNew.aColumnPairs[nWriteIndex].sRealColumnName = sSel; @@ -519,7 +519,7 @@ void DBChangeDialog_Impl::dispose() OUString DBChangeDialog_Impl::GetCurrentURL()const { - return m_pSelectionLB->GetSelectEntry(); + return m_pSelectionLB->GetSelectedEntry(); } // XDispatchProvider diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index b7f9771d6c56..023ab3ef77e3 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -476,7 +476,7 @@ IMPL_LINK_NOARG( BibToolBar, SendSelHdl, Timer*, void ) Sequence<PropertyValue> aPropVal(1); PropertyValue* pPropertyVal = const_cast<PropertyValue*>(aPropVal.getConstArray()); pPropertyVal[0].Name = "DataSourceName"; - OUString aEntry( MnemonicGenerator::EraseAllMnemonicChars( aLBSource->GetSelectEntry() ) ); + OUString aEntry( MnemonicGenerator::EraseAllMnemonicChars( aLBSource->GetSelectedEntry() ) ); pPropertyVal[0].Value <<= aEntry; SendDispatch(nTBC_LB_SOURCE, aPropVal); } diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 680335d96e34..713507e5c2f4 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -178,10 +178,10 @@ namespace dbp { xOldConn = getFormConnection(); - OUString sDataSource = m_pDatasource->GetSelectEntry(); + OUString sDataSource = m_pDatasource->GetSelectedEntry(); rContext.xForm->setPropertyValue("DataSourceName", makeAny( sDataSource ) ); } - OUString sCommand = m_pTable->GetSelectEntry(); + OUString sCommand = m_pTable->GetSelectedEntry(); sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_pTable->GetSelectEntryData() ); rContext.xForm->setPropertyValue("Command", makeAny( sCommand ) ); @@ -278,7 +278,7 @@ namespace dbp // connect to the data source try { - OUString sCurrentDatasource = m_pDatasource->GetSelectEntry(); + OUString sCurrentDatasource = m_pDatasource->GetSelectedEntry(); if (!sCurrentDatasource.isEmpty()) { // obtain the DS object @@ -421,7 +421,7 @@ namespace dbp void OMaybeListSelectionPage::implCommit(OUString& _rSelection) { - _rSelection = m_pYes->IsChecked() ? m_pList->GetSelectEntry() : OUString(); + _rSelection = m_pYes->IsChecked() ? m_pList->GetSelectedEntry() : OUString(); } diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 17b6894fc5d9..4b9076bbc89e 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -340,7 +340,7 @@ namespace dbp return false; OListComboSettings& rSettings = getSettings(); - rSettings.sListContentTable = m_pSelectTable->GetSelectEntry(); + rSettings.sListContentTable = m_pSelectTable->GetSelectedEntry(); if (rSettings.sListContentTable.isEmpty() && (::svt::WizardTypes::eTravelBackward != _eReason)) // need to select a table return false; @@ -404,7 +404,7 @@ namespace dbp IMPL_LINK_NOARG( OContentFieldSelection, OnFieldSelected, ListBox&, void ) { updateDialogTravelUI(); - m_pDisplayedField->SetText(m_pSelectTableField->GetSelectEntry()); + m_pDisplayedField->SetText(m_pSelectTableField->GetSelectedEntry()); } @@ -413,7 +413,7 @@ namespace dbp if (!OLCPage::commitPage(_eReason)) return false; - getSettings().sListContentField = m_pSelectTableField->GetSelectEntry(); + getSettings().sListContentField = m_pSelectTableField->GetSelectedEntry(); return true; } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index f566a8483eb5..8be81dbb32c1 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -696,7 +696,7 @@ namespace pcr Any SAL_CALL OListboxControl::getValue() { - OUString sControlValue( getTypedControlWindow()->GetSelectEntry() ); + OUString sControlValue( getTypedControlWindow()->GetSelectedEntry() ); Any aPropValue; if ( !sControlValue.isEmpty() ) @@ -720,7 +720,7 @@ namespace pcr OUString sSelection; _rValue >>= sSelection; - if ( sSelection != getTypedControlWindow()->GetSelectEntry() ) + if ( sSelection != getTypedControlWindow()->GetSelectedEntry() ) getTypedControlWindow()->SelectEntry( sSelection ); if ( !getTypedControlWindow()->IsEntrySelected( sSelection ) ) diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 8bf4fb01fdab..df7598320afc 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -692,12 +692,12 @@ IMPL_LINK( SaneDlg, SelectHdl, ListBox&, rListBox, void ) { if( &rListBox == mpQuantumRangeBox ) { - double fValue = mpQuantumRangeBox->GetSelectEntry().toDouble(); + double fValue = mpQuantumRangeBox->GetSelectedEntry().toDouble(); mrSane.SetOptionValue( mnCurrentOption, fValue, mnCurrentElement ); } else if( &rListBox == mpStringRangeBox ) { - mrSane.SetOptionValue( mnCurrentOption, mpStringRangeBox->GetSelectEntry() ); + mrSane.SetOptionValue( mnCurrentOption, mpStringRangeBox->GetSelectedEntry() ); } } } @@ -1396,7 +1396,7 @@ void SaneDlg::SaveState() aConfig.DeleteGroup( "SANE" ); aConfig.SetGroup( "SANE" ); aConfig.WriteKey( "SO_LastSANEDevice", - OUStringToOString(mpDeviceBox->GetSelectEntry(), RTL_TEXTENCODING_UTF8) ); + OUStringToOString(mpDeviceBox->GetSelectedEntry(), RTL_TEXTENCODING_UTF8) ); static char const* pSaveOptions[] = { "resolution", diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 8419678e6564..717e8c8fecee 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -1802,7 +1802,7 @@ void ImpPDFTabSigningPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) paParent->msSignReason = mpEdSignReason->GetText(); // Entry 0 is 'None' if (mpLBSignTSA->GetSelectEntryPos() >= 1) - paParent->msSignTSA = mpLBSignTSA->GetSelectEntry(); + paParent->msSignTSA = mpLBSignTSA->GetSelectedEntry(); } diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 8a12f389a73c..c77c9acebc3e 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -284,7 +284,7 @@ sal_Int32 FuncPage::GetFunctionEntryCount() OUString FuncPage::GetSelFunctionName() const { - return m_pLbFunction->GetSelectEntry(); + return m_pLbFunction->GetSelectedEntry(); } const IFunctionDescription* FuncPage::GetFuncDesc( sal_Int32 nPos ) const diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 475716c37f37..848142393c25 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -723,7 +723,7 @@ namespace svt sal_Int32 nSelected = static_cast< ListBox const * >( _pControl )->GetSelectEntryPos(); OUString sSelected; if ( LISTBOX_ENTRY_NOTFOUND != nSelected ) - sSelected = static_cast< ListBox const * >( _pControl )->GetSelectEntry(); + sSelected = static_cast< ListBox const * >( _pControl )->GetSelectedEntry(); aReturn <<= sSelected; } break; diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 6d4194245f94..03ff057041dc 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -852,7 +852,7 @@ IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, void ) if( nPos >= 0 ) { OUString sMsg = FpsResId( STR_SVT_DELETESERVICE ); - sMsg = sMsg.replaceFirst( "$servicename$", m_pServices_lb->GetSelectEntry() ); + sMsg = sMsg.replaceFirst( "$servicename$", m_pServices_lb->GetSelectedEntry() ); ScopedVclPtrInstance< MessageDialog > aBox( this, sMsg, VclMessageType::Question, VclButtonsType::YesNo ); if( aBox->Execute() == RET_YES ) diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 233beb856491..7fcaa3218f39 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -227,7 +227,7 @@ inline void SvtExpFileDlg_Impl::SetNoFilterListSelection( ) inline SvtFileDialogFilter_Impl* SvtExpFileDlg_Impl::GetSelectedFilterEntry( OUString& _rDisplayName ) const { - _rDisplayName = _pLbFilter->GetSelectEntry(); + _rDisplayName = _pLbFilter->GetSelectedEntry(); return static_cast< SvtFileDialogFilter_Impl* >( _pLbFilter->GetSelectEntryData () ); } diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 7608d112b5d3..bff0fd85aaac 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -147,7 +147,7 @@ void SAL_CALL DropdownToolbarController::dispose() Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const { Sequence<PropertyValue> aArgs( 2 ); - OUString aSelectedText = m_pListBoxControl->GetSelectEntry(); + OUString aSelectedText = m_pListBoxControl->GetSelectedEntry(); // Add key modifier to argument list aArgs[0].Name = "KeyModifier"; diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx index e2cb74962aad..be6165cdc5aa 100644 --- a/include/svx/colorbox.hxx +++ b/include/svx/colorbox.hxx @@ -60,7 +60,7 @@ public: void SetSlotId(sal_uInt16 nSlotId, bool bShowNoneButton = false); Color GetSelectEntryColor() const { return m_aSelectedColor.first; } - NamedColor GetSelectEntry() const { return m_aSelectedColor; } + NamedColor GetSelectedEntry() const { return m_aSelectedColor; } void SelectEntry(const NamedColor& rColor); void SelectEntry(const Color& rColor); diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index fd9306d2e8c4..5b5a03840a37 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -143,7 +143,7 @@ public: sal_Int32 GetSelectEntryCount() const; sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const; - OUString GetSelectEntry() const { return GetEntry( GetSelectEntryPos() ); } + OUString GetSelectedEntry() const { return GetEntry( GetSelectEntryPos() ); } bool IsEntryPosSelected( sal_Int32 nPos ) const; void SelectEntryPos( sal_Int32 nPos, bool bSelect = true ); void SetNoSelection(); diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index bfdb013038b1..7c5206b68ffa 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -165,7 +165,7 @@ public: void SelectEntryPos( sal_Int32 nPos, bool bSelect = true ); sal_Int32 GetSelectEntryCount() const; - OUString GetSelectEntry( sal_Int32 nSelIndex = 0 ) const; + OUString GetSelectedEntry( sal_Int32 nSelIndex = 0 ) const; sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const; bool IsEntrySelected(const OUString& rStr) const; diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index f5e0d4c3aa5b..a14d1db47f4b 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -152,12 +152,12 @@ short ODateTimeDialog::Execute() sal_Int32 nWidth = 0; if ( m_pDate->IsChecked() ) { - OUString sDateFormat = m_pDateListBox->GetSelectEntry(); + OUString sDateFormat = m_pDateListBox->GetSelectedEntry(); nWidth = LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MapUnit::Map100thMM); } if ( m_pTime->IsChecked() ) { - OUString sDateFormat = m_pTimeListBox->GetSelectEntry(); + OUString sDateFormat = m_pTimeListBox->GetSelectedEntry(); nWidth = ::std::max<sal_Int32>(LogicToLogic(PixelToLogic(Size(GetCtrlTextWidth(sDateFormat),0)).Width(),GetMapMode().GetMapUnit(),MapUnit::Map100thMM),nWidth); } diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index ccc684c69350..d5495c2234aa 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -220,7 +220,7 @@ class AbstractScSelEntryDlg : public VclAbstractDialog protected: virtual ~AbstractScSelEntryDlg() override = default; public: - virtual OUString GetSelectEntry() const = 0; + virtual OUString GetSelectedEntry() const = 0; }; class AbstractScLinkedAreaDlg : public VclAbstractDialog @@ -348,7 +348,7 @@ public: virtual void Insert( const OUString& rString, bool bSelected ) = 0; virtual sal_Int32 GetSelectEntryCount() const = 0; virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& nDlgHelpId, const OString& nLbHelpId ) = 0; - virtual OUString GetSelectEntry(sal_Int32 nPos) const = 0; + virtual OUString GetSelectedEntry(sal_Int32 nPos) const = 0; virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const = 0; }; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index cca9632150f9..a96d31a233b3 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -389,9 +389,9 @@ const OUString* AbstractScInsertTableDlg_Impl::GetNextTable( sal_uInt16* pN ) return pDlg->GetNextTable( pN ); } -OUString AbstractScSelEntryDlg_Impl::GetSelectEntry() const +OUString AbstractScSelEntryDlg_Impl::GetSelectedEntry() const { - return pDlg->GetSelectEntry(); + return pDlg->GetSelectedEntry(); } void AbstractScLinkedAreaDlg_Impl::InitFromOldLink( const OUString& rFile, const OUString& rFilter, @@ -575,9 +575,9 @@ sal_Int32 AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_Int32 nPos) const return pDlg->GetSelectEntryPos( nPos); } -OUString AbstractScShowTabDlg_Impl::GetSelectEntry(sal_Int32 nPos) const +OUString AbstractScShowTabDlg_Impl::GetSelectedEntry(sal_Int32 nPos) const { - return pDlg->GetSelectEntry(nPos); + return pDlg->GetSelectedEntry(nPos); } OUString AbstractScStringInputDlg_Impl::GetInputString() const diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index b22b68b2cd57..ee9d80af5842 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -230,7 +230,7 @@ class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg { DECL_ABSTDLG_BASE( AbstractScSelEntryDlg_Impl, ScSelEntryDlg ) - virtual OUString GetSelectEntry() const override; + virtual OUString GetSelectedEntry() const override; }; class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg @@ -336,7 +336,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg virtual void Insert( const OUString& rString, bool bSelected ) override; virtual sal_Int32 GetSelectEntryCount() const override; virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ) override; - virtual OUString GetSelectEntry(sal_Int32 nPos) const override; + virtual OUString GetSelectedEntry(sal_Int32 nPos) const override; virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const override; }; diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 1e4e27272119..53b5da126957 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -296,7 +296,7 @@ ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const } } - ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, mpDoc, maPos, maLbStyle->GetSelectEntry()); + ScFormatEntry* pEntry = new ScCondFormatEntry(eMode, aExpr1, aExpr2, mpDoc, maPos, maLbStyle->GetSelectedEntry()); return pEntry; } @@ -453,7 +453,7 @@ namespace { void UpdateStyleList(ListBox& rLbStyle, const ScDocument* pDoc) { - OUString aSelectedStyle = rLbStyle.GetSelectEntry(); + OUString aSelectedStyle = rLbStyle.GetSelectedEntry(); for(sal_Int32 i = rLbStyle.GetEntryCount(); i >= 1; --i) { rLbStyle.RemoveEntry(i); @@ -528,7 +528,7 @@ void StyleSelect( ListBox& rLbStyle, const ScDocument* pDoc, SvxFontPrevWindow& } } - OUString aStyleName = rLbStyle.GetSelectEntry(); + OUString aStyleName = rLbStyle.GetSelectedEntry(); SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SfxStyleFamily::Para ); if(pStyleSheet) { @@ -607,7 +607,7 @@ ScFormatEntry* ScFormulaFrmtEntry::createFormulaEntry() const if(aFormula.isEmpty()) return nullptr; - ScFormatEntry* pEntry = new ScCondFormatEntry(SC_COND_DIRECT, aFormula, OUString(), mpDoc, maPos, maLbStyle->GetSelectEntry()); + ScFormatEntry* pEntry = new ScCondFormatEntry(SC_COND_DIRECT, aFormula, OUString(), mpDoc, maPos, maLbStyle->GetSelectedEntry()); return pEntry; } @@ -1302,7 +1302,7 @@ ScFormatEntry* ScDateFrmtEntry::GetEntry() const ScCondDateFormatEntry* pNewEntry = new ScCondDateFormatEntry(mpDoc); condformat::ScCondFormatDateType eType = static_cast<condformat::ScCondFormatDateType>(maLbDateEntry->GetSelectEntryPos()); pNewEntry->SetDateType(eType); - pNewEntry->SetStyleName(maLbStyle->GetSelectEntry()); + pNewEntry->SetStyleName(maLbStyle->GetSelectedEntry()); return pNewEntry; } diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index c98ed9dc5f3c..e2bcac817219 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -425,7 +425,7 @@ void ScPivotLayoutDialog::UpdateSourceRange() if (mpSourceRadioNamedRange->IsChecked()) { - OUString aEntryString = mpSourceListBox->GetSelectEntry(); + OUString aEntryString = mpSourceListBox->GetSelectedEntry(); ScRange aSourceRange = lclGetRangeForNamedRange(aEntryString, mpDocument); if (!aSourceRange.IsValid() || aSourceSheet.GetSourceRange() == aSourceRange) return; @@ -610,7 +610,7 @@ bool ScPivotLayoutDialog::GetDestination(ScRange& aDestinationRange, bool& bToNe if (mpDestinationRadioNamedRange->IsChecked()) { - OUString aName = mpDestinationListBox->GetSelectEntry(); + OUString aName = mpDestinationListBox->GetSelectedEntry(); aDestinationRange = lclGetRangeForNamedRange(aName, mpDocument); if (!aDestinationRange.IsValid()) return false; diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 2fc447c3e314..c981c14817e1 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -99,7 +99,7 @@ void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc ) { const sal_Int32 nSelect = m_pLbType->GetSelectEntryPos(); - rDesc.aDBName = m_pLbDatabase->GetSelectEntry(); + rDesc.aDBName = m_pLbDatabase->GetSelectedEntry(); rDesc.aObject = m_pCbObject->GetText(); if (rDesc.aDBName.isEmpty() || rDesc.aObject.isEmpty()) @@ -123,7 +123,7 @@ void ScDataPilotDatabaseDlg::FillObjects() { m_pCbObject->Clear(); - OUString aDatabaseName = m_pLbDatabase->GetSelectEntry(); + OUString aDatabaseName = m_pLbDatabase->GetSelectedEntry(); if (aDatabaseName.isEmpty()) return; diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index a78442b32259..81320c4c1da1 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -138,7 +138,7 @@ void ScDataPilotServiceDlg::dispose() OUString ScDataPilotServiceDlg::GetServiceName() const { - return m_pLbService->GetSelectEntry(); + return m_pLbService->GetSelectedEntry(); } OUString ScDataPilotServiceDlg::GetParSource() const diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index ad86c0eaef7c..74e5f947e9c8 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -237,7 +237,7 @@ DataPilotFieldReference ScDPFunctionDlg::GetFieldRef() const DataPilotFieldReference aRef; aRef.ReferenceType = mxLbTypeWrp->GetControlValue(); - aRef.ReferenceField = GetBaseFieldName(mpLbBaseField->GetSelectEntry()); + aRef.ReferenceField = GetBaseFieldName(mpLbBaseField->GetSelectedEntry()); sal_Int32 nBaseItemPos = mpLbBaseItem->GetSelectEntryPos(); switch( nBaseItemPos ) @@ -252,7 +252,7 @@ DataPilotFieldReference ScDPFunctionDlg::GetFieldRef() const { aRef.ReferenceItemType = DataPilotFieldReferenceItemType::NAMED; if( !mbEmptyItem || (nBaseItemPos > SC_BASEITEM_USER_POS) ) - aRef.ReferenceItemName = GetBaseItemName(mpLbBaseItem->GetSelectEntry()); + aRef.ReferenceItemName = GetBaseItemName(mpLbBaseItem->GetSelectedEntry()); } } @@ -610,7 +610,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const else rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::DATA; - ScDPName aFieldName = GetFieldName(m_pLbSortBy->GetSelectEntry()); + ScDPName aFieldName = GetFieldName(m_pLbSortBy->GetSelectedEntry()); if (!aFieldName.maName.isEmpty()) { rLabelData.maSortInfo.Field = @@ -626,7 +626,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const // *** AUTO SHOW *** - aFieldName = GetFieldName(m_pLbShowUsing->GetSelectEntry()); + aFieldName = GetFieldName(m_pLbShowUsing->GetSelectedEntry()); if (!aFieldName.maName.isEmpty()) { rLabelData.maShowInfo.IsEnabled = m_pCbShow->IsChecked(); @@ -870,7 +870,7 @@ OUString ScDPShowDetailDlg::GetDimensionName() const { // Look up the internal dimension name which may be different from the // displayed field name. - OUString aSelectedName = mpLbDims->GetSelectEntry(); + OUString aSelectedName = mpLbDims->GetSelectedEntry(); DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName); if (itr == maNameIndexMap.end()) // This should never happen! diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 9ae6c8ecae24..38c967f01610 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -441,7 +441,7 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem ) IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox&, rLb, void ) { - OUString aSelEntry = rLb.GetSelectEntry(); + OUString aSelEntry = rLb.GetSelectedEntry(); ScSortKeyItems::iterator pIter; // If last listbox is enabled add one item diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 973dcd8f7d0c..5df386873520 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -186,7 +186,7 @@ void ScFunctionWin::SetDescription() { pDesc->initArgumentInfo(); // full argument info is needed - OUStringBuffer aBuf(aFuncList->GetSelectEntry()); + OUStringBuffer aBuf(aFuncList->GetSelectedEntry()); aBuf.append(":\n\n"); aBuf.append(pDesc->GetParamList()); aBuf.append("\n\n"); @@ -279,7 +279,7 @@ void ScFunctionWin::DoEnter() { OUString aFirstArgStr; OUString aArgStr; - OUString aString=aFuncList->GetSelectEntry(); + OUString aString=aFuncList->GetSelectedEntry(); SfxViewShell* pCurSh = SfxViewShell::Current(); nArgs=0; @@ -296,7 +296,7 @@ void ScFunctionWin::DoEnter() if (OutputDevice::isDisposed()) return; aString = "="; - aString += aFuncList->GetSelectEntry(); + aString += aFuncList->GetSelectedEntry(); if (pHdl) pHdl->ClearText(); } @@ -342,7 +342,7 @@ void ScFunctionWin::DoEnter() if (pHdl->GetEditString().isEmpty()) { aString = "="; - aString += aFuncList->GetSelectEntry(); + aString += aFuncList->GetSelectedEntry(); } EditView *pEdView=pHdl->GetActiveView(); if(pEdView!=nullptr) // @ needed because of crash during setting a name diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index a67e2972a5b8..0b45c70e8fa1 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -39,7 +39,7 @@ public: virtual ~ScSelEntryDlg() override; virtual void dispose() override; - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; }; #endif // INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 7e9ed521f2d2..0afc636c9072 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -74,7 +74,7 @@ private: typedef ::std::vector< ScenarioEntry > ScenarioList; private: - const ScenarioEntry* GetSelectedEntry() const; + const ScenarioEntry* GetSelectedScenarioEntry() const; void ExecuteScenarioSlot( sal_uInt16 nSlotId ); void SelectScenario(); diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 60823c4c4537..6230b9d14176 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -47,7 +47,7 @@ public: void Insert( const OUString& rString, bool bSelected ); sal_Int32 GetSelectEntryCount() const; - OUString GetSelectEntry(sal_Int32 nPos) const; + OUString GetSelectedEntry(sal_Int32 nPos) const; sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const; }; diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index f2779fc15ea5..94a3a2b0eb0c 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -574,7 +574,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl, Button*, void) IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) { - OUString aRangeStr = pLbRange->GetSelectEntry(); + OUString aRangeStr = pLbRange->GetSelectedEntry(); sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos(); bool bColName = (reinterpret_cast<sal_uLong>(pLbRange->GetEntryData( nSelectPos )) == nEntryDataCol); @@ -642,7 +642,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void) ++nMoves; pLbRange->SelectEntryPos( ++nSelectPos ); } - OUString aRangeStr = pLbRange->GetSelectEntry(); + OUString aRangeStr = pLbRange->GetSelectedEntry(); if ( nMoves ) { if ( nSelectPos > 1 && nSelectPos >= nCnt ) @@ -650,14 +650,14 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void) // do not stop at the delimiter nSelectPos = nCnt - 2; pLbRange->SelectEntryPos( nSelectPos ); - aRangeStr = pLbRange->GetSelectEntry(); + aRangeStr = pLbRange->GetSelectedEntry(); } else if ( nSelectPos > 2 && nSelectPos < nCnt && !aRangeStr.isEmpty() && aRangeStr == pEdAssign->GetText() ) { // move upwards instead of below to the previous position nSelectPos -= 2; pLbRange->SelectEntryPos( nSelectPos ); - aRangeStr = pLbRange->GetSelectEntry(); + aRangeStr = pLbRange->GetSelectedEntry(); } } NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr); diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx index 14cec83a8c68..b049344eb536 100644 --- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx +++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx @@ -88,8 +88,8 @@ IMPL_LINK_NOARG(DataProviderDlg, SelectHdl, ListBox&, void) void DataProviderDlg::UpdateEnable() { bool bEmptyEntry = m_pCbUrl->GetURL().isEmpty() || - m_pCBData->GetSelectEntry().isEmpty() || - m_pCBProvider->GetSelectEntry().isEmpty(); + m_pCBData->GetSelectedEntry().isEmpty() || + m_pCBProvider->GetSelectedEntry().isEmpty(); m_pBtnOk->Enable(!bEmptyEntry); setOptimalLayoutSize(); } @@ -117,11 +117,11 @@ void DataProviderDlg::StartImport() if (aURL.isEmpty()) return; - OUString maDBDataName = m_pCBData->GetSelectEntry(); + OUString maDBDataName = m_pCBData->GetSelectedEntry(); if (maDBDataName.isEmpty()) return; - OUString aProvider = m_pCBProvider->GetSelectEntry(); + OUString aProvider = m_pCBProvider->GetSelectedEntry(); if (aProvider.isEmpty()) return; diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 04acdf5e530a..c19644070b04 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -212,7 +212,7 @@ const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN ) } else if ( nSelTabIndex < m_pLbTables->GetSelectEntryCount() ) { - aStrCurSelTable = m_pLbTables->GetSelectEntry(); + aStrCurSelTable = m_pLbTables->GetSelectedEntry(); pStr = &aStrCurSelTable; if ( pN ) *pN = m_pLbTables->GetSelectEntryPos(); @@ -228,7 +228,7 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) if ( !m_pBtnNew->IsChecked() && nSelTabIndex < m_pLbTables->GetSelectEntryCount() ) { - aStrCurSelTable = m_pLbTables->GetSelectEntry( nSelTabIndex ); + aStrCurSelTable = m_pLbTables->GetSelectedEntry( nSelTabIndex ); pStr = &aStrCurSelTable; if ( pN ) *pN = m_pLbTables->GetSelectEntryPos( nSelTabIndex ); diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index ff59830c1926..ce8d891f9f1d 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -53,9 +53,9 @@ void ScSelEntryDlg::dispose() } -OUString ScSelEntryDlg::GetSelectEntry() const +OUString ScSelEntryDlg::GetSelectedEntry() const { - return m_pLb->GetSelectEntry(); + return m_pLb->GetSelectedEntry(); } IMPL_LINK_NOARG(ScSelEntryDlg, DblClkHdl, ListBox&, void) diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 2de2133121cd..b7c8fee457e3 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -319,7 +319,7 @@ OUString ScLinkedAreaDlg::GetSource() { if (i > 0) aBuf.append(';'); - aBuf.append(m_pLbRanges->GetSelectEntry(i)); + aBuf.append(m_pLbRanges->GetSelectedEntry(i)); } return aBuf.makeStringAndClear(); } diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 3cbaff853680..3105cdd84c23 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -282,7 +282,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl, Button*, void) if ( (nIndex > 0) && (m_pLbFormat->GetEntryCount() > 0) ) { OUString aMsg = aStrDelMsg.getToken( 0, '#' ) - + m_pLbFormat->GetSelectEntry() + + m_pLbFormat->GetSelectedEntry() + aStrDelMsg.getToken( 1, '#' ); if ( RET_YES == @@ -318,7 +318,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl, Button*, void) while( !bOk ) { - OUString aFormatName = m_pLbFormat->GetSelectEntry(); + OUString aFormatName = m_pLbFormat->GetSelectedEntry(); OUString aEntry; VclPtrInstance<ScStringInputDlg> pDlg( this, diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 747351aef56e..b1b75f3b366e 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -71,9 +71,9 @@ sal_Int32 ScShowTabDlg::GetSelectEntryCount() const return m_pLb->GetSelectEntryCount(); } -OUString ScShowTabDlg::GetSelectEntry(sal_Int32 nPos) const +OUString ScShowTabDlg::GetSelectedEntry(sal_Int32 nPos) const { - return m_pLb->GetSelectEntry(nPos); + return m_pLb->GetSelectedEntry(nPos); } sal_Int32 ScShowTabDlg::GetSelectEntryPos(sal_Int32 nPos) const diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 1e3631792ea8..a2f26e4d0f09 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -137,7 +137,7 @@ bool ScNameDefDlg::IsFormulaValid() bool ScNameDefDlg::IsNameValid() { - OUString aScope = m_pLbScope->GetSelectEntry(); + OUString aScope = m_pLbScope->GetSelectedEntry(); OUString aName = m_pEdName->GetText(); ScRangeName* pRangeName = nullptr; @@ -194,7 +194,7 @@ bool ScNameDefDlg::IsNameValid() void ScNameDefDlg::AddPushed() { - OUString aScope = m_pLbScope->GetSelectEntry(); + OUString aScope = m_pLbScope->GetSelectedEntry(); OUString aName = m_pEdName->GetText(); OUString aExpression = m_pEdRange->GetText(); diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 571dd6fbe02c..10d9f0b23433 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -268,7 +268,7 @@ void ScNameDlg::UpdateChecks(const ScRangeData* pData) bool ScNameDlg::IsNameValid() { - OUString aScope = m_pLbScope->GetSelectEntry(); + OUString aScope = m_pLbScope->GetSelectedEntry(); OUString aName = m_pEdName->GetText(); aName = aName.trim(); @@ -394,7 +394,7 @@ void ScNameDlg::NameModified() if (aOldScope.isEmpty()) return; OUString aExpr = m_pEdAssign->GetText(); - OUString aNewScope = m_pLbScope->GetSelectEntry(); + OUString aNewScope = m_pLbScope->GetSelectedEntry(); ScRangeName* pOldRangeName = GetRangeName( aOldScope ); ScRangeData* pData = pOldRangeName->findByUpperName( ScGlobal::pCharClass->uppercase(aOldName) ); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 5a70da276730..6ef08f8561fb 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -310,7 +310,7 @@ IMPL_LINK(ScNavigatorDlg, DocumentSelectHdl, ListBox&, rListBox, void) { ScNavigatorDlg::ReleaseFocus(); - OUString aDocName = rListBox.GetSelectEntry(); + OUString aDocName = rListBox.GetSelectedEntry(); aLbEntries->SelectDoc(aDocName); } diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 0d9d6e030f53..bd8175d056b3 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -98,7 +98,7 @@ void ScScenarioListBox::UpdateEntries( const std::vector<OUString> &aNewEntryLis void ScScenarioListBox::Select() { - if( const ScenarioEntry* pEntry = GetSelectedEntry() ) + if( const ScenarioEntry* pEntry = GetSelectedScenarioEntry() ) mrParent.SetComment( pEntry->maComment ); } @@ -131,7 +131,7 @@ bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt ) const CommandEvent* pCEvt = rNEvt.GetCommandEvent(); if ( pCEvt && pCEvt->GetCommand() == CommandEventId::ContextMenu ) { - if( const ScenarioEntry* pEntry = GetSelectedEntry() ) + if( const ScenarioEntry* pEntry = GetSelectedScenarioEntry() ) { if( !pEntry->mbProtected ) { @@ -152,7 +152,7 @@ bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt ) return bHandled || ListBox::EventNotify(rNEvt); } -const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedEntry() const +const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedScenarioEntry() const { size_t nPos = GetSelectEntryPos(); return (nPos < maEntries.size()) ? &maEntries[ nPos ] : nullptr; @@ -162,7 +162,7 @@ void ScScenarioListBox::ExecuteScenarioSlot( sal_uInt16 nSlotId ) { if( SfxViewFrame* pViewFrm = SfxViewFrame::Current() ) { - SfxStringItem aStringItem( nSlotId, GetSelectEntry() ); + SfxStringItem aStringItem( nSlotId, GetSelectedEntry() ); pViewFrm->GetDispatcher()->ExecuteList(nSlotId, SfxCallMode::SLOT | SfxCallMode::RECORD, { &aStringItem } ); } diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index d8e242474293..4e4d0b6b622c 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -154,7 +154,7 @@ bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet ) pBreakCB ->IsValueChangedFromSaved() || pGuideLineCB ->IsValueChangedFromSaved()) { - NamedColor aNamedColor = pColorLB->GetSelectEntry(); + NamedColor aNamedColor = pColorLB->GetSelectedEntry(); pLocalOptions->SetGridColor(aNamedColor.first, aNamedColor.second); rCoreSet->Put(ScTpViewItem(*pLocalOptions)); bRet = true; diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index fb7a2bdfd401..ff98bff748b2 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -741,7 +741,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) OSL_ENSURE(pDlg, "Dialog create fail!"); if ( pDlg->Execute() == RET_OK ) { - OUString aName = pDlg->GetSelectEntry(); + OUString aName = pDlg->GetSelectedEntry(); pTabViewShell->GotoDBArea( aName ); rReq.AppendItem( SfxStringItem( SID_SELECT_DB, aName ) ); rReq.Done(); diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index c178a4033d66..676ce2c76f53 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -154,7 +154,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) const sal_Int32 nCount = pDlg->GetSelectEntryCount(); for (sal_Int32 nPos=0; nPos<nCount; ++nPos) { - aName = pDlg->GetSelectEntry(nPos); + aName = pDlg->GetSelectedEntry(nPos); rReq.AppendItem( SfxStringItem( FID_TABLE_SHOW, aName ) ); rNames.push_back(aName); } diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 89dae96b6ce9..29ba1d004a84 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -574,7 +574,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl, Button*, void) const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos(); if (!pImagesLst->GetEntry(nActPos + 1).isEmpty()) { - OUString sActEntry( pImagesLst->GetSelectEntry() ); + OUString sActEntry( pImagesLst->GetSelectedEntry() ); OUString* pActData = static_cast<OUString*>(pImagesLst->GetSelectEntryData()); OUString sAct(*pActData); diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index d047d6a39f02..eaf00a4d3551 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -984,7 +984,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) sal_Int32 nPos = m_pLbLoopCount->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != m_pLbLoopCount->GetEntryCount() - 1 ) // endless - nLoopCount = m_pLbLoopCount->GetSelectEntry().toUInt32(); + nLoopCount = m_pLbLoopCount->GetSelectedEntry().toUInt32(); aAnimBmp.aBmpEx = *pBitmapEx; aAnimBmp.aPosPix = aPt; diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index d957d1706aa8..440fc909a8bd 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -239,9 +239,9 @@ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs ) rOutAttrs.Put( SfxInt32Item( ATTR_COPY_WIDTH, nWidth ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_HEIGHT, nHeight ) ); - NamedColor aColor = m_pLbStartColor->GetSelectEntry(); + NamedColor aColor = m_pLbStartColor->GetSelectedEntry(); rOutAttrs.Put(XColorItem(ATTR_COPY_START_COLOR, aColor.second, aColor.first)); - aColor = m_pLbEndColor->GetSelectEntry(); + aColor = m_pLbEndColor->GetSelectedEntry(); rOutAttrs.Put(XColorItem(ATTR_COPY_END_COLOR, aColor.second, aColor.first)); } diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 9659b87a0434..69cfb59a782b 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -413,7 +413,7 @@ void SdDefineCustomShowDlg::ClickButtonHdl2(void const * p) for( sal_Int32 i = 0; i < nCount; i++ ) { - OUString aStr = m_pLbPages->GetSelectEntry( i ); + OUString aStr = m_pLbPages->GetSelectedEntry( i ); pEntry = m_pLbCustomPages->InsertEntry( aStr, nullptr, false, nPosCP ); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index b77e744daf36..e3f405695030 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -315,7 +315,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool) // if it is the active window, we jump to the page if( pInfo && pInfo->IsActive() ) { - OUString aStr( maTlbObjects->GetSelectEntry() ); + OUString aStr( maTlbObjects->GetSelectedEntry() ); if( !aStr.isEmpty() ) { @@ -345,7 +345,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool) IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl, ListBox&, void) { - OUString aStrLb = maLbDocs->GetSelectEntry(); + OUString aStrLb = maLbDocs->GetSelectedEntry(); long nPos = maLbDocs->GetSelectEntryPos(); bool bFound = false; ::sd::DrawDocShell* pDocShell = nullptr; diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index c4788163f413..d6087bfacdf6 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -294,7 +294,7 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr ) { rAttr.Put( SfxBoolItem ( ATTR_PRESENT_ALL, aRbtAll->IsChecked() ) ); rAttr.Put( SfxBoolItem ( ATTR_PRESENT_CUSTOMSHOW, aRbtCustomshow->IsChecked() ) ); - rAttr.Put( SfxStringItem ( ATTR_PRESENT_DIANAME, aLbDias->GetSelectEntry() ) ); + rAttr.Put( SfxStringItem ( ATTR_PRESENT_DIANAME, aLbDias->GetSelectedEntry() ) ); rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MANUEL, aCbxManuel->IsChecked() ) ); rAttr.Put( SfxBoolItem ( ATTR_PRESENT_MOUSE, aCbxMousepointer->IsChecked() ) ); rAttr.Put( SfxBoolItem ( ATTR_PRESENT_PEN, aCbxPen->IsChecked() ) ); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index db86c1409ed7..c573ffdbf0f8 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -324,7 +324,7 @@ void SdPageObjsTLB::Clear() maSelectionEntryText.clear(); maTreeItem.clear(); if (GetCurEntry()) - maSelectionEntryText = GetSelectEntry(); + maSelectionEntryText = GetSelectedEntry(); SvTreeListEntry* pEntry = FirstChild(nullptr); SaveExpandedTreeItemState(pEntry, maTreeItem); } @@ -420,7 +420,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, bool bAllPages, OUString aSelection; if( GetSelectionCount() > 0 ) { - aSelection = GetSelectEntry(); + aSelection = GetSelectedEntry(); Clear(); } @@ -697,7 +697,7 @@ bool SdPageObjsTLB::IsEqualToDoc( const SdDrawDocument* pInDoc ) /** * @return selected string */ -OUString SdPageObjsTLB::GetSelectEntry() +OUString SdPageObjsTLB::GetSelectedEntry() { return GetEntryText( GetCurEntry() ); } @@ -1006,9 +1006,9 @@ void SdPageObjsTLB::DoDrag() OUString aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INetProtocol::File ).GetMainURL( INetURLObject::DecodeMechanism::NONE ); NavigatorDragType eDragType = mpDropNavWin->GetNavigatorDragType(); - aURL += "#" + GetSelectEntry(); + aURL += "#" + GetSelectedEntry(); - INetBookmark aBookmark( aURL, GetSelectEntry() ); + INetBookmark aBookmark( aURL, GetSelectedEntry() ); sal_Int8 nDNDActions = DND_ACTION_COPYMOVE; if( eDragType == NAVIGATOR_DRAGTYPE_LINK ) diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 9f6b8f24bc3e..55afea747209 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -643,7 +643,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl, ListBox&, void) IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl, SvTreeListBox*, void) { - m_pEdtBookmark->SetText( m_pLbTree->GetSelectEntry() ); + m_pEdtBookmark->SetText( m_pLbTree->GetSelectedEntry() ); } IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, Control&, void) @@ -835,7 +835,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) m_pLbTreeDocument->Control::IsVisible() && m_pLbTreeDocument->GetSelectionCount() > 0 ) { - OUString aTmpStr( m_pLbTreeDocument->GetSelectEntry() ); + OUString aTmpStr( m_pLbTreeDocument->GetSelectedEntry() ); if( !aTmpStr.isEmpty() ) { aStr += OUStringLiteral1(DOCUMENT_TOKEN) + aTmpStr; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index db218e950787..245b94a37b3e 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -206,7 +206,7 @@ public: bool IsEqualToDoc( const SdDrawDocument* pInDoc ); bool HasSelectedChildren( const OUString& rName ); bool SelectEntry( const OUString& rName ); - OUString GetSelectEntry(); + OUString GetSelectedEntry(); //Mark Current Entry void SetSdNavigatorWinFlag(bool isInSdNavigatorWin){bisInSdNavigatorWin =isInSdNavigatorWin;}; diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 447386de9e27..8a521fcb0577 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -1032,7 +1032,7 @@ IMPL_LINK_NOARG(SlideBackground, AssignMasterPage, ListBox&, void) break; } } - OUString aLayoutName(mpMasterSlide->GetSelectEntry()); + OUString aLayoutName(mpMasterSlide->GetSelectedEntry()); pDoc->SetMasterPage(nSelectedPage, aLayoutName, pDoc, false, false); } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 01a5f47d6450..8bd88551c1e1 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -400,7 +400,7 @@ bool ContentListBox_Impl::EventNotify( NotifyEvent& rNEvt ) } -OUString ContentListBox_Impl::GetSelectEntry() const +OUString ContentListBox_Impl::GetSelectedEntry() const { OUString aRet; SvTreeListEntry* pEntry = FirstSelected(); @@ -776,7 +776,7 @@ void IndexTabPage_Impl::SetFactory( const OUString& rFactory ) } -OUString IndexTabPage_Impl::GetSelectEntry() const +OUString IndexTabPage_Impl::GetSelectedEntry() const { OUString aRet; IndexEntry_Impl* pEntry = static_cast<IndexEntry_Impl*>(m_pIndexCB->GetEntryData( m_pIndexCB->GetEntryPos( m_pIndexCB->GetText() ) )); @@ -1080,7 +1080,7 @@ void SearchTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink ) } -OUString SearchTabPage_Impl::GetSelectEntry() const +OUString SearchTabPage_Impl::GetSelectedEntry() const { OUString aRet; OUString* pData = static_cast<OUString*>(m_pResultsLB->GetSelectEntryData()); @@ -1326,7 +1326,7 @@ void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link<ListBox&,void>& rLink m_pBookmarksBox->SetDoubleClickHdl(rLink); } -OUString BookmarksTabPage_Impl::GetSelectEntry() const +OUString BookmarksTabPage_Impl::GetSelectedEntry() const { OUString aRet; OUString* pData = static_cast<OUString*>(m_pBookmarksBox->GetSelectEntryData()); @@ -1714,7 +1714,7 @@ void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, bool bActive } } -OUString SfxHelpIndexWindow_Impl::GetSelectEntry() const +OUString SfxHelpIndexWindow_Impl::GetSelectedEntry() const { OUString sRet; @@ -1722,19 +1722,19 @@ OUString SfxHelpIndexWindow_Impl::GetSelectEntry() const if (sName == "contents") { - sRet = pCPage->GetSelectEntry(); + sRet = pCPage->GetSelectedEntry(); } else if (sName == "index") { - sRet = pIPage->GetSelectEntry(); + sRet = pIPage->GetSelectedEntry(); } else if (sName == "find") { - sRet = pSPage->GetSelectEntry(); + sRet = pSPage->GetSelectedEntry(); } else if (sName == "bookmarks") { - sRet = pBPage->GetSelectEntry(); + sRet = pBPage->GetSelectedEntry(); } return sRet; @@ -2804,7 +2804,7 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox, void ) IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl, Control*, bool) { pIndexWin->SelectExecutableEntry(); - OUString aEntry = pIndexWin->GetSelectEntry(); + OUString aEntry = pIndexWin->GetSelectedEntry(); if ( aEntry.isEmpty() ) return false; diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index c2d752e9c86f..3dea56bda052 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -69,7 +69,7 @@ public: virtual bool EventNotify( NotifyEvent& rNEvt ) override; void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { SetDoubleClickHdl( rLink ); } - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; }; // class HelpTabPage_Impl ------------------------------------------------ @@ -106,7 +106,7 @@ public: virtual Control* GetLastFocusControl() override; void SetOpenHdl( const Link<SvTreeListBox*,bool>& rLink ) { m_pContentBox->SetOpenHdl( rLink ); } - OUString GetSelectEntry() const { return m_pContentBox->GetSelectEntry(); } + OUString GetSelectedEntry() const { return m_pContentBox->GetSelectedEntry(); } void SetFocusOnBox() { m_pContentBox->GrabFocus(); } }; @@ -156,7 +156,7 @@ public: void SetDoubleClickHdl( const Link<ComboBox&,void>& rLink ); void SetFactory( const OUString& rFactory ); const OUString& GetFactory() const { return sFactory; } - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; void SetFocusOnBox() { m_pIndexCB->GrabFocus(); } bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); } @@ -233,7 +233,7 @@ public: void SetDoubleClickHdl( const Link<ListBox&,void>& rLink ); void SetFactory( const OUString& rFactory ) { aFactory = rFactory; } - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; void ClearPage(); void SetFocusOnBox() { m_pResultsLB->GrabFocus(); } bool HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); } @@ -274,7 +274,7 @@ public: virtual Control* GetLastFocusControl() override; void SetDoubleClickHdl( const Link<ListBox&,void>& rLink ); - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; void AddBookmarks( const OUString& rTitle, const OUString& rURL ); void SetFocusOnBox() { m_pBookmarksBox->GrabFocus(); } }; @@ -338,10 +338,10 @@ public: void SetSelectFactoryHdl( const Link<SfxHelpIndexWindow_Impl*,void>& rLink ) { aSelectFactoryLink = rLink; } void SetFactory( const OUString& rFactory, bool bActive ); OUString GetFactory() const { return pIPage->GetFactory(); } - OUString GetSelectEntry() const; + OUString GetSelectedEntry() const; void AddBookmarks( const OUString& rTitle, const OUString& rURL ); bool IsValidFactory( const OUString& _rFactory ); - OUString GetActiveFactoryTitle() const { return m_pActiveLB->GetSelectEntry(); } + OUString GetActiveFactoryTitle() const { return m_pActiveLB->GetSelectedEntry(); } void ClearSearchPage(); void GrabFocusBack(); bool HasFocusOnEdit() const; diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 11f7c9e0de15..66bb328dda24 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -289,7 +289,7 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, if ( pBox->IsEnabled() ) { // it is the current entry, which name was modified - const bool bSelect = pBox->GetSelectEntry() == aBuf; + const bool bSelect = pBox->GetSelectedEntry() == aBuf; pBox->RemoveEntry( aBuf ); pBox->InsertEntry( rNew ); @@ -337,7 +337,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl() IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox&, void ) { - OUString aTemplName(m_pFollowLb->GetSelectEntry()); + OUString aTemplName(m_pFollowLb->GetSelectedEntry()); OUString aEditTemplName(m_pNameRo->GetText()); if (!( aTemplName == aEditTemplName)) m_pEditStyleBtn->Enable(); @@ -347,7 +347,7 @@ IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleSelectHdl_Impl, ListBox&, voi IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void ) { - OUString aTemplName(m_pFollowLb->GetSelectEntry()); + OUString aTemplName(m_pFollowLb->GetSelectedEntry()); if (Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily() )) { } @@ -364,7 +364,7 @@ IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, ListBox&, IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleHdl_Impl, Button*, void ) { - OUString aTemplName(m_pBaseLb->GetSelectEntry()); + OUString aTemplName(m_pBaseLb->GetSelectedEntry()); if (aTemplName != SfxResId(STR_NONE)) Execute_Impl( SID_STYLE_EDIT, aTemplName, OUString(),(sal_uInt16)pStyle->GetFamily() ); } @@ -619,7 +619,7 @@ DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) if ( pStyle->HasFollowSupport() && m_pFollowLb->IsEnabled() ) { - const OUString aFollowEntry( m_pFollowLb->GetSelectEntry() ); + const OUString aFollowEntry( m_pFollowLb->GetSelectedEntry() ); if ( pStyle->GetFollow() != aFollowEntry ) { @@ -636,7 +636,7 @@ DeactivateRC SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet ) if ( m_pBaseLb->IsEnabled() ) { - OUString aParentEntry( m_pBaseLb->GetSelectEntry() ); + OUString aParentEntry( m_pBaseLb->GetSelectedEntry() ); if ( SfxResId(STR_NONE) == aParentEntry || aParentEntry == pStyle->GetName() ) aParentEntry.clear(); diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index a9fa42dad284..00270770863b 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -238,7 +238,7 @@ void SfxCommonPrintOptionsTabPage::ImplUpdateControls( const PrinterOptions* pCu } } - m_pReduceBitmapsResolutionLB->SetText( m_pReduceBitmapsResolutionLB->GetSelectEntry() ); + m_pReduceBitmapsResolutionLB->SetText( m_pReduceBitmapsResolutionLB->GetSelectedEntry() ); m_pReduceBitmapsTransparencyCB->Check( pCurrentOptions->IsReducedBitmapIncludesTransparency() ); m_pConvertToGreyscalesCB->Check( pCurrentOptions->IsConvertToGreyscales() ); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 19eda7892422..08166ceb8302 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1629,7 +1629,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable) IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox&, rBox, void ) { - if (SfxResId(STR_STYLE_FILTER_HIERARCHICAL) == rBox.GetSelectEntry()) + if (SfxResId(STR_STYLE_FILTER_HIERARCHICAL) == rBox.GetSelectedEntry()) { EnableHierarchical(true); } diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 8ffb28820072..790a474509ce 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -242,7 +242,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox&, rBox, void ) const sal_uInt16 nCount = aTemplates.GetRegionCount()? aTemplates.GetCount(nRegion): 0; m_pTemplateLb->SetUpdateMode(false); m_pTemplateLb->Clear(); - OUString aSel = m_pRegionLb->GetSelectEntry(); + OUString aSel = m_pRegionLb->GetSelectedEntry(); sal_Int32 nc = aSel.indexOf('('); if (nc != -1 && nc != 0) aSel = aSel.replaceAt(nc-1, 1, ""); @@ -290,7 +290,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, LoadFile, Button*, void) sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const { sal_uInt16 nEntry = m_pTemplateLb->GetSelectEntryPos(); - OUString aSel = m_pRegionLb->GetSelectEntry(); + OUString aSel = m_pRegionLb->GetSelectedEntry(); sal_Int32 nc = aSel.indexOf('('); if (nc != -1 && nc != 0) aSel = aSel.replaceAt(nc-1, 1, ""); diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index 74883875e7a8..03d1ad6bc5b7 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -113,7 +113,7 @@ IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, SelectCategoryHdl, ListBox&, void) } else { - msSelectedCategory = mpLBCategory->GetSelectEntry(); + msSelectedCategory = mpLBCategory->GetSelectedEntry(); mpOKButton->Enable(!msTemplateName.isEmpty()); } } diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index fbaaa1b70aa0..a65f11446ad6 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectApplicationHdl, ListBox&, void) IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectRegionHdl, ListBox&, void) { - const OUString sSelectedRegion = mpCBFolder->GetSelectEntry(); + const OUString sSelectedRegion = mpCBFolder->GetSelectedEntry(); if(mpCBFolder->GetSelectEntryPos() == 0) { @@ -823,7 +823,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl, Edit&, void) mpLocalView->Show(); mpLocalView->filterItems(ViewFilter_Application(getCurrentApplicationFilter())); mpLocalView->reload(); - OUString sLastFolder = mpCBFolder->GetSelectEntry(); + OUString sLastFolder = mpCBFolder->GetSelectedEntry(); mpLocalView->showRegion(sLastFolder); mpActionMenu->ShowItem(MNI_ACTION_RENAME_FOLDER); } @@ -1124,7 +1124,7 @@ void SfxTemplateManagerDlg::OnCategoryNew() void SfxTemplateManagerDlg::OnCategoryRename() { - OUString sCategory = mpCBFolder->GetSelectEntry(); + OUString sCategory = mpCBFolder->GetSelectedEntry(); ScopedVclPtrInstance< InputDialog > dlg(SfxResId(STR_INPUT_NEW),this); dlg->SetEntryText(sCategory); @@ -1363,7 +1363,7 @@ IMPL_LINK_NOARG(SfxTemplateCategoryDialog, SelectCategoryHdl, ListBox&, void) } else { - msSelectedCategory = mpLBCategory->GetSelectEntry(); + msSelectedCategory = mpLBCategory->GetSelectedEntry(); mpNewCategoryEdit->Disable(); mpOKButton->Enable(); } diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 93cbee5e8193..328466f908cc 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -179,7 +179,7 @@ uno::Reference<awt::XWindow> ClassificationCategoriesController::createItemWindo IMPL_STATIC_LINK(ClassificationCategoriesController, SelectHdl, ListBox&, rCategory, void) { - OUString aEntry = rCategory.GetSelectEntry(); + OUString aEntry = rCategory.GetSelectedEntry(); OUString aType = getCategoryType(); uno::Sequence<beans::PropertyValue> aPropertyValues(comphelper::InitPropertySequence({ diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 4d09089449e2..7adf4ce5fd92 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -779,7 +779,7 @@ IMPL_LINK( SmElementsDockingWindow, ElementSelectedHandle, ListBox&, rList, void for (const char* pCurrentCategory : aCategories) { OUString aCurrentCategoryString = SmResId(pCurrentCategory); - if (aCurrentCategoryString == rList.GetSelectEntry()) + if (aCurrentCategoryString == rList.GetSelectedEntry()) { mpElementsControl->setElementSetId(pCurrentCategory); return; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 60df855f2831..3c352bb901db 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1414,7 +1414,7 @@ void SmSymbolDialog::FillSymbolSets() IMPL_LINK_NOARG( SmSymbolDialog, SymbolSetChangeHdl, ListBox&, void ) { - SelectSymbolSet(m_pSymbolSets->GetSelectEntry()); + SelectSymbolSet(m_pSymbolSets->GetSelectedEntry()); } @@ -1428,7 +1428,7 @@ IMPL_LINK_NOARG(SmSymbolDialog, EditClickHdl, Button*, void) ScopedVclPtrInstance<SmSymDefineDialog> pDialog(this, pFontListDev, rSymbolMgr); // set current symbol and SymbolSet for the new dialog - const OUString aSymSetName (m_pSymbolSets->GetSelectEntry()), + const OUString aSymSetName (m_pSymbolSets->GetSelectedEntry()), aSymName (m_pSymbolName->GetText()); pDialog->SelectOldSymbolSet(aSymSetName); pDialog->SelectOldSymbol(aSymName); @@ -1436,7 +1436,7 @@ IMPL_LINK_NOARG(SmSymbolDialog, EditClickHdl, Button*, void) pDialog->SelectSymbol(aSymName); // remember old SymbolSet - OUString aOldSymbolSet (m_pSymbolSets->GetSelectEntry()); + OUString aOldSymbolSet (m_pSymbolSets->GetSelectedEntry()); sal_uInt16 nSymPos = m_pSymbolSetDisplay->GetSelectSymbol(); @@ -1710,7 +1710,7 @@ void SmSymDefineDialog::FillStyles() pStyles->Clear(); pStyles->SetText(OUString()); - OUString aText (pFonts->GetSelectEntry()); + OUString aText (pFonts->GetSelectedEntry()); if (!aText.isEmpty()) { // use own StyleNames @@ -1779,7 +1779,7 @@ IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void ) (void) rListBox; assert(&rListBox == pFonts && "Sm : wrong argument"); - SelectFont(pFonts->GetSelectEntry()); + SelectFont(pFonts->GetSelectedEntry()); } @@ -1937,7 +1937,7 @@ void SmSymDefineDialog::UpdateButtons() bool bEqual = pOrigSymbol && aTmpSymbolSetName.equalsIgnoreAsciiCase(pOldSymbolSetName->GetText()) && aTmpSymbolName == pOrigSymbol->GetName() - && pFonts->GetSelectEntry().equalsIgnoreAsciiCase( + && pFonts->GetSelectedEntry().equalsIgnoreAsciiCase( pOrigSymbol->GetFace().GetFamilyName()) && pStyles->GetText().equalsIgnoreAsciiCase( GetFontStyles().GetStyleName(pOrigSymbol->GetFace())) @@ -2285,7 +2285,7 @@ bool SmSymDefineDialog::SelectFont(const OUString &rFontName, bool bApplyFont) SelectStyle(pStyles->GetEntry(0)); if (bApplyFont) { - SetFont(pFonts->GetSelectEntry(), pStyles->GetText()); + SetFont(pFonts->GetSelectedEntry(), pStyles->GetText()); pSymbolDisplay->SetSymbol( pCharsetDisplay->GetSelectCharacter(), pCharsetDisplay->GetFont() ); } bRet = true; @@ -2314,7 +2314,7 @@ bool SmSymDefineDialog::SelectStyle(const OUString &rStyleName, bool bApplyFont) pStyles->SetText(pStyles->GetEntry(nPos)); if (bApplyFont) { - SetFont(pFonts->GetSelectEntry(), pStyles->GetText()); + SetFont(pFonts->GetSelectedEntry(), pStyles->GetText()); pSymbolDisplay->SetSymbol( pCharsetDisplay->GetSelectCharacter(), pCharsetDisplay->GetFont() ); } bRet = true; diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 0c878a71dea1..f4ea43e2a29d 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -215,7 +215,7 @@ void PlaceEditDialog::InitDetails( ) // Set default to first value m_pLBServerType->SelectEntryPos( 0 ); - if ( m_pLBServerType->GetSelectEntry() == "--------------------" ) + if ( m_pLBServerType->GetSelectedEntry() == "--------------------" ) m_pLBServerType->SelectEntryPos( 1 ); SelectTypeHdl( *m_pLBServerType ); @@ -273,14 +273,14 @@ IMPL_LINK_NOARG( PlaceEditDialog, EditHdl, DetailsContainer*, void ) nLength = sUser.getLength(); sLabel = sLabel.replaceFirst( "$user$", sUser.copy( 0, nLength ) ); - sLabel = sLabel.replaceFirst( "$service$", m_pLBServerType->GetSelectEntry() ); + sLabel = sLabel.replaceFirst( "$service$", m_pLBServerType->GetSelectedEntry() ); m_pEDServerName->SetText( sLabel ); bLabelChanged = false; } else { - m_pEDServerName->SetText( m_pLBServerType->GetSelectEntry( ) ); + m_pEDServerName->SetText( m_pLBServerType->GetSelectedEntry( ) ); } } @@ -314,7 +314,7 @@ IMPL_LINK_NOARG( PlaceEditDialog, EditUsernameHdl, Edit&, void ) IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl, ListBox&, void ) { - if ( m_pLBServerType->GetSelectEntry() == "--------------------" ) + if ( m_pLBServerType->GetSelectedEntry() == "--------------------" ) { if( !m_pLBServerType->IsTravelSelect() ) m_pLBServerType->SelectEntryPos( m_nCurrentType ); diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 99389a084066..8a16ab3a3091 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -911,7 +911,7 @@ void AssignmentPersistentData::ImplCommit() for (sal_Int32 i=0; i<FIELD_CONTROLS_VISIBLE; ++i, ++aInitialSelection) { VclPtr<ListBox>& pListbox = m_pImpl->pFields[i]; - sSaveSelection = pListbox->GetSelectEntry(); + sSaveSelection = pListbox->GetSelectedEntry(); pListbox->Clear(); @@ -961,7 +961,7 @@ void AssignmentPersistentData::ImplCommit() m_pImpl->aFieldAssignments[m_pImpl->nFieldScrollPos * 2 + nListBoxIndex].clear(); else // it's a regular field entry - m_pImpl->aFieldAssignments[m_pImpl->nFieldScrollPos * 2 + nListBoxIndex] = _rListbox.GetSelectEntry(); + m_pImpl->aFieldAssignments[m_pImpl->nFieldScrollPos * 2 + nListBoxIndex] = _rListbox.GetSelectedEntry(); } diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 7016948fa228..22b6662d5e9a 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -55,7 +55,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox const * pBox, PushButton* pPropBtn, VclPtr<Printer> pTempPrinter( pTempPrinterIn ); if ( pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { - const QueueInfo* pInfo = Printer::GetQueueInfo( pBox->GetSelectEntry(), true ); + const QueueInfo* pInfo = Printer::GetQueueInfo( pBox->GetSelectedEntry(), true ); if( pInfo) { if ( !pTempPrinter ) @@ -111,7 +111,7 @@ void ImplPrnDlgUpdateQueueInfo( ListBox const * pBox, QueueInfo& rInfo ) { if ( pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { - const QueueInfo* pInfo = Printer::GetQueueInfo( pBox->GetSelectEntry(), true ); + const QueueInfo* pInfo = Printer::GetQueueInfo( pBox->GetSelectedEntry(), true ); if( pInfo ) rInfo = *pInfo; } @@ -262,7 +262,7 @@ void PrinterSetupDialog::SetOptionsHdl( const Link<Button*,void>& rLink ) void PrinterSetupDialog::ImplSetInfo() { - const QueueInfo* pInfo = Printer::GetQueueInfo(m_pLbName->GetSelectEntry(), true); + const QueueInfo* pInfo = Printer::GetQueueInfo(m_pLbName->GetSelectedEntry(), true); if ( pInfo ) { m_pFiType->SetText( pInfo->GetDriver() ); diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 3de009f3daef..57942a39f32a 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -546,7 +546,7 @@ sal_uInt32 ExportDialog::GetRawFileSize() const if ( mbIsPixelFormat ) { sal_Int32 nBitsPerPixel = 24; - OUString aEntry( mpLbColorDepth->GetSelectEntry() ); + OUString aEntry( mpLbColorDepth->GetSelectedEntry() ); if ( ms1BitTreshold == aEntry ) nBitsPerPixel = 1; else if ( ms1BitDithered == aEntry ) diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index d83e5e67e055..f17266966875 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -255,7 +255,7 @@ double CompressGraphicsDialog::GetViewHeightInch() BmpScaleFlag CompressGraphicsDialog::GetSelectedInterpolationType() { - OUString aSelectionText = m_pInterpolationCombo->GetSelectEntry(); + OUString aSelectionText = m_pInterpolationCombo->GetSelectedEntry(); if( aSelectionText == "Lanczos" ) { return BmpScaleFlag::Lanczos; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 253e3b43e32f..8e56390c7984 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -728,7 +728,7 @@ void SvxTPFilter::InsertAuthor( const OUString& rString) OUString SvxTPFilter::GetSelectedAuthor() const { - return m_pLbAuthor->GetSelectEntry(); + return m_pLbAuthor->GetSelectedEntry(); } void SvxTPFilter::SelectedAuthorPos(sal_Int32 nPos) diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 55b7d562bdcb..73371cb0c588 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -334,7 +334,7 @@ void SvxRubyDialog::Activate() if (xRubySel.is()) { Reference< XModel > xModel = m_pImpl->GetModel(); - const OUString sCharStyleSelect = m_pCharStyleLB->GetSelectEntry(); + const OUString sCharStyleSelect = m_pCharStyleLB->GetSelectedEntry(); ClearCharStyleList(); Reference<XStyleFamiliesSupplier> xSupplier(xModel, UNO_QUERY); if (xSupplier.is()) diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 47c409718971..e0ee16f9e3d0 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1277,8 +1277,8 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) { if ( m_pLayoutBtn->IsChecked() && !bInclusive ) { - pSearchItem->SetSearchString ( m_pSearchTmplLB->GetSelectEntry() ); - pSearchItem->SetReplaceString( m_pReplaceTmplLB->GetSelectEntry() ); + pSearchItem->SetSearchString ( m_pSearchTmplLB->GetSelectedEntry() ); + pSearchItem->SetReplaceString( m_pReplaceTmplLB->GetSelectedEntry() ); } else { @@ -1615,8 +1615,8 @@ void SvxSearchDialog::Remember_Impl( const OUString &rStr, bool _bSearch ) void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) { - OUString aOldSrch( m_pSearchTmplLB->GetSelectEntry() ); - OUString aOldRepl( m_pReplaceTmplLB->GetSelectEntry() ); + OUString aOldSrch( m_pSearchTmplLB->GetSelectedEntry() ); + OUString aOldRepl( m_pReplaceTmplLB->GetSelectedEntry() ); m_pSearchTmplLB->Clear(); m_pReplaceTmplLB->Clear(); rPool.SetSearchMask( pSearchItem->GetFamily() ); @@ -2259,8 +2259,8 @@ void SvxSearchDialog::SaveToModule_Impl() if ( m_pLayoutBtn->IsChecked() ) { - pSearchItem->SetSearchString ( m_pSearchTmplLB->GetSelectEntry() ); - pSearchItem->SetReplaceString( m_pReplaceTmplLB->GetSelectEntry() ); + pSearchItem->SetSearchString ( m_pSearchTmplLB->GetSelectedEntry() ); + pSearchItem->SetReplaceString( m_pReplaceTmplLB->GetSelectedEntry() ); } else { diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 9c16503bd11e..7b5ca399335d 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2677,7 +2677,7 @@ void DbFilterField::PaintCell(OutputDevice& rDev, const tools::Rectangle& rRect) DbCellControl::PaintCell( rDev, rRect ); break; case FormComponentType::LISTBOX: - rDev.DrawText(rRect, static_cast<ListBox*>(m_pWindow.get())->GetSelectEntry(), nStyle); + rDev.DrawText(rRect, static_cast<ListBox*>(m_pWindow.get())->GetSelectedEntry(), nStyle); break; default: rDev.DrawText(rRect, m_aText, nStyle); @@ -4171,7 +4171,7 @@ OUString SAL_CALL FmXListBoxCell::getSelectedItem() if (m_pBox) { UpdateFromColumn(); - aItem = m_pBox->GetSelectEntry(); + aItem = m_pBox->GetSelectedEntry(); } return aItem; @@ -4190,7 +4190,7 @@ css::uno::Sequence<OUString> SAL_CALL FmXListBoxCell::getSelectedItems() const sal_Int32 nSelEntries = m_pBox->GetSelectEntryCount(); aSeq = css::uno::Sequence<OUString>( nSelEntries ); for ( sal_Int32 n = 0; n < nSelEntries; ++n ) - aSeq.getArray()[n] = m_pBox->GetSelectEntry( n ); + aSeq.getArray()[n] = m_pBox->GetSelectedEntry( n ); } return aSeq; } @@ -4308,7 +4308,7 @@ IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick, ListBox&, void) css::awt::ActionEvent aEvent; aEvent.Source = *this; - aEvent.ActionCommand = m_pBox->GetSelectEntry(); + aEvent.ActionCommand = m_pBox->GetSelectedEntry(); while( aIt.hasMoreElements() ) static_cast< css::awt::XActionListener *>(aIt.next())->actionPerformed( aEvent ); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index ee6c7b12ed83..796def0b73c5 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1898,7 +1898,7 @@ namespace svxform void DataNavigatorWindow::SetPageModel() { - OUString sModel( m_pModelsBox->GetSelectEntry() ); + OUString sModel( m_pModelsBox->GetSelectedEntry() ); try { Any aAny = m_xDataContainer->getByName( sModel ); @@ -1931,7 +1931,7 @@ namespace svxform void DataNavigatorWindow::InitPages() { - OUString sModel( m_pModelsBox->GetSelectEntry() ); + OUString sModel( m_pModelsBox->GetSelectedEntry() ); try { Any aAny = m_xDataContainer->getByName( sModel ); @@ -2447,7 +2447,7 @@ namespace svxform return; } - OUString sDataType( m_pDataTypeLB->GetSelectEntry() ); + OUString sDataType( m_pDataTypeLB->GetSelectedEntry() ); m_xTempBinding->setPropertyValue( PN_BINDING_TYPE, makeAny( sDataType ) ); if ( bIsHandleBinding ) @@ -3183,17 +3183,17 @@ namespace svxform m_xSubmission->setPropertyValue( PN_SUBMISSION_ID, makeAny( sTemp ) ); sTemp = m_pActionED->GetText(); m_xSubmission->setPropertyValue( PN_SUBMISSION_ACTION, makeAny( sTemp ) ); - sTemp = m_aMethodString.toAPI( m_pMethodLB->GetSelectEntry() ); + sTemp = m_aMethodString.toAPI( m_pMethodLB->GetSelectedEntry() ); m_xSubmission->setPropertyValue( PN_SUBMISSION_METHOD, makeAny( sTemp ) ); sTemp = m_pRefED->GetText(); m_xSubmission->setPropertyValue( PN_SUBMISSION_REF, makeAny( sTemp ) ); - OUString sEntry = m_pBindLB->GetSelectEntry(); + OUString sEntry = m_pBindLB->GetSelectedEntry(); sal_Int32 nColonIdx = sEntry.indexOf(':'); if (nColonIdx != -1) sEntry = sEntry.copy(0, nColonIdx); sTemp = sEntry; m_xSubmission->setPropertyValue( PN_SUBMISSION_BIND, makeAny( sTemp ) ); - sTemp = m_aReplaceString.toAPI( m_pReplaceLB->GetSelectEntry() ); + sTemp = m_aReplaceString.toAPI( m_pReplaceLB->GetSelectedEntry() ); m_xSubmission->setPropertyValue( PN_SUBMISSION_REPLACE, makeAny( sTemp ) ); } catch ( Exception& ) diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index ee4324146464..d6c1361f8523 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -359,7 +359,7 @@ void GalleryBrowser1::ImplExecute(const OString &rIdent) else if (rIdent == "delete") { if( ScopedVclPtrInstance<MessageDialog>(nullptr, "QueryDeleteThemeDialog","svx/ui/querydeletethemedialog.ui")->Execute() == RET_YES ) - mpGallery->RemoveTheme( mpThemes->GetSelectEntry() ); + mpGallery->RemoveTheme( mpThemes->GetSelectedEntry() ); } else if (rIdent == "rename") { diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 3abd35c509e9..531e92edc472 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -124,7 +124,7 @@ public: virtual void dispose() override; void SelectTheme( sal_uInt16 nThemePos ) { mpThemes->SelectEntryPos( nThemePos ); SelectThemeHdl( *mpThemes ); } - OUString GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetSelectEntry() : OUString(); } + OUString GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetSelectedEntry() : OUString(); } void ShowContextMenu(); bool KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ); diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index eb2980a0b195..bdced73f824f 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -348,7 +348,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) if(mnLastPosHatch < pXHatchList->Count()) { const XHatch aHatch = pXHatchList->GetHatch(mnLastPosHatch)->GetHatch(); - const XFillHatchItem aXFillHatchItem(mpLbFillAttr->GetSelectEntry(), aHatch); + const XFillHatchItem aXFillHatchItem(mpLbFillAttr->GetSelectedEntry(), aHatch); // #i122676# change FillStyle and Hatch in one call XFillStyleItem aXFillStyleItem(drawing::FillStyle_HATCH); @@ -394,7 +394,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) { const XBitmapEntry* pXBitmapEntry = pXBitmapList->GetBitmap(mnLastPosBitmap); aBitmap = pXBitmapEntry->GetGraphicObject(); - aName = mpLbFillAttr->GetSelectEntry(); + aName = mpLbFillAttr->GetSelectedEntry(); mpLbFillAttr->SelectEntryPos(mnLastPosBitmap); } } @@ -420,7 +420,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) { const XBitmapEntry* pXPatternEntry = pXPatternList->GetBitmap(mnLastPosPattern); aBitmap = pXPatternEntry->GetGraphicObject(); - aName = mpLbFillAttr->GetSelectEntry(); + aName = mpLbFillAttr->GetSelectedEntry(); mpLbFillAttr->SelectEntryPos(mnLastPosPattern); } } @@ -506,7 +506,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() aGradient.SetStartColor(mpLbFillGradFrom->GetSelectEntryColor()); aGradient.SetEndColor(mpLbFillGradTo->GetSelectEntryColor()); - const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetSelectEntry(), aGradient); + const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetSelectedEntry(), aGradient); // #i122676# Change FillStyle and Gradinet in one call XFillStyleItem aXFillStyleItem(drawing::FillStyle_GRADIENT); @@ -530,7 +530,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() if(nPos < aItem.GetHatchList()->Count()) { const XHatch aHatch = aItem.GetHatchList()->GetHatch(nPos)->GetHatch(); - const XFillHatchItem aXFillHatchItem( mpLbFillAttr->GetSelectEntry(), aHatch); + const XFillHatchItem aXFillHatchItem( mpLbFillAttr->GetSelectedEntry(), aHatch); // #i122676# Change FillStyle and Hatch in one call XFillStyleItem aXFillStyleItem(drawing::FillStyle_HATCH); @@ -560,7 +560,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() if(nPos < aItem.GetBitmapList()->Count()) { const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos); - const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); + const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectedEntry(), pXBitmapEntry->GetGraphicObject()); // #i122676# Change FillStyle and Bitmap in one call XFillStyleItem aXFillStyleItem(drawing::FillStyle_BITMAP); @@ -590,7 +590,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() if(nPos < aItem.GetPatternList()->Count()) { const XBitmapEntry* pXPatternEntry = aItem.GetPatternList()->GetBitmap(nPos); - const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXPatternEntry->GetGraphicObject()); + const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectedEntry(), pXPatternEntry->GetGraphicObject()); // #i122676# Change FillStyle and Bitmap in one call XFillStyleItem aXFillStyleItem(drawing::FillStyle_BITMAP); diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 3f15d5e85402..3e6e52ac3975 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -586,7 +586,7 @@ IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeStartHdl, ListBox&, void) if( nPos == 0 ) pItem.reset(new XLineStartItem()); else if( mxLineEndList.is() && mxLineEndList->Count() > (long) ( nPos - 1 ) ) - pItem.reset(new XLineStartItem( mpLBStart->GetSelectEntry(),mxLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); + pItem.reset(new XLineStartItem( mpLBStart->GetSelectedEntry(),mxLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); setLineStartStyle(pItem.get()); } } @@ -600,7 +600,7 @@ IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeEndHdl, ListBox&, void) if( nPos == 0 ) pItem.reset(new XLineEndItem()); else if( mxLineEndList.is() && mxLineEndList->Count() > (long) ( nPos - 1 ) ) - pItem.reset(new XLineEndItem( mpLBEnd->GetSelectEntry(), mxLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); + pItem.reset(new XLineEndItem( mpLBEnd->GetSelectedEntry(), mxLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() )); setLineEndStyle(pItem.get()); } } diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 0e3ebade9ff9..dd5c761a0ba0 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -362,7 +362,7 @@ void SvxFillToolBoxControl::Update() mpLbFillAttr->SelectEntry(aString); // Check if the entry is not in the list - if (mpLbFillAttr->GetSelectEntry() != aString) + if (mpLbFillAttr->GetSelectedEntry() != aString) { sal_Int32 nCount = mpLbFillAttr->GetEntryCount(); OUString aTmpStr; @@ -421,7 +421,7 @@ void SvxFillToolBoxControl::Update() mpLbFillAttr->SelectEntry( aString ); // Check if the entry is not in the list - if( mpLbFillAttr->GetSelectEntry() != aString ) + if( mpLbFillAttr->GetSelectedEntry() != aString ) { const sal_Int32 nCount = mpLbFillAttr->GetEntryCount(); OUString aTmpStr; @@ -480,7 +480,7 @@ void SvxFillToolBoxControl::Update() mpLbFillAttr->SelectEntry(aString); // Check if the entry is not in the list - if (mpLbFillAttr->GetSelectEntry() != aString) + if (mpLbFillAttr->GetSelectedEntry() != aString) { sal_Int32 nCount = mpLbFillAttr->GetEntryCount(); OUString aTmpStr; @@ -676,7 +676,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) if(mnLastPosHatch < aItem.GetHatchList()->Count()) { const XHatch aHatch = aItem.GetHatchList()->GetHatch(mnLastPosHatch)->GetHatch(); - const XFillHatchItem aXFillHatchItem(mpLbFillAttr->GetSelectEntry(), aHatch); + const XFillHatchItem aXFillHatchItem(mpLbFillAttr->GetSelectedEntry(), aHatch); // #i122676# change FillStyle and Hatch in one call SfxViewFrame::Current()->GetDispatcher()->ExecuteList( @@ -716,7 +716,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) if(mnLastPosBitmap < aItem.GetBitmapList()->Count()) { const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(mnLastPosBitmap); - const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); + const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectedEntry(), pXBitmapEntry->GetGraphicObject()); // #i122676# change FillStyle and Bitmap in one call SfxViewFrame::Current()->GetDispatcher()->ExecuteList( @@ -782,7 +782,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) if(nPos < aItem.GetGradientList()->Count()) { const XGradient aGradient = aItem.GetGradientList()->GetGradient(nPos)->GetGradient(); - const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetSelectEntry(), aGradient); + const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetSelectedEntry(), aGradient); // #i122676# Change FillStyle and Gradinet in one call SfxViewFrame::Current()->GetDispatcher()->ExecuteList( @@ -815,7 +815,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) if(nPos < aItem.GetHatchList()->Count()) { const XHatch aHatch = aItem.GetHatchList()->GetHatch(nPos)->GetHatch(); - const XFillHatchItem aXFillHatchItem( mpLbFillAttr->GetSelectEntry(), aHatch); + const XFillHatchItem aXFillHatchItem( mpLbFillAttr->GetSelectedEntry(), aHatch); // #i122676# Change FillStyle and Hatch in one call SfxViewFrame::Current()->GetDispatcher()->ExecuteList( @@ -848,7 +848,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) if(nPos < aItem.GetBitmapList()->Count()) { const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos); - const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); + const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectedEntry(), pXBitmapEntry->GetGraphicObject()); // #i122676# Change FillStyle and Bitmap in one call SfxViewFrame::Current()->GetDispatcher()->ExecuteList( diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index cd71cb296302..e43f0375c5e1 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -112,7 +112,7 @@ void SvxLineBox::Select() // Notify cares! SvxDashListItem aItem( *static_cast<const SvxDashListItem*>( SfxObjectShell::Current()->GetItem( SID_DASH_LIST ) ) ); - XLineDashItem aLineDashItem( GetSelectEntry(), + XLineDashItem aLineDashItem( GetSelectedEntry(), aItem.GetDashList()->GetDash( nPos - 2 )->GetDash() ); Any a; diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 7a35ddf3a502..59a36954c913 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -173,7 +173,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) SvxLineBox* pBox = static_cast<SvxLineBox*>(GetToolBox().GetItemWindow( GetId() )); DBG_ASSERT( pBox, "Window not found!" ); - OUString aString( pBox->GetSelectEntry() ); + OUString aString( pBox->GetSelectedEntry() ); pBox->Clear(); pBox->InsertEntry( SvxResId(RID_SVXSTR_INVISIBLE) ); pBox->InsertEntry( SvxResId(RID_SVXSTR_SOLID) ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index cbd1c7c1d056..453042bbdc0d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -403,7 +403,7 @@ void SvxStyleBox_Impl::ReleaseFocus() IMPL_LINK( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool) { - OUString sEntry = GetSelectEntry(); + OUString sEntry = GetSelectedEntry(); OString sMenuIdent = pMenu->GetCurItemIdent(); ReleaseFocus(); // It must be after getting entry pos! if (IsInDropDown()) 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 ) { diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index e4aaa658b707..2285695fba2f 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -709,7 +709,7 @@ void SwDBManager::ImportDBEntry(SwWrtShell* pSh) bool SwDBManager::GetTableNames(ListBox* pListBox, const OUString& rDBName) { bool bRet = false; - OUString sOldTableName(pListBox->GetSelectEntry()); + OUString sOldTableName(pListBox->GetSelectedEntry()); pListBox->Clear(); SwDSParam* pParam = FindDSConnection(rDBName, false); uno::Reference< sdbc::XConnection> xConnection; diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx index 29131215a72b..1a61670945f0 100644 --- a/sw/source/uibase/dialog/watermarkdialog.cxx +++ b/sw/source/uibase/dialog/watermarkdialog.cxx @@ -95,7 +95,7 @@ IMPL_LINK_NOARG( SwWatermarkDialog, OKButtonHdl, Button*, void ) css::uno::Sequence<css::beans::PropertyValue> aPropertyValues( comphelper::InitPropertySequence( { { "Text", css::uno::makeAny( sText ) }, - { "Font", css::uno::makeAny( m_pFont->GetSelectEntry() ) }, + { "Font", css::uno::makeAny( m_pFont->GetSelectedEntry() ) }, { "Angle", css::uno::makeAny( static_cast<sal_Int16>( m_pAngle->GetValue() ) ) }, { "Transparency", css::uno::makeAny( static_cast<sal_Int16>( m_pTransparency->GetValue() ) ) }, { "Color", css::uno::makeAny( static_cast<sal_uInt32>( m_pColor->GetSelectEntryColor().GetRGBColor() ) ) } diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index e139d6a8bc65..718353b8b74c 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -131,7 +131,7 @@ public: bool IsSaveSingleDoc() const { return m_pSaveSingleDocRB->IsChecked(); } bool IsGenerateFromDataBase() const { return m_pGenerateFromDataBaseCB->IsChecked(); } - OUString GetColumnName() const { return m_pColumnLB->GetSelectEntry(); } + OUString GetColumnName() const { return m_pColumnLB->GetSelectedEntry(); } OUString GetTargetURL() const; const OUString& GetSaveFilter() const {return m_sSaveFilter;} diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 4b0879dbde27..29f60efe9ef1 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -911,7 +911,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, FilterChangedHdl, SvxTPFilter*, void) SvxTPFilter *pFilterTP = m_aTabPagesCTRL->GetFilterPage(); if (pFilterTP->IsAction()) - m_sFilterAction = pFilterTP->GetLbAction()->GetSelectEntry(); + m_sFilterAction = pFilterTP->GetLbAction()->GetSelectedEntry(); else m_sFilterAction = aEmptyOUStr; diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index cdb07db50d3a..74d97b85ffc1 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -494,7 +494,7 @@ void ThemePanel::DoubleClickHdl() SwDocShell* pDocSh = static_cast<SwDocShell*>(SfxObjectShell::Current()); if (pDocSh) { - OUString sEntryFonts = mpListBoxFonts->GetSelectEntry(); + OUString sEntryFonts = mpListBoxFonts->GetSelectedEntry(); sal_uInt32 nItemId = mpValueSetColors->GetSelectItemId(); OUString sEntryColors = maColorSets.getColorSet(nItemId).getName(); diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index ecb8625a09bc..8eea2d7b3013 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -1649,7 +1649,7 @@ OUString VCLXListBox::getSelectedItem() OUString aItem; VclPtr< ListBox > pBox = GetAs< ListBox >(); if ( pBox ) - aItem = pBox->GetSelectEntry(); + aItem = pBox->GetSelectedEntry(); return aItem; } @@ -1664,7 +1664,7 @@ css::uno::Sequence< OUString> VCLXListBox::getSelectedItems() const sal_Int32 nSelEntries = pBox->GetSelectEntryCount(); aSeq = css::uno::Sequence< OUString>( nSelEntries ); for ( sal_Int32 n = 0; n < nSelEntries; ++n ) - aSeq.getArray()[n] = pBox->GetSelectEntry( n ); + aSeq.getArray()[n] = pBox->GetSelectedEntry( n ); } return aSeq; } @@ -1795,7 +1795,7 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) // Call ActionListener on DropDown event css::awt::ActionEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); - aEvent.ActionCommand = pListBox->GetSelectEntry(); + aEvent.ActionCommand = pListBox->GetSelectedEntry(); maActionListeners.actionPerformed( aEvent ); } @@ -1812,7 +1812,7 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { css::awt::ActionEvent aEvent; aEvent.Source = static_cast<cppu::OWeakObject*>(this); - aEvent.ActionCommand = GetAs<ListBox>()->GetSelectEntry(); + aEvent.ActionCommand = GetAs<ListBox>()->GetSelectedEntry(); maActionListeners.actionPerformed( aEvent ); } break; diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index 42c870de403a..8687e6850110 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -138,7 +138,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem ) { if( ModalDialog::Execute() == RET_OK ) { - OUString sEntry = m_pLbFilters->GetSelectEntry(); + OUString sEntry = m_pLbFilters->GetSelectedEntry(); if( !sEntry.isEmpty() ) { int nPos = m_pLbFilters->GetSelectEntryPos(); diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index 2b52e43ff83e..09e1d0dbcd55 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -130,7 +130,7 @@ public: void SelectEntry( sal_Int32 nPos, bool bSelect ); sal_Int32 GetSelectEntryCount() const; - OUString GetSelectEntry( sal_Int32 nIndex ) const; + OUString GetSelectedEntry( sal_Int32 nIndex ) const; sal_Int32 GetSelectEntryPos( sal_Int32 nIndex ) const; bool IsEntryPosSelected( sal_Int32 nIndex ) const; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 824803b2f981..316677f9a102 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -399,7 +399,7 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) } else { - aText = m_pImplLB->GetEntryList()->GetSelectEntry( 0 ); + aText = m_pImplLB->GetEntryList()->GetSelectedEntry( 0 ); } m_pSubEdit->SetText( aText ); diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index 649a593abae9..a06e2c31a01e 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -391,7 +391,7 @@ sal_Int32 ImplEntryList::GetSelectEntryCount() const return nSelCount; } -OUString ImplEntryList::GetSelectEntry( sal_Int32 nIndex ) const +OUString ImplEntryList::GetSelectedEntry( sal_Int32 nIndex ) const { return GetEntryText( GetSelectEntryPos( nIndex ) ); } diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index 932595276c37..0a9475b01c0b 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -186,7 +186,7 @@ IMPL_LINK_NOARG(ListBox, ImplSelectHdl, LinkParamNone*, void) } mpImplWin->SetItemPos( GetSelectEntryPos() ); - mpImplWin->SetString( GetSelectEntry() ); + mpImplWin->SetString( GetSelectedEntry() ); if( mpImplLB->GetEntryList()->HasImages() ) { Image aImage = mpImplLB->GetEntryList()->GetEntryImage( GetSelectEntryPos() ); @@ -392,7 +392,7 @@ void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, Dr if ( IsDropDownBox() ) { - OUString aText = GetSelectEntry(); + OUString aText = GetSelectedEntry(); long nTextHeight = pDev->GetTextHeight(); long nTextWidth = pDev->GetTextWidth( aText ); long nOffY = (aSize.Height()-nTextHeight) / 2; @@ -1016,7 +1016,7 @@ sal_Int32 ListBox::GetEntryCount() const return mpImplLB->GetEntryList()->GetEntryCount() - mpImplLB->GetEntryList()->GetMRUCount(); } -OUString ListBox::GetSelectEntry(sal_Int32 nIndex) const +OUString ListBox::GetSelectedEntry(sal_Int32 nIndex) const { return GetEntry( GetSelectEntryPos( nIndex ) ); } diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index 73c5aabcfab1..c977b7d56391 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -827,7 +827,7 @@ StringMap ListBoxUIObject::get_state() aMap["EntryCount"] = OUString::number(mxListBox->GetEntryCount()); aMap["SelectEntryCount"] = OUString::number(mxListBox->GetSelectEntryCount()); aMap["SelectEntryPos"] = OUString::number(mxListBox->GetSelectEntryPos()); - aMap["SelectEntryText"] = mxListBox->GetSelectEntry(); + aMap["SelectEntryText"] = mxListBox->GetSelectedEntry(); return aMap; } diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index f8e29b94fa82..949ebaf7745f 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -776,7 +776,7 @@ void PrintDialog::storeToSettings() pItem->setValue( "PrintDialog", "LastPrinter", isPrintToFile() ? Printer::GetDefaultPrinterName() - : maJobPage.mpPrinters->GetSelectEntry() ); + : maJobPage.mpPrinters->GetSelectedEntry() ); pItem->setValue( "PrintDialog", "LastPage", @@ -1276,7 +1276,7 @@ static OUString searchAndReplace( const OUString& i_rOrig, const char* i_pRepl, void PrintDialog::updatePrinterText() { const OUString aDefPrt( Printer::GetDefaultPrinterName() ); - const QueueInfo* pInfo = Printer::GetQueueInfo( maJobPage.mpPrinters->GetSelectEntry(), true ); + const QueueInfo* pInfo = Printer::GetQueueInfo( maJobPage.mpPrinters->GetSelectedEntry(), true ); if( pInfo ) { maJobPage.mpLocationTxt->SetText( pInfo->GetLocation() ); @@ -1521,7 +1521,7 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox&, rBox, void ) if ( rBox.GetSelectEntryPos() != 0) { - OUString aNewPrinter( rBox.GetSelectEntry() ); + OUString aNewPrinter( rBox.GetSelectedEntry() ); // set new printer maPController->setPrinter( VclPtrInstance<Printer>( aNewPrinter ) ); maPController->resetPrinterOptions( false ); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 8a3b2b75a4bc..81c8be25be4d 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -249,7 +249,7 @@ IMPL_STATIC_LINK_NOARG( MyWin, QuitHdl, Button*, void) IMPL_LINK_NOARG( MyWin, SelectHdl, ListBox&, void) { - OUString aEntry = m_aSvpBitmaps->GetSelectEntry(); + OUString aEntry = m_aSvpBitmaps->GetSelectedEntry(); sal_Int32 nPos = aEntry.indexOf( ": " ); if( nPos != -1 ) { |