diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-09-14 16:50:25 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-09-21 12:44:00 +0200 |
commit | b649e5bf1d3f0a11fb0c2fdf6fa08329529ce6fb (patch) | |
tree | bd6937a0ece320c9545774dd5c9a68c68d04769e /cui | |
parent | 06ce312f79cb0871c0b110ba4bff16f5aaa0f538 (diff) |
Rename GetSelectEntry -> GetSelectedEntry
Change-Id: Ibb7d8c59c0e61b0e87455bd78f241d8691dd9dce
Reviewed-on: https://gerrit.libreoffice.org/42282
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'cui')
24 files changed, 58 insertions, 58 deletions
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() ) ); |