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 /svx/source | |
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 'svx/source')
22 files changed, 81 insertions, 81 deletions
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index ac3a32f5e2e3..cb2b94e8a17e 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -79,7 +79,7 @@ void SvxCheckListBox::SelectEntryPos( sal_uLong nPos ) } -sal_uLong SvxCheckListBox::GetSelectEntryPos() const +sal_uLong SvxCheckListBox::GetSelectedEntryPos() const { SvTreeListEntry* pEntry = GetCurEntry(); @@ -158,7 +158,7 @@ void SvxCheckListBox::ToggleCheckButton( SvTreeListEntry* pEntry ) if ( !IsSelected( pEntry ) ) Select( pEntry ); else - CheckEntryPos( GetSelectEntryPos(), !IsChecked( GetSelectEntryPos() ) ); + CheckEntryPos( GetSelectedEntryPos(), !IsChecked( GetSelectedEntryPos() ) ); } } diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 8e56390c7984..aba6e7abe925 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -714,7 +714,7 @@ void SvxTPFilter::SetDateMode(sal_uInt16 nMode) SvxRedlinDateMode SvxTPFilter::GetDateMode() { - return static_cast<SvxRedlinDateMode>(m_pLbDate->GetSelectEntryPos()); + return static_cast<SvxRedlinDateMode>(m_pLbDate->GetSelectedEntryPos()); } void SvxTPFilter::ClearAuthors() { @@ -739,7 +739,7 @@ void SvxTPFilter::SelectedAuthorPos(sal_Int32 nPos) sal_Int32 SvxTPFilter::SelectAuthor(const OUString& aString) { m_pLbAuthor->SelectEntry(aString); - return m_pLbAuthor->GetSelectEntryPos(); + return m_pLbAuthor->GetSelectedEntryPos(); } void SvxTPFilter::SetRange(const OUString& rString) @@ -862,7 +862,7 @@ void SvxTPFilter::ShowAction(bool bShow) IMPL_LINK_NOARG( SvxTPFilter, SelDateHdl, ListBox&, void ) { - SvxRedlinDateMode nKind = static_cast<SvxRedlinDateMode>(m_pLbDate->GetSelectEntryPos()); + SvxRedlinDateMode nKind = static_cast<SvxRedlinDateMode>(m_pLbDate->GetSelectedEntryPos()); switch(nKind) { case SvxRedlinDateMode::BEFORE: diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 151329a5f524..3c2a445b8372 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -113,7 +113,7 @@ void SvxFontListBox::SetNoSelection() SelectAll( false ); } -sal_uLong SvxFontListBox::GetSelectEntryPos() const +sal_uLong SvxFontListBox::GetSelectedEntryPos() const { SvTreeListEntry* pSvLBoxEntry = FirstSelected(); return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : TREELIST_ENTRY_NOTFOUND; diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index a2d3eaa7075a..048a56918b56 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -72,7 +72,7 @@ void FrameDirectionListBox::SelectEntryValue( SvxFrameDirection eDirection ) SvxFrameDirection FrameDirectionListBox::GetSelectEntryValue() const { - sal_Int32 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectedEntryPos(); if( nPos == LISTBOX_ENTRY_NOTFOUND ) return static_cast< SvxFrameDirection >( 0xFFFF ); return lclVoidToEnum( GetEntryData( nPos ) ); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index bc7ac82bee9a..478f5ca9336a 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -611,12 +611,12 @@ void SvxLanguageComboBox::ImplSetEntryData( sal_Int32 nPos, void* pData ) sal_Int32 SvxLanguageBox::ImplGetSelectEntryPos() const { - return GetSelectEntryPos(); + return GetSelectedEntryPos(); } sal_Int32 SvxLanguageComboBox::ImplGetSelectEntryPos() const { - return GetSelectEntryPos(); + return GetSelectedEntryPos(); } @@ -705,7 +705,7 @@ void SvxLanguageBox::ImplSaveValue() void SvxLanguageComboBox::ImplSaveValue() { // Emulate the ListBox behavior. - mnSavedValuePos = GetSelectEntryPos(); + mnSavedValuePos = GetSelectedEntryPos(); } diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx index e0361e104d47..1ec9c17c0da4 100644 --- a/svx/source/dialog/papersizelistbox.cxx +++ b/svx/source/dialog/papersizelistbox.cxx @@ -73,7 +73,7 @@ void PaperSizeListBox::SetSelection( Paper ePreselectPaper ) Paper PaperSizeListBox::GetSelection() const { - const sal_Int32 nPos = GetSelectEntryPos(); + const sal_Int32 nPos = GetSelectedEntryPos(); Paper ePaper = (Paper)reinterpret_cast<sal_uLong>(GetEntryData( nPos )); return ePaper; diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 73371cb0c588..682295b46fae 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -594,7 +594,7 @@ IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl, Button*, void) IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox&, rBox, void) { AssertOneEntry(); - sal_Int16 nAdjust = rBox.GetSelectEntryPos(); + sal_Int16 nAdjust = rBox.GetSelectedEntryPos(); Sequence<PropertyValues>& aRubyValues = m_pImpl->GetRubyValues(); for (PropertyValues & rProps : aRubyValues) { @@ -611,7 +611,7 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox&, rBox, void) IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox&, rBox, void) { AssertOneEntry(); - bool bAbove = !rBox.GetSelectEntryPos(); + bool bAbove = !rBox.GetSelectedEntryPos(); Sequence<PropertyValues>& aRubyValues = m_pImpl->GetRubyValues(); for (PropertyValues & rProps : aRubyValues) { @@ -629,7 +629,7 @@ IMPL_LINK_NOARG(SvxRubyDialog, CharStyleHdl_Impl, ListBox&, void) { AssertOneEntry(); OUString sStyleName; - if (LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectEntryPos()) + if (LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectedEntryPos()) sStyleName = *static_cast<OUString*>(m_pCharStyleLB->GetSelectEntryData()); Sequence<PropertyValues>& aRubyValues = m_pImpl->GetRubyValues(); for (PropertyValues & rProps : aRubyValues) @@ -801,7 +801,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang long nRubyWidth = rRenderContext.GetTextWidth(sRubyText); rRenderContext.SetFont(aSaveFont); - RubyAdjust nAdjust = (RubyAdjust)m_pParentDlg->m_pAdjustLB->GetSelectEntryPos(); + RubyAdjust nAdjust = (RubyAdjust)m_pParentDlg->m_pAdjustLB->GetSelectedEntryPos(); //use center if no adjustment is available if (nAdjust > RubyAdjust_INDENT_BLOCK) nAdjust = RubyAdjust_CENTER; @@ -817,7 +817,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang long nYBase = aWinSize.Height() * 3 / 4 - nTextHeight / 2; //use above also if no selection is set - bool bAbove = m_pParentDlg->m_pPositionLB->GetSelectEntryPos() != 1; + bool bAbove = m_pParentDlg->m_pPositionLB->GetSelectedEntryPos() != 1; if (!bAbove) { long nTmp = nYRuby; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index e0ee16f9e3d0..30ec52ebce46 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1337,8 +1337,8 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) if ( !bWriter ) { - if ( m_pCalcSearchInLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) - pSearchItem->SetCellType( static_cast<SvxSearchCellType>(m_pCalcSearchInLB->GetSelectEntryPos()) ); + if ( m_pCalcSearchInLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ) + pSearchItem->SetCellType( static_cast<SvxSearchCellType>(m_pCalcSearchInLB->GetSelectedEntryPos()) ); pSearchItem->SetRowDirection( m_pRowsBtn->IsChecked() ); pSearchItem->SetAllTables( m_pAllSheetsCB->IsChecked() ); @@ -2303,8 +2303,8 @@ void SvxSearchDialog::SaveToModule_Impl() if ( !bWriter ) { - if ( m_pCalcSearchInLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) - pSearchItem->SetCellType( static_cast<SvxSearchCellType>(m_pCalcSearchInLB->GetSelectEntryPos()) ); + if ( m_pCalcSearchInLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ) + pSearchItem->SetCellType( static_cast<SvxSearchCellType>(m_pCalcSearchInLB->GetSelectedEntryPos()) ); pSearchItem->SetRowDirection( m_pRowsBtn->IsChecked() ); pSearchItem->SetAllTables( m_pAllSheetsCB->IsChecked() ); diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index f02645980dc5..2a1999cf6e0b 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -206,7 +206,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc ) rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const { - sal_Int32 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) return rtl_TextEncoding( reinterpret_cast<sal_uIntPtr>(GetEntryData(nPos)) ); diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 0b29842e3284..d71513effeee 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -827,7 +827,7 @@ void Svx3DWin::Update( SfxItemSet const & rAttrs ) if( eState != SfxItemState::DONTCARE ) { sal_uInt16 nValue = static_cast<const Svx3DShadeModeItem&>(rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue(); - if( nValue != m_pLbShademode->GetSelectEntryPos() ) + if( nValue != m_pLbShademode->GetSelectedEntryPos() ) { m_pLbShademode->SelectEntryPos( nValue ); bUpdate = true; @@ -1798,7 +1798,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Shade mode if( m_pLbShademode->GetSelectEntryCount() ) { - nValue = m_pLbShademode->GetSelectEntryPos(); + nValue = m_pLbShademode->GetSelectedEntryPos(); rAttrs.Put(Svx3DShadeModeItem(nValue)); } else @@ -2547,7 +2547,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, ListBox&, rListBox, void ) Color aColSpec( COL_WHITE ); sal_uInt16 nSpecIntens = 20; - switch( m_pLbMatFavorites->GetSelectEntryPos() ) + switch( m_pLbMatFavorites->GetSelectedEntryPos() ) { case 1: // Metall { diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 7b5ca399335d..c6d3a39e181c 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2641,7 +2641,7 @@ bool DbListBox::commitControl() if (static_cast<ListBox*>(m_pWindow.get())->GetSelectEntryCount()) { aSelectSeq.realloc(1); - *aSelectSeq.getArray() = (sal_Int16)static_cast<ListBox*>(m_pWindow.get())->GetSelectEntryPos(); + *aSelectSeq.getArray() = (sal_Int16)static_cast<ListBox*>(m_pWindow.get())->GetSelectedEntryPos(); } aVal <<= aSelectSeq; m_rColumn.getModel()->setPropertyValue(FM_PROP_SELECT_SEQ, aVal); @@ -2852,7 +2852,7 @@ bool DbFilterField::commitControl() aText.clear(); if (static_cast<ListBox*>(m_pWindow.get())->GetSelectEntryCount()) { - sal_Int16 nPos = (sal_Int16)static_cast<ListBox*>(m_pWindow.get())->GetSelectEntryPos(); + sal_Int16 nPos = (sal_Int16)static_cast<ListBox*>(m_pWindow.get())->GetSelectedEntryPos(); if ( ( nPos >= 0 ) && ( nPos < m_aValueList.getLength() ) ) aText = m_aValueList.getConstArray()[nPos]; } @@ -4137,7 +4137,7 @@ sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos() if (m_pBox) { UpdateFromColumn(); - sal_Int32 nPos = m_pBox->GetSelectEntryPos(); + sal_Int32 nPos = m_pBox->GetSelectedEntryPos(); if (nPos > SHRT_MAX || nPos < SHRT_MIN) throw std::out_of_range("awt::XListBox::getSelectedItemPos can only return a short"); return nPos; @@ -4157,7 +4157,7 @@ Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() const sal_Int32 nSelEntries = m_pBox->GetSelectEntryCount(); aSeq = Sequence<sal_Int16>( nSelEntries ); for ( sal_Int32 n = 0; n < nSelEntries; ++n ) - aSeq.getArray()[n] = m_pBox->GetSelectEntryPos( n ); + aSeq.getArray()[n] = m_pBox->GetSelectedEntryPos( n ); } return aSeq; } @@ -4290,7 +4290,7 @@ void FmXListBoxCell::onWindowEvent( const VclEventId _nEventId, const vcl::Windo // with multiple selection 0xFFFF, otherwise the ID aEvent.Selected = (m_pBox->GetSelectEntryCount() == 1 ) - ? m_pBox->GetSelectEntryPos() : 0xFFFF; + ? m_pBox->GetSelectedEntryPos() : 0xFFFF; m_aItemListeners.notifyEach( &awt::XItemListener::itemStateChanged, aEvent ); return; @@ -4490,7 +4490,7 @@ void FmXComboBoxCell::onWindowEvent( const VclEventId _nEventId, const vcl::Wind // with multiple selection 0xFFFF, otherwise the ID aEvent.Selected = ( m_pComboBox->GetSelectEntryCount() == 1 ) - ? m_pComboBox->GetSelectEntryPos() + ? m_pComboBox->GetSelectedEntryPos() : 0xFFFF; m_aItemListeners.notifyEach( &awt::XItemListener::itemStateChanged, aEvent ); } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 796def0b73c5..7eb5ff874f26 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1447,7 +1447,7 @@ namespace svxform } void DataNavigatorWindow::ModelSelectHdl(ListBox const * pBox) { - sal_Int32 nPos = m_pModelsBox->GetSelectEntryPos(); + sal_Int32 nPos = m_pModelsBox->GetSelectedEntryPos(); // pBox == NULL, if you want to force a new fill. if ( nPos != m_nLastSelectedPos || !pBox ) { @@ -1462,7 +1462,7 @@ namespace svxform { bool bIsDocModified = false; Reference< css::xforms::XFormsUIHelper1 > xUIHelper; - sal_Int32 nSelectedPos = m_pModelsBox->GetSelectEntryPos(); + sal_Int32 nSelectedPos = m_pModelsBox->GetSelectedEntryPos(); OUString sSelectedModel( m_pModelsBox->GetEntry( nSelectedPos ) ); Reference< css::xforms::XModel > xModel; try diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index d6c1361f8523..2ef9a5ce5922 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -443,7 +443,7 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint ) case GalleryHintType::THEME_RENAMED: { - const sal_Int32 nCurSelectPos = mpThemes->GetSelectEntryPos(); + const sal_Int32 nCurSelectPos = mpThemes->GetSelectedEntryPos(); const sal_Int32 nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); mpThemes->RemoveEntry( rGalleryHint.GetThemeName() ); @@ -465,7 +465,7 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint ) case GalleryHintType::CLOSE_THEME: { - const sal_Int32 nCurSelectPos = mpThemes->GetSelectEntryPos(); + const sal_Int32 nCurSelectPos = mpThemes->GetSelectedEntryPos(); const sal_Int32 nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); if( nCurSelectPos == nCloseEntryPos ) @@ -580,7 +580,7 @@ IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl, void*, void) aMenu->RemoveDisabledEntries(); const tools::Rectangle aThemesRect( mpThemes->GetPosPixel(), mpThemes->GetOutputSizePixel() ); - Point aSelPos( mpThemes->GetBoundingRectangle( mpThemes->GetSelectEntryPos() ).Center() ); + Point aSelPos( mpThemes->GetBoundingRectangle( mpThemes->GetSelectedEntryPos() ).Center() ); aSelPos.X() = std::max( std::min( aSelPos.X(), aThemesRect.Right() ), aThemesRect.Left() ); aSelPos.Y() = std::max( std::min( aSelPos.Y(), aThemesRect.Bottom() ), aThemesRect.Top() ); diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index bdced73f824f..7be5d84bfe81 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -240,7 +240,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, void) IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) { - sal_Int32 nPos = (eFillStyle)mpLbFillType->GetSelectEntryPos(); + sal_Int32 nPos = (eFillStyle)mpLbFillType->GetSelectedEntryPos(); mpLbFillAttr->Clear(); SfxObjectShell* pSh = SfxObjectShell::Current(); if(!pSh) @@ -467,7 +467,7 @@ void AreaPropertyPanelBase::DataChanged( void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() { - sal_Int32 nPosFillStyle = (eFillStyle)mpLbFillType->GetSelectEntryPos(); + sal_Int32 nPosFillStyle = (eFillStyle)mpLbFillType->GetSelectedEntryPos(); SfxObjectShell* pSh = SfxObjectShell::Current(); // #i122676# dependent from bFillStyleChange, do execute a single or two @@ -502,7 +502,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() { XGradient aGradient; aGradient.SetAngle(mpMTRAngle->GetValue() * 10); - aGradient.SetGradientStyle((css::awt::GradientStyle)mpGradientStyle->GetSelectEntryPos()); + aGradient.SetGradientStyle((css::awt::GradientStyle)mpGradientStyle->GetSelectedEntryPos()); aGradient.SetStartColor(mpLbFillGradFrom->GetSelectEntryColor()); aGradient.SetEndColor(mpLbFillGradTo->GetSelectEntryColor()); @@ -516,7 +516,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() } case eFillStyle::HATCH: { - sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = mpLbFillAttr->GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND == nPos) { @@ -546,7 +546,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() } case eFillStyle::BITMAP: { - sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = mpLbFillAttr->GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND == nPos) { @@ -576,7 +576,7 @@ void AreaPropertyPanelBase::SelectFillAttrHdl_Impl() } case eFillStyle::PATTERN: { - sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = mpLbFillAttr->GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND == nPos) { @@ -847,7 +847,7 @@ void AreaPropertyPanelBase::updateFillStyle(bool bDisabled, bool bDefaultOrSet, break; } } - meLastXFS = static_cast< sal_uInt16 >(mpLbFillType->GetSelectEntryPos()); + meLastXFS = static_cast< sal_uInt16 >(mpLbFillType->GetSelectedEntryPos()); mpLbFillType->SelectEntryPos(static_cast< sal_Int32 >(nPos)); Update(); return; @@ -1104,7 +1104,7 @@ void AreaPropertyPanelBase::NotifyItemUpdate( void AreaPropertyPanelBase::Update() { - const eFillStyle eXFS = (eFillStyle)mpLbFillType->GetSelectEntryPos(); + const eFillStyle eXFS = (eFillStyle)mpLbFillType->GetSelectedEntryPos(); SfxObjectShell* pSh = SfxObjectShell::Current(); switch( eXFS ) @@ -1161,7 +1161,7 @@ void AreaPropertyPanelBase::Update() mpLbFillGradFrom->SelectEntry(aGradient.GetStartColor()); mpLbFillGradTo->SelectEntry(aGradient.GetEndColor()); mpGradientStyle->SelectEntryPos(sal::static_int_cast< sal_Int32 >( aGradient.GetGradientStyle() )); - if(mpGradientStyle->GetSelectEntryPos() == (sal_Int32)GradientStyle::Radial) + if(mpGradientStyle->GetSelectedEntryPos() == (sal_Int32)GradientStyle::Radial) mpMTRAngle->Disable(); else mpMTRAngle->SetValue( aGradient.GetAngle() /10 ); @@ -1276,7 +1276,7 @@ IMPL_LINK( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void ) IMPL_LINK_NOARG(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, void) { - sal_Int32 nSelectType = mpLBTransType->GetSelectEntryPos(); + sal_Int32 nSelectType = mpLBTransType->GetSelectedEntryPos(); bool bGradient = false; sal_uInt16 nTrans = 0; @@ -1376,7 +1376,7 @@ IMPL_LINK_NOARG(AreaPropertyPanelBase, ModifyTransparentHdl_Impl, Edit&, void) const sal_uInt16 nTrans = (sal_uInt16)mpMTRTransparent->GetValue(); mnLastTransSolid = nTrans; SetTransparency(nTrans); - const sal_Int32 nSelectType = mpLBTransType->GetSelectEntryPos(); + const sal_Int32 nSelectType = mpLBTransType->GetSelectedEntryPos(); if(nTrans && !nSelectType) { @@ -1436,7 +1436,7 @@ void AreaPropertyPanelBase::SetGradient (const XGradient& rGradient) sal_Int32 AreaPropertyPanelBase::GetSelectedTransparencyTypeIndex() const { - return mpLBTransType->GetSelectEntryPos(); + return mpLBTransType->GetSelectedEntryPos(); } } } // end of namespace svx::sidebar diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 44bfc5aa11cb..6ac50e56ab38 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -157,7 +157,7 @@ IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyTransHdl, Edit&, void ) IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void ) { - const sal_Int16 nTrans = mpLBColorMode->GetSelectEntryPos(); + const sal_Int16 nTrans = mpLBColorMode->GetSelectedEntryPos(); const SfxInt16Item aTransItem( SID_ATTR_GRAF_MODE, nTrans ); GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_MODE, SfxCallMode::RECORD, { &aTransItem }); diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 3e6e52ac3975..b0cc6c354e66 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -541,7 +541,7 @@ void LinePropertyPanelBase::updateLineCap(bool bDisabled, bool bSetOrDefault, IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeLineStyleHdl, ListBox&, void) { - const sal_Int32 nPos(mpLBStyle->GetSelectEntryPos()); + const sal_Int32 nPos(mpLBStyle->GetSelectedEntryPos()); if(LISTBOX_ENTRY_NOTFOUND != nPos && mpLBStyle->IsValueChangedFromSaved()) { @@ -579,7 +579,7 @@ IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeLineStyleHdl, ListBox&, void) IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeStartHdl, ListBox&, void) { - sal_Int32 nPos = mpLBStart->GetSelectEntryPos(); + sal_Int32 nPos = mpLBStart->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBStart->IsValueChangedFromSaved() ) { std::unique_ptr<XLineStartItem> pItem; @@ -593,7 +593,7 @@ IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeStartHdl, ListBox&, void) IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeEndHdl, ListBox&, void) { - sal_Int32 nPos = mpLBEnd->GetSelectEntryPos(); + sal_Int32 nPos = mpLBEnd->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBEnd->IsValueChangedFromSaved() ) { std::unique_ptr<XLineEndItem> pItem; @@ -607,7 +607,7 @@ IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeEndHdl, ListBox&, void) IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeEdgeStyleHdl, ListBox&, void) { - const sal_Int32 nPos(mpLBEdgeStyle->GetSelectEntryPos()); + const sal_Int32 nPos(mpLBEdgeStyle->GetSelectedEntryPos()); if(LISTBOX_ENTRY_NOTFOUND != nPos && mpLBEdgeStyle->IsValueChangedFromSaved()) { @@ -643,7 +643,7 @@ IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeEdgeStyleHdl, ListBox&, void) IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeCapStyleHdl, ListBox&, void) { - const sal_Int32 nPos(mpLBCapStyle->GetSelectEntryPos()); + const sal_Int32 nPos(mpLBCapStyle->GetSelectedEntryPos()); if(LISTBOX_ENTRY_NOTFOUND != nPos && mpLBCapStyle->IsValueChangedFromSaved()) { @@ -896,7 +896,7 @@ void LinePropertyPanelBase::SelectEndStyle(bool bStart) void LinePropertyPanelBase::ActivateControls() { - const sal_Int32 nPos(mpLBStyle->GetSelectEntryPos()); + const sal_Int32 nPos(mpLBStyle->GetSelectedEntryPos()); bool bLineStyle( nPos != 0 ); mpGridLineProps->Enable( bLineStyle ); diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 73099ed8509b..2cda7a14cd82 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -243,7 +243,7 @@ void ParaLineSpacingControl::Initialize() void ParaLineSpacingControl::UpdateMetricFields() { - switch (mpLineDist->GetSelectEntryPos()) + switch (mpLineDist->GetSelectedEntryPos()) { case LLINESPACE_1: case LLINESPACE_115: @@ -340,7 +340,7 @@ void ParaLineSpacingControl::ExecuteLineSpace() mpLineDist->SaveValue(); SvxLineSpacingItem aSpacing(DEFAULT_LINE_SPACING, SID_ATTR_PARA_LINESPACE); - const sal_Int32 nPos = mpLineDist->GetSelectEntryPos(); + const sal_Int32 nPos = mpLineDist->GetSelectedEntryPos(); switch ( nPos ) { diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index dd5c761a0ba0..32e421083af9 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -570,7 +570,7 @@ void FillControl::dispose() IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) { - const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectEntryPos(); + const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectedEntryPos(); if((drawing::FillStyle)meLastXFS != eXFS) { @@ -745,7 +745,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) { - const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectEntryPos(); + const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectedEntryPos(); const XFillStyleItem aXFillStyleItem(eXFS); SfxObjectShell* pSh = SfxObjectShell::Current(); @@ -768,7 +768,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) } case drawing::FillStyle_GRADIENT: { - sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = mpLbFillAttr->GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND == nPos) { @@ -801,7 +801,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) } case drawing::FillStyle_HATCH: { - sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = mpLbFillAttr->GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND == nPos) { @@ -834,7 +834,7 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) } case drawing::FillStyle_BITMAP: { - sal_Int32 nPos = mpLbFillAttr->GetSelectEntryPos(); + sal_Int32 nPos = mpLbFillAttr->GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND == nPos) { diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 3a14314e5066..46d95d62874c 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -349,7 +349,7 @@ void ImplGrafModeControl::Select() { Sequence< PropertyValue > aArgs( 1 ); aArgs[0].Name = "GrafMode"; - aArgs[0].Value <<= sal_Int16( GetSelectEntryPos() ); + aArgs[0].Value <<= sal_Int16( GetSelectedEntryPos() ); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. This instance may be deleted in the meantime (i.e. when a dialog is opened @@ -368,7 +368,7 @@ bool ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt ) MouseNotifyEvent nType = rNEvt.GetType(); if( MouseNotifyEvent::MOUSEBUTTONDOWN == nType || MouseNotifyEvent::GETFOCUS == nType ) - mnCurPos = GetSelectEntryPos(); + mnCurPos = GetSelectedEntryPos(); return ListBox::PreNotify( rNEvt ); } diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index e43f0375c5e1..b76fbebc7b73 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -88,7 +88,7 @@ void SvxLineBox::Select() if ( !IsTravelSelect() ) { drawing::LineStyle eXLS; - sal_Int32 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectedEntryPos(); switch ( nPos ) { @@ -138,7 +138,7 @@ void SvxLineBox::Select() ".uno:XLineStyle", aArgs ); - nCurPos = GetSelectEntryPos(); + nCurPos = GetSelectedEntryPos(); ReleaseFocus_Impl(); } } @@ -152,7 +152,7 @@ bool SvxLineBox::PreNotify( NotifyEvent& rNEvt ) { case MouseNotifyEvent::MOUSEBUTTONDOWN: case MouseNotifyEvent::GETFOCUS: - nCurPos = GetSelectEntryPos(); + nCurPos = GetSelectedEntryPos(); break; case MouseNotifyEvent::LOSEFOCUS: SelectEntryPos(nCurPos); @@ -401,7 +401,7 @@ bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) if (!isDisposed()) { if ( MouseNotifyEvent::MOUSEBUTTONDOWN == nType || MouseNotifyEvent::GETFOCUS == nType ) - nCurPos = GetSelectEntryPos(); + nCurPos = GetSelectedEntryPos(); else if ( MouseNotifyEvent::LOSEFOCUS == nType && Application::GetFocusWindow() && !IsWindowOrChild( Application::GetFocusWindow(), true ) ) @@ -476,7 +476,7 @@ bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) MouseNotifyEvent nType = rNEvt.GetType(); if ( MouseNotifyEvent::MOUSEBUTTONDOWN == nType || MouseNotifyEvent::GETFOCUS == nType ) - nCurPos = GetSelectEntryPos(); + nCurPos = GetSelectedEntryPos(); return FillAttrLB::PreNotify( rNEvt ); } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 453042bbdc0d..98e5f602fbb4 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -439,7 +439,7 @@ void SvxStyleBox_Impl::Select() bool bDoIt = true, bClear = false; if( bInSpecialMode ) { - if( aSearchEntry == aClearFormatKey && GetSelectEntryPos() == 0 ) + if( aSearchEntry == aClearFormatKey && GetSelectedEntryPos() == 0 ) { aSearchEntry = sDefaultStyle; bClear = true; @@ -448,7 +448,7 @@ void SvxStyleBox_Impl::Select() SfxToolBoxControl::Dispatch( m_xDispatchProvider, ".uno:ResetAttributes", aEmptyVals); } - else if( aSearchEntry == aMoreKey && GetSelectEntryPos() == ( GetEntryCount() - 1 ) ) + else if( aSearchEntry == aMoreKey && GetSelectedEntryPos() == ( GetEntryCount() - 1 ) ) { SfxViewFrame* pViewFrm = SfxViewFrame::Current(); DBG_ASSERT( pViewFrm, "SvxStyleBox_Impl::Select(): no viewframe" ); @@ -521,7 +521,7 @@ bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt ) MouseNotifyEvent nType = rNEvt.GetType(); if ( MouseNotifyEvent::MOUSEBUTTONDOWN == nType || MouseNotifyEvent::GETFOCUS == nType ) - nCurSel = GetSelectEntryPos(); + nCurSel = GetSelectedEntryPos(); else if ( MouseNotifyEvent::LOSEFOCUS == nType ) { // don't handle before our Select() is called @@ -545,7 +545,7 @@ bool SvxStyleBox_Impl::EventNotify( NotifyEvent& rNEvt ) { if(IsInDropDown()) { - const sal_Int32 nItem = GetSelectEntryPos() - 1; + const sal_Int32 nItem = GetSelectedEntryPos() - 1; if(nItem < MAX_STYLES_ENTRIES) m_pButtons[nItem]->ExecuteMenu(); bHandled = true; @@ -812,7 +812,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) pDevice->Push(PushFlags::FILLCOLOR | PushFlags::FONT | PushFlags::TEXTCOLOR); const tools::Rectangle& rRect(rUDEvt.GetRect()); - bool bIsNotSelected = rUDEvt.GetItemId() != GetSelectEntryPos(); + bool bIsNotSelected = rUDEvt.GetItemId() != GetSelectedEntryPos(); SetupEntry(*pDevice, rUDEvt.GetWindow(), nItem, rRect, aStyleName, bIsNotSelected); @@ -1322,7 +1322,7 @@ SvxColorWindow::SvxColorWindow(const OUString& rCommand, } OUString aPaletteName( officecfg::Office::Common::UserColors::PaletteName::get() ); mpPaletteListBox->SelectEntry( aPaletteName ); - const sal_Int32 nSelectedEntry(mpPaletteListBox->GetSelectEntryPos()); + const sal_Int32 nSelectedEntry(mpPaletteListBox->GetSelectedEntryPos()); if (nSelectedEntry != LISTBOX_ENTRY_NOTFOUND) mrPaletteManager.SetPalette(nSelectedEntry); @@ -1471,7 +1471,7 @@ IMPL_LINK(SvxColorWindow, SelectHdl, ValueSet*, pColorSet, void) IMPL_LINK_NOARG(SvxColorWindow, SelectPaletteHdl, ListBox&, void) { - sal_Int32 nPos = mpPaletteListBox->GetSelectEntryPos(); + sal_Int32 nPos = mpPaletteListBox->GetSelectedEntryPos(); mrPaletteManager.SetPalette( nPos ); mrPaletteManager.ReloadColorSet(*mpColorSet); mpColorSet->layoutToGivenHeight(mpColorSet->GetSizePixel().Height(), mrPaletteManager.GetColorCount()); @@ -2107,10 +2107,10 @@ IMPL_LINK_NOARG(SvxCurrencyList_Impl, SelectHdl, ListBox&, void) if (!m_xControl.is()) return; - m_rSelectedFormat = m_aFormatEntries[ m_pCurrencyLb->GetSelectEntryPos() ]; + m_rSelectedFormat = m_aFormatEntries[ m_pCurrencyLb->GetSelectedEntryPos() ]; m_eSelectedLanguage = m_eFormatLanguage; - m_xControl->execute( m_pCurrencyLb->GetSelectEntryPos() + 1 ); + m_xControl->execute( m_pCurrencyLb->GetSelectedEntryPos() + 1 ); } IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl, ListBox&, void) @@ -2120,7 +2120,7 @@ IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl, ListBox&, void) SvxLineItem aLineItem( SID_FRAME_LINESTYLE ); SvxBorderLineStyle nStyle = m_aLineStyleLb->GetSelectEntryStyle(); - if ( m_aLineStyleLb->GetSelectEntryPos( ) > 0 ) + if ( m_aLineStyleLb->GetSelectedEntryPos( ) > 0 ) { SvxBorderLine aTmp; aTmp.SetBorderLineStyle( nStyle ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 9e9152304ecc..d5111a5fb29a 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -649,7 +649,7 @@ bool ChineseDictionaryDialog::isEditFieldsContentEqualsSelectedListContent() con return false; if( pE->m_aMapping != m_pED_Mapping->GetText() ) return false; - if( pE->m_nConversionPropertyType != m_pLB_Property->GetSelectEntryPos()+1 ) + if( pE->m_nConversionPropertyType != m_pLB_Property->GetSelectedEntryPos()+1 ) return false; return true; } @@ -709,7 +709,7 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, AddHdl, Button*, void) if( !isEditFieldsHaveContent() ) return; - sal_Int16 nConversionPropertyType = m_pLB_Property->GetSelectEntryPos()+1; + sal_Int16 nConversionPropertyType = m_pLB_Property->GetSelectedEntryPos()+1; getActiveDictionary().addEntry( m_pED_Term->GetText(), m_pED_Mapping->GetText(), nConversionPropertyType ); @@ -726,7 +726,7 @@ IMPL_LINK_NOARG(ChineseDictionaryDialog, ModifyHdl, Button*, void) { OUString aTerm( m_pED_Term->GetText() ); OUString aMapping( m_pED_Mapping->GetText() ); - sal_Int16 nConversionPropertyType = m_pLB_Property->GetSelectEntryPos()+1; + sal_Int16 nConversionPropertyType = m_pLB_Property->GetSelectedEntryPos()+1; DictionaryList& rActive = getActiveDictionary(); DictionaryList& rReverse = getReverseDictionary(); |