diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-09-14 16:57:06 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-09-21 12:45:38 +0200 |
| commit | d99b65c864cc3358238e4eac651f12a34d05e2d9 (patch) | |
| tree | fcd7d6fefb9434c27533c826aabc639f68ba97ed /cui | |
| parent | b649e5bf1d3f0a11fb0c2fdf6fa08329529ce6fb (diff) | |
Rename GetSelectEntryPos -> GetSelectedEntryPos
Change-Id: I0bd4cb463575af843c72d9c8aaf91742203532a4
Reviewed-on: https://gerrit.libreoffice.org/42283
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'cui')
51 files changed, 258 insertions, 258 deletions
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx index 481723867af5..accd56afc670 100644 --- a/cui/source/customize/SvxMenuConfigPage.cxx +++ b/cui/source/customize/SvxMenuConfigPage.cxx @@ -282,7 +282,7 @@ short SvxMenuConfigPage::QueryReset() OUString msg = CuiResId( RID_SVXSTR_CONFIRM_MENU_RESET ); OUString saveInName = m_pSaveInListBox->GetEntry( - m_pSaveInListBox->GetSelectEntryPos() ); + m_pSaveInListBox->GetSelectedEntryPos() ); OUString label = SvxConfigPageHelper::replaceSaveInName( msg, saveInName ); @@ -457,7 +457,7 @@ IMPL_LINK_NOARG( SvxMenuConfigPage, ResetMenuHdl, Button *, void ) // So we are resetting only if it is a context menu if (!m_bIsMenuBar && qbox->Execute() == RET_YES) { - sal_Int32 nPos = m_pTopLevelListBox->GetSelectEntryPos(); + sal_Int32 nPos = m_pTopLevelListBox->GetSelectedEntryPos(); ContextMenuSaveInData* pSaveInData = static_cast< ContextMenuSaveInData* >(GetSaveInData()); pSaveInData->ResetContextMenu(pMenuData); diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx index 7112e6edbd7a..abc741297ff7 100644 --- a/cui/source/customize/SvxToolbarConfigPage.cxx +++ b/cui/source/customize/SvxToolbarConfigPage.cxx @@ -194,7 +194,7 @@ void SvxToolbarConfigPage::dispose() void SvxToolbarConfigPage::DeleteSelectedTopLevel() { - const sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); + const sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectedEntryPos(); ToolbarSaveInData* pSaveInData = static_cast<ToolbarSaveInData*>( GetSaveInData() ); pSaveInData->RemoveToolbar( GetTopLevelSelection() ); @@ -361,14 +361,14 @@ IMPL_LINK_NOARG( SvxToolbarConfigPage, AddToolbarHdl, Button *, void ) } pNameDialog->m_pSaveInListBox->SelectEntryPos( - m_pSaveInListBox->GetSelectEntryPos() ); + m_pSaveInListBox->GetSelectedEntryPos() ); if ( pNameDialog->Execute() == RET_OK ) { aNewName = pNameDialog->GetName(); // Where to save the new toolbar? (i.e. Modulewise or documentwise) - sal_Int32 nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectEntryPos(); + sal_Int32 nInsertPos = pNameDialog->m_pSaveInListBox->GetSelectedEntryPos(); ToolbarSaveInData* pData = static_cast<ToolbarSaveInData*>( @@ -678,7 +678,7 @@ IMPL_LINK( SvxToolbarConfigPage, ModifyItemHdl, MenuButton *, pButton, void ) IMPL_LINK_NOARG( SvxToolbarConfigPage, ResetToolbarHdl, Button *, void ) { - sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); + sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectedEntryPos(); SvxConfigEntry* pToolbar = static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( nSelectionPos )); @@ -719,7 +719,7 @@ short SvxToolbarConfigPage::QueryReset() OUString msg = CuiResId( RID_SVXSTR_CONFIRM_TOOLBAR_RESET ); OUString saveInName = m_pSaveInListBox->GetEntry( - m_pSaveInListBox->GetSelectEntryPos() ); + m_pSaveInListBox->GetSelectedEntryPos() ); OUString label = SvxConfigPageHelper::replaceSaveInName( msg, saveInName ); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 8626ddf68ba8..b342c42e327e 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1529,14 +1529,14 @@ bool SvxConfigPage::FillItemSet( SfxItemSet* ) IMPL_LINK_NOARG( SvxConfigPage, SelectSaveInLocation, ListBox&, void ) { pCurrentSaveInData = static_cast<SaveInData*>(m_pSaveInListBox->GetEntryData( - m_pSaveInListBox->GetSelectEntryPos())); + m_pSaveInListBox->GetSelectedEntryPos())); Init(); } void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry const * pToSelect ) { - sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectEntryPos(); + sal_Int32 nSelectionPos = m_pTopLevelListBox->GetSelectedEntryPos(); m_pTopLevelListBox->Clear(); if ( GetSaveInData() && GetSaveInData()->GetEntries() ) diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index a3ff1697629b..187f60af132d 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -166,7 +166,7 @@ void SvxEventConfigPage::ImplInitDocument() IMPL_LINK_NOARG( SvxEventConfigPage, SelectHdl_Impl, ListBox&, void ) { bool* bApp = static_cast<bool*>(m_pSaveInListBox->GetEntryData( - m_pSaveInListBox->GetSelectEntryPos())); + m_pSaveInListBox->GetSelectedEntryPos())); mpImpl->pEventLB->SetUpdateMode( false ); if ( *bApp ) diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 72d81f410f3f..770cd82a1ce7 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -635,7 +635,7 @@ void SvxCharacterMap::insertCharToDoc(const OUString& sGlyph) IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl, ListBox&, void) { - const sal_Int32 nPos = m_pFontLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pFontLB->GetSelectedEntryPos(); const sal_uInt16 nFont = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFontLB->GetEntryData( nPos )); aFont = GetDevFont( nFont ); aFont.SetWeight( WEIGHT_DONTKNOW ); @@ -722,7 +722,7 @@ void SvxCharacterMap::setCharName(sal_UCS4 nDecimalValue) IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl, ListBox&, void) { - const sal_Int32 nPos = m_pSubsetLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pSubsetLB->GetSelectedEntryPos(); const Subset* pSubset = static_cast<const Subset*> (m_pSubsetLB->GetEntryData(nPos)); if( pSubset && !isSearchMode) { diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 0227d3699cfc..9d025f17f7c2 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -297,7 +297,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton, void) if (pButton == m_prbSingleField) { m_plbField->Enable(); - m_pSearchEngine->RebuildUsedFields(m_plbField->GetSelectEntryPos()); + m_pSearchEngine->RebuildUsedFields(m_plbField->GetSelectedEntryPos()); } else { @@ -409,17 +409,17 @@ IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox&, rBox, void) { DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnMethodSelected : unexpected : not exactly one entry selected!"); - m_pSearchEngine->SetPosition(m_plbPosition->GetSelectEntryPos()); + m_pSearchEngine->SetPosition(m_plbPosition->GetSelectedEntryPos()); } IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox&, rBox, void) { DBG_ASSERT(rBox.GetSelectEntryCount() == 1, "FmSearchDialog::OnFieldSelected : unexpected : not exactly one entry select!"); - m_pSearchEngine->RebuildUsedFields(m_prbAllFields->IsChecked() ? -1 : (sal_Int16)m_plbField->GetSelectEntryPos()); + m_pSearchEngine->RebuildUsedFields(m_prbAllFields->IsChecked() ? -1 : (sal_Int16)m_plbField->GetSelectedEntryPos()); // calls m_pSearchEngine->InvalidatePreviousLoc too - sal_Int32 nCurrentContext = m_plbForm->GetSelectEntryPos(); + sal_Int32 nCurrentContext = m_plbForm->GetSelectedEntryPos(); if (nCurrentContext != LISTBOX_ENTRY_NOTFOUND) m_arrContextFields[nCurrentContext] = m_plbField->GetSelectedEntry(); } @@ -551,7 +551,7 @@ void FmSearchDialog::InitContext(sal_Int16 nContext) IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox&, rBox, void) { - InitContext(rBox.GetSelectEntryPos()); + InitContext(rBox.GetSelectedEntryPos()); } void FmSearchDialog::EnableSearchUI(bool bEnable) @@ -674,13 +674,13 @@ IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint, Timer *, void) void FmSearchDialog::OnFound(const css::uno::Any& aCursorPos, sal_Int16 nFieldPos) { FmFoundRecordInformation friInfo; - friInfo.nContext = m_plbForm->GetSelectEntryPos(); + friInfo.nContext = m_plbForm->GetSelectedEntryPos(); // if I don't do a search in a context, this has an invalid value - but then it doesn't matter anyway friInfo.aPosition = aCursorPos; if (m_prbAllFields->IsChecked()) friInfo.nFieldPos = nFieldPos; else - friInfo.nFieldPos = m_plbField->GetSelectEntryPos(); + friInfo.nFieldPos = m_plbField->GetSelectedEntryPos(); // this of course implies that I have really searched in the field that is selected in the listbox, // which is made sure in RebuildUsedFields @@ -736,7 +736,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, if (m_lnkCanceledNotFoundHdl.IsSet()) { FmFoundRecordInformation friInfo; - friInfo.nContext = m_plbForm->GetSelectEntryPos(); + friInfo.nContext = m_plbForm->GetSelectedEntryPos(); // if I don't do a search in a context, this has an invalid value - but then it doesn't matter anyway friInfo.aPosition = pProgress->aBookmark; m_lnkCanceledNotFoundHdl.Call(friInfo); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index a6f3ff16084c..945ba73c3d53 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -289,7 +289,7 @@ void TakeThread::execute() for( sal_Int32 i = 0; i < nEntries && schedule(); ++i ) { - const sal_Int32 nPos = mpBrowser->bTakeAll ? i : mpBrowser->m_pLbxFound->GetSelectEntryPos( i ); + const sal_Int32 nPos = mpBrowser->bTakeAll ? i : mpBrowser->m_pLbxFound->GetSelectedEntryPos( i ); const INetURLObject aURL( mpBrowser->aFoundList[ nPos ]); mrTakenList.push_back( (sal_uLong)nPos ); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index d28cf058215c..ba8774d347c1 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -491,7 +491,7 @@ namespace svx m_bInSelectionUpdate = true; if( pControl == m_aListBox.get() ) { - sal_uInt16 nPos = m_aListBox->GetSelectEntryPos(); + sal_uInt16 nPos = m_aListBox->GetSelectedEntryPos(); m_aValueSet->SelectItem( nPos+1 ); //itemid == pos+1 (id 0 has special meaning) } else @@ -1058,14 +1058,14 @@ namespace svx DBG_ASSERT( pEntry, "+HangulHanjaEditDictDialog::EditDictHdl(): call of edit should not be possible with no selection!" ); if( pEntry ) { - ScopedVclPtrInstance< HangulHanjaEditDictDialog > aEdDlg(this, m_aDictList, m_pDictsLB->GetSelectEntryPos()); + ScopedVclPtrInstance< HangulHanjaEditDictDialog > aEdDlg(this, m_aDictList, m_pDictsLB->GetSelectedEntryPos()); aEdDlg->Execute(); } } IMPL_LINK_NOARG(HangulHanjaOptionsDialog, DeleteDictHdl, Button*, void) { - sal_uLong nSelPos = m_pDictsLB->GetSelectEntryPos(); + sal_uLong nSelPos = m_pDictsLB->GetSelectedEntryPos(); if( nSelPos != TREELIST_ENTRY_NOTFOUND ) { Reference< XConversionDictionary > xDic( m_aDictList[ nSelPos ] ); @@ -1518,7 +1518,7 @@ namespace svx IMPL_LINK_NOARG( HangulHanjaEditDictDialog, BookLBSelectHdl, ListBox&, void ) { - InitEditDictDialog( m_aBookLB->GetSelectEntryPos() ); + InitEditDictDialog( m_aBookLB->GetSelectedEntryPos() ); } IMPL_LINK_NOARG( HangulHanjaEditDictDialog, NewPBPushHdl, Button*, void ) diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 64239c21d1bd..772360f4ab37 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -85,7 +85,7 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUStri } if ( bIsValidURL ) { - sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbDocTypes->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) aURLObject.SetExtension( static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData( nPos ))->aStrExt ); } @@ -337,7 +337,7 @@ void SvxHyperlinkNewDocTp::DoApply () if ( !aStrNewName.isEmpty() ) { // get private-url - sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbDocTypes->GetSelectedEntryPos(); if( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos=0; OUString aStrDocName ( static_cast<DocumentTypeData*>( @@ -448,10 +448,10 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl, Button*, void) INetURLObject aNewURL( aStrTmp ); if( !aStrName.isEmpty() && !aNewURL.getExtension().isEmpty() && - m_pLbDocTypes->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) + m_pLbDocTypes->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { // get private-url - const sal_Int32 nPos = m_pLbDocTypes->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLbDocTypes->GetSelectedEntryPos(); aNewURL.setExtension( static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData( nPos ))->aStrExt ); } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index bae6b299bd78..e09d52039381 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -427,7 +427,7 @@ void SvxHyperlinkTabPageBase::GetDataFromCommonFields( OUString& aStrName, aStrIntName = mpEdText->GetText(); aStrName = mpEdIndication->GetText(); aStrFrame = mpCbbFrame->GetText(); - eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1); + eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectedEntryPos()+1); // Ask dialog whether the current doc is a HTML-doc if (static_cast<SvxHpLinkDlg*>(mpDialog.get())->IsHTMLDoc()) eMode = (SvxLinkInsertMode) ( sal_uInt16(eMode) | HLINK_HTMLMODE ); diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index 7bc05a3cdc43..9b521a28543a 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -51,7 +51,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl, SvTreeListBox*, void) IMPL_LINK_NOARG(SvxPathSelectDialog, SelectHdl_Impl, ListBox&, void) { sal_uLong nCount = m_pPathLB->GetEntryCount(); - bool bIsSelected = m_pPathLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; + bool bIsSelected = m_pPathLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND; bool bEnable = nCount > 1; m_pDelBtn->Enable(bEnable && bIsSelected); } @@ -156,7 +156,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl, Button*, void) IMPL_LINK_NOARG(SvxPathSelectDialog, DelHdl_Impl, Button*, void) { - sal_Int32 nPos = m_pPathLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pPathLB->GetSelectedEntryPos(); m_pPathLB->RemoveEntry( nPos ); sal_Int32 nCnt = m_pPathLB->GetEntryCount(); diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 50b35c157f6c..d2c950b8f6a2 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -59,7 +59,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk, Button*, void) css::uno::Reference< css::beans::XPropertySet > xCol; for (sal_Int32 i=0; i < m_pList->GetSelectEntryCount(); ++i) { - m_xColumns->getByIndex(sal::static_int_cast<sal_Int32>(reinterpret_cast<sal_uIntPtr>(m_pList->GetEntryData(m_pList->GetSelectEntryPos(i))))) >>= xCol; + m_xColumns->getByIndex(sal::static_int_cast<sal_Int32>(reinterpret_cast<sal_uIntPtr>(m_pList->GetEntryData(m_pList->GetSelectedEntryPos(i))))) >>= xCol; if (xCol.is()) { try diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 19f86c41b5de..6efcaa29d171 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -380,7 +380,7 @@ IMPL_LINK( SvxThesaurusDialog, WordSelectHdl_Impl, ComboBox&, rBox, void ) { if (!m_pWordCB->IsTravelSelect()) // act only upon return key and not when traveling with cursor keys { - const sal_Int32 nPos = rBox.GetSelectEntryPos(); + const sal_Int32 nPos = rBox.GetSelectedEntryPos(); OUString aStr( rBox.GetEntry( nPos ) ); aStr = linguistic::GetThesaurusReplaceText( aStr ); m_pWordCB->SetText( aStr ); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 405a743efa34..372e0b99aa8c 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -80,7 +80,7 @@ class OfaACorrCheckListBox : public SvSimpleTable void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); } void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } - sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); } + sal_uLong GetSelectedEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); } bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked); diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 9e6de15e9e91..81386ef877b2 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -478,7 +478,7 @@ public: SvxConfigEntry* GetTopLevelSelection() { return static_cast<SvxConfigEntry*>(m_pTopLevelListBox->GetEntryData( - m_pTopLevelListBox->GetSelectEntryPos() )); + m_pTopLevelListBox->GetSelectedEntryPos() )); } /** identifies the module in the given frame. If the frame is <NULL/>, a default diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 189a95e3b4f7..d4fdaa5ed54b 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -191,7 +191,7 @@ public: GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); virtual ~GalleryIdDialog() override; virtual void dispose() override; - sal_uLong GetId() const { return m_pLbResName->GetSelectEntryPos(); } + sal_uLong GetId() const { return m_pLbResName->GetSelectedEntryPos(); } }; class GalleryThemeProperties : public SfxTabDialog diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 0dfb9adcca7b..79c0e9f32f8f 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -196,7 +196,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) m_pNonPropFontsOnlyCB->IsChecked(), batch); //font name changes cannot be detected by saved values OUString sFontName; - if(m_pFontNameLB->GetSelectEntryPos()) + if(m_pFontNameLB->GetSelectedEntryPos()) sFontName = m_pFontNameLB->GetSelectedEntry(); officecfg::Office::Common::Font::SourceViewFont::FontName::set( boost::optional< OUString >(sFontName), batch); diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 030dd28a4739..af7ce029c4b6 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -27,7 +27,7 @@ Color SvxDefaultColorOptPage::GetSelectEntryColor() const { - sal_Int32 nPos = m_pLbChartColors->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbChartColors->GetSelectedEntryPos(); Color aColor; if (nPos != LISTBOX_ENTRY_NOTFOUND) aColor = GetEntryColor(nPos); @@ -288,7 +288,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor, Button*, void) IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, Button*, pButton, void ) { - sal_Int32 nIndex = m_pLbChartColors->GetSelectEntryPos(); + sal_Int32 nIndex = m_pLbChartColors->GetSelectedEntryPos(); if (m_pLbChartColors->GetSelectEntryCount() == 0) return; @@ -331,7 +331,7 @@ IMPL_LINK_NOARG( SvxDefaultColorOptPage, ListClickedHdl, ListBox&, void ) IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void) { - sal_Int32 nIdx = m_pLbChartColors->GetSelectEntryPos(); + sal_Int32 nIdx = m_pLbChartColors->GetSelectedEntryPos(); if( nIdx != LISTBOX_ENTRY_NOTFOUND ) { const XColorEntry aEntry( m_pValSetColorBox->GetItemColor( m_pValSetColorBox->GetSelectItemId() ), m_pLbChartColors->GetSelectedEntry() ); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 7223e2f4b1a2..6b1223c4485a 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1135,7 +1135,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, Button*, pButton, void ) if(RET_YES == aQuery->Execute()) { OUString sDeleteScheme(m_pColorSchemeLB->GetSelectedEntry()); - m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectEntryPos()); + m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectedEntryPos()); m_pColorSchemeLB->SelectEntryPos(0); m_pColorSchemeLB->GetSelectHdl().Call(*m_pColorSchemeLB); //first select the new scheme and then delete the old one diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index ca8e9137ae8b..904e87796b6d 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -114,7 +114,7 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* ) if ( m_pNumeralsLB->IsValueChangedFromSaved() ) { - const sal_Int32 nPos = m_pNumeralsLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pNumeralsLB->GetSelectedEntryPos(); aCTLOptions.SetCTLTextNumerals( (SvtCTLOptions::TextNumerals)nPos ); bModified = true; } diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index feb5326cdffe..e546069a679a 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -290,7 +290,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog( if ( nCount > 0 ) { pAllDictsLB->SelectEntry( aLookUpEntry ); - sal_Int32 nPos = pAllDictsLB->GetSelectEntryPos(); + sal_Int32 nPos = pAllDictsLB->GetSelectedEntryPos(); if ( nPos == LISTBOX_ENTRY_NOTFOUND ) { @@ -402,7 +402,7 @@ sal_uLong SvxEditDictionaryDialog::GetLBInsertPos(const OUString &rDicWord) void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry) { - sal_Int32 nLBPos = pAllDictsLB->GetSelectEntryPos(); + sal_Int32 nLBPos = pAllDictsLB->GetSelectedEntryPos(); if ( pEntry != nullptr && nLBPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -419,7 +419,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry) IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void) { - sal_Int32 nPos = pAllDictsLB->GetSelectEntryPos(); + sal_Int32 nPos = pAllDictsLB->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -442,7 +442,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl, ListBox&, void) IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox&, void) { - sal_Int32 nDicPos = pAllDictsLB->GetSelectEntryPos(); + sal_Int32 nDicPos = pAllDictsLB->GetSelectedEntryPos(); LanguageType nLang = pLangLB->GetSelectLanguage(); Reference< XDictionary > xDic( aDics.getConstArray()[ nDicPos ], UNO_QUERY ); LanguageType nOldLang = LanguageTag( xDic->getLocale() ).getLanguageType(); @@ -599,7 +599,7 @@ bool SvxEditDictionaryDialog::NewDelHdl(void const * pBtn) OUString aReplaceStr(pReplaceED->GetText()); DictionaryError nAddRes = DictionaryError::UNKNOWN; - sal_Int32 nPos = pAllDictsLB->GetSelectEntryPos(); + sal_Int32 nPos = pAllDictsLB->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && !aNewWord.isEmpty()) { DBG_ASSERT(nPos < aDics.getLength(), "invalid dictionary index"); diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index bba98cf6540c..bf89e846c98c 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -722,7 +722,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) bool bRepaintWindows(false); SvtMiscOptions aMiscOptions; - const sal_Int32 nSizeLB_NewSelection = m_pIconSizeLB->GetSelectEntryPos(); + const sal_Int32 nSizeLB_NewSelection = m_pIconSizeLB->GetSelectedEntryPos(); if( nSizeLB_InitialSelection != nSizeLB_NewSelection ) { // from now on it's modified, even if via auto setting the same size was set as now selected in the LB @@ -739,7 +739,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) aMiscOptions.SetSymbolsSize( eSet ); } - const sal_Int32 nSidebarSizeLB_NewSelection = m_pSidebarIconSizeLB->GetSelectEntryPos(); + const sal_Int32 nSidebarSizeLB_NewSelection = m_pSidebarIconSizeLB->GetSelectedEntryPos(); if( nSidebarSizeLB_InitialSelection != nSidebarSizeLB_NewSelection ) { // from now on it's modified, even if via auto setting the same size was set as now selected in the LB @@ -755,7 +755,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) aMiscOptions.SetSidebarIconSize( eSet ); } - const sal_Int32 nNotebookbarSizeLB_NewSelection = m_pNotebookbarIconSizeLB->GetSelectEntryPos(); + const sal_Int32 nNotebookbarSizeLB_NewSelection = m_pNotebookbarIconSizeLB->GetSelectedEntryPos(); if( nNotebookbarSizeLB_InitialSelection != nNotebookbarSizeLB_NewSelection ) { // from now on it's modified, even if via auto setting the same size was set as now selected in the LB @@ -771,7 +771,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) aMiscOptions.SetNotebookbarIconSize( eSet ); } - const sal_Int32 nStyleLB_NewSelection = m_pIconStyleLB->GetSelectEntryPos(); + const sal_Int32 nStyleLB_NewSelection = m_pIconStyleLB->GetSelectedEntryPos(); if( nStyleLB_InitialSelection != nStyleLB_NewSelection ) { // 0 means choose style automatically @@ -779,7 +779,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) aMiscOptions.SetIconTheme("auto"); else { - const sal_Int32 pos = m_pIconStyleLB->GetSelectEntryPos(); + const sal_Int32 pos = m_pIconStyleLB->GetSelectedEntryPos(); const vcl::IconThemeInfo& iconThemeId = mInstalledIconThemes.at(pos-1); aMiscOptions.SetIconTheme(iconThemeId.GetThemeId()); } @@ -790,7 +790,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) // Mouse Snap Mode SnapType eOldSnap = pAppearanceCfg->GetSnapMode(); - SnapType eNewSnap = (SnapType)m_pMousePosLB->GetSelectEntryPos(); + SnapType eNewSnap = (SnapType)m_pMousePosLB->GetSelectedEntryPos(); if(eNewSnap > SnapType::NONE) eNewSnap = SnapType::NONE; @@ -802,7 +802,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) // Middle Mouse Button MouseMiddleButtonAction eOldMiddleMouse = pAppearanceCfg->GetMiddleMouseButton(); - short eNewMiddleMouse = m_pMouseMiddleLB->GetSelectEntryPos(); + short eNewMiddleMouse = m_pMouseMiddleLB->GetSelectedEntryPos(); if(eNewMiddleMouse > 2) eNewMiddleMouse = 2; @@ -834,9 +834,9 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) if(m_pMenuIconsLB->IsValueChangedFromSaved()) { - aMenuOpt.SetMenuIconsState(m_pMenuIconsLB->GetSelectEntryPos() == 0 ? + aMenuOpt.SetMenuIconsState(m_pMenuIconsLB->GetSelectedEntryPos() == 0 ? TRISTATE_INDET : - static_cast<TriState>(m_pMenuIconsLB->GetSelectEntryPos() - 1)); + static_cast<TriState>(m_pMenuIconsLB->GetSelectedEntryPos() - 1)); bModified = true; bMenuOptModified = true; bAppearanceChanged = true; @@ -844,9 +844,9 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) if(m_pContextMenuShortcutsLB->IsValueChangedFromSaved()) { - aMenuOpt.SetContextMenuShortcuts(m_pContextMenuShortcutsLB->GetSelectEntryPos() == 0 ? + aMenuOpt.SetContextMenuShortcuts(m_pContextMenuShortcutsLB->GetSelectedEntryPos() == 0 ? TRISTATE_INDET : - static_cast<TriState>(m_pContextMenuShortcutsLB->GetSelectEntryPos() - 1)); + static_cast<TriState>(m_pContextMenuShortcutsLB->GetSelectedEntryPos() - 1)); bModified = true; bMenuOptModified = true; bAppearanceChanged = true; @@ -1334,7 +1334,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) aLangString = seqInstalledLanguages[d-1]; /* - if( m_pUserInterfaceLB->GetSelectEntryPos() > 0) + if( m_pUserInterfaceLB->GetSelectedEntryPos() > 0) aLangString = ConvertLanguageToIsoString(m_pUserInterfaceLB->GetSelectLanguage()); */ Reference< XMultiServiceFactory > theConfigProvider( diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 126017e2f9b8..4e6e90b6e998 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -400,7 +400,7 @@ void SvxProxyTabPage::Reset(const SfxItemSet*) m_pFtpPortED->SaveValue(); m_pNoProxyForED->SaveValue(); - EnableControls_Impl( m_pProxyModeLB->GetSelectEntryPos() == 2 ); + EnableControls_Impl( m_pProxyModeLB->GetSelectedEntryPos() == 2 ); } bool SvxProxyTabPage::FillItemSet(SfxItemSet* ) @@ -410,7 +410,7 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet* ) try { Reference< beans::XPropertySet > xPropertySet(m_xConfigurationUpdateAccess, UNO_QUERY_THROW ); - sal_Int32 nSelPos = m_pProxyModeLB->GetSelectEntryPos(); + sal_Int32 nSelPos = m_pProxyModeLB->GetSelectedEntryPos(); if(m_pProxyModeLB->IsValueChangedFromSaved()) { if( nSelPos == 1 ) @@ -512,7 +512,7 @@ void SvxProxyTabPage::EnableControls_Impl(bool bEnable) IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox&, rBox, void ) { - sal_Int32 nPos = rBox.GetSelectEntryPos(); + sal_Int32 nPos = rBox.GetSelectedEntryPos(); // Restore original system values if( nPos == 1 ) diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 5bd4b65ad062..b619232e1c8f 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -782,7 +782,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void) IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void) { - sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos(); + sal_Int32 nPos = m_pAssignedList->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { m_pAssignedList->RemoveEntry( nPos ); @@ -803,7 +803,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl, Button*, void) void SvxJavaParameterDlg::EditParameter() { - sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos(); + sal_Int32 nPos = m_pAssignedList->GetSelectedEntryPos(); m_pParameterEdit->SetText( OUString() ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -978,7 +978,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl, Button*, void) IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl, Button*, void) { - sal_Int32 nPos = m_pPathList->GetSelectEntryPos(); + sal_Int32 nPos = m_pPathList->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { m_pPathList->RemoveEntry( nPos ); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 6598dfda5c70..064cacce64e0 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -138,13 +138,13 @@ private: void EnableRemoveButton() { m_pRemoveBtn->Enable( - m_pAssignedList->GetSelectEntryPos() + m_pAssignedList->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } void EnableEditButton() { m_pEditBtn->Enable( - m_pAssignedList->GetSelectEntryPos() + m_pAssignedList->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } void DisableAssignButton() @@ -190,7 +190,7 @@ private: bool IsPathDuplicate( const OUString& _rPath ); void EnableRemoveButton() { m_pRemoveBtn->Enable( - m_pPathList->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } + m_pPathList->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } public: diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 44fd520ba724..bc0690d3c26d 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1477,7 +1477,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void if (pBox == m_pLinguModulesCLB) { DBG_ASSERT( pLinguData, "NULL pointer, LinguData missing" ); - sal_uLong nPos = m_pLinguModulesCLB->GetSelectEntryPos(); + sal_uLong nPos = m_pLinguModulesCLB->GetSelectedEntryPos(); if (nPos != TREELIST_ENTRY_NOTFOUND && pLinguData) { pLinguData->Reconfigure( m_pLinguModulesCLB->GetText( nPos ), @@ -1486,7 +1486,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox, void } else if (pBox == m_pLinguDicsCLB) { - sal_uLong nPos = m_pLinguDicsCLB->GetSelectEntryPos(); + sal_uLong nPos = m_pLinguDicsCLB->GetSelectedEntryPos(); if (nPos != TREELIST_ENTRY_NOTFOUND) { const uno::Reference< XDictionary > &rDic = aDics.getConstArray()[ nPos ]; @@ -1865,7 +1865,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvTreeListBox*, pBox, void ) ModuleUserData_Impl* pData = static_cast<ModuleUserData_Impl*>(pEntry->GetUserData()); if(!pData->IsParent() && pData->GetType() != TYPE_HYPH) { - sal_uLong nCurPos = static_cast<SvxCheckListBox*>(pBox)->GetSelectEntryPos(); + sal_uLong nCurPos = static_cast<SvxCheckListBox*>(pBox)->GetSelectedEntryPos(); if(nCurPos < pBox->GetEntryCount() - 1) { bDisableDown = static_cast<ModuleUserData_Impl*>(pBox-> @@ -2181,7 +2181,7 @@ void SvxEditModulesDlg::LangSelectHdl_Impl(ListBox const * pBox) IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, Button *, pBtn, void ) { bool bUp = m_pPrioUpPB == pBtn; - sal_uLong nCurPos = m_pModulesCLB->GetSelectEntryPos(); + sal_uLong nCurPos = m_pModulesCLB->GetSelectedEntryPos(); SvTreeListEntry* pEntry; if (nCurPos != TREELIST_ENTRY_NOTFOUND && nullptr != (pEntry = m_pModulesCLB->GetEntry(nCurPos))) diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 9876b2afa36a..048ac415d8d6 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -560,7 +560,7 @@ static OUString lcl_ExtracUIName(const Sequence<PropertyValue> &rProperties, con IMPL_LINK( SvxSaveTabPage, FilterHdl_Impl, ListBox&, rBox, void ) { - const sal_Int32 nCurPos = aDocTypeLB->GetSelectEntryPos(); + const sal_Int32 nCurPos = aDocTypeLB->GetSelectedEntryPos(); sal_IntPtr nData = -1; if(nCurPos < APP_COUNT) diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 25237bbc7d07..f14a3a05cb0a 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -518,7 +518,7 @@ IMPL_LINK_NOARG( SvxPersonalizationTabPage, SelectInstalledPersona, ListBox&, vo // Get the details of the selected theme. m_pExtensionPersonaPreview->Show(); - sal_Int32 nSelectedPos = m_pPersonaList->GetSelectEntryPos(); + sal_Int32 nSelectedPos = m_pPersonaList->GetSelectedEntryPos(); OUString aSettings = m_vExtensionPersonaSettings[nSelectedPos]; sal_Int32 nIndex = aSettings.indexOf( ';' ); OUString aPreviewFile = aSettings.copy( 0, nIndex ); diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx index 215a63454919..b53741f1691d 100644 --- a/cui/source/options/tsaurls.cxx +++ b/cui/source/options/tsaurls.cxx @@ -123,7 +123,7 @@ IMPL_LINK_NOARG(TSAURLsDialog, SelectHdl, ListBox&, void) IMPL_LINK_NOARG(TSAURLsDialog, DeleteHdl_Impl, Button*, void) { - sal_Int32 nSel = m_pURLListBox->GetSelectEntryPos(); + sal_Int32 nSel = m_pURLListBox->GetSelectedEntryPos(); if (nSel == LISTBOX_ENTRY_NOTFOUND) return; diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 02c769659804..18d52e7d0a44 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -141,7 +141,7 @@ void lcl_MaybeResetAlignToDistro( void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const ListBox& rLB, sal_uInt16 nListPos) { SvxCellJustifyMethod eJM = SvxCellJustifyMethod::Auto; - if (rLB.GetSelectEntryPos() == nListPos) + if (rLB.GetSelectedEntryPos() == nListPos) eJM = SvxCellJustifyMethod::Distribute; SvxJustifyMethodItem aItem(eJM, nWhichJM); @@ -369,7 +369,7 @@ void AlignmentTabPage::InitVsRefEgde() void AlignmentTabPage::UpdateEnableControls() { - const sal_Int32 nHorAlign = m_pLbHorAlign->GetSelectEntryPos(); + const sal_Int32 nHorAlign = m_pLbHorAlign->GetSelectedEntryPos(); bool bHorLeft = (nHorAlign == ALIGNDLG_HORALIGN_LEFT); bool bHorBlock = (nHorAlign == ALIGNDLG_HORALIGN_BLOCK); bool bHorFill = (nHorAlign == ALIGNDLG_HORALIGN_FILL); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 5512f1a583b3..ec37b08ecf0f 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -119,7 +119,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet ) nLangList |= SvxLanguageListFlags::CJK; m_pLanguageLB->SetLanguageList( nLangList, true, true ); m_pLanguageLB->SelectLanguage( LANGUAGE_NONE ); - sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pLanguageLB->GetSelectedEntryPos(); DBG_ASSERT( LISTBOX_ENTRY_NOTFOUND != nPos, "listbox entry missing" ); m_pLanguageLB->SetEntryData( nPos, reinterpret_cast<void*>((sal_uInt16)LANGUAGE_UNDETERMINED) ); @@ -160,7 +160,7 @@ static bool lcl_FindEntry( ListBox& rLB, const OUString& rEntry, CollatorWrapper const & rCmpClass ) { sal_Int32 nCount = rLB.GetEntryCount(); - sal_Int32 nSelPos = rLB.GetSelectEntryPos(); + sal_Int32 nSelPos = rLB.GetSelectedEntryPos(); sal_Int32 i; for(i = 0; i < nCount; i++) { @@ -177,7 +177,7 @@ static bool lcl_FindEntry( ListBox& rLB, const OUString& rEntry, IMPL_LINK(OfaAutoCorrDlg, SelectLanguageHdl, ListBox&, rBox, void) { - sal_Int32 nPos = rBox.GetSelectEntryPos(); + sal_Int32 nPos = rBox.GetSelectedEntryPos(); void* pVoid = rBox.GetEntryData(nPos); LanguageType eNewLang = LanguageType(reinterpret_cast<sal_IntPtr>(pVoid)); // save old settings and fill anew @@ -729,7 +729,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, DoubleClickEditHdl, SvTreeListBox*, boo IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void) { - sal_uLong nSelEntryPos = m_pCheckLB->GetSelectEntryPos(); + sal_uLong nSelEntryPos = m_pCheckLB->GetSelectedEntryPos(); if( nSelEntryPos == REPLACE_BULLETS || nSelEntryPos == APPLY_NUMBERING) { @@ -843,7 +843,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) if(!rKEvt.GetKeyCode().GetModifier() && KEY_SPACE == rKEvt.GetKeyCode().GetCode()) { - sal_uLong nSelPos = GetSelectEntryPos(); + sal_uLong nSelPos = GetSelectedEntryPos(); sal_uInt16 nCol = GetCurrentTabPos() - 1; if ( nCol < 2 ) { @@ -2278,7 +2278,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* ) bModified |= nVal != pOpt->nAutoCmpltListLen; pOpt->nAutoCmpltListLen = nVal; - const sal_Int32 nPos = m_pDCBExpandKey->GetSelectEntryPos(); + const sal_Int32 nPos = m_pDCBExpandKey->GetSelectedEntryPos(); if( nPos < m_pDCBExpandKey->GetEntryCount() ) { sal_uLong nKey = reinterpret_cast<sal_uLong>(m_pDCBExpandKey->GetEntryData( nPos )); @@ -2360,7 +2360,7 @@ IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl, Button*, void) (m_pAutoCompleteList) ? m_pLBEntries->GetSelectEntryCount() : 0; while( nSelCnt ) { - sal_Int32 nPos = m_pLBEntries->GetSelectEntryPos( --nSelCnt ); + sal_Int32 nPos = m_pLBEntries->GetSelectedEntryPos( --nSelCnt ); OUString* pStr = static_cast<OUString*>(m_pLBEntries->GetEntryData(nPos)); m_pLBEntries->RemoveEntry( nPos ); editeng::IAutoCompleteString hack(*pStr); // UGLY @@ -2572,7 +2572,7 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr ) */ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl, Button*, void) { - const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectEntryPos(); + const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectedEntryPos(); const SvTreeListEntry* pEntry = m_pSmartTagTypesLB->GetEntry(nPos); const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData()); uno::Reference< smarttags::XSmartTagRecognizer > xRec = pUserData->mxRec; @@ -2607,7 +2607,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl, SvTreeListBox*, void) if ( m_pSmartTagTypesLB->GetEntryCount() < 1 ) return; - const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectEntryPos(); + const sal_uLong nPos = m_pSmartTagTypesLB->GetSelectedEntryPos(); const SvTreeListEntry* pEntry = m_pSmartTagTypesLB->GetEntry(nPos); const ImplSmartTagLBUserData* pUserData = static_cast< ImplSmartTagLBUserData* >(pEntry->GetUserData()); uno::Reference< smarttags::XSmartTagRecognizer > xRec = pUserData->mxRec; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index d38f5bfe67fb..39e0e8413393 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -522,7 +522,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet ) { if(m_pTblLBox->IsVisible()) { - sal_Int32 nValue = m_pTblLBox->GetSelectEntryPos(); + sal_Int32 nValue = m_pTblLBox->GetSelectedEntryPos(); if ( pTableBck_Impl ) { @@ -610,7 +610,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet ) if ( m_pTblLBox->IsVisible() ) { - switch( m_pTblLBox->GetSelectEntryPos() ) + switch( m_pTblLBox->GetSelectedEntryPos() ) { case TBL_DEST_CELL: nSlot = SID_ATTR_BRUSH; @@ -806,7 +806,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* rCoreSet ) if( m_pTblLBox->IsValueChangedFromSaved() ) { rCoreSet->Put( SfxUInt16Item( SID_BACKGRND_DESTINATION, - m_pTblLBox->GetSelectEntryPos() ) ); + m_pTblLBox->GetSelectedEntryPos() ) ); bModified = true; } } @@ -1225,7 +1225,7 @@ void SvxBackgroundTabPage::ShowTblControl() IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox&, rBox, void ) { - sal_Int32 nSelPos = rBox.GetSelectEntryPos(); + sal_Int32 nSelPos = rBox.GetSelectedEntryPos(); if( pTableBck_Impl && pTableBck_Impl->nActPos != nSelPos) { std::unique_ptr<SvxBrushItem> xItemHolder; diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 5b3d1ecefae8..f2b3e8cfe99c 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -585,7 +585,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) // - no line - should not be selected - if ( m_pLbLineStyle->GetSelectEntryPos() == 0 ) + if ( m_pLbLineStyle->GetSelectedEntryPos() == 0 ) { m_pLbLineStyle->SelectEntryPos( 1 ); SelStyleHdl_Impl(*m_pLbLineStyle); @@ -878,7 +878,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void) if( m_pFrameSel->IsAnyBorderSelected() ) { // any visible style, but "no-line" in line list box? -> use hair-line - if( (m_pLbLineStyle->GetSelectEntryPos() == 0) || (m_pLbLineStyle->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND) ) + if( (m_pLbLineStyle->GetSelectedEntryPos() == 0) || (m_pLbLineStyle->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND) ) m_pLbLineStyle->SelectEntryPos( 1 ); // set current style to all previously selected lines diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 7ca6d1931571..b1abbe7c39c2 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1488,11 +1488,11 @@ void SvxCharEffectsPage::UpdatePreview_Impl() rCJKFont.SetColor(GetPreviewFontColor(rSelectedColor)); rCTLFont.SetColor(GetPreviewFontColor(rSelectedColor)); - sal_Int32 nPos = m_pUnderlineLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pUnderlineLB->GetSelectedEntryPos(); FontLineStyle eUnderline = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pUnderlineLB->GetEntryData( nPos )); - nPos = m_pOverlineLB->GetSelectEntryPos(); + nPos = m_pOverlineLB->GetSelectedEntryPos(); FontLineStyle eOverline = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pOverlineLB->GetEntryData( nPos )); - nPos = m_pStrikeoutLB->GetSelectEntryPos(); + nPos = m_pStrikeoutLB->GetSelectedEntryPos(); FontStrikeout eStrikeout = (FontStrikeout)reinterpret_cast<sal_uLong>(m_pStrikeoutLB->GetEntryData( nPos )); rFont.SetUnderline( eUnderline ); rCJKFont.SetUnderline( eUnderline ); @@ -1506,8 +1506,8 @@ void SvxCharEffectsPage::UpdatePreview_Impl() rCJKFont.SetStrikeout( eStrikeout ); rCTLFont.SetStrikeout( eStrikeout ); - nPos = m_pPositionLB->GetSelectEntryPos(); - sal_Int32 nEmphasis = m_pEmphasisLB->GetSelectEntryPos(); + nPos = m_pPositionLB->GetSelectedEntryPos(); + sal_Int32 nEmphasis = m_pEmphasisLB->GetSelectedEntryPos(); if (nEmphasis != LISTBOX_ENTRY_NOTFOUND) { bool bUnder = ( CHRDLG_POSITION_UNDER == reinterpret_cast<sal_uLong>(m_pPositionLB->GetEntryData( nPos )) ); @@ -1518,7 +1518,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl() rCTLFont.SetEmphasisMark( eMark ); } - sal_Int32 nRelief = m_pReliefLB->GetSelectEntryPos(); + sal_Int32 nRelief = m_pReliefLB->GetSelectedEntryPos(); if (LISTBOX_ENTRY_NOTFOUND != nRelief) { rFont.SetRelief( (FontRelief)nRelief ); @@ -1534,7 +1534,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl() rCJKFont.SetShadow( rFont.IsShadow() ); rCTLFont.SetShadow( rFont.IsShadow() ); - sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos(); + sal_Int32 nCapsPos = m_pEffectsLB->GetSelectedEntryPos(); if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND ) { SvxCaseMap eCaps = (SvxCaseMap)nCapsPos; @@ -1653,22 +1653,22 @@ void SvxCharEffectsPage::SelectHdl_Impl( ListBox* pBox ) { if ( m_pEmphasisLB == pBox ) { - sal_Int32 nEPos = m_pEmphasisLB->GetSelectEntryPos(); + sal_Int32 nEPos = m_pEmphasisLB->GetSelectedEntryPos(); bool bEnable = ( nEPos > 0 && nEPos != LISTBOX_ENTRY_NOTFOUND ); m_pPositionFT->Enable( bEnable ); m_pPositionLB->Enable( bEnable ); } else if( m_pReliefLB == pBox) { - bool bEnable = ( pBox->GetSelectEntryPos() == 0 ); + bool bEnable = ( pBox->GetSelectedEntryPos() == 0 ); m_pOutlineBtn->Enable( bEnable ); m_pShadowBtn->Enable( bEnable ); } else if ( m_pPositionLB.get() != pBox ) { - sal_Int32 nUPos = m_pUnderlineLB->GetSelectEntryPos(), - nOPos = m_pOverlineLB->GetSelectEntryPos(), - nSPos = m_pStrikeoutLB->GetSelectEntryPos(); + sal_Int32 nUPos = m_pUnderlineLB->GetSelectedEntryPos(), + nOPos = m_pOverlineLB->GetSelectedEntryPos(), + nSPos = m_pStrikeoutLB->GetSelectedEntryPos(); bool bUEnable = ( nUPos > 0 && nUPos != LISTBOX_ENTRY_NOTFOUND ); bool bOEnable = ( nOPos > 0 && nOPos != LISTBOX_ENTRY_NOTFOUND ); m_pUnderlineColorFT->Enable( bUEnable ); @@ -1683,9 +1683,9 @@ void SvxCharEffectsPage::SelectHdl_Impl( ListBox* pBox ) IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl, ListBox&, void) { - bool bEnable = ( ( m_pUnderlineLB->GetSelectEntryPos() > 0 ) || - ( m_pOverlineLB->GetSelectEntryPos() > 0 ) || - ( m_pStrikeoutLB->GetSelectEntryPos() > 0 ) ); + bool bEnable = ( ( m_pUnderlineLB->GetSelectedEntryPos() > 0 ) || + ( m_pOverlineLB->GetSelectedEntryPos() > 0 ) || + ( m_pStrikeoutLB->GetSelectedEntryPos() > 0 ) ); m_pIndividualWordsBtn->Enable( bEnable ); UpdatePreview_Impl(); @@ -2154,7 +2154,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) // Underline sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_UNDERLINE ); pOld = GetOldItem( *rSet, SID_ATTR_CHAR_UNDERLINE ); - sal_Int32 nPos = m_pUnderlineLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pUnderlineLB->GetSelectedEntryPos(); FontLineStyle eUnder = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pUnderlineLB->GetEntryData( nPos )); if ( pOld ) @@ -2188,7 +2188,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) // Overline nWhich = GetWhich( SID_ATTR_CHAR_OVERLINE ); pOld = GetOldItem( *rSet, SID_ATTR_CHAR_OVERLINE ); - nPos = m_pOverlineLB->GetSelectEntryPos(); + nPos = m_pOverlineLB->GetSelectedEntryPos(); FontLineStyle eOver = (FontLineStyle)reinterpret_cast<sal_uLong>(m_pOverlineLB->GetEntryData( nPos )); if ( pOld ) @@ -2222,7 +2222,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) // Strikeout nWhich = GetWhich( SID_ATTR_CHAR_STRIKEOUT ); pOld = GetOldItem( *rSet, SID_ATTR_CHAR_STRIKEOUT ); - nPos = m_pStrikeoutLB->GetSelectEntryPos(); + nPos = m_pStrikeoutLB->GetSelectedEntryPos(); FontStrikeout eStrike = (FontStrikeout)reinterpret_cast<sal_uLong>(m_pStrikeoutLB->GetEntryData( nPos )); if ( pOld ) @@ -2278,8 +2278,8 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) // Emphasis nWhich = GetWhich( SID_ATTR_CHAR_EMPHASISMARK ); pOld = GetOldItem( *rSet, SID_ATTR_CHAR_EMPHASISMARK ); - sal_Int32 nMarkPos = m_pEmphasisLB->GetSelectEntryPos(); - sal_Int32 nPosPos = m_pPositionLB->GetSelectEntryPos(); + sal_Int32 nMarkPos = m_pEmphasisLB->GetSelectedEntryPos(); + sal_Int32 nPosPos = m_pPositionLB->GetSelectedEntryPos(); FontEmphasisMark eMark = (FontEmphasisMark)nMarkPos; if ( m_pPositionLB->IsEnabled() ) { @@ -2316,7 +2316,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) pOld = GetOldItem( *rSet, SID_ATTR_CHAR_CASEMAP ); SvxCaseMap eCaseMap = SvxCaseMap::NotMapped; bool bChecked = false; - sal_Int32 nCapsPos = m_pEffectsLB->GetSelectEntryPos(); + sal_Int32 nCapsPos = m_pEffectsLB->GetSelectedEntryPos(); if ( nCapsPos != LISTBOX_ENTRY_NOTFOUND ) { eCaseMap = (SvxCaseMap)nCapsPos; @@ -2352,7 +2352,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) if(m_pReliefLB->IsValueChangedFromSaved()) { m_pReliefLB->SaveValue(); - SvxCharReliefItem aRelief((FontRelief)m_pReliefLB->GetSelectEntryPos(), nWhich); + SvxCharReliefItem aRelief((FontRelief)m_pReliefLB->GetSelectedEntryPos(), nWhich); rSet->Put(aRelief); } @@ -3276,7 +3276,7 @@ IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl, Button*, void) IMPL_LINK( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox&, rBox, void ) { - sal_Int32 nPos = rBox.GetSelectEntryPos(); + sal_Int32 nPos = rBox.GetSelectedEntryPos(); if ( CHRDLG_ENCLOSE_SPECIAL_CHAR == reinterpret_cast<sal_uLong>(rBox.GetEntryData( nPos )) ) SelectCharacter( &rBox ); else @@ -3339,9 +3339,9 @@ bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet* rSet ) sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES ); const SfxPoolItem* pOld = GetOldItem( *rSet, SID_ATTR_CHAR_TWO_LINES ); bool bOn = m_pTwoLinesBtn->IsChecked(); - sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 ) + sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectedEntryPos() > 0 ) ? m_pStartBracketLB->GetSelectedEntry()[0] : 0; - sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectEntryPos() > 0 ) + sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectedEntryPos() > 0 ) ? m_pEndBracketLB->GetSelectedEntry()[0] : 0; if ( pOld ) @@ -3365,9 +3365,9 @@ bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet* rSet ) void SvxCharTwoLinesPage::UpdatePreview_Impl() { - sal_Unicode cStart = m_pStartBracketLB->GetSelectEntryPos() > 0 + sal_Unicode cStart = m_pStartBracketLB->GetSelectedEntryPos() > 0 ? m_pStartBracketLB->GetSelectedEntry()[0] : 0; - sal_Unicode cEnd = m_pEndBracketLB->GetSelectEntryPos() > 0 + sal_Unicode cEnd = m_pEndBracketLB->GetSelectedEntryPos() > 0 ? m_pEndBracketLB->GetSelectedEntry()[0] : 0; m_pPreviewWin->SetBrackets(cStart, cEnd); m_pPreviewWin->SetTwoLines(m_pTwoLinesBtn->IsChecked()); diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 118bb62de742..25b1ecd170d9 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -362,7 +362,7 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet* rAttrs) } - sal_Int32 nPos = m_pLbType->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbType->GetSelectedEntryPos(); if( m_pLbType->IsValueChangedFromSaved() ) { if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -450,7 +450,7 @@ void SvxConnectionPage::ChangeAttrHdl_Impl(void const * p) if( p == m_pLbType ) { - sal_Int32 nPos = m_pLbType->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbType->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { aAttrSet.Put( SdrEdgeKindItem( (SdrEdgeKind) nPos ) ); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index b2cd972394b1..02f5a1912156 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -201,7 +201,7 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs) { long nVal = 0; - switch( m_pLB_ANSATZ_REL->GetSelectEntryPos() ) + switch( m_pLB_ANSATZ_REL->GetSelectedEntryPos() ) { case AT_OBEN: nVal=0;break; case AT_MITTE: nVal=5000;break; @@ -422,7 +422,7 @@ IMPL_LINK( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox&, rListBox, void ) { if (&rListBox == m_pLB_ANSATZ) { - SetupAnsatz_Impl( m_pLB_ANSATZ->GetSelectEntryPos() ); + SetupAnsatz_Impl( m_pLB_ANSATZ->GetSelectedEntryPos() ); } } @@ -430,7 +430,7 @@ IMPL_LINK( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox&, rListBox, void { if (&rListBox == m_pLB_ANSATZ_REL) { - nAnsatzRelPos = m_pLB_ANSATZ_REL->GetSelectEntryPos(); + nAnsatzRelPos = m_pLB_ANSATZ_REL->GetSelectedEntryPos(); } } diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 86a3481f0f23..9dc0230104bb 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -507,7 +507,7 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs) bModified = true; } - sal_Int32 nPos = m_pLbUnit->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbUnit->GetSelectedEntryPos(); if( m_pLbUnit->IsValueChangedFromSaved() ) { if( nPos != LISTBOX_ENTRY_NOTFOUND ) @@ -735,7 +735,7 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void const * p ) if( p == m_pLbUnit ) { - sal_Int32 nPos = m_pLbUnit->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbUnit->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_uInt16 nFieldUnit = (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pLbUnit->GetEntryData( nPos )); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 6503b48fe9bb..f37ee3963c26 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -841,7 +841,7 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt } else { - nTmpCatPos=m_pLbCategory->GetSelectEntryPos(); + nTmpCatPos=m_pLbCategory->GetSelectedEntryPos(); } switch (nTmpCatPos) @@ -898,13 +898,13 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( std::vector<OUString>& rEnt void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_False*/ ) { OUString theFormat = m_pEdFormat->GetText(); - sal_Int32 nCurCategory = m_pLbCategory->GetSelectEntryPos(); + sal_Int32 nCurCategory = m_pLbCategory->GetSelectedEntryPos(); sal_uInt16 nCategory = static_cast<sal_uInt16>(nCurCategory); sal_uInt16 nDecimals = 0; sal_uInt16 nZeroes = 0; bool bNegRed = false; bool bThousand = false; - sal_Int32 nCurrencyPos =m_pLbCurrency->GetSelectEntryPos(); + sal_Int32 nCurrencyPos =m_pLbCurrency->GetSelectedEntryPos(); if(bOneAreaFlag) nCurCategory=nFixedCategory; @@ -982,7 +982,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_Fa m_pFtLeadZeroes->Enable(); m_pEdLeadZeroes->Enable(); m_pBtnNegRed->Enable(); - if ( nCategory == CAT_NUMBER && m_pLbFormat->GetSelectEntryPos() == 0 ) + if ( nCategory == CAT_NUMBER && m_pLbFormat->GetSelectedEntryPos() == 0 ) m_pEdDecimals->SetText( "" ); //General format tdf#44399 else if ( nCategory == CAT_FRACTION ) @@ -1053,7 +1053,7 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl } else { - nTmpCatPos=m_pLbCategory->GetSelectEntryPos(); + nTmpCatPos=m_pLbCategory->GetSelectedEntryPos(); } @@ -1139,7 +1139,7 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl void SvxNumberFormatTabPage::UpdateThousandEngineeringCheckBox() { - bool bIsScientific = m_pLbCategory->GetSelectEntryPos() == CAT_SCIENTIFIC; + bool bIsScientific = m_pLbCategory->GetSelectedEntryPos() == CAT_SCIENTIFIC; m_pBtnThousand->Show( !bIsScientific ); m_pBtnEngineering->Show( bIsScientific ); } @@ -1153,7 +1153,7 @@ void SvxNumberFormatTabPage::UpdateThousandEngineeringCheckBox() void SvxNumberFormatTabPage::UpdateDecimalsDenominatorEditBox() { - bool bIsFraction = m_pLbCategory->GetSelectEntryPos() == CAT_FRACTION; + bool bIsFraction = m_pLbCategory->GetSelectedEntryPos() == CAT_FRACTION; m_pFtDecimals->Show( !bIsFraction ); m_pEdDecimals->Show( !bIsFraction ); m_pFtDenominator->Show( bIsFraction ); @@ -1233,7 +1233,7 @@ void SvxNumberFormatTabPage::SelFormatHdl_Impl(void * pLb ) // And yes, m_pLbFormat is a SvxFontListBox with sal_uLong list positions, // implementation returns a TREELIST_ENTRY_NOTFOUND if empty, // comparison with sal_Int32 LISTBOX_ENTRY_NOTFOUND wouldn't match. - if ( m_pLbFormat->GetSelectEntryPos() == TREELIST_ENTRY_NOTFOUND ) + if ( m_pLbFormat->GetSelectedEntryPos() == TREELIST_ENTRY_NOTFOUND ) pLb = m_pLbCategory; // continue with the current category selected else pLb = m_pLbFormat; // continue with the current format selected @@ -1247,12 +1247,12 @@ void SvxNumberFormatTabPage::SelFormatHdl_Impl(void * pLb ) } else { - nTmpCatPos=m_pLbCategory->GetSelectEntryPos(); + nTmpCatPos=m_pLbCategory->GetSelectedEntryPos(); } if (nTmpCatPos==CAT_CURRENCY && pLb == m_pLbCurrency ) { - sal_Int32 nCurrencyPos = m_pLbCurrency->GetSelectEntryPos(); + sal_Int32 nCurrencyPos = m_pLbCurrency->GetSelectedEntryPos(); pNumFmtShell->SetCurrencySymbol(static_cast<sal_uInt32>(nCurrencyPos)); } @@ -1260,7 +1260,7 @@ void SvxNumberFormatTabPage::SelFormatHdl_Impl(void * pLb ) // Format-ListBox ---------------------------------------------------- if (pLb == m_pLbFormat) { - sal_uLong nSelPos = m_pLbFormat->GetSelectEntryPos(); + sal_uLong nSelPos = m_pLbFormat->GetSelectedEntryPos(); short nFmtLbSelPos = static_cast<short>(nSelPos); OUString aFormat = pNumFmtShell->GetFormat4Entry(nFmtLbSelPos); @@ -1625,7 +1625,7 @@ void SvxNumberFormatTabPage::OptHdl_Impl( void const * pOptCtrl ) pNumFmtShell->MakeFormat( aFormat, bThousand, bNegRed, nPrecision, nLeadZeroes, - (sal_uInt16)m_pLbFormat->GetSelectEntryPos() ); + (sal_uInt16)m_pLbFormat->GetSelectedEntryPos() ); m_pEdFormat->SetText( aFormat ); MakePreviewText( aFormat ); @@ -1675,7 +1675,7 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Control&, rControl, void) m_pFtComment->Show(); if(!m_pIbAdd->IsEnabled()) { - sal_uInt16 nSelPos = (sal_uInt16) m_pLbFormat->GetSelectEntryPos(); + sal_uInt16 nSelPos = (sal_uInt16) m_pLbFormat->GetSelectedEntryPos(); pNumFmtShell->SetComment4Entry(nSelPos, m_pEdComment->GetText()); m_pEdComment->SetText(m_pLbCategory->GetEntry(1)); // String for user defined @@ -1783,7 +1783,7 @@ void SvxNumberFormatTabPage::FillCurrencyBox() void SvxNumberFormatTabPage::SetCategory(sal_uInt16 nPos) { - sal_uInt16 nCurCategory = m_pLbCategory->GetSelectEntryPos(); + sal_uInt16 nCurCategory = m_pLbCategory->GetSelectedEntryPos(); sal_uInt16 nTmpCatPos; if(bOneAreaFlag) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 9705062e4f77..0f65307f512a 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1863,7 +1863,7 @@ void SvxNumOptionsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) IMPL_LINK( SvxNumOptionsTabPage, OrientHdl_Impl, ListBox&, rBox, void ) { - sal_Int32 nPos = rBox.GetSelectEntryPos(); + sal_Int32 nPos = rBox.GetSelectedEntryPos(); nPos ++; // no VERT_NONE sal_uInt16 nMask = 1; @@ -2212,7 +2212,7 @@ IMPL_LINK( SvxNumOptionsTabPage, RatioHdl_Impl, Button*, pBox, void ) IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl, ListBox&, void) { bAutomaticCharStyles = false; - sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectEntryPos(); + sal_Int32 nEntryPos = m_pCharFmtLB->GetSelectedEntryPos(); OUString sEntry = m_pCharFmtLB->GetSelectedEntry(); sal_uInt16 nMask = 1; for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++) @@ -2261,7 +2261,7 @@ void SvxNumOptionsTabPage::EditModifyHdl_Impl( Edit* pEdit ) aNumFmt.SetStart( (sal_uInt16)m_pStartED->GetValue() ); else //align { - sal_Int32 nPos = m_pAlignLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pAlignLB->GetSelectedEntryPos(); SvxAdjust eAdjust = SvxAdjust::Center; if(nPos == 0) eAdjust = SvxAdjust::Left; @@ -3190,8 +3190,8 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, EditModifyHdl_Impl, ListBox&, void) SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); const sal_Int32 nPos = m_pAlignLB->IsVisible() - ? m_pAlignLB->GetSelectEntryPos() - : m_pAlign2LB->GetSelectEntryPos(); + ? m_pAlignLB->GetSelectedEntryPos() + : m_pAlign2LB->GetSelectedEntryPos(); SvxAdjust eAdjust = SvxAdjust::Center; if(nPos == 0) eAdjust = SvxAdjust::Left; @@ -3360,7 +3360,7 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, LabelFollowedByHdl_Impl, ListBox&, void) // determine value to be set at the chosen list levels SvxNumberFormat::LabelFollowedBy eLabelFollowedBy = SvxNumberFormat::LISTTAB; { - const sal_Int32 nPos = m_pLabelFollowedByLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLabelFollowedByLB->GetSelectedEntryPos(); if ( nPos == 1 ) { eLabelFollowedBy = SvxNumberFormat::SPACE; diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 70b67024317f..6766784cf456 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -711,7 +711,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) // paper tray nWhich = GetWhich( SID_ATTR_PAGE_PAPERBIN ); - sal_Int32 nPos = m_pPaperTrayBox->GetSelectEntryPos(); + sal_Int32 nPos = m_pPaperTrayBox->GetSelectedEntryPos(); sal_uInt16 nBin = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pPaperTrayBox->GetEntryData( nPos )); pOld = GetOldItem( *rSet, SID_ATTR_PAGE_PAPERBIN ); @@ -721,7 +721,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) bModified = true; } - nPos = m_pPaperSizeBox->GetSelectEntryPos(); + nPos = m_pPaperSizeBox->GetSelectedEntryPos(); Paper ePaper = (Paper)reinterpret_cast<sal_uLong>(m_pPaperSizeBox->GetEntryData( nPos )); const sal_Int32 nOld = m_pPaperSizeBox->GetSavedValue(); bool bChecked = m_pLandscapeBtn->IsChecked(); @@ -769,7 +769,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) if ( bMod ) aPage.SetPageUsage( - ::PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() ) ); + ::PosToPageUsage_Impl( m_pLayoutBox->GetSelectedEntryPos() ) ); if ( m_pLandscapeBtn->IsValueChangedFromSaved() ) { @@ -778,7 +778,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) } //Get the NumType value - nPos = m_pNumberFormatBox->GetSelectEntryPos(); + nPos = m_pNumberFormatBox->GetSelectedEntryPos(); SvxNumType nEntryData = static_cast<SvxNumType>(reinterpret_cast<sal_uLong>(m_pNumberFormatBox->GetEntryData(nPos))); if ( m_pNumberFormatBox->IsValueChangedFromSaved() ) { @@ -868,7 +868,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet* rSet ) IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl, ListBox&, void) { // switch inside outside - const SvxPageUsage nUsage = PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() ); + const SvxPageUsage nUsage = PosToPageUsage_Impl( m_pLayoutBox->GetSelectedEntryPos() ); if ( nUsage == SvxPageUsage::Mirror ) { @@ -1119,7 +1119,7 @@ void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground ) m_pBspWin->SetRight( GetCoreValue( *m_pRightMarginEdit, MapUnit::MapTwip ) ); // Layout - m_pBspWin->SetUsage( PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() ) ); + m_pBspWin->SetUsage( PosToPageUsage_Impl( m_pLayoutBox->GetSelectedEntryPos() ) ); if ( bResetbackground ) m_pBspWin->ResetBackground(); m_pBspWin->Invalidate(); @@ -1544,7 +1544,7 @@ IMPL_LINK( SvxPageDescPage, RegisterModify, Button*, pBox, void ) if(static_cast<CheckBox*>(pBox)->IsChecked()) { bEnable = true; - if(USHRT_MAX == m_pRegisterLB->GetSelectEntryPos()) + if(USHRT_MAX == m_pRegisterLB->GetSelectedEntryPos()) m_pRegisterLB->SelectEntry(sStandardRegister); } m_pRegisterFT->Enable( bEnable ); diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 37d33d456e3a..6b5e19ea8b95 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -211,7 +211,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) bool bModified = false; sal_uInt16 nWhich; - sal_Int32 nPos = m_pLineDist->GetSelectEntryPos(); + sal_Int32 nPos = m_pLineDist->GetSelectedEntryPos(); if ( LISTBOX_ENTRY_NOTFOUND != nPos && ( m_pLineDist->IsValueChangedFromSaved() || @@ -780,7 +780,7 @@ void SvxStdParagraphTabPage::SetLineSpacing_Impl IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox&, rBox, void ) { - switch( rBox.GetSelectEntryPos() ) + switch( rBox.GetSelectedEntryPos() ) { case LLINESPACE_1: case LLINESPACE_115: @@ -885,7 +885,7 @@ void SvxStdParagraphTabPage::UpdateExample_Impl() m_pExampleWin->SetUpper( (sal_uInt16)m_pTopDist->Denormalize( m_pTopDist->GetValue( FUNIT_TWIP ) ) ); m_pExampleWin->SetLower( (sal_uInt16)m_pBottomDist->Denormalize( m_pBottomDist->GetValue( FUNIT_TWIP ) ) ); - sal_Int32 nPos = m_pLineDist->GetSelectEntryPos(); + sal_Int32 nPos = m_pLineDist->GetSelectedEntryPos(); switch ( nPos ) { @@ -1119,7 +1119,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet ) SvxAdjust eOneWord = m_pExpandCB->IsChecked() ? SvxAdjust::Block : SvxAdjust::Left; - sal_Int32 nLBPos = m_pLastLineLB->GetSelectEntryPos(); + sal_Int32 nLBPos = m_pLastLineLB->GetSelectedEntryPos(); SvxAdjust eLastBlock = SvxAdjust::Left; if ( 1 == nLBPos ) @@ -1152,7 +1152,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet ) } if(m_pVertAlignLB->IsValueChangedFromSaved()) { - rOutSet->Put(SvxParaVertAlignItem((SvxParaVertAlignItem::Align)m_pVertAlignLB->GetSelectEntryPos(), GetWhich( SID_PARA_VERTALIGN ))); + rOutSet->Put(SvxParaVertAlignItem((SvxParaVertAlignItem::Align)m_pVertAlignLB->GetSelectedEntryPos(), GetWhich( SID_PARA_VERTALIGN ))); bModified = true; } @@ -1282,7 +1282,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void) bool bJustify = m_pJustify->IsChecked(); m_pLastLineFT->Enable(bJustify); m_pLastLineLB->Enable(bJustify); - bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2; + bool bLastLineIsBlock = m_pLastLineLB->GetSelectedEntryPos() == 2; m_pExpandCB->Enable(bJustify && bLastLineIsBlock); UpdateExample_Impl(); } @@ -1290,7 +1290,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl, Button*, void) IMPL_LINK_NOARG(SvxParaAlignTabPage, LastLineHdl_Impl, ListBox&, void) { //fdo#41350 only enable 'Expand last word' if last line is also justified - bool bLastLineIsBlock = m_pLastLineLB->GetSelectEntryPos() == 2; + bool bLastLineIsBlock = m_pLastLineLB->GetSelectedEntryPos() == 2; m_pExpandCB->Enable(bLastLineIsBlock); UpdateExample_Impl(); } @@ -1323,7 +1323,7 @@ void SvxParaAlignTabPage::UpdateExample_Impl() { m_pExampleWin->SetAdjust( SvxAdjust::Block ); SvxAdjust eLastBlock = SvxAdjust::Left; - sal_Int32 nLBPos = m_pLastLineLB->GetSelectEntryPos(); + sal_Int32 nLBPos = m_pLastLineLB->GetSelectedEntryPos(); if(nLBPos == 1) eLastBlock = SvxAdjust::Center; else if(nLBPos == 2) @@ -1468,9 +1468,9 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) { case TRISTATE_TRUE: { - bool bBefore = m_pBreakPositionLB->GetSelectEntryPos() == 0; + bool bBefore = m_pBreakPositionLB->GetSelectedEntryPos() == 0; - if ( m_pBreakTypeLB->GetSelectEntryPos() == 0 ) + if ( m_pBreakTypeLB->GetSelectedEntryPos() == 0 ) { if ( bBefore ) aBreak.SetValue( SvxBreak::PageBefore ); @@ -2030,8 +2030,8 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, PageBreakHdl_Impl, Button*, void) m_pBreakPositionFT->Enable(); m_pBreakPositionLB->Enable(); - if ( 0 == m_pBreakTypeLB->GetSelectEntryPos()&& - 0 == m_pBreakPositionLB->GetSelectEntryPos() ) + if ( 0 == m_pBreakTypeLB->GetSelectedEntryPos()&& + 0 == m_pBreakPositionLB->GetSelectedEntryPos() ) { m_pApplyCollBtn->Enable(); @@ -2148,7 +2148,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, Button*, void) IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBox, void ) { - if ( 0 == rListBox.GetSelectEntryPos() ) + if ( 0 == rListBox.GetSelectedEntryPos() ) { m_pApplyCollBtn->Enable(); @@ -2162,7 +2162,7 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBox, voi m_pPagenumEdit->Enable(bEnable && m_pPageNumBox->GetState() == TRISTATE_TRUE); } } - else if ( 1 == rListBox.GetSelectEntryPos() ) + else if ( 1 == rListBox.GetSelectedEntryPos() ) { m_pApplyCollBtn->SetState( TRISTATE_FALSE ); m_pApplyCollBtn->Enable(false); @@ -2175,8 +2175,8 @@ IMPL_LINK( SvxExtParagraphTabPage, PageBreakPosHdl_Impl, ListBox&, rListBox, voi IMPL_LINK( SvxExtParagraphTabPage, PageBreakTypeHdl_Impl, ListBox&, rListBox, void ) { //column break or break break after - sal_Int32 nBreakPos = m_pBreakPositionLB->GetSelectEntryPos(); - if ( rListBox.GetSelectEntryPos() == 1 || 1 == nBreakPos) + sal_Int32 nBreakPos = m_pBreakPositionLB->GetSelectedEntryPos(); + if ( rListBox.GetSelectedEntryPos() == 1 || 1 == nBreakPos) { m_pApplyCollBtn->SetState( TRISTATE_FALSE ); m_pApplyCollBtn->Enable(false); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 399f674306cf..08d2014f676a 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -1260,11 +1260,11 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox&, rLB, void ) if(bHori) { sal_uInt16 nRel = GetRelation(*m_pHoriToLB); - if(RelOrientation::PRINT_AREA == nRel && 0 == m_pVertLB->GetSelectEntryPos()) + if(RelOrientation::PRINT_AREA == nRel && 0 == m_pVertLB->GetSelectedEntryPos()) { m_pVertLB->SelectEntryPos(1); } - else if(RelOrientation::CHAR == nRel && 1 == m_pVertLB->GetSelectEntryPos()) + else if(RelOrientation::CHAR == nRel && 1 == m_pVertLB->GetSelectedEntryPos()) { m_pVertLB->SelectEntryPos(0); } @@ -1303,7 +1303,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) if (rLB.GetSelectEntryCount()) { - if (pRelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) + if (pRelLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND) nRel = static_cast<RelationMap *>(pRelLB->GetSelectEntryData())->nRelation; FillRelLB(pMap, nMapPos, nAlign, nRel, *pRelLB, *pRelFT); @@ -1322,7 +1322,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) // on the right only below is allowed - from the left only at the top // from the left at the character -> below if((HoriOrientation::LEFT == nAlign || HoriOrientation::RIGHT == nAlign) && - 0 == m_pVertLB->GetSelectEntryPos()) + 0 == m_pVertLB->GetSelectedEntryPos()) { if(RelOrientation::FRAME == nRel) m_pVertLB->SelectEntryPos(1); @@ -1330,12 +1330,12 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) m_pVertLB->SelectEntryPos(0); bSet = true; } - else if(HoriOrientation::LEFT == nAlign && 1 == m_pVertLB->GetSelectEntryPos()) + else if(HoriOrientation::LEFT == nAlign && 1 == m_pVertLB->GetSelectedEntryPos()) { m_pVertLB->SelectEntryPos(0); bSet = true; } - else if(HoriOrientation::NONE == nAlign && 1 == m_pVertLB->GetSelectEntryPos()) + else if(HoriOrientation::NONE == nAlign && 1 == m_pVertLB->GetSelectedEntryPos()) { m_pVertLB->SelectEntryPos(0); bSet = true; @@ -1347,7 +1347,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) { if(VertOrientation::TOP == nAlign) { - if(1 == m_pHoriLB->GetSelectEntryPos()) + if(1 == m_pHoriLB->GetSelectedEntryPos()) { m_pHoriLB->SelectEntryPos(0); bSet = true; @@ -1356,7 +1356,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox&, rLB, void ) } else if(VertOrientation::CHAR_BOTTOM == nAlign) { - if(2 == m_pHoriLB->GetSelectEntryPos()) + if(2 == m_pHoriLB->GetSelectedEntryPos()) { m_pHoriLB->SelectEntryPos(0); bSet = true; @@ -1399,7 +1399,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl, Button*, void) short SvxSwPosSizeTabPage::GetRelation(ListBox const &rRelationLB) { short nRel = 0; - sal_Int32 nPos = rRelationLB.GetSelectEntryPos(); + sal_Int32 nPos = rRelationLB.GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) { @@ -1419,7 +1419,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBo if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap || pMap == aVCharMap ) { - if (rRelationLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) + if (rRelationLB.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND) { LB nRel = static_cast<RelationMap *>(rRelationLB.GetSelectEntryData())->nLBRelation; std::size_t nMapCount = ::lcl_GetFrmMapCount(pMap); @@ -1448,7 +1448,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, sal_uInt16 nMapPos, ListBo sal_uInt16 SvxSwPosSizeTabPage::GetMapPos(FrmMap *pMap, ListBox const &rAlignLB) { sal_uInt16 nMapPos = 0; - sal_Int32 nLBSelPos = rAlignLB.GetSelectEntryPos(); + sal_Int32 nLBSelPos = rAlignLB.GetSelectedEntryPos(); if (nLBSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -1485,21 +1485,21 @@ void SvxSwPosSizeTabPage::InitPos(RndStdIds nAnchor, long nX, long nY) { - sal_Int32 nPos = m_pVertLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pVertLB->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && m_pVMap ) { m_nOldV = m_pVMap[nPos].nAlign; - nPos = m_pVertToLB->GetSelectEntryPos(); + nPos = m_pVertToLB->GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) m_nOldVRel = static_cast<RelationMap *>(m_pVertToLB->GetEntryData(nPos))->nRelation; } - nPos = m_pHoriLB->GetSelectEntryPos(); + nPos = m_pHoriLB->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && m_pHMap ) { m_nOldH = m_pHMap[nPos].nAlign; - nPos = m_pHoriToLB->GetSelectEntryPos(); + nPos = m_pHoriToLB->GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) m_nOldHRel = static_cast<RelationMap *>(m_pHoriToLB->GetEntryData(nPos))->nRelation; } @@ -1628,7 +1628,7 @@ void SvxSwPosSizeTabPage::InitPos(RndStdIds nAnchor, void SvxSwPosSizeTabPage::UpdateExample() { - sal_Int32 nPos = m_pHoriLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pHoriLB->GetSelectedEntryPos(); if ( m_pHMap && nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_uInt16 nMapPos = GetMapPos(m_pHMap, *m_pHoriLB); @@ -1639,7 +1639,7 @@ void SvxSwPosSizeTabPage::UpdateExample() m_pExampleWN->SetHoriRel(nRel); } - nPos = m_pVertLB->GetSelectEntryPos(); + nPos = m_pVertLB->GetSelectedEntryPos(); if ( m_pVMap && nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_uInt16 nMapPos = GetMapPos(m_pVMap, *m_pVertLB); diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 4670e462f455..55c293510656 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -367,7 +367,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs) TriState eState; // animation type - nPos = m_pLbEffect->GetSelectEntryPos(); + nPos = m_pLbEffect->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbEffect->IsValueChangedFromSaved() ) { @@ -482,7 +482,7 @@ VclPtr<SfxTabPage> SvxTextAnimationPage::Create( vcl::Window* pWindow, IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void) { - sal_Int32 nPos = m_pLbEffect->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbEffect->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { eAniKind = (SdrTextAniKind) nPos; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index fa2e431f3cf3..8ec7516ae437 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -210,7 +210,7 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* rAttrs ) rAttrs->Put(XFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject())); } - BitmapStyle eStylePos = (BitmapStyle)m_pBitmapStyleLB->GetSelectEntryPos(); bool bIsStretched( eStylePos == STRETCHED ); + BitmapStyle eStylePos = (BitmapStyle)m_pBitmapStyleLB->GetSelectedEntryPos(); bool bIsStretched( eStylePos == STRETCHED ); bool bIsTiled( eStylePos == TILED ); rAttrs->Put( XFillBmpTileItem(bIsTiled) ); @@ -255,14 +255,14 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* rAttrs ) } if(m_pPositionLB->IsEnabled()) - rAttrs->Put( XFillBmpPosItem( static_cast<RectPoint>( m_pPositionLB->GetSelectEntryPos() ) ) ); + rAttrs->Put( XFillBmpPosItem( static_cast<RectPoint>( m_pPositionLB->GetSelectedEntryPos() ) ) ); if(m_pPositionOffX->IsEnabled()) rAttrs->Put( XFillBmpPosOffsetXItem( m_pPositionOffX->GetValue() ) ); if(m_pPositionOffY->IsEnabled()) rAttrs->Put( XFillBmpPosOffsetYItem( m_pPositionOffY->GetValue() ) ); if(m_pTileOffBox->IsEnabled()) { - TileOffset eValue = static_cast<TileOffset>(m_pTileOffLB->GetSelectEntryPos()); + TileOffset eValue = static_cast<TileOffset>(m_pTileOffLB->GetSelectedEntryPos()); sal_uInt16 nOffsetValue = static_cast<sal_uInt16>(m_pTileOffset->GetValue()); sal_uInt16 nRowOff = (eValue == ROW) ? nOffsetValue : 0; sal_uInt16 nColOff = (eValue == COLUMN) ? nOffsetValue : 0; @@ -329,7 +329,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs ) } } - if( m_pBitmapStyleLB->GetSelectEntryPos() == 0 && rAttrs->GetItemState( XATTR_FILLBMP_STRETCH ) != SfxItemState::DONTCARE) + if( m_pBitmapStyleLB->GetSelectedEntryPos() == 0 && rAttrs->GetItemState( XATTR_FILLBMP_STRETCH ) != SfxItemState::DONTCARE) { if( static_cast<const XFillBmpStretchItem&>( rAttrs->Get( XATTR_FILLBMP_STRETCH ) ).GetValue() ) { @@ -372,7 +372,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs ) nHeight = (OutputDevice::LogicToLogic(nHeight, mePoolUnit, MapUnit::Map100thMM )) / fUIScale; } - if(m_pBitmapStyleLB->GetSelectEntryPos() == 0) + if(m_pBitmapStyleLB->GetSelectedEntryPos() == 0) { if( nWidth == rBitmapSize.Width() && nHeight == rBitmapSize.Height() ) m_pBitmapStyleLB->SelectEntryPos( static_cast<sal_Int32>(ORIGINAL) ); @@ -618,7 +618,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void) IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapSizeHdl, Edit&, void ) { - if( m_pTsbScale->GetState() != TRISTATE_TRUE && static_cast<BitmapStyle>(m_pBitmapStyleLB->GetSelectEntryPos()) != TILED ) + if( m_pTsbScale->GetState() != TRISTATE_TRUE && static_cast<BitmapStyle>(m_pBitmapStyleLB->GetSelectedEntryPos()) != TILED ) { sal_Int64 nWidthPercent = m_pBitmapWidth->Denormalize( m_pBitmapWidth->GetValue() ); sal_Int64 nHeightPercent = m_pBitmapHeight->Denormalize( m_pBitmapHeight->GetValue() ); @@ -644,7 +644,7 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, Button*, void ) IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void ) { - BitmapStyle eStylePos = (BitmapStyle)m_pBitmapStyleLB->GetSelectEntryPos(); + BitmapStyle eStylePos = (BitmapStyle)m_pBitmapStyleLB->GetSelectedEntryPos(); bool bIsStretched( eStylePos == STRETCHED ); bool bIsTiled( eStylePos == TILED ); @@ -719,7 +719,7 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapStyleHdl, ListBox&, void ) IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapPositionHdl, ListBox&, void) { if(m_pPositionLB->IsEnabled()) - m_rXFSet.Put( XFillBmpPosItem( static_cast< RectPoint >( m_pPositionLB->GetSelectEntryPos() ) ) ); + m_rXFSet.Put( XFillBmpPosItem( static_cast< RectPoint >( m_pPositionLB->GetSelectedEntryPos() ) ) ); m_pCtlBitmapPreview->SetAttributes( m_aXFillAttr.GetItemSet() ); m_pCtlBitmapPreview->Invalidate(); @@ -742,10 +742,10 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void) sal_uInt16 nTileXOff = 0; sal_uInt16 nTileYOff = 0; - if(m_pTileOffLB->GetSelectEntryPos() == static_cast<sal_Int32>(ROW)) + if(m_pTileOffLB->GetSelectedEntryPos() == static_cast<sal_Int32>(ROW)) nTileXOff = m_pTileOffset->GetValue(); - if(m_pTileOffLB->GetSelectEntryPos() == static_cast<sal_Int32>(COLUMN)) + if(m_pTileOffLB->GetSelectedEntryPos() == static_cast<sal_Int32>(COLUMN)) nTileYOff = m_pTileOffset->GetValue(); m_rXFSet.Put( XFillBmpTileOffsetXItem(nTileXOff) ); diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index fdbd86392a1e..9b20e7090a07 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -219,7 +219,7 @@ void SvxColorTabPage::FillPaletteLB() } OUString aPaletteName( officecfg::Office::Common::UserColors::PaletteName::get() ); m_pSelectPalette->SelectEntry(aPaletteName); - if (m_pSelectPalette->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) + if (m_pSelectPalette->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND) { SelectPaletteLBHdl( *m_pSelectPalette ); } @@ -444,7 +444,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) { sal_uInt16 nId = m_pValSetColorList->GetSelectItemId(); size_t nPos = m_pValSetColorList->GetSelectItemPos(); - if(m_pSelectPalette->GetSelectEntryPos() == 0 && nPos != VALUESET_ITEM_NOTFOUND ) + if(m_pSelectPalette->GetSelectedEntryPos() == 0 && nPos != VALUESET_ITEM_NOTFOUND ) { std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create(m_context)); css::uno::Sequence< sal_Int32 > aCustomColorList(officecfg::Office::Common::UserColors::CustomColor::get()); @@ -475,7 +475,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void) IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, ListBox&, void) { m_pValSetColorList->Clear(); - sal_Int32 nPos = m_pSelectPalette->GetSelectEntryPos(); + sal_Int32 nPos = m_pSelectPalette->GetSelectedEntryPos(); maPaletteManager.SetPalette( nPos ); maPaletteManager.ReloadColorSet( *m_pValSetColorList ); @@ -521,7 +521,7 @@ IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, pValSet, void) if(pValSet == m_pValSetColorList) { m_pValSetRecentList->SetNoSelection(); - if(m_pSelectPalette->GetSelectEntryPos() == 0 && m_pValSetColorList->GetSelectItemId() != 0) + if(m_pSelectPalette->GetSelectedEntryPos() == 0 && m_pValSetColorList->GetSelectItemId() != 0) m_pBtnDelete->Enable(); else m_pBtnDelete->Disable(); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 6d060e4b16ab..0dd20ccd3feb 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -237,7 +237,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet ) aString = "gradient"; pXGradient.reset(new XGradient( m_pLbColorFrom->GetSelectEntryColor(), m_pLbColorTo->GetSelectEntryColor(), - (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(), + (css::awt::GradientStyle) m_pLbGradientType->GetSelectedEntryPos(), static_cast<long>(m_pMtrAngle->GetValue() * 10), // should be changed in resource (sal_uInt16) m_pMtrCenterX->GetValue(), (sal_uInt16) m_pMtrCenterY->GetValue(), @@ -330,7 +330,7 @@ void SvxGradientTabPage::ModifiedHdl_Impl( void const * pControl ) if(pControl == m_pSliderIncrement) m_pMtrIncrement->SetValue( m_pSliderIncrement->GetThumbPos() ); - css::awt::GradientStyle eXGS = (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(); + css::awt::GradientStyle eXGS = (css::awt::GradientStyle) m_pLbGradientType->GetSelectedEntryPos(); XGradient aXGradient( m_pLbColorFrom->GetSelectEntryColor(), m_pLbColorTo->GetSelectEntryColor(), @@ -410,7 +410,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void) { XGradient aXGradient( m_pLbColorFrom->GetSelectEntryColor(), m_pLbColorTo->GetSelectEntryColor(), - (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(), + (css::awt::GradientStyle) m_pLbGradientType->GetSelectedEntryPos(), static_cast<long>(m_pMtrAngle->GetValue() * 10), // should be changed in resource (sal_uInt16) m_pMtrCenterX->GetValue(), (sal_uInt16) m_pMtrCenterY->GetValue(), @@ -449,7 +449,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void) XGradient aXGradient( m_pLbColorFrom->GetSelectEntryColor(), m_pLbColorTo->GetSelectEntryColor(), - (css::awt::GradientStyle) m_pLbGradientType->GetSelectEntryPos(), + (css::awt::GradientStyle) m_pLbGradientType->GetSelectedEntryPos(), static_cast<long>(m_pMtrAngle->GetValue() * 10), // should be changed in resource (sal_uInt16) m_pMtrCenterX->GetValue(), (sal_uInt16) m_pMtrCenterY->GetValue(), diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index c6d9eab34265..9c2e44e91d73 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -261,7 +261,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet ) else { pXHatch.reset(new XHatch( m_pLbLineColor->GetSelectEntryColor(), - (css::drawing::HatchStyle) m_pLbLineType->GetSelectEntryPos(), + (css::drawing::HatchStyle) m_pLbLineType->GetSelectedEntryPos(), GetCoreValue( *m_pMtrDistance, m_ePoolUnit ), static_cast<long>(m_pMtrAngle->GetValue() * 10) )); } @@ -362,7 +362,7 @@ void SvxHatchTabPage::ModifiedHdl_Impl( void const * p ) m_pMtrAngle->SetValue( m_pSliderAngle->GetThumbPos() ); XHatch aXHatch( m_pLbLineColor->GetSelectEntryColor(), - (css::drawing::HatchStyle) m_pLbLineType->GetSelectEntryPos(), + (css::drawing::HatchStyle) m_pLbLineType->GetSelectedEntryPos(), GetCoreValue( *m_pMtrDistance, m_ePoolUnit ), static_cast<long>(m_pMtrAngle->GetValue() * 10) ); @@ -478,7 +478,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void) if( !nError ) { XHatch aXHatch( m_pLbLineColor->GetSelectEntryColor(), - (css::drawing::HatchStyle) m_pLbLineType->GetSelectEntryPos(), + (css::drawing::HatchStyle) m_pLbLineType->GetSelectedEntryPos(), GetCoreValue( *m_pMtrDistance, m_ePoolUnit ), static_cast<long>(m_pMtrAngle->GetValue() * 10) ); @@ -507,7 +507,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void) OUString aName( m_pHatchingList->GetHatch( static_cast<sal_uInt16>(nPos) )->GetName() ); XHatch aXHatch( m_pLbLineColor->GetSelectEntryColor(), - (css::drawing::HatchStyle) m_pLbLineType->GetSelectEntryPos(), + (css::drawing::HatchStyle) m_pLbLineType->GetSelectedEntryPos(), GetCoreValue( *m_pMtrDistance, m_ePoolUnit ), static_cast<long>(m_pMtrAngle->GetValue() * 10) ); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 6c4d2c1a8dce..f99dcc975607 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -519,19 +519,19 @@ void SvxLineTabPage::SymbolSelected(MenuButton const * pButton) void SvxLineTabPage::FillListboxes() { // Line styles - sal_Int32 nOldSelect = m_pLbLineStyle->GetSelectEntryPos(); + sal_Int32 nOldSelect = m_pLbLineStyle->GetSelectedEntryPos(); // aLbLineStyle.FillStyles(); m_pLbLineStyle->Fill( m_pDashList ); m_pLbLineStyle->SelectEntryPos( nOldSelect ); // Line end style OUString sNone( SvxResId( RID_SVXSTR_NONE ) ); - nOldSelect = m_pLbStartStyle->GetSelectEntryPos(); + nOldSelect = m_pLbStartStyle->GetSelectedEntryPos(); m_pLbStartStyle->Clear(); m_pLbStartStyle->InsertEntry( sNone ); m_pLbStartStyle->Fill( m_pLineEndList ); m_pLbStartStyle->SelectEntryPos( nOldSelect ); - nOldSelect = m_pLbEndStyle->GetSelectEntryPos(); + nOldSelect = m_pLbEndStyle->GetSelectedEntryPos(); m_pLbEndStyle->Clear(); m_pLbEndStyle->InsertEntry( sNone ); m_pLbEndStyle->Fill( m_pLineEndList, false ); @@ -559,7 +559,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) *m_pnDashListState = ChangeType::NONE; // Style list - nPos = m_pLbLineStyle->GetSelectEntryPos(); + nPos = m_pLbLineStyle->GetSelectedEntryPos(); m_pLbLineStyle->Clear(); m_pLbLineStyle->InsertEntry( SvxResId( RID_SVXSTR_INVISIBLE ) ); @@ -588,7 +588,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) *m_pnLineEndListState = ChangeType::NONE; - nPos = m_pLbLineStyle->GetSelectEntryPos(); + nPos = m_pLbLineStyle->GetSelectedEntryPos(); OUString sNone( SvxResId( RID_SVXSTR_NONE ) ); m_pLbStartStyle->Clear(); m_pLbStartStyle->InsertEntry( sNone ); @@ -620,7 +620,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet ) aLineURL.Append( m_pLineEndList->GetName() ); DBG_ASSERT( aLineURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" ); // Evaluate if another TabPage set another fill type - if( m_pLbLineStyle->GetSelectEntryPos() != 0 ) + if( m_pLbLineStyle->GetSelectedEntryPos() != 0 ) { if( m_nPageType == PageType::Hatch ) // 1 { @@ -661,8 +661,8 @@ DeactivateRC SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet ) if( m_nDlgType == 0 ) // Line dialog { m_nPageType = PageType::Gradient; // possibly for extensions - *m_pPosDashLb = m_pLbLineStyle->GetSelectEntryPos() - 2;// First entry SOLID!!! - sal_Int32 nPos = m_pLbStartStyle->GetSelectEntryPos(); + *m_pPosDashLb = m_pLbLineStyle->GetSelectedEntryPos() - 2;// First entry SOLID!!! + sal_Int32 nPos = m_pLbStartStyle->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) nPos--; *m_pPosLineEndLb = nPos; @@ -684,7 +684,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) // To prevent modifications to the list, we do not set other page's items. if( m_nDlgType != 0 || m_nPageType != PageType::Hatch ) { - nPos = m_pLbLineStyle->GetSelectEntryPos(); + nPos = m_pLbLineStyle->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbLineStyle->IsValueChangedFromSaved() ) { @@ -769,7 +769,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) if( m_nDlgType != 0 || m_nPageType != PageType::Bitmap ) { // Line start - nPos = m_pLbStartStyle->GetSelectEntryPos(); + nPos = m_pLbStartStyle->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbStartStyle->IsValueChangedFromSaved() ) { std::unique_ptr<XLineStartItem> pItem; @@ -785,7 +785,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) } } // Line end - nPos = m_pLbEndStyle->GetSelectEntryPos(); + nPos = m_pLbEndStyle->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbEndStyle->IsValueChangedFromSaved() ) { std::unique_ptr<XLineEndItem> pItem; @@ -840,7 +840,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) } } - nPos = m_pLBEdgeStyle->GetSelectEntryPos(); + nPos = m_pLBEdgeStyle->GetSelectedEntryPos(); if( LISTBOX_ENTRY_NOTFOUND != nPos && m_pLBEdgeStyle->IsValueChangedFromSaved() ) { std::unique_ptr<XLineJointItem> pNew; @@ -882,7 +882,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs ) } // LineCaps - nPos = m_pLBCapStyle->GetSelectEntryPos(); + nPos = m_pLBCapStyle->GetSelectedEntryPos(); if( LISTBOX_ENTRY_NOTFOUND != nPos && m_pLBCapStyle->IsValueChangedFromSaved() ) { std::unique_ptr<XLineCapItem> pNew; @@ -963,7 +963,7 @@ void SvxLineTabPage::FillXLSet_Impl() { sal_Int32 nPos; - if( m_pLbLineStyle->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) + if( m_pLbLineStyle->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND ) { m_rXLSet.Put( XLineStyleItem( drawing::LineStyle_NONE ) ); } @@ -975,7 +975,7 @@ void SvxLineTabPage::FillXLSet_Impl() { m_rXLSet.Put( XLineStyleItem( drawing::LineStyle_DASH ) ); - nPos = m_pLbLineStyle->GetSelectEntryPos(); + nPos = m_pLbLineStyle->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { m_rXLSet.Put( XLineDashItem( m_pLbLineStyle->GetSelectedEntry(), @@ -983,7 +983,7 @@ void SvxLineTabPage::FillXLSet_Impl() } } - nPos = m_pLbStartStyle->GetSelectEntryPos(); + nPos = m_pLbStartStyle->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { if( nPos == 0 ) @@ -992,7 +992,7 @@ void SvxLineTabPage::FillXLSet_Impl() m_rXLSet.Put( XLineStartItem( m_pLbStartStyle->GetSelectedEntry(), m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ) ); } - nPos = m_pLbEndStyle->GetSelectEntryPos(); + nPos = m_pLbEndStyle->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { if( nPos == 0 ) @@ -1002,7 +1002,7 @@ void SvxLineTabPage::FillXLSet_Impl() m_pLineEndList->GetLineEnd( nPos - 1 )->GetLineEnd() ) ); } - nPos = m_pLBEdgeStyle->GetSelectEntryPos(); + nPos = m_pLBEdgeStyle->GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) { switch(nPos) @@ -1031,7 +1031,7 @@ void SvxLineTabPage::FillXLSet_Impl() } // LineCaps - nPos = m_pLBCapStyle->GetSelectEntryPos(); + nPos = m_pLBCapStyle->GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) { switch(nPos) @@ -1531,7 +1531,7 @@ void SvxLineTabPage::ChangePreviewHdl_Impl(void const * pCntrl ) m_pCtlPreview->Invalidate(); // Make transparency accessible accordingly - if( m_pLbLineStyle->GetSelectEntryPos() == 0 ) // invisible + if( m_pLbLineStyle->GetSelectedEntryPos() == 0 ) // invisible { m_pBoxTransparency->Disable(); } @@ -1540,12 +1540,12 @@ void SvxLineTabPage::ChangePreviewHdl_Impl(void const * pCntrl ) m_pBoxTransparency->Enable(); } - const bool bHasLineStyle = m_pLbLineStyle->GetSelectEntryPos() !=0; - const bool bHasLineStart = m_pLbStartStyle->GetSelectEntryPos() != 0; + const bool bHasLineStyle = m_pLbLineStyle->GetSelectedEntryPos() !=0; + const bool bHasLineStart = m_pLbStartStyle->GetSelectedEntryPos() != 0; m_pBoxStart->Enable(bHasLineStart && bHasLineStyle); - const bool bHasLineEnd = m_pLbEndStyle->GetSelectEntryPos() != 0; + const bool bHasLineEnd = m_pLbEndStyle->GetSelectedEntryPos() != 0; m_pBoxEnd->Enable(bHasLineEnd && bHasLineStyle); } @@ -1570,7 +1570,7 @@ void SvxLineTabPage::ChangeStartHdl_Impl( void const * p ) if( p == m_pMtrStartWidth ) m_pMtrEndWidth->SetValue( m_pMtrStartWidth->GetValue() ); if( p == m_pLbStartStyle ) - m_pLbEndStyle->SelectEntryPos( m_pLbStartStyle->GetSelectEntryPos() ); + m_pLbEndStyle->SelectEntryPos( m_pLbStartStyle->GetSelectedEntryPos() ); if( p == m_pTsbCenterStart ) m_pTsbCenterEnd->SetState( m_pTsbCenterStart->GetState() ); } @@ -1595,7 +1595,7 @@ IMPL_LINK_NOARG( SvxLineTabPage, ChangeCapStyleHdl_Impl, ListBox&, void ) IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl, ListBox&, void) { - if( m_pLbLineStyle->GetSelectEntryPos() == 0 ) // invisible + if( m_pLbLineStyle->GetSelectedEntryPos() == 0 ) // invisible { if(!m_bSymbols) m_pBoxColor->Disable(); @@ -1645,7 +1645,7 @@ void SvxLineTabPage::ChangeEndHdl_Impl( void const * p ) if( p == m_pMtrEndWidth ) m_pMtrStartWidth->SetValue( m_pMtrEndWidth->GetValue() ); if( p == m_pLbEndStyle ) - m_pLbStartStyle->SelectEntryPos( m_pLbEndStyle->GetSelectEntryPos() ); + m_pLbStartStyle->SelectEntryPos( m_pLbEndStyle->GetSelectedEntryPos() ); if( p == m_pTsbCenterEnd ) m_pTsbCenterStart->SetState( m_pTsbCenterEnd->GetState() ); } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index ccf38b72114b..27ed488d3c85 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -270,7 +270,7 @@ void SvxLineDefTabPage::CheckChanges_Impl() } - sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineStyles->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { *pPosDashLb = nPos; @@ -355,7 +355,7 @@ void SvxLineDefTabPage::SelectLinestyleHdl_Impl(ListBox const * p) { if(pDashList->Count()) { - int nTmp = m_pLbLineStyles->GetSelectEntryPos(); + int nTmp = m_pLbLineStyles->GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND == nTmp) { @@ -499,7 +499,7 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p) { if ( p == m_pLbType1 || !p ) { - if ( m_pLbType1->GetSelectEntryPos() == 0 ) + if ( m_pLbType1->GetSelectedEntryPos() == 0 ) { m_pMtrLength1->Disable(); m_pMtrLength1->SetText( "" ); @@ -513,7 +513,7 @@ void SvxLineDefTabPage::SelectTypeHdl_Impl(ListBox* p) if ( p == m_pLbType2 || !p ) { - if ( m_pLbType2->GetSelectEntryPos() == 0 ) + if ( m_pLbType2->GetSelectedEntryPos() == 0 ) { m_pMtrLength2->Disable(); m_pMtrLength2->SetText( "" ); @@ -611,7 +611,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl, Button*, void) IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) { - sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineStyles->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -676,7 +676,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl, Button*, void) IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) { - sal_Int32 nPos = m_pLbLineStyles->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineStyles->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -851,9 +851,9 @@ void SvxLineDefTabPage::FillDash_Impl() aDash.SetDashStyle( eXDS ); aDash.SetDots( (sal_uInt8) m_pNumFldNumber1->GetValue() ); - aDash.SetDotLen( m_pLbType1->GetSelectEntryPos() == 0 ? 0 : GetCoreValue( *m_pMtrLength1, ePoolUnit ) ); + aDash.SetDotLen( m_pLbType1->GetSelectedEntryPos() == 0 ? 0 : GetCoreValue( *m_pMtrLength1, ePoolUnit ) ); aDash.SetDashes( (sal_uInt8) m_pNumFldNumber2->GetValue() ); - aDash.SetDashLen( m_pLbType2->GetSelectEntryPos() == 0 ? 0 : GetCoreValue( *m_pMtrLength2, ePoolUnit ) ); + aDash.SetDashLen( m_pLbType2->GetSelectedEntryPos() == 0 ? 0 : GetCoreValue( *m_pMtrLength2, ePoolUnit ) ); aDash.SetDistance( GetCoreValue( *m_pMtrDistance, ePoolUnit ) ); rXLSet.Put( XLineDashItem( OUString(), aDash ) ); @@ -898,7 +898,7 @@ void SvxLineDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { - sal_Int32 nOldSelect = m_pLbLineStyles->GetSelectEntryPos(); + sal_Int32 nOldSelect = m_pLbLineStyles->GetSelectedEntryPos(); m_pLbLineStyles->Clear(); m_pLbLineStyles->Fill( pDashList ); m_pLbLineStyles->SelectEntryPos( nOldSelect ); diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index db2ddeed56df..9329ea2d8008 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -193,7 +193,7 @@ DeactivateRC SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet ) void SvxLineEndDefTabPage::CheckChanges_Impl() { - sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineEnds->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -208,7 +208,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl() ClickModifyHdl_Impl( nullptr ); } } - nPos = m_pLbLineEnds->GetSelectEntryPos(); + nPos = m_pLbLineEnds->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) *pPosLineEndLb = nPos; @@ -223,7 +223,7 @@ bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet* rSet ) { CheckChanges_Impl(); - long nPos = m_pLbLineEnds->GetSelectEntryPos(); + long nPos = m_pLbLineEnds->GetSelectedEntryPos(); const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos); rSet->Put( XLineStartItem( pEntry->GetName(), pEntry->GetLineEnd() ) ); @@ -241,7 +241,7 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) // Update lineend if( pLineEndList->Count() > 0 ) { - int nPos = m_pLbLineEnds->GetSelectEntryPos(); + int nPos = m_pLbLineEnds->GetSelectedEntryPos(); const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos); @@ -282,7 +282,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void) { if( pLineEndList->Count() > 0 ) { - int nPos = m_pLbLineEnds->GetSelectEntryPos(); + int nPos = m_pLbLineEnds->GetSelectedEntryPos(); const XLineEndEntry* pEntry = pLineEndList->GetLineEnd(nPos); @@ -305,7 +305,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl, ListBox&, void) IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl, Button*, void) { - sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineEnds->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -489,7 +489,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl, Button*, void) IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl, Button*, void) { - sal_Int32 nPos = m_pLbLineEnds->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLineEnds->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -661,7 +661,7 @@ void SvxLineEndDefTabPage::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) ) { - sal_Int32 nOldSelect = m_pLbLineEnds->GetSelectEntryPos(); + sal_Int32 nOldSelect = m_pLbLineEnds->GetSelectedEntryPos(); m_pLbLineEnds->Clear(); m_pLbLineEnds->Fill( pLineEndList ); m_pLbLineEnds->SelectEntryPos( nOldSelect ); diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index 941f4f1901ce..edd7a0f930a4 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -152,7 +152,7 @@ void SvxTransparenceTabPage::ModifiedTrgrHdl_Impl(void const * pControl) { if(pControl == m_pLbTrgrGradientType || pControl == this) { - css::awt::GradientStyle eXGS = (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos(); + css::awt::GradientStyle eXGS = (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectedEntryPos(); SetControlState_Impl( eXGS ); } @@ -162,7 +162,7 @@ void SvxTransparenceTabPage::ModifiedTrgrHdl_Impl(void const * pControl) XGradient aTmpGradient( Color(nStartCol, nStartCol, nStartCol), Color(nEndCol, nEndCol, nEndCol), - (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos(), + (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectedEntryPos(), (sal_uInt16)m_pMtrTrgrAngle->GetValue() * 10, (sal_uInt16)m_pMtrTrgrCenterX->GetValue(), (sal_uInt16)m_pMtrTrgrCenterY->GetValue(), @@ -181,7 +181,7 @@ void SvxTransparenceTabPage::ActivateGradient(bool bActivate) if(bActivate) { - css::awt::GradientStyle eXGS = (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos(); + css::awt::GradientStyle eXGS = (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectedEntryPos(); SetControlState_Impl( eXGS ); } } @@ -346,7 +346,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) XGradient aTmpGradient( Color(nStartCol, nStartCol, nStartCol), Color(nEndCol, nEndCol, nEndCol), - (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos(), + (css::awt::GradientStyle)m_pLbTrgrGradientType->GetSelectedEntryPos(), (sal_uInt16)m_pMtrTrgrAngle->GetValue() * 10, (sal_uInt16)m_pMtrTrgrCenterX->GetValue(), (sal_uInt16)m_pMtrTrgrCenterY->GetValue(), |