diff options
262 files changed, 1015 insertions, 1015 deletions
diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx index 8c60bc5b8070..75bd598a85ba 100644 --- a/accessibility/inc/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/helper/IComboListBoxHelper.hxx @@ -55,7 +55,7 @@ namespace accessibility virtual void SelectEntryPos( sal_Int32 nPos, bool bSelect = true ) = 0; virtual sal_Int32 GetSelectEntryCount() const = 0; virtual void SetNoSelection() = 0; - virtual sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex ) const = 0; + virtual sal_Int32 GetSelectedEntryPos( sal_Int32 nSelIndex ) const = 0; virtual bool IsInDropDown() const = 0; virtual tools::Rectangle GetEntryCharacterBounds( const sal_Int32 _nEntryPos, const sal_Int32 _nCharacterIndex ) const = 0; virtual long GetIndexForPoint( const Point& rPoint, sal_Int32 & nPos ) const = 0; diff --git a/accessibility/inc/helper/listboxhelper.hxx b/accessibility/inc/helper/listboxhelper.hxx index 8bc7e2dae2ef..0ef5d9f57509 100644 --- a/accessibility/inc/helper/listboxhelper.hxx +++ b/accessibility/inc/helper/listboxhelper.hxx @@ -147,9 +147,9 @@ public: m_aComboListBox.SetNoSelection(); } - virtual sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const override + virtual sal_Int32 GetSelectedEntryPos( sal_Int32 nSelIndex = 0 ) const override { - return m_aComboListBox.GetSelectEntryPos(nSelIndex); + return m_aComboListBox.GetSelectedEntryPos(nSelIndex); } virtual bool IsInDropDown() const override diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index f5cb1602f0f3..cd3021437a5d 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -90,7 +90,7 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType UpdateVisibleLineCount(); if(m_pListBoxHelper) { - m_nCurSelectedPos=m_pListBoxHelper->GetSelectEntryPos(0); + m_nCurSelectedPos=m_pListBoxHelper->GetSelectedEntryPos(0); } sal_uInt16 nCount = static_cast<sal_uInt16>(getAccessibleChildCount()); m_aAccessibleChildren.reserve(nCount); @@ -330,7 +330,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve { uno::Any aOldValue, aNewValue; - sal_Int32 nPos = m_nCurSelectedPos; //m_pListBoxHelper->GetSelectEntryPos(); + sal_Int32 nPos = m_nCurSelectedPos; //m_pListBoxHelper->GetSelectedEntryPos(); if ( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos = m_pListBoxHelper->GetTopEntry(); @@ -831,7 +831,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild if ( m_pListBoxHelper ) { checkSelection_Impl(nSelectedChildIndex,*m_pListBoxHelper,true); - return getAccessibleChild( m_pListBoxHelper->GetSelectEntryPos( (sal_uInt16)nSelectedChildIndex ) ); + return getAccessibleChild( m_pListBoxHelper->GetSelectedEntryPos( (sal_uInt16)nSelectedChildIndex ) ); } return nullptr; diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 98706fc8a679..a50b7d236722 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -327,7 +327,7 @@ IMPL_LINK( MediaControl, implZoomSelectHdl, ListBox&, p, void ) MediaItem aExecItem; css::media::ZoomLevel eLevel; - switch( p.GetSelectEntryPos() ) + switch( p.GetSelectedEntryPos() ) { case AVMEDIA_ZOOMLEVEL_50: eLevel = css::media::ZoomLevel_ZOOM_1_TO_2; break; case AVMEDIA_ZOOMLEVEL_100: eLevel = css::media::ZoomLevel_ORIGINAL; break; diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index e184dd74dc75..e0ee83e4beea 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -300,7 +300,7 @@ void LibBox::Select() void LibBox::NotifyIDE() { - sal_Int32 nSelPos = GetSelectEntryPos(); + sal_Int32 nSelPos = GetSelectedEntryPos(); if (LibEntry* pEntry = static_cast<LibEntry*>(GetEntryData(nSelPos))) { ScriptDocument aDocument( pEntry->GetDocument() ); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 47d1ece3a936..48452341b4f2 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -2696,7 +2696,7 @@ void CodeCompleteListBox::KeyInput( const KeyEvent& rKeyEvt ) OUString sTypedText = pCodeCompleteWindow->pParent->GetEditEngine()->GetText(aTextSelection); if( !aFuncBuffer.isEmpty() ) { - sal_Int32 nInd = GetSelectEntryPos(); + sal_Int32 nInd = GetSelectedEntryPos(); if( nInd != LISTBOX_ENTRY_NOTFOUND ) {//if there is something selected bool bFound = false; diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index e165cabe2c1f..5bd4910b8dc0 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -1388,7 +1388,7 @@ void LibPage::InsertListBoxEntry( const ScriptDocument& rDocument, LibraryLocati void LibPage::SetCurLib() { - const sal_Int32 nSelPos = m_pBasicsBox->GetSelectEntryPos(); + const sal_Int32 nSelPos = m_pBasicsBox->GetSelectedEntryPos(); DocumentEntry* pEntry = static_cast<DocumentEntry*>(m_pBasicsBox->GetEntryData( nSelPos )); if ( pEntry ) { diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index b603bf41781c..2921e52f6b4c 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -167,12 +167,12 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, Button*, void) if ( aQBox->Execute() == RET_OK ) { sal_Int32 nCount = m_pLanguageLB->GetSelectEntryCount(); - sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pLanguageLB->GetSelectedEntryPos(); // remove locales Sequence< Locale > aLocaleSeq( nCount ); for ( sal_Int32 i = 0; i < nCount; ++i ) { - const sal_Int32 nSelPos = m_pLanguageLB->GetSelectEntryPos(i); + const sal_Int32 nSelPos = m_pLanguageLB->GetSelectedEntryPos(i); LanguageEntry* pEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nSelPos )); if ( pEntry ) aLocaleSeq[i] = pEntry->m_aLocale; @@ -192,7 +192,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, DeleteHdl, Button*, void) IMPL_LINK_NOARG(ManageLanguageDialog, MakeDefHdl, Button*, void) { - const sal_Int32 nPos = m_pLanguageLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLanguageLB->GetSelectedEntryPos(); LanguageEntry* pSelectEntry = static_cast<LanguageEntry*>(m_pLanguageLB->GetEntryData( nPos )); if ( pSelectEntry && !pSelectEntry->m_bIsDefault ) { @@ -212,7 +212,7 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl, ListBox&, void) const sal_Int32 nCount = m_pLanguageLB->GetEntryCount(); bool bEmpty = ( !nCount || m_pLanguageLB->GetEntryPos( m_sCreateLangStr ) != LISTBOX_ENTRY_NOTFOUND ); - bool bSelect = ( m_pLanguageLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); + bool bSelect = ( m_pLanguageLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ); bool bEnable = !bEmpty && bSelect; m_pDeletePB->Enable(bEnable); diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index f3602e44b536..b870fd1471c8 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -49,9 +49,9 @@ sal_Int32 BarGeometryResources::GetSelectEntryCount() const return m_pLB_Geometry->GetSelectEntryCount(); } -sal_Int32 BarGeometryResources::GetSelectEntryPos() const +sal_Int32 BarGeometryResources::GetSelectedEntryPos() const { - return m_pLB_Geometry->GetSelectEntryPos(); + return m_pLB_Geometry->GetSelectedEntryPos(); } void BarGeometryResources::SelectEntryPos(sal_Int32 nPos) diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx index 31936724669f..b0f4535cb9a1 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.hxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx @@ -35,7 +35,7 @@ public: void Enable( bool bEnable ); sal_Int32 GetSelectEntryCount() const; - sal_Int32 GetSelectEntryPos() const; + sal_Int32 GetSelectedEntryPos() const; void SelectEntryPos(sal_Int32 nPos); void SetSelectHdl( const Link<ListBox&,void>& rLink ); diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index d04eed5a484e..254eef40ee70 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -295,10 +295,10 @@ bool DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs ) const if( m_pCBWrapText->GetState()!= TRISTATE_INDET ) rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_WRAP_TEXT, m_pCBWrapText->IsChecked()) ); - OUString aSep = our_aLBEntryMap[m_pLB_Separator->GetSelectEntryPos()]; + OUString aSep = our_aLBEntryMap[m_pLB_Separator->GetSelectedEntryPos()]; rOutAttrs->Put( SfxStringItem( SCHATTR_DATADESCR_SEPARATOR, aSep) ); - std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectEntryPos()) ); + std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectedEntryPos()) ); if(aIt!=m_aListBoxToPlacementMap.end()) { sal_Int32 nValue = aIt->second; diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 9a0c7ff53fee..45783bb1db2f 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -254,7 +254,7 @@ void ErrorBarResources::UpdateControlStates() // unit for metric fields bool bIsErrorMargin( ( m_pRbFunction->IsChecked()) && - ( m_pLbFunction->GetSelectEntryPos() == CHART_LB_FUNCTION_ERROR_MARGIN )); + ( m_pLbFunction->GetSelectedEntryPos() == CHART_LB_FUNCTION_ERROR_MARGIN )); bool bIsPercentage( m_pRbPercent->IsChecked() || bIsErrorMargin ); FieldUnit eFieldUnit = FUNIT_NONE; @@ -308,7 +308,7 @@ void ErrorBarResources::UpdateControlStates() } // all functions except error margin take no arguments - if( m_pRbFunction->IsChecked() && ( m_pLbFunction->GetSelectEntryPos() != CHART_LB_FUNCTION_ERROR_MARGIN )) + if( m_pRbFunction->IsChecked() && ( m_pLbFunction->GetSelectedEntryPos() != CHART_LB_FUNCTION_ERROR_MARGIN )) { bPosEnabled = false; bNegEnabled = false; @@ -362,7 +362,7 @@ IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, Button*, void ) { if( m_pLbFunction->GetSelectEntryCount() == 1 ) { - switch( m_pLbFunction->GetSelectEntryPos()) + switch( m_pLbFunction->GetSelectedEntryPos()) { case CHART_LB_FUNCTION_STD_ERROR: m_eErrorKind = SvxChartKindError::StdError; break; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 9863f5ea615e..2a6589f07960 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -302,9 +302,9 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, void) uno::Reference< chart2::XDiagram > xDiagram( ::chart::ChartModelHelper::findDiagram( m_xChartModel ) ); - if( m_pLB_Scheme->GetSelectEntryPos() == POS_3DSCHEME_REALISTIC ) + if( m_pLB_Scheme->GetSelectedEntryPos() == POS_3DSCHEME_REALISTIC ) ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Realistic ); - else if( m_pLB_Scheme->GetSelectEntryPos() == POS_3DSCHEME_SIMPLE ) + else if( m_pLB_Scheme->GetSelectedEntryPos() == POS_3DSCHEME_SIMPLE ) ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Simple ); else { diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 6998113199cb..3027e3514fdd 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -116,18 +116,18 @@ VclPtr<SfxTabPage> AxisPositionsTabPage::Create(vcl::Window* pWindow,const SfxIt bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs) { // axis line - sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos(); + sal_Int32 nPos = m_pLB_CrossesAt->GetSelectedEntryPos(); rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_POSITION, nPos+1 )); if( nPos==2 ) { double fCrossover = m_pED_CrossesAt->GetValue(); if( m_bCrossingAxisIsCategoryAxis ) - fCrossover = m_pED_CrossesAtCategory->GetSelectEntryPos()+1; + fCrossover = m_pED_CrossesAtCategory->GetSelectedEntryPos()+1; rOutAttrs->Put(SvxDoubleItem(fCrossover,SCHATTR_AXIS_POSITION_VALUE)); } // labels - sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos(); + sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectedEntryPos(); if( nLabelPos != LISTBOX_ENTRY_NOTFOUND ) rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_LABEL_POSITION, nLabelPos )); @@ -147,7 +147,7 @@ bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs) rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_TICKS,nTicks)); rOutAttrs->Put(SfxInt32Item(SCHATTR_AXIS_HELPTICKS,nMinorTicks)); - sal_Int32 nMarkPos = m_pLB_PlaceTicks->GetSelectEntryPos(); + sal_Int32 nMarkPos = m_pLB_PlaceTicks->GetSelectedEntryPos(); if( nMarkPos != LISTBOX_ENTRY_NOTFOUND ) rOutAttrs->Put( SfxInt32Item( SCHATTR_AXIS_MARK_POSITION, nMarkPos )); @@ -315,7 +315,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void) { - sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos(); + sal_Int32 nPos = m_pLB_CrossesAt->GetSelectedEntryPos(); m_pED_CrossesAt->Show( (nPos==2) && !m_bCrossingAxisIsCategoryAxis ); m_pED_CrossesAtCategory->Show( (nPos==2) && m_bCrossingAxisIsCategoryAxis ); @@ -329,12 +329,12 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void) IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl, ListBox&, void) { - sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos(); + sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectedEntryPos(); bool bEnableTickmarkPlacement = (nLabelPos>1); if( bEnableTickmarkPlacement ) { - sal_Int32 nAxisPos = m_pLB_CrossesAt->GetSelectEntryPos(); + sal_Int32 nAxisPos = m_pLB_CrossesAt->GetSelectedEntryPos(); if( nLabelPos-2 == nAxisPos ) bEnableTickmarkPlacement=false; } diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 795571f6e569..b741b0812ce8 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -95,7 +95,7 @@ void Dim3DLookResourceGroup::fillControls( const ChartTypeParameter& rParameter void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { rParameter.b3DLook = m_pCB_3DLook->IsChecked(); - const sal_Int32 nPos = m_pLB_Scheme->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLB_Scheme->GetSelectedEntryPos(); if( nPos == POS_3DSCHEME_SIMPLE ) rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple; else if( nPos == POS_3DSCHEME_REALISTIC ) @@ -366,16 +366,16 @@ void SplinePropertiesDialog::fillControls( const ChartTypeParameter& rParameter m_pMF_SplineResolution->SetValue( rParameter.nCurveResolution ); //dis/enabling - m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS); - m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS); + m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS); + m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS); } void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool bSmoothLines ) { if(!bSmoothLines) rParameter.eCurveStyle=CurveStyle_LINES; - else if(m_pLB_Spline_Type->GetSelectEntryPos() == CUBIC_SPLINE_POS) + else if(m_pLB_Spline_Type->GetSelectedEntryPos() == CUBIC_SPLINE_POS) rParameter.eCurveStyle=CurveStyle_CUBIC_SPLINES; - else if(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS) + else if(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS) rParameter.eCurveStyle=CurveStyle_B_SPLINES; rParameter.nCurveResolution = static_cast< sal_Int32 >( m_pMF_SplineResolution->GetValue()); @@ -383,8 +383,8 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool } IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl, ListBox&, void) { - m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS); - m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectEntryPos() == B_SPLINE_POS); + m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS); + m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() == B_SPLINE_POS); } class SteppedPropertiesDialog : public ModalDialog @@ -551,7 +551,7 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter ) } void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { - switch (m_pLB_LineType->GetSelectEntryPos()) + switch (m_pLB_LineType->GetSelectedEntryPos()) { case POS_LINETYPE_SMOOTH: getSplinePropertiesDialog().fillParameter( rParameter, true ); @@ -573,9 +573,9 @@ IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void) { ChartTypeParameter aOldParameter; - getSplinePropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectEntryPos() == POS_LINETYPE_SMOOTH ); + getSplinePropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectedEntryPos() == POS_LINETYPE_SMOOTH ); - const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); + const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectedEntryPos(); m_pLB_LineType->SelectEntryPos(POS_LINETYPE_SMOOTH); if( getSplinePropertiesDialog().Execute() == RET_OK ) { @@ -593,9 +593,9 @@ IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, void) { ChartTypeParameter aOldParameter; - getSteppedPropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectEntryPos() == POS_LINETYPE_STEPPED ); + getSteppedPropertiesDialog().fillParameter( aOldParameter, m_pLB_LineType->GetSelectedEntryPos() == POS_LINETYPE_STEPPED ); - const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); + const sal_Int32 iOldLineTypePos = m_pLB_LineType->GetSelectedEntryPos(); m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STEPPED); if( getSteppedPropertiesDialog().Execute() == RET_OK ) { @@ -650,7 +650,7 @@ void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { rParameter.nGeometry3D = 1; if( m_aGeometryResources.GetSelectEntryCount() ) - rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos(); + rParameter.nGeometry3D = m_aGeometryResources.GetSelectedEntryPos(); } IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void) @@ -847,7 +847,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType() { ChartTypeDialogController* pTypeController = nullptr; std::vector< ChartTypeDialogController* >::size_type nM = static_cast< std::vector< ChartTypeDialogController* >::size_type >( - m_pMainTypeList->GetSelectEntryPos() ); + m_pMainTypeList->GetSelectedEntryPos() ); if( nM<m_aChartTypeDialogControllerList.size() ) pTypeController = m_aChartTypeDialogControllerList[nM]; return pTypeController; diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 34056ec9de3b..1004a9ab6dee 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -62,7 +62,7 @@ bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs) { long nSegs=32; - long nShape = m_pGeometryResources->GetSelectEntryPos(); + long nShape = m_pGeometryResources->GetSelectedEntryPos(); if(nShape==CHART_SHAPE3D_PYRAMID) nSegs=4; diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index 6f72cfaf3f4d..2a24efedfe11 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -254,7 +254,7 @@ enum AxisTypeListBoxEntry IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void) { - const sal_Int32 nPos = m_pLB_AxisType->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLB_AxisType->GetSelectedEntryPos(); if( nPos==TYPE_DATE ) m_nAxisType = chart2::AxisType::DATE; else @@ -276,7 +276,7 @@ bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs) rOutAttrs->Put(SfxInt32Item(SCHATTR_AXISTYPE, m_nAxisType)); if(m_bAllowDateAxis) - rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, m_pLB_AxisType->GetSelectEntryPos()==TYPE_AUTO)); + rOutAttrs->Put(SfxBoolItem(SCHATTR_AXIS_AUTO_DATEAXIS, m_pLB_AxisType->GetSelectedEntryPos()==TYPE_AUTO)); bool bAutoScale = false; if( m_nAxisType==chart2::AxisType::CATEGORY ) @@ -438,9 +438,9 @@ DeactivateRC ScaleTabPage::DeactivatePage(SfxItemSet* pItemSet) fOrigin = m_pFmtFldOrigin->GetValue(); fStepMain = bDateAxis ? m_pMt_MainDateStep->GetValue() : m_pFmtFldStepMain->GetValue(); nStepHelp = static_cast< sal_Int32 >( m_pMtStepHelp->GetValue()); - m_nTimeResolution = m_pLB_TimeResolution->GetSelectEntryPos(); - m_nMainTimeUnit = m_pLB_MainTimeUnit->GetSelectEntryPos(); - m_nHelpTimeUnit = m_pLB_HelpTimeUnit->GetSelectEntryPos(); + m_nTimeResolution = m_pLB_TimeResolution->GetSelectedEntryPos(); + m_nMainTimeUnit = m_pLB_MainTimeUnit->GetSelectedEntryPos(); + m_nHelpTimeUnit = m_pLB_HelpTimeUnit->GetSelectedEntryPos(); if( m_nAxisType != chart2::AxisType::REALNUMBER ) m_pCbxLogarithm->Show( false ); diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index c4d1ef375c2b..b2c2dd7c7737 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -187,7 +187,7 @@ void SelectorListBox::Select() if ( !IsTravelSelect() ) { - const sal_Int32 nPos = GetSelectEntryPos(); + const sal_Int32 nPos = GetSelectedEntryPos(); if( static_cast<size_t>(nPos) < m_aEntries.size() ) { ObjectIdentifier aOID = m_aEntries[nPos].OID; diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index cfad4732a591..baa15ff75ffb 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -374,7 +374,7 @@ IMPL_LINK(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void) IMPL_LINK_NOARG(ChartAxisPanel, ListBoxHdl, ListBox&, void) { OUString aCID = getCID(mxModel); - sal_Int32 nPos = mpLBLabelPos->GetSelectEntryPos(); + sal_Int32 nPos = mpLBLabelPos->GetSelectedEntryPos(); setLabelPosition(mxModel, aCID, nPos); } diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index 39607513f4f8..ae27888d4d86 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -579,7 +579,7 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void) IMPL_LINK_NOARG(ChartElementsPanel, LegendPosHdl, ListBox&, void) { - sal_Int32 nPos = mpLBLegendPosition->GetSelectEntryPos(); + sal_Int32 nPos = mpLBLegendPosition->GetSelectedEntryPos(); setLegendPos(mxModel, nPos); } diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index 95100060cfb0..b4d68caee4d0 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -419,7 +419,7 @@ IMPL_LINK_NOARG(ChartErrorBarPanel, RadioBtnHdl, RadioButton&, void) IMPL_LINK_NOARG(ChartErrorBarPanel, ListBoxHdl, ListBox&, void) { OUString aCID = getCID(mxModel); - sal_Int32 nPos = mpLBType->GetSelectEntryPos(); + sal_Int32 nPos = mpLBType->GetSelectedEntryPos(); setTypePos(mxModel, aCID, nPos); } diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 07cf968c2e7b..9d58aecbdcd5 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -478,7 +478,7 @@ IMPL_LINK_NOARG(ChartSeriesPanel, ListBoxHdl, ListBox&, void) { OUString aCID = getCID(mxModel); - sal_Int32 nPos = mpLBLabelPlacement->GetSelectEntryPos(); + sal_Int32 nPos = mpLBLabelPlacement->GetSelectedEntryPos(); setDataLabelPlacement(mxModel, aCID, nPos); } 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(), diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 88c54db98731..a213d4f9289a 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -579,7 +579,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void ) // If pRequired = sal_True then the sal_Bool field must NOT contain <<none>> OUString sDef = BoolStringUI(::comphelper::getString(pActFieldDescr->GetControlDefault())); - if(pRequired->GetSelectEntryPos() == 0) // Yes + if(pRequired->GetSelectedEntryPos() == 0) // Yes { pBoolDefault->RemoveEntry(DBA_RES(STR_VALUE_NONE)); if (sDef != aYes && sDef != aNo) @@ -597,7 +597,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void ) // A special treatment only for AutoIncrement if (&rListBox == pAutoIncrement) { - if(rListBox.GetSelectEntryPos() == 1) + if(rListBox.GetSelectedEntryPos() == 1) { // no DeactivateAggregate( tpAutoIncrementValue ); if(pActFieldDescr->IsPrimaryKey()) @@ -627,7 +627,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox&, rListBox, void ) if(&rListBox == m_pType) { - TOTypeInfoSP pTypeInfo = getTypeInfo(m_pType->GetSelectEntryPos()); + TOTypeInfoSP pTypeInfo = getTypeInfo(m_pType->GetSelectedEntryPos()); pActFieldDescr->FillFromTypeInfo(pTypeInfo,true,false); // SetType(pTypeInfo); DisplayData(pActFieldDescr); @@ -1475,13 +1475,13 @@ void OFieldDescControl::SaveData( OFieldDescription* pFieldDescr ) else pFieldDescr->SetControlDefault(Any()); - if((pRequired && pRequired->GetSelectEntryPos() == 0) || pFieldDescr->IsPrimaryKey() || (pBoolDefault && pBoolDefault->GetEntryCount() == 2)) // yes + if((pRequired && pRequired->GetSelectedEntryPos() == 0) || pFieldDescr->IsPrimaryKey() || (pBoolDefault && pBoolDefault->GetEntryCount() == 2)) // yes pFieldDescr->SetIsNullable( ColumnValue::NO_NULLS ); else pFieldDescr->SetIsNullable( ColumnValue::NULLABLE ); if ( pAutoIncrement ) - pFieldDescr->SetAutoIncrement( pAutoIncrement->GetSelectEntryPos() == 0 ); + pFieldDescr->SetAutoIncrement( pAutoIncrement->GetSelectedEntryPos() == 0 ); if( pTextLen ) pFieldDescr->SetPrecision( static_cast<sal_Int32>(pTextLen->GetValue()) ); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index b2948824a191..7ecf1b00dbfe 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -527,7 +527,7 @@ namespace dbaui pOther = m_pRightTable; else pOther = m_pLeftTable; - pOther->SelectEntryPos(1 - pOther->GetSelectEntryPos()); + pOther->SelectEntryPos(1 - pOther->GetSelectedEntryPos()); OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->begin(); OTableWindow* pFirst = aIter->second; diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index d7d91ece60ad..4232ec2478fc 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -189,8 +189,8 @@ namespace dbaui OUString OpenDocumentListBox::GetSelectedDocumentURL() const { OUString sURL; - sal_Int32 nSelected = GetSelectEntryPos(); - if ( LISTBOX_ENTRY_NOTFOUND != GetSelectEntryPos() ) + sal_Int32 nSelected = GetSelectedEntryPos(); + if ( LISTBOX_ENTRY_NOTFOUND != GetSelectedEntryPos() ) sURL = impl_getDocumentAtIndex( nSelected ).first; return sURL; } @@ -198,8 +198,8 @@ namespace dbaui OUString OpenDocumentListBox::GetSelectedDocumentFilter() const { OUString sFilter; - sal_Int32 nSelected = GetSelectEntryPos(); - if ( LISTBOX_ENTRY_NOTFOUND != GetSelectEntryPos() ) + sal_Int32 nSelected = GetSelectedEntryPos(); + if ( LISTBOX_ENTRY_NOTFOUND != GetSelectedEntryPos() ) sFilter = impl_getDocumentAtIndex( nSelected ).second; return sFilter; } diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 6b9a5d7371b6..c0b3364d4bea 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -316,7 +316,7 @@ namespace dbaui { if ( m_pBooleanComparisonMode->IsValueChangedFromSaved() ) { - _rSet->Put( SfxInt32Item( DSID_BOOLEANCOMPARISON, m_pBooleanComparisonMode->GetSelectEntryPos() ) ); + _rSet->Put( SfxInt32Item( DSID_BOOLEANCOMPARISON, m_pBooleanComparisonMode->GetSelectedEntryPos() ) ); bChangedSomething = true; } } diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index ceaee42f1f62..220687e2ff6b 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -323,7 +323,7 @@ namespace dbaui { if (!m_pSQLHistory->IsTravelSelect()) { - const sal_Int32 nSelected = m_pSQLHistory->GetSelectEntryPos(); + const sal_Int32 nSelected = m_pSQLHistory->GetSelectedEntryPos(); if (LISTBOX_ENTRY_NOTFOUND != nSelected) switchToHistory(nSelected); } diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index d462f16d81b1..a43364b6ad8c 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -397,10 +397,10 @@ namespace dbaui IMPL_LINK( OGeneralPageWizard, OnEmbeddedDBTypeSelected, ListBox&, _rBox, void ) { // get the type from the entry data - const sal_Int32 nSelected = _rBox.GetSelectEntryPos(); + const sal_Int32 nSelected = _rBox.GetSelectedEntryPos(); if (static_cast<size_t>(nSelected) >= m_aEmbeddedURLPrefixes.size() ) { - SAL_WARN("dbaccess.ui.generalpage", "Got out-of-range value '" << nSelected << "' from the DatasourceType selection ListBox's GetSelectEntryPos(): no corresponding URL prefix"); + SAL_WARN("dbaccess.ui.generalpage", "Got out-of-range value '" << nSelected << "' from the DatasourceType selection ListBox's GetSelectedEntryPos(): no corresponding URL prefix"); return; } const OUString sURLPrefix = m_aEmbeddedURLPrefixes[ nSelected ]; @@ -415,10 +415,10 @@ namespace dbaui IMPL_LINK( OGeneralPage, OnDatasourceTypeSelected, ListBox&, _rBox, void ) { // get the type from the entry data - const sal_Int32 nSelected = _rBox.GetSelectEntryPos(); + const sal_Int32 nSelected = _rBox.GetSelectedEntryPos(); if (static_cast<size_t>(nSelected) >= m_aURLPrefixes.size() ) { - SAL_WARN("dbaccess.ui.generalpage", "Got out-of-range value '" << nSelected << "' from the DatasourceType selection ListBox's GetSelectEntryPos(): no corresponding URL prefix"); + SAL_WARN("dbaccess.ui.generalpage", "Got out-of-range value '" << nSelected << "' from the DatasourceType selection ListBox's GetSelectedEntryPos(): no corresponding URL prefix"); return; } const OUString sURLPrefix = m_aURLPrefixes[ nSelected ]; @@ -461,7 +461,7 @@ namespace dbaui { bool bChangedSomething = false; - const sal_Int32 nEntry = m_pDatasourceType->GetSelectEntryPos(); + const sal_Int32 nEntry = m_pDatasourceType->GetSelectedEntryPos(); OUString sURLPrefix = m_aURLPrefixes[ nEntry ]; if ( m_pDatasourceType->IsValueChangedFromSaved() ) @@ -654,7 +654,7 @@ namespace dbaui if ( bCommitTypeSelection ) { - const sal_Int32 nEntry = m_pDatasourceType->GetSelectEntryPos(); + const sal_Int32 nEntry = m_pDatasourceType->GetSelectedEntryPos(); OUString sURLPrefix = m_aURLPrefixes[nEntry]; if ( m_pDatasourceType->IsValueChangedFromSaved() diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 68eebc4c7c51..c3952074dada 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -338,7 +338,7 @@ namespace dbaui { OSL_ENSURE(!isNewField(), "IndexFieldsControl::SaveModified: why the hell ...!!!"); // selected entry - sal_Int32 nPos = m_pSortingCell->GetSelectEntryPos(); + sal_Int32 nPos = m_pSortingCell->GetSelectedEntryPos(); OSL_ENSURE(LISTBOX_ENTRY_NOTFOUND != nPos, "IndexFieldsControl::SaveModified: how did you get this selection??"); // adjust the sort flag in the index field description OIndexField& rCurrentField = m_aFields[GetCurRow()]; diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 74fa78bacecb..a5504650193f 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -263,7 +263,7 @@ namespace dbaui { if (sal_Int32 nCount = m_pAllParams->GetEntryCount()) { - sal_Int32 nCurrent = m_pAllParams->GetSelectEntryPos(); + sal_Int32 nCurrent = m_pAllParams->GetSelectedEntryPos(); OSL_ENSURE(static_cast<size_t>(nCount) == m_aVisitedParams.size(), "OParameterDialog::OnButtonClicked : inconsistent lists !"); // search the next entry in list we haven't visited yet @@ -311,7 +311,7 @@ namespace dbaui } // initialize the controls with the new values - sal_Int32 nSelected = m_pAllParams->GetSelectEntryPos(); + sal_Int32 nSelected = m_pAllParams->GetSelectedEntryPos(); OSL_ENSURE(nSelected != LISTBOX_ENTRY_NOTFOUND, "OParameterDialog::OnEntrySelected : no current entry !"); m_pParam->SetText(::comphelper::getString(m_aFinalValues[nSelected].Value)); diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 498fcd80667c..3584c88ebfeb 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -214,7 +214,7 @@ void DlgFilterCrit::dispose() } #define LbText(x) ((x).GetSelectedEntry()) -#define LbPos(x) ((x).GetSelectEntryPos()) +#define LbPos(x) ((x).GetSelectedEntryPos()) sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const OUString& _rSelectedPredicate ) const { @@ -735,7 +735,7 @@ void DlgFilterCrit::BuildWherePart() if ( getCondition(*m_pLB_WHEREFIELD2,*m_pLB_WHERECOMP2,*m_pET_WHEREVALUE2,aValue) ) _rValues = aHaving; PropertyValue* pPos = nullptr; - if ( m_pLB_WHERECOND2->GetSelectEntryPos() ) + if ( m_pLB_WHERECOND2->GetSelectedEntryPos() ) { sal_Int32 nPos = _rValues.getLength(); _rValues.realloc( nPos + 1); @@ -759,7 +759,7 @@ void DlgFilterCrit::BuildWherePart() if ( getCondition(*m_pLB_WHEREFIELD3,*m_pLB_WHERECOMP3,*m_pET_WHEREVALUE3,aValue) ) _rValues = aHaving; PropertyValue* pPos = nullptr; - if ( m_pLB_WHERECOND3->GetSelectEntryPos() ) + if ( m_pLB_WHERECOND3->GetSelectedEntryPos() ) { sal_Int32 nPos = _rValues.getLength(); _rValues.realloc( nPos + 1); diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 5e96fe2b3854..4119cf0c1da9 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -184,7 +184,7 @@ void DlgOrderCrit::impl_initializeOrderList_nothrow() void DlgOrderCrit::EnableLines() { - if ( m_pLB_ORDERFIELD1->GetSelectEntryPos() == 0 ) + if ( m_pLB_ORDERFIELD1->GetSelectedEntryPos() == 0 ) { m_pLB_ORDERFIELD2->Disable(); m_pLB_ORDERVALUE2->Disable(); @@ -198,7 +198,7 @@ void DlgOrderCrit::EnableLines() m_pLB_ORDERVALUE2->Enable(); } - if ( m_pLB_ORDERFIELD2->GetSelectEntryPos() == 0 ) + if ( m_pLB_ORDERFIELD2->GetSelectedEntryPos() == 0 ) { m_pLB_ORDERFIELD3->Disable(); m_pLB_ORDERVALUE3->Disable(); @@ -223,14 +223,14 @@ OUString DlgOrderCrit::GetOrderList( ) const OUString sOrder; for( sal_uInt16 i=0 ; i<DOG_ROWS; i++ ) { - if(m_aColumnList[i]->GetSelectEntryPos() != 0) + if(m_aColumnList[i]->GetSelectedEntryPos() != 0) { if(!sOrder.isEmpty()) sOrder += ","; OUString sName = m_aColumnList[i]->GetSelectedEntry(); sOrder += ::dbtools::quoteName(sQuote,sName); - if(m_aValueList[i]->GetSelectEntryPos()) + if(m_aValueList[i]->GetSelectedEntryPos()) sOrder += " DESC "; else sOrder += " ASC "; diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 2a15f19e4fb6..091753f742b5 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -380,7 +380,7 @@ bool OWizTypeSelectList::IsPrimaryKeyAllowed() const for( sal_Int32 j = 0; m_bPKey && j < nCount; ++j ) { - OFieldDescription* pField = static_cast<OFieldDescription*>(GetEntryData(GetSelectEntryPos(j))); + OFieldDescription* pField = static_cast<OFieldDescription*>(GetEntryData(GetSelectedEntryPos(j))); if(!pField || pField->getTypeInfo()->nSearchType == ColumnSearch::NONE) return false; } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 0d5dd0d05c47..63138efeb749 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -982,7 +982,7 @@ bool OSelectionBrowseBox::SaveModified() { OUString aAliasName = m_pTableCell->GetSelectedEntry(); strOldCellContents = pEntry->GetAlias(); - if ( m_pTableCell->GetSelectEntryPos() != 0 ) + if ( m_pTableCell->GetSelectedEntryPos() != 0 ) { pEntry->SetAlias(aAliasName); // we have to set the table name as well as the table window @@ -1011,7 +1011,7 @@ bool OSelectionBrowseBox::SaveModified() case BROW_ORDER_ROW: { strOldCellContents = OUString::number((sal_uInt16)pEntry->GetOrderDir()); - sal_Int32 nIdx = m_pOrderCell->GetSelectEntryPos(); + sal_Int32 nIdx = m_pOrderCell->GetSelectedEntryPos(); if (nIdx == LISTBOX_ENTRY_NOTFOUND) nIdx = 0; pEntry->SetOrderDir(EOrderDir(nIdx)); @@ -1032,7 +1032,7 @@ bool OSelectionBrowseBox::SaveModified() case BROW_FUNCTION_ROW: { strOldCellContents = pEntry->GetFunction(); - sal_Int32 nPos = m_pFunctionCell->GetSelectEntryPos(); + sal_Int32 nPos = m_pFunctionCell->GetSelectedEntryPos(); // these functions are only available in CORE OUString sFunctionName = m_pFunctionCell->GetEntry(nPos); OUString sGroupFunctionName = m_aFunctionStrings.getToken(comphelper::string::getTokenCount(m_aFunctionStrings, ';')-1, ';'); @@ -1866,7 +1866,7 @@ void OSelectionBrowseBox::CellModified() { OTableFieldDescRef pEntry = getEntry(GetColumnPos(GetCurColumnId()) - 1); - sal_Int32 nIdx = m_pOrderCell->GetSelectEntryPos(); + sal_Int32 nIdx = m_pOrderCell->GetSelectedEntryPos(); if(!m_bOrderByUnRelated && nIdx > 0 && nIdx != LISTBOX_ENTRY_NOTFOUND && !pEntry->IsEmpty() && @@ -2233,7 +2233,7 @@ OUString OSelectionBrowseBox::GetCellContents(sal_Int32 nCellIndex, sal_uInt16 n return pEntry->IsVisible() ? OUStringLiteral("1") : OUStringLiteral("0"); case BROW_ORDER_ROW: { - sal_Int32 nIdx = m_pOrderCell->GetSelectEntryPos(); + sal_Int32 nIdx = m_pOrderCell->GetSelectedEntryPos(); if (nIdx == LISTBOX_ENTRY_NOTFOUND) nIdx = 0; return OUString::number(nIdx); diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 9880cfa59349..d9b3bd1d040f 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -155,7 +155,7 @@ void DlgQryJoin::dispose() IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) { - if (m_pLB_JoinType->GetSelectEntryPos() == m_pLB_JoinType->GetSavedValue() ) + if (m_pLB_JoinType->GetSelectedEntryPos() == m_pLB_JoinType->GetSavedValue() ) return; m_pLB_JoinType->SaveValue(); @@ -167,7 +167,7 @@ IMPL_LINK_NOARG( DlgQryJoin, LBChangeHdl, ListBox&, void ) OUString sSecondWinName = m_pConnData->getReferencedTable()->GetWinName(); const EJoinType eOldJoinType = eJoinType; const char* pResId = nullptr; - const sal_Int32 nPos = m_pLB_JoinType->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLB_JoinType->GetSelectedEntryPos(); const sal_IntPtr nJoinType = reinterpret_cast<sal_IntPtr>(m_pLB_JoinType->GetEntryData(nPos)); bool bAddHint = true; switch ( nJoinType ) diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 144a980a72a3..d3e3d29715b4 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -689,7 +689,7 @@ void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) void OTableEditorCtrl::resetType() { - sal_Int32 nPos = pTypeCell->GetSelectEntryPos(); + sal_Int32 nPos = pTypeCell->GetSelectedEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) SwitchType( GetView()->getController().getTypeInfo(nPos) ); else @@ -1574,7 +1574,7 @@ void OTableEditorCtrl::SwitchType( const TOTypeInfoSP& _pType ) pRow->SetFieldType( _pType, true ); if ( _pType.get() ) { - const sal_Int32 nCurrentlySelected = pTypeCell->GetSelectEntryPos(); + const sal_Int32 nCurrentlySelected = pTypeCell->GetSelectedEntryPos(); if ( ( LISTBOX_ENTRY_NOTFOUND == nCurrentlySelected ) || ( GetView()->getController().getTypeInfo( nCurrentlySelected ) != _pType ) diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 7cf0ae366594..8d10415c90d5 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -636,7 +636,7 @@ void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos ) if ( pData ) { - sal_uLong nEntryPos = GetSelectEntryPos(); + sal_uLong nEntryPos = GetSelectedEntryPos(); UpdateDialog::Index * p = static_cast< UpdateDialog::Index * >( GetEntryData( nEntryPos ) ); if ( ( p->m_eKind == ENABLED_UPDATE ) || ( p->m_eKind == DISABLED_UPDATE ) ) diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index de05ae1df728..22d4e8fae122 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -413,12 +413,12 @@ void MappingDialog_Impl::dispose() IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox&, rListBox, void) { - const sal_Int32 nEntryPos = rListBox.GetSelectEntryPos(); + const sal_Int32 nEntryPos = rListBox.GetSelectedEntryPos(); if(0 < nEntryPos) { for(VclPtr<ListBox> & aListBoxe : aListBoxes) { - if(&rListBox != aListBoxe && aListBoxe->GetSelectEntryPos() == nEntryPos) + if(&rListBox != aListBoxe && aListBoxe->GetSelectedEntryPos() == nEntryPos) aListBoxe->SelectEntryPos(0); } } diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 94880bd20a2f..3d782de06dd1 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -410,7 +410,7 @@ namespace dbp ListBox& rMoveTo = bMoveRight ? *m_pSelFields : *m_pExistFields; // the index of the selected entry - const sal_Int32 nSelected = bMoveRight ? m_pExistFields->GetSelectEntryPos() : m_pSelFields->GetSelectEntryPos(); + const sal_Int32 nSelected = bMoveRight ? m_pExistFields->GetSelectedEntryPos() : m_pSelFields->GetSelectedEntryPos(); // the (original) relative position of the entry sal_IntPtr nRelativeIndex = reinterpret_cast<sal_IntPtr>(bMoveRight ? m_pExistFields->GetEntryData(nSelected) : m_pSelFields->GetEntryData(nSelected)); @@ -437,7 +437,7 @@ namespace dbp // remove the entry from its old list if (bMoveRight) { - sal_Int32 nSelectPos = m_pExistFields->GetSelectEntryPos(); + sal_Int32 nSelectPos = m_pExistFields->GetSelectedEntryPos(); m_pExistFields->RemoveEntry(nSelected); if ((LISTBOX_ENTRY_NOTFOUND != nSelectPos) && (nSelectPos < m_pExistFields->GetEntryCount())) m_pExistFields->SelectEntryPos(nSelectPos); @@ -446,7 +446,7 @@ namespace dbp } else { - sal_Int32 nSelectPos = m_pSelFields->GetSelectEntryPos(); + sal_Int32 nSelectPos = m_pSelFields->GetSelectedEntryPos(); m_pSelFields->RemoveEntry(nSelected); if ((LISTBOX_ENTRY_NOTFOUND != nSelectPos) && (nSelectPos < m_pSelFields->GetEntryCount())) m_pSelFields->SelectEntryPos(nSelectPos); diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 740d8fe15d72..703d48f9facc 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -259,7 +259,7 @@ namespace dbp if (bMoveLeft) { while (m_pExistingRadios->GetSelectEntryCount()) - m_pExistingRadios->RemoveEntry(m_pExistingRadios->GetSelectEntryPos()); + m_pExistingRadios->RemoveEntry(m_pExistingRadios->GetSelectedEntryPos()); } else { @@ -417,7 +417,7 @@ namespace dbp m_aUncommittedValues[m_nLastSelection] = m_pValue->GetText(); } - m_nLastSelection = m_pOptions->GetSelectEntryPos(); + m_nLastSelection = m_pOptions->GetSelectedEntryPos(); DBG_ASSERT((size_t)m_nLastSelection < m_aUncommittedValues.size(), "OOptionValuesPage::implTraveledOptions: invalid new selection index!"); m_pValue->SetText(m_aUncommittedValues[m_nLastSelection]); } diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx index 4685b169fe68..2e09942d89e6 100644 --- a/extensions/source/propctrlr/listselectiondlg.cxx +++ b/extensions/source/propctrlr/listselectiondlg.cxx @@ -134,7 +134,7 @@ namespace pcr const sal_Int32 nSelectedCount = m_pEntries->GetSelectEntryCount( ); _rSelection.resize( nSelectedCount ); for ( sal_Int32 selected = 0; selected < nSelectedCount; ++selected ) - _rSelection[selected] = static_cast< sal_Int16 >( m_pEntries->GetSelectEntryPos( selected ) ); + _rSelection[selected] = static_cast< sal_Int16 >( m_pEntries->GetSelectedEntryPos( selected ) ); } diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 30568ae94f51..7acef8421f71 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -706,7 +706,7 @@ IMPL_LINK( GridDialog, ClickButtonHdl, Button*, pButton, void ) { if (pButton == m_pResetButton) { - int nType = m_pResetTypeBox->GetSelectEntryPos(); + int nType = m_pResetTypeBox->GetSelectedEntryPos(); m_pGridWindow->ChangeMode((ResetType)nType); } } diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index df7598320afc..67de8730e624 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -678,7 +678,7 @@ IMPL_LINK( SaneDlg, SelectHdl, ListBox&, rListBox, void ) { if( &rListBox == mpDeviceBox && Sane::IsSane() && Sane::CountDevices() ) { - int nNewNumber = mpDeviceBox->GetSelectEntryPos(); + int nNewNumber = mpDeviceBox->GetSelectedEntryPos(); int nOldNumber = mrSane.GetDeviceNumber(); if (nNewNumber != nOldNumber) { diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 717e8c8fecee..a5f6cf945861 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -739,7 +739,7 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) * FIXME: the entries are only implicitly defined by the resource file. Should there * ever be an additional form submit format this could get invalid. */ - paParent->mnFormsType = mpLbFormsFormat->GetSelectEntryPos(); + paParent->mnFormsType = mpLbFormsFormat->GetSelectedEntryPos(); paParent->mbAllowDuplicateFieldNames = mpCbAllowDuplicateFieldNames->IsChecked(); } @@ -1801,7 +1801,7 @@ void ImpPDFTabSigningPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) paParent->msSignContact = mpEdSignContactInfo->GetText(); paParent->msSignReason = mpEdSignReason->GetText(); // Entry 0 is 'None' - if (mpLBSignTSA->GetSelectEntryPos() >= 1) + if (mpLBSignTSA->GetSelectedEntryPos() >= 1) paParent->msSignTSA = mpLBSignTSA->GetSelectedEntry(); } diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index c77c9acebc3e..e7649d857d8a 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -121,7 +121,7 @@ void FuncPage::UpdateFunctionList(const OUString& aStr) m_pLbFunction->Clear(); m_pLbFunction->SetUpdateMode( false ); - const sal_Int32 nSelPos = m_pLbCategory->GetSelectEntryPos(); + const sal_Int32 nSelPos = m_pLbCategory->GetSelectedEntryPos(); if (aStr.isEmpty() || nSelPos == 0) { @@ -269,12 +269,12 @@ void FuncPage::SetFocus() sal_Int32 FuncPage::GetCategory() { - return m_pLbCategory->GetSelectEntryPos(); + return m_pLbCategory->GetSelectedEntryPos(); } sal_Int32 FuncPage::GetFunction() { - return m_pLbFunction->GetSelectEntryPos(); + return m_pLbFunction->GetSelectedEntryPos(); } sal_Int32 FuncPage::GetFunctionEntryCount() diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 848142393c25..1b30f285734b 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -720,7 +720,7 @@ namespace svt DBG_ASSERT( WindowType::LISTBOX == _pControl->GetType(), "OControlAccess::implGetControlProperty: invalid control/property combination!" ); - sal_Int32 nSelected = static_cast< ListBox const * >( _pControl )->GetSelectEntryPos(); + sal_Int32 nSelected = static_cast< ListBox const * >( _pControl )->GetSelectedEntryPos(); OUString sSelected; if ( LISTBOX_ENTRY_NOTFOUND != nSelected ) sSelected = static_cast< ListBox const * >( _pControl )->GetSelectedEntry(); @@ -733,9 +733,9 @@ namespace svt DBG_ASSERT( WindowType::LISTBOX == _pControl->GetType(), "OControlAccess::implGetControlProperty: invalid control/property combination!" ); - sal_Int32 nSelected = static_cast< ListBox const * >( _pControl )->GetSelectEntryPos(); + sal_Int32 nSelected = static_cast< ListBox const * >( _pControl )->GetSelectedEntryPos(); if ( LISTBOX_ENTRY_NOTFOUND != nSelected ) - aReturn <<= static_cast< ListBox const * >( _pControl )->GetSelectEntryPos(); + aReturn <<= static_cast< ListBox const * >( _pControl )->GetSelectedEntryPos(); else aReturn <<= (sal_Int32)-1; } diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 03ff057041dc..c6fcaa0217a9 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -522,7 +522,7 @@ void RemoteFilesDialog::FillServicesListbox() int RemoteFilesDialog::GetSelectedServicePos() { - int nSelected = m_pServices_lb->GetSelectEntryPos(); + int nSelected = m_pServices_lb->GetSelectedEntryPos(); int nPos = 0; int i = -1; @@ -553,7 +553,7 @@ void RemoteFilesDialog::AddFilter( const OUString& rFilter, const OUString& rTyp m_aFilters.emplace_back( rFilter, rType ); m_pFilter_lb->InsertEntry( sName ); - if( m_pFilter_lb->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) + if( m_pFilter_lb->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND ) m_pFilter_lb->SelectEntryPos( 0 ); } @@ -806,7 +806,7 @@ IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, void ) OString sIdent( pButton->GetCurItemIdent() ); if( sIdent == "edit_service" && m_pServices_lb->GetEntryCount() > 0 ) { - unsigned int nSelected = m_pServices_lb->GetSelectEntryPos(); + unsigned int nSelected = m_pServices_lb->GetSelectedEntryPos(); int nPos = GetSelectedServicePos(); if( nPos >= 0 ) @@ -846,7 +846,7 @@ IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, void ) } if( sIdent == "delete_service" && m_pServices_lb->GetEntryCount() > 0 ) { - unsigned int nSelected = m_pServices_lb->GetSelectEntryPos(); + unsigned int nSelected = m_pServices_lb->GetSelectedEntryPos(); int nPos = GetSelectedServicePos(); if( nPos >= 0 ) @@ -1041,7 +1041,7 @@ IMPL_LINK_NOARG( RemoteFilesDialog, SplitHdl, Splitter*, void ) IMPL_LINK_NOARG( RemoteFilesDialog, SelectFilterHdl, ListBox&, void ) { - unsigned int nPos = m_pFilter_lb->GetSelectEntryPos(); + unsigned int nPos = m_pFilter_lb->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && !m_aFilters[nPos].second.isEmpty() ) { diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index fadf5ab3190e..d032bfddef0e 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -485,7 +485,7 @@ void MetricFieldWrapper< ValueT >::SetControlValue( ValueT nValue ) template< typename ValueT > ValueT ListBoxWrapper< ValueT >::GetControlValue() const { - return this->GetValueFromPos( this->GetControl().GetSelectEntryPos() ); + return this->GetValueFromPos( this->GetControl().GetSelectedEntryPos() ); } template< typename ValueT > diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index b096573280b0..a99058fd3e99 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -64,8 +64,8 @@ public: void RemoveEntry ( sal_uLong nPos ); void SelectEntryPos ( sal_uLong nPos ); - sal_uLong GetSelectEntryPos () const; - void* GetSelectEntryData () const { return GetEntryData(GetSelectEntryPos()); } + sal_uLong GetSelectedEntryPos () const; + void* GetSelectEntryData () const { return GetEntryData(GetSelectedEntryPos()); } OUString GetText ( sal_uLong nPos ) const; sal_uLong GetCheckedEntryCount() const; diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index fb742cf106e8..838d8defb20f 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -79,7 +79,7 @@ public: /** Returns the position of the entry currently selected or TREELIST_APPEND. */ - sal_uLong GetSelectEntryPos() const; + sal_uLong GetSelectedEntryPos() const; protected: /** Initializes a new SvLBoxFontString entry. diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx index 5b5a03840a37..f141c8d96a28 100644 --- a/include/vcl/combobox.hxx +++ b/include/vcl/combobox.hxx @@ -142,8 +142,8 @@ public: sal_uInt16 GetDisplayLineCount() const; sal_Int32 GetSelectEntryCount() const; - sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const; - OUString GetSelectedEntry() const { return GetEntry( GetSelectEntryPos() ); } + sal_Int32 GetSelectedEntryPos( sal_Int32 nSelIndex = 0 ) const; + OUString GetSelectedEntry() const { return GetEntry( GetSelectedEntryPos() ); } bool IsEntryPosSelected( sal_Int32 nPos ) const; void SelectEntryPos( sal_Int32 nPos, bool bSelect = true ); void SetNoSelection(); diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index 7c5206b68ffa..fee5a295c373 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -166,7 +166,7 @@ public: sal_Int32 GetSelectEntryCount() const; OUString GetSelectedEntry( sal_Int32 nSelIndex = 0 ) const; - sal_Int32 GetSelectEntryPos( sal_Int32 nSelIndex = 0 ) const; + sal_Int32 GetSelectedEntryPos( sal_Int32 nSelIndex = 0 ) const; bool IsEntrySelected(const OUString& rStr) const; bool IsEntryPosSelected( sal_Int32 nPos ) const; @@ -174,7 +174,7 @@ public: void SetEntryData( sal_Int32 nPos, void* pNewData ); void* GetEntryData( sal_Int32 nPos ) const; - void* GetSelectEntryData() const { return GetEntryData(GetSelectEntryPos()); } + void* GetSelectEntryData() const { return GetEntryData(GetSelectedEntryPos()); } /** this methods stores a combination of flags from the ListBoxEntryFlags::* defines at the given entry. @@ -196,9 +196,9 @@ public: void SetTopEntry( sal_Int32 nPos ); sal_Int32 GetTopEntry() const; - void SaveValue() { mnSaveValue = GetSelectEntryPos(); } + void SaveValue() { mnSaveValue = GetSelectedEntryPos(); } sal_Int32 GetSavedValue() const { return mnSaveValue; } - bool IsValueChangedFromSaved() const { return mnSaveValue != GetSelectEntryPos(); } + bool IsValueChangedFromSaved() const { return mnSaveValue != GetSelectedEntryPos(); } void SetSeparatorPos( sal_Int32 n ); sal_Int32 GetSeparatorPos() const; diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 8fdfa0ad87ea..c084901df152 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -190,13 +190,13 @@ namespace rptui inline ConditionType Condition::impl_getCurrentConditionType() const { - return sal::static_int_cast< ConditionType >( m_pConditionType->GetSelectEntryPos() ); + return sal::static_int_cast< ConditionType >( m_pConditionType->GetSelectedEntryPos() ); } inline ComparisonOperation Condition::impl_getCurrentComparisonOperation() const { - return sal::static_int_cast< ComparisonOperation >( m_pOperationList->GetSelectEntryPos() ); + return sal::static_int_cast< ComparisonOperation >( m_pOperationList->GetSelectedEntryPos() ); } diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 3ffff9305280..e1031a202252 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -274,7 +274,7 @@ sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt sal_Int8 nAction = DND_ACTION_NONE; if ( IsEditing() ) { - sal_Int32 nPos = m_pComboCell->GetSelectEntryPos(); + sal_Int32 nPos = m_pComboCell->GetSelectedEntryPos(); if ( COMBOBOX_ENTRY_NOTFOUND != nPos || !m_pComboCell->GetText().isEmpty() ) SaveModified(); DeactivateCell(); @@ -458,7 +458,7 @@ bool OFieldExpressionControl::SaveModified() xGroup = m_pParent->getGroup(m_aGroupPositions[nRow]); if ( xGroup.is() ) { - sal_Int32 nPos = m_pComboCell->GetSelectEntryPos(); + sal_Int32 nPos = m_pComboCell->GetSelectedEntryPos(); OUString sExpression; if ( COMBOBOX_ENTRY_NOTFOUND == nPos ) sExpression = m_pComboCell->GetText(); @@ -918,11 +918,11 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow) uno::Reference< report::XGroup> xGroup = getGroup(nGroupPos); if ( m_pHeaderLst->IsValueChangedFromSaved() ) - xGroup->setHeaderOn( m_pHeaderLst->GetSelectEntryPos() == 0 ); + xGroup->setHeaderOn( m_pHeaderLst->GetSelectedEntryPos() == 0 ); if ( m_pFooterLst->IsValueChangedFromSaved() ) - xGroup->setFooterOn( m_pFooterLst->GetSelectEntryPos() == 0 ); + xGroup->setFooterOn( m_pFooterLst->GetSelectedEntryPos() == 0 ); if ( m_pKeepTogetherLst->IsValueChangedFromSaved() ) - xGroup->setKeepTogether( m_pKeepTogetherLst->GetSelectEntryPos() ); + xGroup->setKeepTogether( m_pKeepTogetherLst->GetSelectedEntryPos() ); if ( m_pGroupOnLst->IsValueChangedFromSaved() ) { sal_Int16 nGroupOn = static_cast<sal_Int16>(reinterpret_cast<sal_IntPtr>(m_pGroupOnLst->GetSelectEntryData())); @@ -934,7 +934,7 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow) m_pGroupIntervalEd->SaveValue(); } if ( m_pOrderLst->IsValueChangedFromSaved() ) - xGroup->setSortAscending( m_pOrderLst->GetSelectEntryPos() == 0 ); + xGroup->setSortAscending( m_pOrderLst->GetSelectedEntryPos() == 0 ); ListBox* pControls[] = { m_pHeaderLst, m_pFooterLst, m_pGroupOnLst, m_pKeepTogetherLst, m_pOrderLst}; for (ListBox* pControl : pControls) @@ -1057,7 +1057,7 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox&, rListBox, void ) if ( rListBox.IsValueChangedFromSaved() ) SaveData(nRow); if ( &rListBox == m_pGroupOnLst ) - m_pGroupIntervalEd->Enable( rListBox.GetSelectEntryPos() != 0 ); + m_pGroupIntervalEd->Enable( rListBox.GetSelectedEntryPos() != 0 ); } else if ( nGroupPos != NO_GROUP ) { @@ -1071,7 +1071,7 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox&, rListBox, void ) else aArgs[0].Name = PROPERTY_FOOTERON; - aArgs[0].Value <<= rListBox.GetSelectEntryPos() == 0; + aArgs[0].Value <<= rListBox.GetSelectedEntryPos() == 0; m_pController->executeChecked(m_pHeaderLst == &rListBox ? SID_GROUPHEADER : SID_GROUPFOOTER, aArgs); m_pFieldExpression->InvalidateHandleColumn(); } diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 04cb43486cdf..2459a1b676bf 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -86,7 +86,7 @@ short OPageNumberDialog::Execute() sal_Int32 nPosX = 0; sal_Int32 nPos2X = 0; awt::Size aRptSize = getStyleProperty<awt::Size>(m_xHoldAlive,PROPERTY_PAPERSIZE); - switch ( m_pAlignmentLst->GetSelectEntryPos() ) + switch ( m_pAlignmentLst->GetSelectedEntryPos() ) { case 0: // left nPosX = getStyleProperty<sal_Int32>(m_xHoldAlive,PROPERTY_LEFTMARGIN); @@ -105,7 +105,7 @@ short OPageNumberDialog::Execute() default: break; } - if ( m_pAlignmentLst->GetSelectEntryPos() > 2 ) + if ( m_pAlignmentLst->GetSelectedEntryPos() > 2 ) nPosX = nPos2X; uno::Sequence<beans::PropertyValue> aValues( comphelper::InitPropertySequence({ diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index d5495c2234aa..2527b97b8def 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -349,7 +349,7 @@ public: virtual sal_Int32 GetSelectEntryCount() const = 0; virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& nDlgHelpId, const OString& nLbHelpId ) = 0; virtual OUString GetSelectedEntry(sal_Int32 nPos) const = 0; - virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const = 0; + virtual sal_Int32 GetSelectedEntryPos(sal_Int32 nPos) const = 0; }; class AbstractScSortWarningDlg : public VclAbstractDialog diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index af5431197000..66d6517d08fa 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -181,7 +181,7 @@ void ScRandomNumberGeneratorDialog::SelectGeneratorAndGenerateNumbers() if (!maInputRange.IsValid()) return; - sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); + sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectedEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>(mpDistributionCombo->GetEntryData(aSelectedIndex)); sal_uInt32 seedValue; @@ -380,7 +380,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, InputRangeModified, Edit&, void) IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter1ValueModified, Edit&, void) { - sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); + sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectedEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) ); if (aSelectedId == DIST_UNIFORM || aSelectedId == DIST_UNIFORM_INTEGER) @@ -396,7 +396,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter1ValueModified, Edit&, v IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter2ValueModified, Edit&, void) { - sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); + sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectedEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) ); if (aSelectedId == DIST_UNIFORM || aSelectedId == DIST_UNIFORM_INTEGER) @@ -418,7 +418,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, CheckChanged, CheckBox&, void) IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, DistributionChanged, ListBox&, void) { - sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectEntryPos(); + sal_Int16 aSelectedIndex = mpDistributionCombo-> GetSelectedEntryPos(); sal_Int64 aSelectedId = reinterpret_cast<sal_Int64>( mpDistributionCombo->GetEntryData(aSelectedIndex) ); mpParameter1Value->SetMin(SAL_MIN_INT64); diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index a96d31a233b3..d3b04e6751d9 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -570,9 +570,9 @@ void AbstractScShowTabDlg_Impl::SetDescription( pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId ); } -sal_Int32 AbstractScShowTabDlg_Impl::GetSelectEntryPos(sal_Int32 nPos) const +sal_Int32 AbstractScShowTabDlg_Impl::GetSelectedEntryPos(sal_Int32 nPos) const { - return pDlg->GetSelectEntryPos( nPos); + return pDlg->GetSelectedEntryPos( nPos); } OUString AbstractScShowTabDlg_Impl::GetSelectedEntry(sal_Int32 nPos) const diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index ee9d80af5842..eec36a0c9ccb 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -337,7 +337,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg virtual sal_Int32 GetSelectEntryCount() const override; virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ) override; virtual OUString GetSelectedEntry(sal_Int32 nPos) const override; - virtual sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const override; + virtual sal_Int32 GetSelectedEntryPos(sal_Int32 nPos) const override; }; class AbstractScSortWarningDlg_Impl : public AbstractScSortWarningDlg diff --git a/sc/source/ui/cctrl/cbnumberformat.cxx b/sc/source/ui/cctrl/cbnumberformat.cxx index dede89437b7c..163b4ad22273 100644 --- a/sc/source/ui/cctrl/cbnumberformat.cxx +++ b/sc/source/ui/cctrl/cbnumberformat.cxx @@ -49,7 +49,7 @@ IMPL_STATIC_LINK(ScNumberFormat, NumFormatSelectHdl, ListBox&, rBox, void) SfxDispatcher* pDisp = SfxViewFrame::Current()->GetBindings().GetDispatcher(); if(pDisp) { - const sal_Int32 nVal = rBox.GetSelectEntryPos(); + const sal_Int32 nVal = rBox.GetSelectedEntryPos(); SfxUInt16Item aItem(SID_NUMBER_TYPE_FORMAT, nVal); pDisp->ExecuteList(SID_NUMBER_TYPE_FORMAT, SfxCallMode::RECORD, {&aItem}); diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index b41b2cd21e49..a147a7287968 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -30,8 +30,8 @@ void GetType(const ListBox& rLstBox, const Edit& rEd, ScColorScaleEntry* pEntry, { double nVal = 0; sal_uInt32 nIndex = 0; - pEntry->SetType(static_cast<ScColorScaleEntryType>(rLstBox.GetSelectEntryPos())); - switch(rLstBox.GetSelectEntryPos()) + pEntry->SetType(static_cast<ScColorScaleEntryType>(rLstBox.GetSelectedEntryPos())); + switch(rLstBox.GetSelectedEntryPos()) { case COLORSCALE_AUTO: case COLORSCALE_MIN: @@ -165,7 +165,7 @@ namespace { void GetAxesPosition(ScDataBarFormatData* pData, const ListBox* rLbox) { - switch(rLbox->GetSelectEntryPos()) + switch(rLbox->GetSelectedEntryPos()) { case 0: pData->meAxisPosition = databar::AUTOMATIC; @@ -198,7 +198,7 @@ ScDataBarFormatData* ScDataBarSettingsDlg::GetData() ScDataBarFormatData* pData = new ScDataBarFormatData(); pData->maPositiveColor = mpLbPos->GetSelectEntryColor(); pData->mpNegativeColor.reset(new Color(mpLbNeg->GetSelectEntryColor())); - pData->mbGradient = ( mpLbFillType->GetSelectEntryPos() == 1 ); + pData->mbGradient = ( mpLbFillType->GetSelectedEntryPos() == 1 ); pData->mpUpperLimit.reset(new ScColorScaleEntry()); pData->mpLowerLimit.reset(new ScColorScaleEntry()); pData->maAxisColor = mpLbAxisCol->GetSelectEntryColor(); @@ -216,10 +216,10 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl, Button*, void ) { //check that min < max bool bWarn = false; - sal_Int32 nSelectMin = mpLbTypeMin->GetSelectEntryPos(); + sal_Int32 nSelectMin = mpLbTypeMin->GetSelectedEntryPos(); if( nSelectMin == COLORSCALE_MAX ) bWarn = true; - sal_Int32 nSelectMax = mpLbTypeMax->GetSelectEntryPos(); + sal_Int32 nSelectMax = mpLbTypeMax->GetSelectedEntryPos(); if( nSelectMax == COLORSCALE_MIN ) bWarn = true; if(!bWarn) // databar length checks @@ -235,7 +235,7 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl, Button*, void ) if(rtl::math::approxEqual(nMinValue, nMaxValue) || nMinValue > nMaxValue || nMaxValue > 100 || nMinValue < 0) bWarn = true; } - if(!bWarn && mpLbTypeMin->GetSelectEntryPos() == mpLbTypeMax->GetSelectEntryPos()) + if(!bWarn && mpLbTypeMin->GetSelectedEntryPos() == mpLbTypeMax->GetSelectedEntryPos()) { if(nSelectMax != COLORSCALE_FORMULA && nSelectMax != COLORSCALE_AUTO) @@ -267,7 +267,7 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, OkBtnHdl, Button*, void ) IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void ) { - sal_Int32 nSelectMin = mpLbTypeMin->GetSelectEntryPos(); + sal_Int32 nSelectMin = mpLbTypeMin->GetSelectedEntryPos(); if( nSelectMin <= COLORSCALE_MAX) mpEdMin->Disable(); else @@ -282,7 +282,7 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void ) } } - sal_Int32 nSelectMax = mpLbTypeMax->GetSelectEntryPos(); + sal_Int32 nSelectMax = mpLbTypeMax->GetSelectedEntryPos(); if(nSelectMax <= COLORSCALE_MAX) mpEdMax->Disable(); else @@ -300,7 +300,7 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl, ListBox&, void ) IMPL_LINK_NOARG( ScDataBarSettingsDlg, PosSelectHdl, ListBox&, void ) { - sal_Int32 axisPos = mpLbAxisPos->GetSelectEntryPos(); + sal_Int32 axisPos = mpLbAxisPos->GetSelectedEntryPos(); if(axisPos != 2 && axisPos != 1) // disable if axis vertical position is automatic { mpLenMin->Disable(); diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index ca1cfbdedf40..0ca7db2bb994 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -261,7 +261,7 @@ IMPL_LINK(ScCondFormatList, ColFormatTypeHdl, ListBox&, rBox, void) if(itr == maEntries.end()) return; - sal_Int32 nPos = rBox.GetSelectEntryPos(); + sal_Int32 nPos = rBox.GetSelectedEntryPos(); switch(nPos) { case 0: @@ -326,7 +326,7 @@ IMPL_LINK(ScCondFormatList, AfterTypeListHdl, void*, p, void) if(itr == maEntries.end()) return; - sal_Int32 nPos = pBox->GetSelectEntryPos(); + sal_Int32 nPos = pBox->GetSelectedEntryPos(); switch(nPos) { case 0: diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 53b5da126957..af081bf65606 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -284,7 +284,7 @@ void ScConditionFrmtEntry::Init(ScCondFormatDlg* pDialogParent) ScFormatEntry* ScConditionFrmtEntry::createConditionEntry() const { - ScConditionMode eMode = EntryPosToConditionMode(maLbCondType->GetSelectEntryPos()); + ScConditionMode eMode = EntryPosToConditionMode(maLbCondType->GetSelectedEntryPos()); OUString aExpr1 = maEdVal1->GetText(); OUString aExpr2; if (GetNumberEditFields(eMode) == 2) @@ -408,7 +408,7 @@ sal_Int32 ScConditionFrmtEntry::GetNumberEditFields( ScConditionMode eMode ) OUString ScConditionFrmtEntry::GetExpressionString() { - return ScCondFormatHelper::GetExpression(CONDITION, maLbCondType->GetSelectEntryPos(), maEdVal1->GetText(), maEdVal2->GetText()); + return ScCondFormatHelper::GetExpression(CONDITION, maLbCondType->GetSelectedEntryPos(), maEdVal1->GetText(), maEdVal2->GetText()); } ScFormatEntry* ScConditionFrmtEntry::GetEntry() const @@ -418,7 +418,7 @@ ScFormatEntry* ScConditionFrmtEntry::GetEntry() const void ScConditionFrmtEntry::SetActive() { - ScConditionMode eMode = EntryPosToConditionMode(maLbCondType->GetSelectEntryPos()); + ScConditionMode eMode = EntryPosToConditionMode(maLbCondType->GetSelectedEntryPos()); maLbCondType->Show(); switch(GetNumberEditFields(eMode)) { @@ -477,7 +477,7 @@ namespace { void StyleSelect( ListBox& rLbStyle, const ScDocument* pDoc, SvxFontPrevWindow& rWdPreview ) { - if(rLbStyle.GetSelectEntryPos() == 0) + if(rLbStyle.GetSelectedEntryPos() == 0) { // call new style dialog SfxUInt16Item aFamilyItem( SID_STYLE_FAMILY, (sal_uInt16) SfxStyleFamily::Para ); @@ -686,7 +686,7 @@ void SetColorScaleEntry( ScColorScaleEntry* pEntry, const ListBox& rType, const { // color scale does not have the automatic entry - sal_Int32 nPos = rType.GetSelectEntryPos(); + sal_Int32 nPos = rType.GetSelectedEntryPos(); if(!bDataBar) ++nPos; @@ -852,7 +852,7 @@ IMPL_LINK( ScColorScale2FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) return; bool bEnableEdit = true; - sal_Int32 nPos = rBox.GetSelectEntryPos(); + sal_Int32 nPos = rBox.GetSelectedEntryPos(); if(nPos < 2) { bEnableEdit = false; @@ -945,7 +945,7 @@ ScFormatEntry* ScColorScale3FrmtEntry::createColorscaleEntry() const { ScColorScaleFormat* pColorScale = new ScColorScaleFormat(mpDoc); pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMin.get(), *maLbColMin.get(), *maEdMin.get(), mpDoc, maPos)); - if(maLbColorFormat->GetSelectEntryPos() == 1) + if(maLbColorFormat->GetSelectedEntryPos() == 1) pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMiddle.get(), *maLbColMiddle.get(), *maEdMiddle.get(), mpDoc, maPos)); pColorScale->AddEntry(createColorScaleEntry(*maLbEntryTypeMax.get(), *maLbColMax.get(), *maEdMax.get(), mpDoc, maPos)); return pColorScale; @@ -1012,7 +1012,7 @@ IMPL_LINK( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) return; bool bEnableEdit = true; - sal_Int32 nPos = rBox.GetSelectEntryPos(); + sal_Int32 nPos = rBox.GetSelectedEntryPos(); if(nPos < 2) { bEnableEdit = false; @@ -1026,7 +1026,7 @@ IMPL_LINK( ScColorScale3FrmtEntry, EntryTypeHdl, ListBox&, rBox, void ) IMPL_LINK_NOARG( ScConditionFrmtEntry, ConditionTypeSelectHdl, ListBox&, void ) { - sal_Int32 nSelectPos = maLbCondType->GetSelectEntryPos(); + sal_Int32 nSelectPos = maLbCondType->GetSelectedEntryPos(); ScConditionMode eMode = EntryPosToConditionMode(nSelectPos); switch(GetNumberEditFields(eMode)) { @@ -1191,13 +1191,13 @@ void ScDataBarFrmtEntry::SetInactive() IMPL_LINK_NOARG( ScDataBarFrmtEntry, DataBarTypeSelectHdl, ListBox&, void ) { - sal_Int32 nSelectPos = maLbDataBarMinType->GetSelectEntryPos(); + sal_Int32 nSelectPos = maLbDataBarMinType->GetSelectedEntryPos(); if(nSelectPos <= COLORSCALE_MAX) maEdDataBarMin->Disable(); else maEdDataBarMin->Enable(); - nSelectPos = maLbDataBarMaxType->GetSelectEntryPos(); + nSelectPos = maLbDataBarMaxType->GetSelectedEntryPos(); if(nSelectPos <= COLORSCALE_MAX) maEdDataBarMax->Disable(); else @@ -1300,7 +1300,7 @@ void ScDateFrmtEntry::Notify( SfxBroadcaster&, const SfxHint& rHint ) ScFormatEntry* ScDateFrmtEntry::GetEntry() const { ScCondDateFormatEntry* pNewEntry = new ScCondDateFormatEntry(mpDoc); - condformat::ScCondFormatDateType eType = static_cast<condformat::ScCondFormatDateType>(maLbDateEntry->GetSelectEntryPos()); + condformat::ScCondFormatDateType eType = static_cast<condformat::ScCondFormatDateType>(maLbDateEntry->GetSelectedEntryPos()); pNewEntry->SetDateType(eType); pNewEntry->SetStyleName(maLbStyle->GetSelectedEntry()); return pNewEntry; @@ -1413,7 +1413,7 @@ void ScIconSetFrmtDataEntry::dispose() ScColorScaleEntry* ScIconSetFrmtDataEntry::CreateEntry(ScDocument* pDoc, const ScAddress& rPos) const { - sal_Int32 nPos = maLbEntryType->GetSelectEntryPos(); + sal_Int32 nPos = maLbEntryType->GetSelectedEntryPos(); OUString aText = maEdEntry->GetText(); ScColorScaleEntry* pEntry = new ScColorScaleEntry(); @@ -1513,7 +1513,7 @@ IMPL_LINK_NOARG( ScIconSetFrmtEntry, IconSetTypeHdl, ListBox&, void ) { const ScIconSetMap* pMap = ScIconSetFormat::g_IconSetMap; - sal_Int32 nPos = maLbIconSetType->GetSelectEntryPos(); + sal_Int32 nPos = maLbIconSetType->GetSelectedEntryPos(); sal_uInt32 nElements = pMap[nPos].nElements; for (auto it = maEntries.begin(); it != maEntries.end(); ++it) @@ -1567,7 +1567,7 @@ ScFormatEntry* ScIconSetFrmtEntry::GetEntry() const ScIconSetFormat* pFormat = new ScIconSetFormat(mpDoc); ScIconSetFormatData* pData = new ScIconSetFormatData; - pData->eIconSetType = static_cast<ScIconSetType>(maLbIconSetType->GetSelectEntryPos()); + pData->eIconSetType = static_cast<ScIconSetType>(maLbIconSetType->GetSelectedEntryPos()); for(ScIconSetFrmtDataEntriesType::const_iterator itr = maEntries.begin(), itrEnd = maEntries.end(); itr != itrEnd; ++itr) { diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index a175220c62ea..ffcb614d4e46 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -385,7 +385,7 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl, Button*, void) theOutParam.nCol = aDestAddress.Col(); theOutParam.nRow = aDestAddress.Row(); theOutParam.nTab = aDestAddress.Tab(); - theOutParam.eFunction = LbPosToFunc( pLbFunc->GetSelectEntryPos() ); + theOutParam.eFunction = LbPosToFunc( pLbFunc->GetSelectedEntryPos() ); theOutParam.bByCol = pBtnByCol->IsChecked(); theOutParam.bByRow = pBtnByRow->IsChecked(); theOutParam.bReferenceData = pBtnRefs->IsChecked(); @@ -473,7 +473,7 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, Button*, pBtn, void ) else if ( pBtn == pBtnRemove ) { while ( pLbConsAreas->GetSelectEntryCount() ) - pLbConsAreas->RemoveEntry( pLbConsAreas->GetSelectEntryPos() ); + pLbConsAreas->RemoveEntry( pLbConsAreas->GetSelectedEntryPos() ); pBtnRemove->Disable(); } } @@ -490,7 +490,7 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox&, rLb, void ) else if ( (&rLb == pLbDataArea) || (&rLb == pLbDestArea) ) { Edit* pEd = (&rLb == pLbDataArea) ? pEdDataArea : pEdDestArea; - const sal_Int32 nSelPos = rLb.GetSelectEntryPos(); + const sal_Int32 nSelPos = rLb.GetSelectedEntryPos(); if ( pRangeUtil && (nSelPos > 0) diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index c981c14817e1..b7058d95a722 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -97,7 +97,7 @@ void ScDataPilotDatabaseDlg::dispose() void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc ) { - const sal_Int32 nSelect = m_pLbType->GetSelectEntryPos(); + const sal_Int32 nSelect = m_pLbType->GetSelectedEntryPos(); rDesc.aDBName = m_pLbDatabase->GetSelectedEntry(); rDesc.aObject = m_pCbObject->GetText(); @@ -127,7 +127,7 @@ void ScDataPilotDatabaseDlg::FillObjects() if (aDatabaseName.isEmpty()) return; - const sal_Int32 nSelect = m_pLbType->GetSelectEntryPos(); + const sal_Int32 nSelect = m_pLbType->GetSelectedEntryPos(); if ( nSelect > DP_TYPELIST_QUERY ) return; // only tables and queries diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 81320c4c1da1..7a314a4cacc9 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -83,7 +83,7 @@ bool ScDataPilotSourceTypeDlg::IsNamedRange() const OUString ScDataPilotSourceTypeDlg::GetSelectedNamedRange() const { - const sal_Int32 nPos = m_pLbNamedRange->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLbNamedRange->GetSelectedEntryPos(); return m_pLbNamedRange->GetEntry(nPos); } diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 02784428a192..2fa9c702f16f 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -323,21 +323,21 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) pLbConnect1->Hide(); // Disable/Enable Logic: - (pLbField1->GetSelectEntryPos() != 0) - && (pLbField2->GetSelectEntryPos() != 0) + (pLbField1->GetSelectedEntryPos() != 0) + && (pLbField2->GetSelectedEntryPos() != 0) ? pLbConnect2->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(1).eConnect ) : pLbConnect2->SetNoSelection(); - (pLbField2->GetSelectEntryPos() != 0) - && (pLbField3->GetSelectEntryPos() != 0) + (pLbField2->GetSelectedEntryPos() != 0) + && (pLbField3->GetSelectedEntryPos() != 0) ? pLbConnect3->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(2).eConnect ) : pLbConnect3->SetNoSelection(); - (pLbField3->GetSelectEntryPos() != 0) - && (pLbField4->GetSelectEntryPos() != 0) + (pLbField3->GetSelectedEntryPos() != 0) + && (pLbField4->GetSelectedEntryPos() != 0) ? pLbConnect4->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(3).eConnect ) : pLbConnect4->SetNoSelection(); - if ( pLbField1->GetSelectEntryPos() == 0 ) + if ( pLbField1->GetSelectedEntryPos() == 0 ) { pLbConnect2->Disable(); pLbField2->Disable(); @@ -351,7 +351,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) pEdVal2->Disable(); } - if ( pLbField2->GetSelectEntryPos() == 0 ) + if ( pLbField2->GetSelectedEntryPos() == 0 ) { pLbConnect3->Disable(); pLbField3->Disable(); @@ -364,7 +364,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) pLbCond3->Disable(); pEdVal3->Disable(); } - if ( pLbField3->GetSelectEntryPos() == 0 ) + if ( pLbField3->GetSelectedEntryPos() == 0 ) { pLbConnect4->Disable(); pLbField4->Disable(); @@ -466,7 +466,7 @@ void ScFilterDlg::UpdateValueList( size_t nList ) if (pDoc && nList > 0 && nList <= QUERY_ENTRY_COUNT) { ComboBox* pValList = maValueEdArr[nList-1].get(); - const sal_Int32 nFieldSelPos = maFieldLbArr[nList-1]->GetSelectEntryPos(); + const sal_Int32 nFieldSelPos = maFieldLbArr[nList-1]->GetSelectedEntryPos(); sal_Int32 nListPos = 0; OUString aCurValue = pValList->GetText(); @@ -561,7 +561,7 @@ void ScFilterDlg::UpdateHdrInValueList( size_t nList ) if (nList == 0 || nList > QUERY_ENTRY_COUNT) return; - size_t nFieldSelPos = maFieldLbArr[nList-1]->GetSelectEntryPos(); + size_t nFieldSelPos = maFieldLbArr[nList-1]->GetSelectedEntryPos(); if (!nFieldSelPos) return; @@ -739,7 +739,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) pLbCond1->Enable(); pEdVal1->Enable(); - const sal_Int32 nConnect1 = pLbConnect1->GetSelectEntryPos(); + const sal_Int32 nConnect1 = pLbConnect1->GetSelectedEntryPos(); size_t nQE = nOffset; theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect1; if (maRefreshExceptQuery.size() < nQE + 1) @@ -753,7 +753,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) pLbCond2->Enable(); pEdVal2->Enable(); - const sal_Int32 nConnect2 = pLbConnect2->GetSelectEntryPos(); + const sal_Int32 nConnect2 = pLbConnect2->GetSelectedEntryPos(); size_t nQE = 1+nOffset; theQueryData.GetEntry(nQE).eConnect =(ScQueryConnect)nConnect2; if (maRefreshExceptQuery.size() < nQE + 1) @@ -766,7 +766,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) pLbCond3->Enable(); pEdVal3->Enable(); - const sal_Int32 nConnect3 = pLbConnect3->GetSelectEntryPos(); + const sal_Int32 nConnect3 = pLbConnect3->GetSelectedEntryPos(); size_t nQE = 2 + nOffset; theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect3; if (maRefreshExceptQuery.size() < nQE + 1) @@ -780,7 +780,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) pLbCond4->Enable(); pEdVal4->Enable(); - const sal_Int32 nConnect4 = pLbConnect4->GetSelectEntryPos(); + const sal_Int32 nConnect4 = pLbConnect4->GetSelectedEntryPos(); size_t nQE = 3 + nOffset; theQueryData.GetEntry(nQE).eConnect = (ScQueryConnect)nConnect4; if (maRefreshExceptQuery.size() < nQE + 1) @@ -789,7 +789,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) } else if ( &rLb == pLbField1 ) { - if ( pLbField1->GetSelectEntryPos() == 0 ) + if ( pLbField1->GetSelectedEntryPos() == 0 ) { pLbConnect2->SetNoSelection(); pLbConnect3->SetNoSelection(); @@ -836,13 +836,13 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) pLbConnect2->Enable(); } theQueryData.GetEntry(nOffset).bDoQuery = true; - const sal_Int32 nField = rLb.GetSelectEntryPos(); + const sal_Int32 nField = rLb.GetSelectedEntryPos(); theQueryData.GetEntry(nOffset).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; } } else if ( &rLb == pLbField2 ) { - if ( pLbField2->GetSelectEntryPos() == 0 ) + if ( pLbField2->GetSelectedEntryPos() == 0 ) { pLbConnect3->SetNoSelection(); pLbConnect4->SetNoSelection(); @@ -882,7 +882,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) { pLbConnect3->Enable(); } - const sal_Int32 nField = rLb.GetSelectEntryPos(); + const sal_Int32 nField = rLb.GetSelectedEntryPos(); sal_uInt16 nQ=1+nOffset; theQueryData.GetEntry(nQ).bDoQuery = true; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -890,7 +890,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) } else if ( &rLb == pLbField3 ) { - if ( pLbField3->GetSelectEntryPos() == 0 ) + if ( pLbField3->GetSelectedEntryPos() == 0 ) { pLbConnect4->SetNoSelection(); pLbField4->SelectEntryPos( 0 ); @@ -923,7 +923,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) pLbConnect4->Enable(); } - const sal_Int32 nField = rLb.GetSelectEntryPos(); + const sal_Int32 nField = rLb.GetSelectedEntryPos(); sal_uInt16 nQ=2+nOffset; theQueryData.GetEntry(nQ).bDoQuery = true; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -932,7 +932,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) } else if ( &rLb == pLbField4 ) { - if ( pLbField4->GetSelectEntryPos() == 0 ) + if ( pLbField4->GetSelectedEntryPos() == 0 ) { ClearValueList( 4 ); sal_uInt16 nTemp=nOffset+3; @@ -950,7 +950,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) else { UpdateValueList( 4 ); - const sal_Int32 nField = rLb.GetSelectEntryPos(); + const sal_Int32 nField = rLb.GetSelectedEntryPos(); sal_uInt16 nQ=3+nOffset; theQueryData.GetEntry(nQ).bDoQuery = true; theQueryData.GetEntry(nQ).nField = theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1 ; @@ -959,22 +959,22 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox&, rLb, void ) } else if ( &rLb == pLbCond1) { - theQueryData.GetEntry(nOffset).eOp=(ScQueryOp)rLb.GetSelectEntryPos(); + theQueryData.GetEntry(nOffset).eOp=(ScQueryOp)rLb.GetSelectedEntryPos(); } else if ( &rLb == pLbCond2) { sal_uInt16 nQ=1+nOffset; - theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectEntryPos(); + theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectedEntryPos(); } else if ( &rLb == pLbCond3) { sal_uInt16 nQ=2+nOffset; - theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectEntryPos(); + theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectedEntryPos(); } else { sal_uInt16 nQ=3+nOffset; - theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectEntryPos(); + theQueryData.GetEntry(nQ).eOp=(ScQueryOp)rLb.GetSelectedEntryPos(); } } @@ -988,10 +988,10 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, Button*, pBox, void ) if ( pBox == pBtnHeader ) // Field list and value list { - const sal_Int32 nCurSel1 = pLbField1->GetSelectEntryPos(); - const sal_Int32 nCurSel2 = pLbField2->GetSelectEntryPos(); - const sal_Int32 nCurSel3 = pLbField3->GetSelectEntryPos(); - const sal_Int32 nCurSel4 = pLbField4->GetSelectEntryPos(); + const sal_Int32 nCurSel1 = pLbField1->GetSelectedEntryPos(); + const sal_Int32 nCurSel2 = pLbField2->GetSelectedEntryPos(); + const sal_Int32 nCurSel3 = pLbField3->GetSelectedEntryPos(); + const sal_Int32 nCurSel4 = pLbField4->GetSelectedEntryPos(); FillFieldLists(); pLbField1->SelectEntryPos( nCurSel1 ); pLbField2->SelectEntryPos( nCurSel2 ); @@ -1059,7 +1059,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, Edit&, rEd, void ) ScQueryEntry& rEntry = theQueryData.GetEntry( nQE ); ScQueryEntry::Item& rItem = rEntry.GetQueryItem(); - bool bDoThis = (pLbField->GetSelectEntryPos() != 0); + bool bDoThis = (pLbField->GetSelectedEntryPos() != 0); rEntry.bDoQuery = bDoThis; if ( rEntry.bDoQuery || maRefreshExceptQuery[nQE] ) @@ -1086,11 +1086,11 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, Edit&, rEd, void ) rItem.meType = bNumber ? ScQueryEntry::ByValue : ScQueryEntry::ByString; } - const sal_Int32 nField = pLbField->GetSelectEntryPos(); + const sal_Int32 nField = pLbField->GetSelectedEntryPos(); rEntry.nField = nField ? (theQueryData.nCol1 + static_cast<SCCOL>(nField) - 1) : static_cast<SCCOL>(0); - ScQueryOp eOp = (ScQueryOp)pLbCond->GetSelectEntryPos(); + ScQueryOp eOp = (ScQueryOp)pLbCond->GetSelectedEntryPos(); rEntry.eOp = eOp; if (maHasDates[nQE] && !bByEmptyOrNotByEmpty) rItem.meType = ScQueryEntry::ByDate; diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index deea6733f395..a492b92264d7 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -211,7 +211,7 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox&, rLb, void ) if ( &rLb == pLbCopyArea ) { OUString aString; - const sal_Int32 nSelPos = pLbCopyArea->GetSelectEntryPos(); + const sal_Int32 nSelPos = pLbCopyArea->GetSelectedEntryPos(); if ( nSelPos > 0 ) aString = *static_cast<OUString*>(pLbCopyArea->GetEntryData( nSelPos )); diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 37da46a92b63..523cb31ae075 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -211,17 +211,17 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) // disable/enable logic: - (m_pLbField1->GetSelectEntryPos() != 0) - && (m_pLbField2->GetSelectEntryPos() != 0) + (m_pLbField1->GetSelectedEntryPos() != 0) + && (m_pLbField2->GetSelectedEntryPos() != 0) ? m_pLbConnect1->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(1).eConnect ) : m_pLbConnect1->SetNoSelection(); - (m_pLbField2->GetSelectEntryPos() != 0) - && (m_pLbField3->GetSelectEntryPos() != 0) + (m_pLbField2->GetSelectedEntryPos() != 0) + && (m_pLbField3->GetSelectedEntryPos() != 0) ? m_pLbConnect2->SelectEntryPos( (sal_uInt16)theQueryData.GetEntry(2).eConnect ) : m_pLbConnect2->SetNoSelection(); - if ( m_pLbField1->GetSelectEntryPos() == 0 ) + if ( m_pLbField1->GetSelectedEntryPos() == 0 ) { m_pLbConnect1->Disable(); m_pLbField2->Disable(); @@ -235,7 +235,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) m_pEdVal2->Disable(); } - if ( m_pLbField2->GetSelectEntryPos() == 0 ) + if ( m_pLbField2->GetSelectedEntryPos() == 0 ) { m_pLbConnect2->Disable(); m_pLbField3->Disable(); @@ -289,7 +289,7 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList ) if ( pDoc && nList>0 && nList<=3 ) { ComboBox* pValList = aValueEdArr[nList-1].get(); - sal_Int32 nFieldSelPos = aFieldLbArr[nList-1]->GetSelectEntryPos(); + sal_Int32 nFieldSelPos = aFieldLbArr[nList-1]->GetSelectedEntryPos(); sal_Int32 nListPos = 0; OUString aCurValue = pValList->GetText(); @@ -350,17 +350,17 @@ sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField ) const ScQueryItem& ScPivotFilterDlg::GetOutputItem() { ScQueryParam theParam( theQueryData ); - sal_Int32 nConnect1 = m_pLbConnect1->GetSelectEntryPos(); - sal_Int32 nConnect2 = m_pLbConnect2->GetSelectEntryPos(); + sal_Int32 nConnect1 = m_pLbConnect1->GetSelectedEntryPos(); + sal_Int32 nConnect2 = m_pLbConnect2->GetSelectedEntryPos(); svl::SharedStringPool& rPool = pViewData->GetDocument()->GetSharedStringPool(); for ( SCSIZE i=0; i<3; i++ ) { - const sal_Int32 nField = aFieldLbArr[i]->GetSelectEntryPos(); - ScQueryOp eOp = (ScQueryOp)aCondLbArr[i]->GetSelectEntryPos(); + const sal_Int32 nField = aFieldLbArr[i]->GetSelectedEntryPos(); + ScQueryOp eOp = (ScQueryOp)aCondLbArr[i]->GetSelectedEntryPos(); - bool bDoThis = (aFieldLbArr[i]->GetSelectEntryPos() != 0); + bool bDoThis = (aFieldLbArr[i]->GetSelectedEntryPos() != 0); theParam.GetEntry(i).bDoQuery = bDoThis; if ( bDoThis ) @@ -449,7 +449,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void ) } else if (&rLb == m_pLbField1) { - if ( m_pLbField1->GetSelectEntryPos() == 0 ) + if ( m_pLbField1->GetSelectedEntryPos() == 0 ) { m_pLbConnect1->SetNoSelection(); m_pLbConnect2->SetNoSelection(); @@ -481,7 +481,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void ) } else if (&rLb == m_pLbField2) { - if ( m_pLbField2->GetSelectEntryPos() == 0 ) + if ( m_pLbField2->GetSelectedEntryPos() == 0 ) { m_pLbConnect2->SetNoSelection(); m_pLbField3->SelectEntryPos( 0 ); @@ -505,7 +505,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox&, rLb, void ) } else if (&rLb == m_pLbField3) { - ( m_pLbField3->GetSelectEntryPos() == 0 ) + ( m_pLbField3->GetSelectedEntryPos() == 0 ) ? ClearValueList( 3 ) : UpdateValueList( 3 ); } diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 74e5f947e9c8..95060eeec84a 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -173,7 +173,7 @@ PivotFunc ScDPFunctionListBox::GetSelection() const { PivotFunc nFuncMask = PivotFunc::NONE; for( sal_Int32 nSel = 0, nCount = GetSelectEntryCount(); nSel < nCount; ++nSel ) - nFuncMask |= spnFunctions[ GetSelectEntryPos( nSel ) ]; + nFuncMask |= spnFunctions[ GetSelectedEntryPos( nSel ) ]; return nFuncMask; } @@ -239,7 +239,7 @@ DataPilotFieldReference ScDPFunctionDlg::GetFieldRef() const aRef.ReferenceType = mxLbTypeWrp->GetControlValue(); aRef.ReferenceField = GetBaseFieldName(mpLbBaseField->GetSelectedEntry()); - sal_Int32 nBaseItemPos = mpLbBaseItem->GetSelectEntryPos(); + sal_Int32 nBaseItemPos = mpLbBaseItem->GetSelectedEntryPos(); switch( nBaseItemPos ) { case SC_BASEITEM_PREV_POS: @@ -292,7 +292,7 @@ void ScDPFunctionDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa // select base field mpLbBaseField->SelectEntry(aSelectedEntry); - if( mpLbBaseField->GetSelectEntryPos() >= mpLbBaseField->GetEntryCount() ) + if( mpLbBaseField->GetSelectedEntryPos() >= mpLbBaseField->GetEntryCount() ) mpLbBaseField->SelectEntryPos( 0 ); SelectHdl( *mpLbBaseField.get() ); // fills base item list, selects base item @@ -393,7 +393,7 @@ IMPL_LINK( ScDPFunctionDlg, SelectHdl, ListBox&, rLBox, void ) // update item list for current base field mbEmptyItem = false; - size_t nBasePos = mpLbBaseField->GetSelectEntryPos(); + size_t nBasePos = mpLbBaseField->GetSelectedEntryPos(); if( nBasePos < mrLabelVec.size() ) { const vector<ScDPLabelData::Member>& rMembers = mrLabelVec[nBasePos]->maMembers; @@ -605,7 +605,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const if( m_pRbSortMan->IsChecked() ) rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::MANUAL; - else if( m_pLbSortBy->GetSelectEntryPos() == SC_SORTNAME_POS ) + else if( m_pLbSortBy->GetSelectedEntryPos() == SC_SORTNAME_POS ) rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::NAME; else rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::DATA; @@ -645,7 +645,7 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const // *** HIERARCHY *** - rLabelData.mnUsedHier = m_pLbHierarchy->GetSelectEntryCount() ? m_pLbHierarchy->GetSelectEntryPos() : 0; + rLabelData.mnUsedHier = m_pLbHierarchy->GetSelectEntryCount() ? m_pLbHierarchy->GetSelectedEntryPos() : 0; } void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayout ) @@ -720,7 +720,7 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayou // m_pLbShowUsing already filled above m_pLbShowUsing->SelectEntry( maLabelData.maShowInfo.DataField ); - if( m_pLbShowUsing->GetSelectEntryPos() >= m_pLbShowUsing->GetEntryCount() ) + if( m_pLbShowUsing->GetSelectedEntryPos() >= m_pLbShowUsing->GetEntryCount() ) m_pLbShowUsing->SelectEntryPos( 0 ); CheckHdl(m_pCbShow); // enable/disable dependent controls @@ -808,7 +808,7 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox&, rLBox, void ) { if (&rLBox == m_pLbHierarchy) { - mrDPObj.GetMembers(maLabelData.mnCol, m_pLbHierarchy->GetSelectEntryPos(), maLabelData.maMembers); + mrDPObj.GetMembers(maLabelData.mnCol, m_pLbHierarchy->GetSelectedEntryPos(), maLabelData.maMembers); InitHideListBox(); } } diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 7f9eac1ff9d9..e263298377be 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -596,7 +596,7 @@ void ScImportAsciiDlg::SaveParameters() pCkbQuotedAsText->IsChecked(), pCkbDetectNumber->IsChecked(), pRbFixed->IsChecked(), static_cast<sal_Int32>(pNfRow->GetValue()), - pLbCharSet->GetSelectEntryPos(), + pLbCharSet->GetSelectedEntryPos(), static_cast<sal_uInt16>(pLbCustomLang->GetSelectLanguage()), meCall ); } @@ -745,7 +745,7 @@ IMPL_LINK( ScImportAsciiDlg, FirstRowHdl, Edit&, rEdit, void ) IMPL_LINK( ScImportAsciiDlg, LbColTypeHdl, ListBox&, rListBox, void ) { if( &rListBox == pLbType ) - mpTableBox->Execute( CSVCMD_SETCOLUMNTYPE, rListBox.GetSelectEntryPos() ); + mpTableBox->Execute( CSVCMD_SETCOLUMNTYPE, rListBox.GetSelectedEntryPos() ); } IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox&, void) diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index a9bbf8b00443..72cccc163506 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -420,7 +420,7 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox&, rLb, void ) if ( &rLb == pLbFilterArea ) { OUString aString; - const sal_Int32 nSelPos = pLbFilterArea->GetSelectEntryPos(); + const sal_Int32 nSelPos = pLbFilterArea->GetSelectedEntryPos(); if ( nSelPos > 0 ) aString = *static_cast<OUString*>(pLbFilterArea->GetEntryData( nSelPos )); diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 38c967f01610..cc62a5e1f839 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -190,7 +190,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ ) // Enable or disable field depending on preceding Listbox selection maSortKeyItems[0]->EnableField(); for ( sal_uInt16 i=1; i<nSortKeyCount; i++ ) - if ( maSortKeyItems[i - 1]->m_pLbSort->GetSelectEntryPos() == 0 ) + if ( maSortKeyItems[i - 1]->m_pLbSort->GetSelectedEntryPos() == 0 ) maSortKeyItems[i]->DisableField(); else maSortKeyItems[i]->EnableField(); @@ -226,7 +226,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ ) } // Make sure that there is always a last undefined sort key - if ( maSortKeyItems[nSortKeyCount - 1]->m_pLbSort->GetSelectEntryPos() > 0 ) + if ( maSortKeyItems[nSortKeyCount - 1]->m_pLbSort->GetSelectedEntryPos() > 0 ) SetLastSortKey( nSortKeyCount ); } @@ -249,7 +249,7 @@ bool ScTabPageSortFields::FillItemSet( SfxItemSet* rArgSet ) for ( sal_uInt16 i=0; i<nSortKeyCount; i++ ) { - nSortPos.push_back( maSortKeyItems[i]->m_pLbSort->GetSelectEntryPos() ); + nSortPos.push_back( maSortKeyItems[i]->m_pLbSort->GetSelectedEntryPos() ); if ( nSortPos[i] == LISTBOX_ENTRY_NOTFOUND ) nSortPos[i] = 0; } @@ -304,7 +304,7 @@ void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet ) { std::vector<sal_uInt16> nCurSel; for ( sal_uInt16 i=0; i<nSortKeyCount; i++ ) - nCurSel.push_back( maSortKeyItems[i]->m_pLbSort->GetSelectEntryPos() ); + nCurSel.push_back( maSortKeyItems[i]->m_pLbSort->GetSelectedEntryPos() ); bHasHeader = pDlg->GetHeaders(); bSortByRows = pDlg->GetByRows(); @@ -732,7 +732,7 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet* rArgSet ) aNewSortData.nDestTab = theOutPos.Tab(); aNewSortData.bUserDef = m_pBtnSortUser->IsChecked(); aNewSortData.nUserIndex = (m_pBtnSortUser->IsChecked()) - ? m_pLbSortUser->GetSelectEntryPos() + ? m_pLbSortUser->GetSelectedEntryPos() : 0; // get locale @@ -745,7 +745,7 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet* rArgSet ) { uno::Sequence<OUString> aAlgos = pColWrap->listCollatorAlgorithms( aNewSortData.aCollatorLocale ); - const sal_Int32 nSel = m_pLbAlgorithm->GetSelectEntryPos(); + const sal_Int32 nSel = m_pLbAlgorithm->GetSelectedEntryPos(); if ( nSel < aAlgos.getLength() ) sAlg = aAlgos[nSel]; } @@ -880,7 +880,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox&, rLb, void ) if (&rLb == m_pLbOutPos) { OUString aString; - const sal_Int32 nSelPos = m_pLbOutPos->GetSelectEntryPos(); + const sal_Int32 nSelPos = m_pLbOutPos->GetSelectedEntryPos(); if ( nSelPos > 0 ) aString = *static_cast<OUString*>(m_pLbOutPos->GetEntryData( nSelPos )); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index bbc06737796b..8b23073925e3 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -200,7 +200,7 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, std::unique_ptr<ScSubTotalFunc[]> pFunctions; std::unique_ptr<SCCOL[]> pSubTotals; - const sal_Int32 nGroup = mpLbGroup->GetSelectEntryPos(); + const sal_Int32 nGroup = mpLbGroup->GetSelectedEntryPos(); const sal_Int32 nEntryCount = mpLbColumns->GetEntryCount(); const sal_Int32 nCheckCount = mpLbColumns->GetCheckedEntryCount(); @@ -356,8 +356,8 @@ void ScTpSubTotalGroup::SelectHdl(const void *pLb) if ( (mpLbColumns->GetEntryCount() > 0) && (mpLbColumns->GetSelectionCount() > 0) ) { - const sal_Int32 nFunction = mpLbFunctions->GetSelectEntryPos(); - const sal_Int32 nColumn = mpLbColumns->GetSelectEntryPos(); + const sal_Int32 nFunction = mpLbFunctions->GetSelectedEntryPos(); + const sal_Int32 nColumn = mpLbColumns->GetSelectedEntryPos(); sal_uInt16* pFunction = static_cast<sal_uInt16*>(mpLbColumns->GetEntryData( nColumn )); OSL_ENSURE( pFunction, "EntryData not found!" ); @@ -548,7 +548,7 @@ bool ScTpSubTotalOptions::FillItemSet( SfxItemSet* rArgSet ) theSubTotalData.bAscending = pBtnAscending->IsChecked(); theSubTotalData.bUserDef = pBtnUserDef->IsChecked(); theSubTotalData.nUserIndex = (pBtnUserDef->IsChecked()) - ? pLbUserDef->GetSelectEntryPos() + ? pLbUserDef->GetSelectedEntryPos() : 0; rArgSet->Put( ScSubTotalItem( nWhichSubTotals, &theSubTotalData ) ); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 59507799a2c9..4a3a32c99e64 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -465,9 +465,9 @@ bool ScTPValidationValue::FillItemSet( SfxItemSet* rArgSet ) ValidListType::INVISIBLE; rArgSet->Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<sal_uInt16>( - lclGetValModeFromPos( m_pLbAllow->GetSelectEntryPos() ) ) ) ); + lclGetValModeFromPos( m_pLbAllow->GetSelectedEntryPos() ) ) ) ); rArgSet->Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<sal_uInt16>( - lclGetCondModeFromPos( m_pLbValue->GetSelectEntryPos() ) ) ) ); + lclGetCondModeFromPos( m_pLbValue->GetSelectedEntryPos() ) ) ) ); rArgSet->Put( SfxStringItem( FID_VALID_VALUE1, GetFirstFormula() ) ); rArgSet->Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) ); rArgSet->Put( SfxBoolItem( FID_VALID_BLANK, m_pCbAllow->IsChecked() ) ); @@ -478,7 +478,7 @@ bool ScTPValidationValue::FillItemSet( SfxItemSet* rArgSet ) OUString ScTPValidationValue::GetFirstFormula() const { OUString aFmlaStr; - if( m_pLbAllow->GetSelectEntryPos() == SC_VALIDDLG_ALLOW_LIST ) + if( m_pLbAllow->GetSelectedEntryPos() == SC_VALIDDLG_ALLOW_LIST ) lclGetFormulaFromStringList( aFmlaStr, m_pEdList->GetText(), mcFmlaSep ); else aFmlaStr = m_pEdMin->GetText(); @@ -494,7 +494,7 @@ void ScTPValidationValue::SetFirstFormula( const OUString& rFmlaStr ) { // try if formula is a string list, validation mode must already be set OUString aStringList; - if( (m_pLbAllow->GetSelectEntryPos() == SC_VALIDDLG_ALLOW_RANGE) && + if( (m_pLbAllow->GetSelectedEntryPos() == SC_VALIDDLG_ALLOW_RANGE) && lclGetStringListFromFormula( aStringList, rFmlaStr, mcFmlaSep ) ) { m_pEdList->SetText( aStringList ); @@ -583,7 +583,7 @@ void ScTPValidationValue::RemoveRefDlg() IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl, Control&, void) { - const sal_Int32 nPos = m_pLbAllow->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLbAllow->GetSelectedEntryPos(); if ( nPos == SC_VALIDDLG_ALLOW_RANGE ) { @@ -605,7 +605,7 @@ IMPL_LINK( ScTPValidationValue, KillFocusHdl, Control&, rControl, void ) IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl, ListBox&, void) { - const sal_Int32 nLbPos = m_pLbAllow->GetSelectEntryPos(); + const sal_Int32 nLbPos = m_pLbAllow->GetSelectedEntryPos(); bool bEnable = (nLbPos != SC_VALIDDLG_ALLOW_ANY); bool bRange = (nLbPos == SC_VALIDDLG_ALLOW_RANGE); bool bList = (nLbPos == SC_VALIDDLG_ALLOW_LIST); @@ -626,7 +626,7 @@ IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl, ListBox&, void) m_pFtMin->SetText( maStrList ); else { - switch( m_pLbValue->GetSelectEntryPos() ) + switch( m_pLbValue->GetSelectedEntryPos() ) { case SC_VALIDDLG_DATA_EQUAL: case SC_VALIDDLG_DATA_NOTEQUAL: m_pFtMin->SetText( maStrValue ); break; @@ -823,7 +823,7 @@ void ScTPValidationError::Reset( const SfxItemSet* rArgSet ) bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet ) { rArgSet->Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) ); - rArgSet->Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectEntryPos() ) ); + rArgSet->Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectedEntryPos() ) ); rArgSet->Put( SfxStringItem( FID_VALID_ERRTITLE, m_pEdtTitle->GetText() ) ); rArgSet->Put( SfxStringItem( FID_VALID_ERRTEXT, m_pEdError->GetText() ) ); @@ -832,7 +832,7 @@ bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet ) IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl, ListBox&, void) { - ScValidErrorStyle eStyle = (ScValidErrorStyle) m_pLbAction->GetSelectEntryPos(); + ScValidErrorStyle eStyle = (ScValidErrorStyle) m_pLbAction->GetSelectedEntryPos(); bool bMacro = ( eStyle == SC_VALERR_MACRO ); m_pBtnSearch->Enable( bMacro ); diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 5df386873520..27f8b7f14c00 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -133,7 +133,7 @@ void ScFunctionWin::InitLRUList() ScFunctionMgr* pFuncMgr = ScGlobal::GetStarCalcFunctionMgr(); pFuncMgr->fillLastRecentlyUsedFunctions(aLRUList); - sal_Int32 nSelPos = aCatBox->GetSelectEntryPos(); + sal_Int32 nSelPos = aCatBox->GetSelectedEntryPos(); if(nSelPos == 0) UpdateFunctionList(); @@ -181,7 +181,7 @@ void ScFunctionWin::SetDescription() aFiFuncDesc->SetText( EMPTY_OUSTRING ); const ScFuncDesc* pDesc = static_cast<const ScFuncDesc*>(aFuncList->GetEntryData( - aFuncList->GetSelectEntryPos() )); + aFuncList->GetSelectedEntryPos() )); if (pDesc) { pDesc->initArgumentInfo(); // full argument info is needed @@ -216,7 +216,7 @@ void ScFunctionWin::SetDescription() void ScFunctionWin::UpdateFunctionList() { - sal_Int32 nSelPos = aCatBox->GetSelectEntryPos(); + sal_Int32 nSelPos = aCatBox->GetSelectedEntryPos(); sal_Int32 nCategory = ( LISTBOX_ENTRY_NOTFOUND != nSelPos ) ? (nSelPos-1) : 0; @@ -302,7 +302,7 @@ void ScFunctionWin::DoEnter() } const ScFuncDesc* pDesc = static_cast<const ScFuncDesc*>(aFuncList->GetEntryData( - aFuncList->GetSelectEntryPos() )); + aFuncList->GetSelectedEntryPos() )); if (pDesc) { pFuncDesc=pDesc; diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 6230b9d14176..dde157b1610e 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -48,7 +48,7 @@ public: sal_Int32 GetSelectEntryCount() const; OUString GetSelectedEntry(sal_Int32 nPos) const; - sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const; + sal_Int32 GetSelectedEntryPos(sal_Int32 nPos) const; }; #endif diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 94a3a2b0eb0c..fe7e8b63b51d 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -575,7 +575,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl, Button*, void) IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) { OUString aRangeStr = pLbRange->GetSelectedEntry(); - sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos(); + sal_Int32 nSelectPos = pLbRange->GetSelectedEntryPos(); bool bColName = (reinterpret_cast<sal_uLong>(pLbRange->GetEntryData( nSelectPos )) == nEntryDataCol); NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr); @@ -633,7 +633,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl, Button*, void) // handler called when a row in the listbox is selected, updates form input fields IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl, ListBox&, void) { - sal_Int32 nSelectPos = pLbRange->GetSelectEntryPos(); + sal_Int32 nSelectPos = pLbRange->GetSelectedEntryPos(); const sal_Int32 nCnt = pLbRange->GetEntryCount(); sal_uInt16 nMoves = 0; while ( nSelectPos < nCnt diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index c19644070b04..ff531f6483c9 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -215,7 +215,7 @@ const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN ) aStrCurSelTable = m_pLbTables->GetSelectedEntry(); pStr = &aStrCurSelTable; if ( pN ) - *pN = m_pLbTables->GetSelectEntryPos(); + *pN = m_pLbTables->GetSelectedEntryPos(); nSelTabIndex = 1; } @@ -231,7 +231,7 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) aStrCurSelTable = m_pLbTables->GetSelectedEntry( nSelTabIndex ); pStr = &aStrCurSelTable; if ( pN ) - *pN = m_pLbTables->GetSelectEntryPos( nSelTabIndex ); + *pN = m_pLbTables->GetSelectedEntryPos( nSelTabIndex ); nSelTabIndex++; } diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 820c4affe618..d57bb053c6b3 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -160,7 +160,7 @@ void ScMoveTableDlg::CheckNewTabName() return; } - bool bMoveInCurrentDoc = pBtnMove->IsChecked() && pLbDoc->GetSelectEntryPos() == mnCurrentDocPos; + bool bMoveInCurrentDoc = pBtnMove->IsChecked() && pLbDoc->GetSelectedEntryPos() == mnCurrentDocPos; bool bFound = false; const sal_Int32 nLast = pLbTable->GetEntryCount(); for ( sal_Int32 i=0; i<nLast && !bFound; ++i ) @@ -191,7 +191,7 @@ void ScMoveTableDlg::CheckNewTabName() ScDocument* ScMoveTableDlg::GetSelectedDoc() { - sal_Int32 nPos = pLbDoc->GetSelectEntryPos(); + sal_Int32 nPos = pLbDoc->GetSelectedEntryPos(); return static_cast<ScDocument*>(pLbDoc->GetEntryData(nPos)); } @@ -258,9 +258,9 @@ IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, RadioButton&, rBtn, void ) IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl, Button*, void) { - const sal_Int32 nDocSel = pLbDoc->GetSelectEntryPos(); + const sal_Int32 nDocSel = pLbDoc->GetSelectedEntryPos(); const sal_Int32 nDocLast = pLbDoc->GetEntryCount()-1; - const sal_Int32 nTabSel = pLbTable->GetSelectEntryPos(); + const sal_Int32 nTabSel = pLbTable->GetSelectedEntryPos(); const sal_Int32 nTabLast = pLbTable->GetEntryCount()-1; nDocument = (nDocSel != nDocLast) ? nDocSel : SC_DOC_NEW; diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 7c7eb3fd5704..8f73855c3f60 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -456,7 +456,7 @@ void ScOptSolverDlg::ReadConditions() ScOptConditionRow aRowEntry; aRowEntry.aLeftStr = mpLeftEdit[nRow]->GetText(); aRowEntry.aRightStr = mpRightEdit[nRow]->GetText(); - aRowEntry.nOperator = mpOperator[nRow]->GetSelectEntryPos(); + aRowEntry.nOperator = mpOperator[nRow]->GetSelectedEntryPos(); long nVecPos = nScrollPos + nRow; if ( nVecPos >= (long)maConditions.size() && !aRowEntry.IsDefault() ) diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 3105cdd84c23..ed337ffe6b05 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -395,7 +395,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl, Button*, void) IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl, ListBox&, void) { - nIndex = m_pLbFormat->GetSelectEntryPos(); + nIndex = m_pLbFormat->GetSelectedEntryPos(); UpdateChecks(); if ( nIndex == 0 ) diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index b1b75f3b366e..c6f1949069a9 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -76,9 +76,9 @@ OUString ScShowTabDlg::GetSelectedEntry(sal_Int32 nPos) const return m_pLb->GetSelectedEntry(nPos); } -sal_Int32 ScShowTabDlg::GetSelectEntryPos(sal_Int32 nPos) const +sal_Int32 ScShowTabDlg::GetSelectedEntryPos(sal_Int32 nPos) const { - return m_pLb->GetSelectEntryPos(nPos); + return m_pLb->GetSelectedEntryPos(nPos); } IMPL_LINK_NOARG(ScShowTabDlg, DblClkHdl, ListBox&, void) diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 52e8db05f0cd..ad3661c4dffc 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -364,7 +364,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, b IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl, ListBox&, void) { - const sal_Int32 nSelectPos = m_pLbEngine->GetSelectEntryPos(); + const sal_Int32 nSelectPos = m_pLbEngine->GetSelectedEntryPos(); if ( nSelectPos < maImplNames.getLength() ) { OUString aNewEngine( maImplNames[nSelectPos] ); diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index bd8175d056b3..7fcc391f7516 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -154,7 +154,7 @@ bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt ) const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedScenarioEntry() const { - size_t nPos = GetSelectEntryPos(); + size_t nPos = GetSelectedEntryPos(); return (nPos < maEntries.size()) ? &maEntries[ nPos ] : nullptr; } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 6d21cf1c7d08..bad8985794db 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -143,13 +143,13 @@ IMPL_LINK(ScCalcOptionsDialog, AsZeroModifiedHdl, Button*, pCheckBox, void ) IMPL_LINK(ScCalcOptionsDialog, ConversionModifiedHdl, ListBox&, rConv, void ) { - maConfig.meStringConversion = (ScCalcConfig::StringConversion)rConv.GetSelectEntryPos(); + maConfig.meStringConversion = (ScCalcConfig::StringConversion)rConv.GetSelectedEntryPos(); CoupleEmptyAsZeroToStringConversion(); } IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, ListBox&, rSyntax, void) { - maConfig.SetStringRefSyntax(toAddressConvention(rSyntax.GetSelectEntryPos())); + maConfig.SetStringRefSyntax(toAddressConvention(rSyntax.GetSelectedEntryPos())); } IMPL_LINK(ScCalcOptionsDialog, CurrentDocOnlyHdl, Button*, pCheckBox, void) diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 30c16b0b2ce3..c5f38a697fb0 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -44,7 +44,7 @@ bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs) { rCoreAttrs->Put( SfxUInt16Item( - SID_SC_OPT_KEY_BINDING_COMPAT, m_pLbKeyBindings->GetSelectEntryPos())); + SID_SC_OPT_KEY_BINDING_COMPAT, m_pLbKeyBindings->GetSelectedEntryPos())); bRet = true; } return bRet; diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 5aa63a7bacec..f47d17139d07 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -239,12 +239,12 @@ bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet) bool bRet = false; ScFormulaOptions aOpt; bool bEnglishFuncName = mpCbEnglishFuncName->IsChecked(); - sal_Int16 aSyntaxPos = mpLbFormulaSyntax->GetSelectEntryPos(); + sal_Int16 aSyntaxPos = mpLbFormulaSyntax->GetSelectedEntryPos(); OUString aSep = mpEdSepFuncArg->GetText(); OUString aSepArrayCol = mpEdSepArrayCol->GetText(); OUString aSepArrayRow = mpEdSepArrayRow->GetText(); - sal_Int16 nOOXMLRecalcMode = mpLbOOXMLRecalcOptions->GetSelectEntryPos(); - sal_Int16 nODFRecalcMode = mpLbODFRecalcOptions->GetSelectEntryPos(); + sal_Int16 nOOXMLRecalcMode = mpLbOOXMLRecalcOptions->GetSelectedEntryPos(); + sal_Int16 nODFRecalcMode = mpLbODFRecalcOptions->GetSelectedEntryPos(); if (mpBtnCustomCalcDefault->IsChecked()) { diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 229ea952fd2c..0ab4e71fa189 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -455,7 +455,7 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox&, rLb, void ) { if ( &rLb == mpLbLists ) { - sal_Int32 nSelPos = mpLbLists->GetSelectEntryPos(); + sal_Int32 nSelPos = mpLbLists->GetSelectedEntryPos(); if ( nSelPos != LISTBOX_ENTRY_NOTFOUND ) { if ( !mpFtEntries->IsEnabled() ) mpFtEntries->Enable(); @@ -479,7 +479,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void ) if ( !bCancelMode ) { nCancelPos = ( mpLbLists->GetEntryCount() > 0 ) - ? mpLbLists->GetSelectEntryPos() + ? mpLbLists->GetSelectedEntryPos() : 0; mpLbLists->SetNoSelection(); mpFtLists->Disable(); @@ -568,7 +568,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void ) } else // if ( bModifyMode ) { - sal_Int32 nSelList = mpLbLists->GetSelectEntryPos(); + sal_Int32 nSelList = mpLbLists->GetSelectedEntryPos(); OSL_ENSURE( nSelList != LISTBOX_ENTRY_NOTFOUND, "Modify without List :-/" ); @@ -608,7 +608,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, Button*, pBtn, void ) { if ( mpLbLists->GetEntryCount() > 0 ) { - sal_Int32 nRemovePos = mpLbLists->GetSelectEntryPos(); + sal_Int32 nRemovePos = mpLbLists->GetSelectedEntryPos(); OUString aMsg = aStrQueryRemove.getToken( 0, '#' ) + mpLbLists->GetEntry( nRemovePos ) + aStrQueryRemove.getToken( 1, '#' ); diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 4e4d0b6b622c..b4250fb477bc 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -247,7 +247,7 @@ DeactivateRC ScTpContentOptions::DeactivatePage( SfxItemSet* pSetP ) IMPL_LINK( ScTpContentOptions, SelLbObjHdl, ListBox&, rLb, void ) { - const sal_Int32 nSelPos = rLb.GetSelectEntryPos(); + const sal_Int32 nSelPos = rLb.GetSelectedEntryPos(); ScVObjMode eMode = ScVObjMode(nSelPos); ScVObjType eType = VOBJ_TYPE_OLE; @@ -317,7 +317,7 @@ void ScTpContentOptions::InitGridOpt() IMPL_LINK( ScTpContentOptions, GridHdl, ListBox&, rLb, void ) { - sal_Int32 nSelPos = rLb.GetSelectEntryPos(); + sal_Int32 nSelPos = rLb.GetSelectedEntryPos(); bool bGrid = ( nSelPos <= 1 ); bool bGridOnTop = ( nSelPos == 1 ); @@ -423,7 +423,7 @@ VclPtr<SfxTabPage> ScTpLayoutOptions::Create( vcl::Window* pParent, bool ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet ) { bool bRet = true; - const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos(); + const sal_Int32 nMPos = m_pUnitLB->GetSelectedEntryPos(); if ( m_pUnitLB->IsValueChangedFromSaved() ) { sal_uInt16 nFieldUnit = (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pUnitLB->GetEntryData( nMPos )); @@ -467,7 +467,7 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet ) if(m_pAlignLB->IsValueChangedFromSaved()) { - rCoreSet->Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, m_pAlignLB->GetSelectEntryPos())); + rCoreSet->Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, m_pAlignLB->GetSelectedEntryPos())); bRet = true; } @@ -636,7 +636,7 @@ DeactivateRC ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl, ListBox&, void) { - const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos(); + const sal_Int32 nMPos = m_pUnitLB->GetSelectedEntryPos(); if(nMPos != LISTBOX_ENTRY_NOTFOUND) { FieldUnit eFieldUnit = (FieldUnit)reinterpret_cast<sal_IntPtr>(m_pUnitLB->GetEntryData( nMPos )); diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 7cc054ced048..9626d22e33a1 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -481,7 +481,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, Button*, pBtn, void ) // Printing area changed? // first try the list box, if "Entire sheet" is selected - bool bEntireSheet = (pLbPrintArea->GetSelectEntryPos() == SC_AREASDLG_PR_ENTIRE); + bool bEntireSheet = (pLbPrintArea->GetSelectedEntryPos() == SC_AREASDLG_PR_ENTIRE); SfxBoolItem aEntireSheet( FN_PARAM_4, bEntireSheet ); bool bDataChanged = bEntireSheet != pDoc->IsPrintEntireSheet( nCurTab ); @@ -540,7 +540,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control&, rCtrl, void ) IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox&, rLb, void ) { ListBox* pLb = &rLb; - const sal_Int32 nSelPos = pLb->GetSelectEntryPos(); + const sal_Int32 nSelPos = pLb->GetSelectedEntryPos(); Edit* pEd = nullptr; // list box positions of specific entries, default to "repeat row/column" list boxes diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 5965e048bb5e..67155250f87e 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -759,7 +759,7 @@ IMPL_LINK( ScHFEditPage, ListHdl_Impl, ListBox&, rList, void ) { if ( &rList == m_pLbDefined ) { - ScHFEntryId eSel = static_cast<ScHFEntryId>(m_pLbDefined->GetSelectEntryPos()); + ScHFEntryId eSel = static_cast<ScHFEntryId>(m_pLbDefined->GetSelectedEntryPos()); if(!m_pLbDefined->IsTravelSelect()) { ProcessDefinedListSel(eSel, false); diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index fab08754d31e..b596d2d4368f 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -384,13 +384,13 @@ IMPL_LINK( ScTablePage, PageNoHdl, Button*, pBtn, void ) IMPL_LINK_NOARG(ScTablePage, ScaleHdl, ListBox&, void) { // controls for Box "Reduce/enlarge" - m_pBxScaleAll->Show(m_pLbScaleMode->GetSelectEntryPos() == SC_TPTABLE_SCALE_PERCENT); + m_pBxScaleAll->Show(m_pLbScaleMode->GetSelectedEntryPos() == SC_TPTABLE_SCALE_PERCENT); // controls for Grid "Scale to width/height" - m_pGrHeightWidth->Show(m_pLbScaleMode->GetSelectEntryPos() == SC_TPTABLE_SCALE_TO); + m_pGrHeightWidth->Show(m_pLbScaleMode->GetSelectedEntryPos() == SC_TPTABLE_SCALE_TO); // controls for Box "Scale to pages" - m_pBxScalePageNum->Show(m_pLbScaleMode->GetSelectEntryPos() == SC_TPTABLE_SCALE_TO_PAGES); + m_pBxScalePageNum->Show(m_pLbScaleMode->GetSelectedEntryPos() == SC_TPTABLE_SCALE_TO_PAGES); } // Helper functions for FillItemSet: @@ -439,7 +439,7 @@ static bool lcl_PutScaleItem( sal_uInt16 nWhich, const SpinField& rEd, sal_uInt16 nValue ) { - bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry); + bool bIsSel = (rListBox.GetSelectedEntryPos() == nLBEntry); bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) || rEd.IsValueChangedFromSaved() || !WAS_DEFAULT( nWhich, rOldSet ); @@ -462,7 +462,7 @@ static bool lcl_PutScaleItem2( sal_uInt16 nWhich, { sal_uInt16 nValue1 = (sal_uInt16)rEd1.GetValue(); sal_uInt16 nValue2 = (sal_uInt16)rEd2.GetValue(); - bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry); + bool bIsSel = (rListBox.GetSelectedEntryPos() == nLBEntry); bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) || rEd1.IsValueChangedFromSaved() || rEd2.IsValueChangedFromSaved() || diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index e39d6f74431d..89210a7a53a3 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -104,7 +104,7 @@ void NumberFormatPropertyPanel::Initialize() IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, ListBox&, rBox, void ) { - const sal_Int32 nVal = rBox.GetSelectEntryPos(); + const sal_Int32 nVal = rBox.GetSelectedEntryPos(); if( nVal != mnCategorySelected ) { SfxUInt16Item aItem( SID_NUMBER_TYPE_FORMAT, nVal ); @@ -268,7 +268,7 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( else if ( mpBtnEngineering->IsVisible() ) mpBtnEngineering->Check(bThousand); mpBtnNegRed->Check(bNegRed); - if ( mpLbCategory->GetSelectEntryPos() == 0 ) + if ( mpLbCategory->GetSelectedEntryPos() == 0 ) mpEdDecimals->SetText(""); // tdf#44399 else if ( mpEdDecimals->IsVisible() ) mpEdDecimals->SetValue(nPrecision); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index b8ce47a144b2..7103511ced7b 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -255,7 +255,7 @@ void ScFilterListBox::dispose() void ScFilterListBox::EndInit() { - sal_Int32 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectedEntryPos(); if ( LISTBOX_ENTRY_NOTFOUND == nPos ) nSel = 0; else @@ -300,7 +300,7 @@ void ScFilterListBox::SelectHdl() { if ( !IsTravelSelect() && !bInit && !bCancelled ) { - sal_Int32 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectedEntryPos(); if ( LISTBOX_ENTRY_NOTFOUND != nPos ) { nSel = nPos; diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 36dc62070d65..1787232f057f 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -870,7 +870,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { const sal_Int32 nSelCount = pDlg->GetSelectEntryCount(); for( sal_Int32 nSelIx = 0; nSelIx < nSelCount; ++nSelIx ) - aIndexList.insert( aIndexList.begin()+nSelIx, pDlg->GetSelectEntryPos( nSelIx ) ); + aIndexList.insert( aIndexList.begin()+nSelIx, pDlg->GetSelectedEntryPos( nSelIx ) ); pDlg.disposeAndClear(); rReq.AppendItem( SfxIntegerListItem( SID_SELECT_TABLES, aIndexList ) ); } diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 217c5cd4c2ec..bdceafff015e 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -954,7 +954,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, Button *, pButton, void ) if(pPage1_Designs->GetSelectEntryCount() == 0) pPage1_Designs->SelectEntryPos(0); - const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos(); + const sal_Int32 nPos = pPage1_Designs->GetSelectedEntryPos(); m_pDesign = &m_aDesignList[nPos]; DBG_ASSERT(m_pDesign, "No Design? That's not allowed (CL)"); @@ -966,7 +966,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, Button *, pButton, void ) // Clickhandler for the choice of one design IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl, ListBox&, void) { - const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos(); + const sal_Int32 nPos = pPage1_Designs->GetSelectedEntryPos(); m_pDesign = &m_aDesignList[nPos]; DBG_ASSERT(m_pDesign, "No Design? That's not allowed (CL)"); @@ -979,7 +979,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignSelectHdl, ListBox&, void) // Clickhandler for the delete of one design IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl, Button*, void) { - const sal_Int32 nPos = pPage1_Designs->GetSelectEntryPos(); + const sal_Int32 nPos = pPage1_Designs->GetSelectedEntryPos(); std::vector<SdPublishingDesign>::iterator iter = m_aDesignList.begin()+nPos; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index e8b332424b1c..4aacf99a6bc6 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -171,7 +171,7 @@ PresetPropertyBox::~PresetPropertyBox() Any PresetPropertyBox::getValue() { - return makeAny( maPropertyValues[mpControl->GetSelectEntryPos()] ); + return makeAny( maPropertyValues[mpControl->GetSelectedEntryPos()] ); } Control* PresetPropertyBox::getControl() @@ -1258,18 +1258,18 @@ void CustomAnimationEffectTabPage::dispose() void CustomAnimationEffectTabPage::updateControlStates() { - sal_Int32 nPos = mpLBAfterEffect->GetSelectEntryPos(); + sal_Int32 nPos = mpLBAfterEffect->GetSelectedEntryPos(); mpCLBDimColor->Enable( nPos == 1 ); mpFTDimColor->Enable( nPos == 1 ); if( mbHasText ) { - nPos = mpLBTextAnim->GetSelectEntryPos(); + nPos = mpLBTextAnim->GetSelectedEntryPos(); mpMFTextDelay->Enable( nPos != 0 ); mpFTTextDelay->Enable( nPos != 0 ); } - nPos = mpLBSound->GetSelectEntryPos(); + nPos = mpLBSound->GetSelectedEntryPos(); mpPBSoundPreview->Enable( nPos >= 2 ); } @@ -1291,7 +1291,7 @@ void CustomAnimationEffectTabPage::implHdl(Control const * pControl ) } else if( pControl == mpLBSound ) { - sal_Int32 nPos = mpLBSound->GetSelectEntryPos(); + sal_Int32 nPos = mpLBSound->GetSelectedEntryPos(); if( nPos == (mpLBSound->GetEntryCount() - 1) ) { openSoundFileDialog(); @@ -1345,7 +1345,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleDecelerate, makeAny( fTemp ) ); } - sal_Int32 nPos = mpLBAfterEffect->GetSelectEntryPos(); + sal_Int32 nPos = mpLBAfterEffect->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { bool bAfterEffect = nPos != 0; @@ -1381,7 +1381,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleAfterEffectOnNextEffect, makeAny( bAfterEffectOnNextEffect ) ); } - nPos = mpLBTextAnim->GetSelectEntryPos(); + nPos = mpLBTextAnim->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_Int16 nIterateType; @@ -1414,7 +1414,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleIterateInterval, makeAny( fIterateInterval ) ); } - nPos = mpLBSound->GetSelectEntryPos(); + nPos = mpLBSound->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { Any aNewSoundURL, aOldSoundURL( makeAny( (sal_Int32) 0 ) ); @@ -1532,7 +1532,7 @@ void CustomAnimationEffectTabPage::openSoundFileDialog() void CustomAnimationEffectTabPage::onSoundPreview() { - const sal_Int32 nPos = mpLBSound->GetSelectEntryPos(); + const sal_Int32 nPos = mpLBSound->GetSelectedEntryPos(); if( nPos >= 2 ) try { @@ -1797,7 +1797,7 @@ void CustomAnimationDurationTabPage::implHdl( Control const * pControl ) void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) { - sal_Int32 nPos = mpLBStart->GetSelectEntryPos(); + sal_Int32 nPos = mpLBStart->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_Int16 nStart; @@ -1829,7 +1829,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) pSet->setPropertyValue( nHandleBegin, makeAny( fBegin ) ); } - nPos = mpCBRepeat->GetSelectEntryPos(); + nPos = mpCBRepeat->GetSelectedEntryPos(); if( (nPos != LISTBOX_ENTRY_NOTFOUND) || (!mpCBRepeat->GetText().isEmpty()) ) { Any aRepeatCount; @@ -1916,7 +1916,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet ) if( mpRBInteractive->IsChecked() ) { - nPos = mpLBTrigger->GetSelectEntryPos(); + nPos = mpLBTrigger->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_Int32 nShape = (sal_Int32)reinterpret_cast<sal_IntPtr>(mpLBTrigger->GetEntryData( nPos )); @@ -2065,7 +2065,7 @@ void CustomAnimationTextAnimTabPage::dispose() void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet ) { - sal_Int32 nPos = maLBGroupText->GetSelectEntryPos(); + sal_Int32 nPos = maLBGroupText->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { sal_Int32 nTextGrouping = nPos - 1; @@ -2119,7 +2119,7 @@ void CustomAnimationTextAnimTabPage::update( STLPropertySet* pSet ) void CustomAnimationTextAnimTabPage::updateControlStates() { - sal_Int32 nPos = maLBGroupText->GetSelectEntryPos(); + sal_Int32 nPos = maLBGroupText->GetSelectedEntryPos(); maCBXGroupAuto->Enable( nPos > 1 ); maMFGroupAuto->Enable( nPos > 1 ); diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index b0f8e63faed7..84044c0f1642 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1910,7 +1910,7 @@ void CustomAnimationPane::onChangeStart() if( mpLBStart->GetSelectEntryCount() == 1 ) { sal_Int16 nNodeType; - switch( mpLBStart->GetSelectEntryPos() ) + switch( mpLBStart->GetSelectedEntryPos() ) { case 0: nNodeType = EffectNodeType::ON_CLICK; break; case 1: nNodeType = EffectNodeType::WITH_PREVIOUS; break; @@ -1994,9 +1994,9 @@ PathKind CustomAnimationPane::getCreatePathKind() const PathKind eKind = PathKind::NONE; if( ( mpLBAnimation->GetSelectEntryCount() == 1 ) && - ( mpLBCategory->GetSelectEntryPos() == mnMotionPathPos ) ) + ( mpLBCategory->GetSelectedEntryPos() == mnMotionPathPos ) ) { - const sal_Int32 nPos = mpLBAnimation->GetSelectEntryPos(); + const sal_Int32 nPos = mpLBAnimation->GetSelectedEntryPos(); if( nPos == mnCurvePathPos ) { eKind = PathKind::CURVE; @@ -2190,7 +2190,7 @@ IMPL_LINK_NOARG(CustomAnimationPane, DurationModifiedHdl, Edit&, void) sal_uInt32 CustomAnimationPane::fillAnimationLB( bool bHasText ) { PresetCategoryList rCategoryList; - sal_uInt16 nPosition = mpLBCategory->GetSelectEntryPos(); + sal_uInt16 nPosition = mpLBCategory->GetSelectedEntryPos(); const CustomAnimationPresets& rPresets (getPresets()); switch(nPosition) { diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 2d9c135fbf6f..41262c6118e6 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -303,7 +303,7 @@ OUString lcl_getSoundFileURL( { if( rListBox->GetSelectEntryCount() > 0 ) { - sal_Int32 nPos = rListBox->GetSelectEntryPos(); + sal_Int32 nPos = rListBox->GetSelectedEntryPos(); // the first three entries are no actual sounds if( nPos >= 3 ) { @@ -700,7 +700,7 @@ void SlideTransitionPane::updateControlState() mpLB_VARIANT->Enable( mbHasSelection && mpLB_VARIANT->GetEntryCount() > 0 ); mpCBX_duration->Enable( mbHasSelection ); mpLB_SOUND->Enable( mbHasSelection ); - mpCB_LOOP_SOUND->Enable( mbHasSelection && (mpLB_SOUND->GetSelectEntryPos() > 2)); + mpCB_LOOP_SOUND->Enable( mbHasSelection && (mpLB_SOUND->GetSelectedEntryPos() > 2)); mpRB_ADVANCE_ON_MOUSE->Enable( mbHasSelection ); mpRB_ADVANCE_AUTO->Enable( mbHasSelection ); mpMF_ADVANCE_AUTO_AFTER->Enable( mbHasSelection && mpRB_ADVANCE_AUTO->IsChecked()); @@ -728,7 +728,7 @@ void SlideTransitionPane::openSoundFileDialog() SdOpenSoundFileDialog aFileDialog(this); OUString aFile; - DBG_ASSERT( mpLB_SOUND->GetSelectEntryPos() == 2, + DBG_ASSERT( mpLB_SOUND->GetSelectedEntryPos() == 2, "Dialog should only open when \"Other sound\" is selected" ); aFile = SvtPathOptions().GetWorkPath(); @@ -805,7 +805,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co auto aSelected = rPresetList.begin(); std::advance( aSelected, mpVS_TRANSITION_ICONS->GetSelectItemId() - 1); - if( mpLB_VARIANT->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) + if( mpLB_VARIANT->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND ) { // Transition with just one effect. aResult = impl::TransitionEffect( **aSelected ); @@ -819,7 +819,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co { if( aIter->getSetId() == (*aSelected)->getSetId() ) { - if( mpLB_VARIANT->GetSelectEntryPos() == nVariant) + if( mpLB_VARIANT->GetSelectedEntryPos() == nVariant) { aResult = impl::TransitionEffect( *aIter ); aResult.setAllAmbiguous(); @@ -877,7 +877,7 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co maCurrentSoundFile.clear(); if( mpLB_SOUND->GetSelectEntryCount() > 0 ) { - sal_Int32 nPos = mpLB_SOUND->GetSelectEntryPos(); + sal_Int32 nPos = mpLB_SOUND->GetSelectedEntryPos(); aResult.mbStopSound = nPos == 1; aResult.mbSoundOn = nPos > 1; if( aResult.mbStopSound ) @@ -1119,7 +1119,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected, ListBox&, void) { if( mpLB_SOUND->GetSelectEntryCount() ) { - sal_Int32 nPos = mpLB_SOUND->GetSelectEntryPos(); + sal_Int32 nPos = mpLB_SOUND->GetSelectedEntryPos(); if( nPos == 2 ) { // other sound... diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 29ba1d004a84..878384019d89 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -128,7 +128,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, CreateHdl, Button*, void) const AutoLayout aAutoLayout(bCreateCaptions ? AUTOLAYOUT_TITLE_ONLY : AUTOLAYOUT_NONE); // get the option - const sal_Int32 nOpt = pInsTypeCombo->GetSelectEntryPos(); + const sal_Int32 nOpt = pInsTypeCombo->GetSelectedEntryPos(); if ( nOpt == ONE_IMAGE ) { OUString sUrl; @@ -540,10 +540,10 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl, Button*, void) IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl, Button*, void) { - if (pImagesLst->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND - && pImagesLst->GetSelectEntryPos() != 0) + if (pImagesLst->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND + && pImagesLst->GetSelectedEntryPos() != 0) { - const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos(); + const sal_Int32 nActPos = pImagesLst->GetSelectedEntryPos(); OUString sActEntry( pImagesLst->GetEntry(nActPos) ); // actual data OUString* pActData = static_cast<OUString*>(pImagesLst->GetEntryData(nActPos)); @@ -571,7 +571,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, UpHdl, Button*, void) IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl, Button*, void) { - const sal_Int32 nActPos = pImagesLst->GetSelectEntryPos(); + const sal_Int32 nActPos = pImagesLst->GetSelectedEntryPos(); if (!pImagesLst->GetEntry(nActPos + 1).isEmpty()) { OUString sActEntry( pImagesLst->GetSelectedEntry() ); @@ -599,7 +599,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, DownHdl, Button*, void) IMPL_LINK_NOARG(SdPhotoAlbumDialog, RemoveHdl, Button*, void) { - pImagesLst->RemoveEntry( pImagesLst->GetSelectEntryPos() ); + pImagesLst->RemoveEntry( pImagesLst->GetSelectedEntryPos() ); pImg->SetImage(Image()); EnableDisableButtons(); @@ -666,7 +666,7 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, TypeSelectHdl, ListBox&, void) { // Enable "Fill Slide" only for one image // If we want to have it for other images too, we need to implement the actual cropping. - bool const bEnable = pInsTypeCombo->GetSelectEntryPos() == ONE_IMAGE; + bool const bEnable = pInsTypeCombo->GetSelectedEntryPos() == ONE_IMAGE; pASRCheckCrop->Enable(bEnable); if (!bEnable) pASRCheckCrop->Check(false); @@ -806,9 +806,9 @@ void SdPhotoAlbumDialog::EnableDisableButtons() { pRemoveBtn->Enable(pImagesLst->GetSelectEntryCount() > 0); pUpBtn->Enable(pImagesLst->GetSelectEntryCount() > 0 && - pImagesLst->GetSelectEntryPos() != 0); + pImagesLst->GetSelectedEntryPos() != 0); pDownBtn->Enable(pImagesLst->GetSelectEntryCount() > 0 && - pImagesLst->GetSelectEntryPos() < pImagesLst->GetEntryCount()-1); + pImagesLst->GetSelectedEntryPos() < pImagesLst->GetEntryCount()-1); } } // end of namespace sd diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index eaf00a4d3551..853f7720f5bd 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -894,7 +894,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) const Point aWindowCenter( pOutWin->PixelToLogic( Point( aTemp.Width() >> 1, aTemp.Height() >> 1 ) ) ); const OutputDevice* pDefDev = Application::GetDefaultDevice(); const size_t nCount = m_FrameList.size(); - BitmapAdjustment eBA = (BitmapAdjustment) m_pLbAdjustment->GetSelectEntryPos(); + BitmapAdjustment eBA = (BitmapAdjustment) m_pLbAdjustment->GetSelectedEntryPos(); // find biggest bitmap for (size_t i = 0; i < nCount; ++i) @@ -981,7 +981,7 @@ void AnimationWindow::CreateAnimObj (::sd::View& rView ) // find LoopCount (number of passes) AnimationBitmap aAnimBmp; sal_uInt32 nLoopCount = 0; - sal_Int32 nPos = m_pLbLoopCount->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbLoopCount->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != m_pLbLoopCount->GetEntryCount() - 1 ) // endless nLoopCount = m_pLbLoopCount->GetSelectedEntry().toUInt32(); diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 69cfb59a782b..55d7bd97c0cb 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -104,7 +104,7 @@ void SdCustomShowDlg::dispose() void SdCustomShowDlg::CheckState() { - sal_Int32 nPos = m_pLbCustomShows->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbCustomShows->GetSelectedEntryPos(); bool bEnable = nPos != LISTBOX_ENTRY_NOTFOUND; m_pBtnEdit->Enable( bEnable ); @@ -155,7 +155,7 @@ void SdCustomShowDlg::SelectHdl(void const *p) // edit CustomShow else if( p == m_pBtnEdit ) { - sal_Int32 nPos = m_pLbCustomShows->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbCustomShows->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { DBG_ASSERT( pCustomShowList, "pCustomShowList does not exist" ); @@ -180,7 +180,7 @@ void SdCustomShowDlg::SelectHdl(void const *p) // delete CustomShow else if( p == m_pBtnRemove ) { - sal_Int32 nPos = m_pLbCustomShows->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbCustomShows->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { delete (*pCustomShowList)[nPos]; @@ -193,7 +193,7 @@ void SdCustomShowDlg::SelectHdl(void const *p) // copy CustomShow else if( p == m_pBtnCopy ) { - sal_Int32 nPos = m_pLbCustomShows->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbCustomShows->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { SdCustomShow* pShow = new SdCustomShow( *(*pCustomShowList)[nPos] ); @@ -251,7 +251,7 @@ void SdCustomShowDlg::SelectHdl(void const *p) } else if( p == m_pLbCustomShows ) { - sal_Int32 nPos = m_pLbCustomShows->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbCustomShows->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) pCustomShowList->Seek( nPos ); @@ -372,8 +372,8 @@ void SdDefineCustomShowDlg::dispose() // CheckState void SdDefineCustomShowDlg::CheckState() { - bool bPages = m_pLbPages->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; - //sal_Bool bCSPages = aLbCustomPages.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; + bool bPages = m_pLbPages->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND; + //sal_Bool bCSPages = aLbCustomPages.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND; bool bCSPages = m_pLbCustomPages->FirstSelected() != nullptr; bool bCount = m_pLbCustomPages->GetEntryCount() > 0; @@ -419,7 +419,7 @@ void SdDefineCustomShowDlg::ClickButtonHdl2(void const * p) m_pLbCustomPages->Select( pEntry ); SdPage* pPage = rDoc.GetSdPage( (sal_uInt16) m_pLbPages-> - GetSelectEntryPos( i ), PageKind::Standard ); + GetSelectedEntryPos( i ), PageKind::Standard ); pEntry->SetUserData( pPage ); if( nPosCP != TREELIST_APPEND ) diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 726a852f1305..362c2f3123f6 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -91,7 +91,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() else eType = SvxDateType::Var; - eFormat = (SvxDateFormat) ( m_pLbFormat->GetSelectEntryPos() + 2 ); + eFormat = (SvxDateFormat) ( m_pLbFormat->GetSelectedEntryPos() + 2 ); pNewField = new SvxDateField( *pDateField ); static_cast<SvxDateField*>( pNewField )->SetType( eType ); @@ -108,7 +108,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() else eType = SvxTimeType::Var; - eFormat = (SvxTimeFormat) ( m_pLbFormat->GetSelectEntryPos() + 2 ); + eFormat = (SvxTimeFormat) ( m_pLbFormat->GetSelectedEntryPos() + 2 ); pNewField = new SvxExtTimeField( *pTimeField ); static_cast<SvxExtTimeField*>( pNewField )->SetType( eType ); @@ -125,7 +125,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() else eType = SvxFileType::Var; - eFormat = (SvxFileFormat) ( m_pLbFormat->GetSelectEntryPos() ); + eFormat = (SvxFileFormat) ( m_pLbFormat->GetSelectedEntryPos() ); ::sd::DrawDocShell* pDocSh = dynamic_cast< ::sd::DrawDocShell* >(SfxObjectShell::Current() ); @@ -153,7 +153,7 @@ SvxFieldData* SdModifyFieldDlg::GetField() else eType = SvxAuthorType::Var; - eFormat = (SvxAuthorFormat) ( m_pLbFormat->GetSelectEntryPos() ); + eFormat = (SvxAuthorFormat) ( m_pLbFormat->GetSelectedEntryPos() ); // Get current state of address, not the old one SvtUserOptions aUserOptions; diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index f8954dc56cd4..8d03a31403d9 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -71,7 +71,7 @@ GlueEscDirLB::~GlueEscDirLB() */ void GlueEscDirLB::Select() { - sal_Int32 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectedEntryPos(); SfxUInt16Item aItem( SID_GLUE_ESCDIR, static_cast<sal_uInt16>(aEscDirArray[ nPos ]) ); if ( m_xFrame.is() ) diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index e3f405695030..e8ad17bac65c 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -308,7 +308,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool) { - if( !mbDocImported || maLbDocs->GetSelectEntryPos() != 0 ) + if( !mbDocImported || maLbDocs->GetSelectedEntryPos() != 0 ) { NavDocInfo* pInfo = GetDocInfo(); @@ -346,7 +346,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl, SvTreeListBox*, bool) IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl, ListBox&, void) { OUString aStrLb = maLbDocs->GetSelectedEntry(); - long nPos = maLbDocs->GetSelectEntryPos(); + long nPos = maLbDocs->GetSelectedEntryPos(); bool bFound = false; ::sd::DrawDocShell* pDocShell = nullptr; NavDocInfo* pInfo = GetDocInfo(); @@ -555,7 +555,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName ) } else { - nPos = maLbDocs->GetSelectEntryPos(); + nPos = maLbDocs->GetSelectedEntryPos(); if( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos = 0; @@ -644,7 +644,7 @@ OUString SdNavigatorWin::GetDragTypeSdBmpId(NavigatorDragType eDT) NavDocInfo* SdNavigatorWin::GetDocInfo() { - sal_uInt32 nPos = maLbDocs->GetSelectEntryPos(); + sal_uInt32 nPos = maLbDocs->GetSelectedEntryPos(); if( mbDocImported ) { diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index d6087bfacdf6..497d1492edb6 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -306,11 +306,11 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr ) rAttr.Put( SfxUInt32Item ( ATTR_PRESENT_PAUSE_TIMEOUT, aTmfPause->GetTime().GetMSFromTime() / 1000 ) ); rAttr.Put( SfxBoolItem ( ATTR_PRESENT_SHOW_PAUSELOGO, aCbxAutoLogo->IsChecked() ) ); - sal_Int32 nPos = maLBMonitor->GetSelectEntryPos(); + sal_Int32 nPos = maLBMonitor->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) rAttr.Put( SfxInt32Item ( ATTR_PRESENT_DISPLAY, (sal_Int32)reinterpret_cast<sal_IntPtr>(maLBMonitor->GetEntryData(nPos))) ); - nPos = aLbCustomshow->GetSelectEntryPos(); + nPos = aLbCustomshow->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) pCustomShowList->Seek( nPos ); } diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 55afea747209..88450b79c0ce 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -704,7 +704,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl, Control&, void) presentation::ClickAction SdTPAction::GetActualClickAction() { presentation::ClickAction eCA = presentation::ClickAction_NONE; - sal_Int32 nPos = m_pLbAction->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbAction->GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND && static_cast<size_t>(nPos) < maCurrentActions.size()) eCA = maCurrentActions[ nPos ]; @@ -793,7 +793,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination ) break; case presentation::ClickAction_VERB: { - const sal_Int32 nPos = m_pLbOLEAction->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLbOLEAction->GetSelectedEntryPos(); if( static_cast<size_t>(nPos) < aVerbVector.size() ) aStr = OUString::number( aVerbVector[ nPos ] ); return aStr; diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 2bcaa84bb585..f2e4615fdacb 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -414,7 +414,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet* rAttrs ) } // metric - const sal_Int32 nMPos = m_pLbMetric->GetSelectEntryPos(); + const sal_Int32 nMPos = m_pLbMetric->GetSelectedEntryPos(); if ( m_pLbMetric->IsValueChangedFromSaved() ) { sal_uInt16 nFieldUnit = (sal_uInt16)reinterpret_cast<sal_IntPtr>(m_pLbMetric->GetEntryData( nMPos )); @@ -530,7 +530,7 @@ VclPtr<SfxTabPage> SdTpOptionsMisc::Create( vcl::Window* pWindow, IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox&, void) { - sal_Int32 nPos = m_pLbMetric->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbMetric->GetSelectedEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 8a521fcb0577..82e0fc8e7bb6 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -289,7 +289,7 @@ void SlideBackground::HandleContextChange( void SlideBackground::Update() { - const eFillStyle nPos = (eFillStyle)mpFillStyle->GetSelectEntryPos(); + const eFillStyle nPos = (eFillStyle)mpFillStyle->GetSelectedEntryPos(); SfxObjectShell* pSh = SfxObjectShell::Current(); if (!pSh) @@ -759,7 +759,7 @@ void SlideBackground::NotifyItemUpdate( if (pSizeItem) { Size aPaperSize = pSizeItem->GetSize(); - if(mpPaperOrientation->GetSelectEntryPos() == 0) + if(mpPaperOrientation->GetSelectedEntryPos() == 0) Swap(aPaperSize); Paper ePaper = SvxPaperInfo::GetSvxPaper(aPaperSize, meUnit, true); @@ -877,7 +877,7 @@ void SlideBackground::SetMetricFieldMaxValues( const Size& rPageSize ) IMPL_LINK_NOARG(SlideBackground, FillStyleModifyHdl, ListBox&, void) { - const eFillStyle nPos = (eFillStyle)mpFillStyle->GetSelectEntryPos(); + const eFillStyle nPos = (eFillStyle)mpFillStyle->GetSelectedEntryPos(); Update(); switch (nPos) @@ -929,10 +929,10 @@ IMPL_LINK_NOARG(SlideBackground, PaperSizeModifyHdl, ListBox&, void) Paper ePaper = mpPaperSizeBox->GetSelection(); Size aSize(SvxPaperInfo::GetPaperSize(ePaper, meUnit)); - if(mpPaperOrientation->GetSelectEntryPos() == 0) + if(mpPaperOrientation->GetSelectedEntryPos() == 0) Swap(aSize); - mpPageItem->SetLandscape(mpPaperOrientation->GetSelectEntryPos() == 0); + mpPageItem->SetLandscape(mpPaperOrientation->GetSelectedEntryPos() == 0); SvxSizeItem aSizeItem(SID_ATTR_PAGE_SIZE, aSize); // Page/slide properties dialog (FuPage::ExecuteDialog and ::ApplyItemSet) misuses // SID_ATTR_PAGE_EXT1 to distinguish between Impress and Draw, as for whether to fit @@ -944,7 +944,7 @@ IMPL_LINK_NOARG(SlideBackground, PaperSizeModifyHdl, ListBox&, void) IMPL_LINK_NOARG(SlideBackground, FillColorHdl, SvxColorListBox&, void) { - const drawing::FillStyle eXFS = (drawing::FillStyle)mpFillStyle->GetSelectEntryPos(); + const drawing::FillStyle eXFS = (drawing::FillStyle)mpFillStyle->GetSelectedEntryPos(); switch(eXFS) { case drawing::FillStyle_SOLID: @@ -972,7 +972,7 @@ IMPL_LINK_NOARG(SlideBackground, FillColorHdl, SvxColorListBox&, void) IMPL_LINK_NOARG(SlideBackground, FillBackgroundHdl, ListBox&, void) { - const eFillStyle nFillPos = (eFillStyle)mpFillStyle->GetSelectEntryPos(); + const eFillStyle nFillPos = (eFillStyle)mpFillStyle->GetSelectedEntryPos(); SfxObjectShell* pSh = SfxObjectShell::Current(); switch(nFillPos) { @@ -980,7 +980,7 @@ IMPL_LINK_NOARG(SlideBackground, FillBackgroundHdl, ListBox&, void) case HATCH: { const SvxHatchListItem aHatchListItem(*static_cast<const SvxHatchListItem*>(pSh->GetItem(SID_HATCH_LIST))); - sal_uInt16 nPos = mpFillAttr->GetSelectEntryPos(); + sal_uInt16 nPos = mpFillAttr->GetSelectedEntryPos(); XHatch aHatch = aHatchListItem.GetHatchList()->GetHatch(nPos)->GetHatch(); const OUString aHatchName = aHatchListItem.GetHatchList()->GetHatch(nPos)->GetName(); @@ -992,7 +992,7 @@ IMPL_LINK_NOARG(SlideBackground, FillBackgroundHdl, ListBox&, void) case BITMAP: case PATTERN: { - sal_Int16 nPos = mpFillAttr->GetSelectEntryPos(); + sal_Int16 nPos = mpFillAttr->GetSelectedEntryPos(); GraphicObject aBitmap; OUString aName; if( nFillPos == BITMAP ) diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 8bd88551c1e1..6063e8064b5c 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1180,7 +1180,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) case MID_RENAME : { - sal_Int32 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { ScopedVclPtrInstance< SfxAddHelpBookmarkDialog_Impl > aDlg(this, true); @@ -1202,7 +1202,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) case MID_DELETE : { - sal_Int32 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { RemoveEntry( nPos ); @@ -1486,7 +1486,7 @@ void SfxHelpIndexWindow_Impl::Initialize() } m_pActiveLB->SetDropDownLineCount( (sal_uInt16)aFactories.size() ); - if ( m_pActiveLB->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND ) + if ( m_pActiveLB->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND ) SetActiveFactory(); } @@ -1506,7 +1506,7 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory() *pFactory = pFactory->toAsciiLowerCase(); if ( *pFactory == pIPage->GetFactory() ) { - if ( m_pActiveLB->GetSelectEntryPos() != i ) + if ( m_pActiveLB->GetSelectedEntryPos() != i ) { m_pActiveLB->SelectEntryPos(i); aSelectFactoryLink.Call( nullptr ); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 66bb328dda24..76a0f097958b 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -87,7 +87,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx else m_pEditStyleBtn->Enable(); - sal_Int32 linkSelectPos = m_pBaseLb->GetSelectEntryPos(); + sal_Int32 linkSelectPos = m_pBaseLb->GetSelectedEntryPos(); if ( linkSelectPos == 0 ) m_pEditLinkStyleBtn->Disable(); else @@ -355,7 +355,7 @@ IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditStyleHdl_Impl, Button*, void ) IMPL_LINK_NOARG( SfxManageStyleSheetPage, EditLinkStyleSelectHdl_Impl, ListBox&, void ) { - sal_Int32 linkSelectPos = m_pBaseLb->GetSelectEntryPos(); + sal_Int32 linkSelectPos = m_pBaseLb->GetSelectedEntryPos(); if ( linkSelectPos == 0 ) m_pEditLinkStyleBtn->Disable(); else @@ -452,7 +452,7 @@ bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet* rSet ) */ { - const sal_Int32 nFilterIdx = m_pFilterLb->GetSelectEntryPos(); + const sal_Int32 nFilterIdx = m_pFilterLb->GetSelectedEntryPos(); // Set Filter diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 00270770863b..5e6a0ece8ab7 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -259,7 +259,7 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt pCurrentOptions->SetReduceBitmaps( m_pReduceBitmapsCB->IsChecked() ); pCurrentOptions->SetReducedBitmapMode( m_pReduceBitmapsOptimalRB->IsChecked() ? PrinterBitmapMode::Optimal : ( m_pReduceBitmapsNormalRB->IsChecked() ? PrinterBitmapMode::Normal : PrinterBitmapMode::Resolution ) ); - pCurrentOptions->SetReducedBitmapResolution( aDPIArray[ std::min<sal_uInt16>( m_pReduceBitmapsResolutionLB->GetSelectEntryPos(), + pCurrentOptions->SetReducedBitmapResolution( aDPIArray[ std::min<sal_uInt16>( m_pReduceBitmapsResolutionLB->GetSelectedEntryPos(), SAL_N_ELEMENTS(aDPIArray) - 1 ) ] ); pCurrentOptions->SetReducedBitmapIncludesTransparency( m_pReduceBitmapsTransparencyCB->IsChecked() ); pCurrentOptions->SetConvertToGreyscales( m_pConvertToGreyscalesCB->IsChecked() ); diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 08166ceb8302..e20305027caa 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1622,7 +1622,7 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable) // If bHierarchical, then the family can have changed // minus one since hierarchical is inserted at the start m_bWantHierarchical = false; // before FilterSelect - FilterSelect(aFilterLb->GetSelectEntryPos() - 1, bHierarchical ); + FilterSelect(aFilterLb->GetSelectedEntryPos() - 1, bHierarchical ); bHierarchical=false; } } diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 790a474509ce..6ca5d80bcede 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -188,7 +188,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update, Timer*, void) if (m_pMoreBt->get_expanded() && (nFlags == SfxNewFileDialogMode::Preview)) { - OUString aFileName = aTemplates.GetPath(m_pRegionLb->GetSelectEntryPos(), nEntry - 1); + OUString aFileName = aTemplates.GetPath(m_pRegionLb->GetSelectedEntryPos(), nEntry - 1); INetURLObject aTestObj(aFileName); if (aTestObj.GetProtocol() == INetProtocol::NotValid) { @@ -238,7 +238,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox&, rBox, void ) if (xDocShell.Is() && xDocShell->GetProgress()) return; - const sal_uInt16 nRegion = rBox.GetSelectEntryPos(); + const sal_uInt16 nRegion = rBox.GetSelectedEntryPos(); const sal_uInt16 nCount = aTemplates.GetRegionCount()? aTemplates.GetCount(nRegion): 0; m_pTemplateLb->SetUpdateMode(false); m_pTemplateLb->Clear(); @@ -289,7 +289,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, LoadFile, Button*, void) sal_uInt16 SfxNewFileDialog_Impl::GetSelectedTemplatePos() const { - sal_uInt16 nEntry = m_pTemplateLb->GetSelectEntryPos(); + sal_uInt16 nEntry = m_pTemplateLb->GetSelectedEntryPos(); OUString aSel = m_pRegionLb->GetSelectedEntry(); sal_Int32 nc = aSel.indexOf('('); if (nc != -1 && nc != 0) @@ -311,7 +311,7 @@ OUString SfxNewFileDialog_Impl::GetTemplateFileName() const { if(!IsTemplate() || !aTemplates.GetRegionCount()) return OUString(); - return aTemplates.GetPath(m_pRegionLb->GetSelectEntryPos(), + return aTemplates.GetPath(m_pRegionLb->GetSelectedEntryPos(), GetSelectedTemplatePos()-1); } diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx index 03d1ad6bc5b7..68d14d5a2a8a 100644 --- a/sfx2/source/doc/saveastemplatedlg.cxx +++ b/sfx2/source/doc/saveastemplatedlg.cxx @@ -106,7 +106,7 @@ IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, TemplateNameEditHdl, Edit&, void) IMPL_LINK_NOARG(SfxSaveAsTemplateDialog, SelectCategoryHdl, ListBox&, void) { - if(mpLBCategory->GetSelectEntryPos() == 0) + if(mpLBCategory->GetSelectedEntryPos() == 0) { msSelectedCategory = OUString(); mpOKButton->Disable(); diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index a65f11446ad6..2616ad998659 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -326,7 +326,7 @@ void SfxTemplateManagerDlg::setDocumentModel(const uno::Reference<frame::XModel> FILTER_APPLICATION SfxTemplateManagerDlg::getCurrentApplicationFilter() { - const sal_Int16 nCurAppId = mpCBApp->GetSelectEntryPos(); + const sal_Int16 nCurAppId = mpCBApp->GetSelectedEntryPos(); if (nCurAppId == MNI_WRITER) return FILTER_APPLICATION::WRITER; @@ -457,7 +457,7 @@ void SfxTemplateManagerDlg::writeSettings () Sequence< NamedValue > aSettings { { TM_SETTING_LASTFOLDER, css::uno::makeAny(aLastFolder) }, - { TM_SETTING_LASTAPPLICATION, css::uno::makeAny(sal_uInt16(mpCBApp->GetSelectEntryPos())) } + { TM_SETTING_LASTAPPLICATION, css::uno::makeAny(sal_uInt16(mpCBApp->GetSelectedEntryPos())) } }; // write @@ -483,7 +483,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SelectRegionHdl, ListBox&, void) { const OUString sSelectedRegion = mpCBFolder->GetSelectedEntry(); - if(mpCBFolder->GetSelectEntryPos() == 0) + if(mpCBFolder->GetSelectedEntryPos() == 0) { mpLocalView->showAllTemplates(); mpActionMenu->HideItem(MNI_ACTION_RENAME_FOLDER); @@ -1355,7 +1355,7 @@ IMPL_LINK_NOARG(SfxTemplateCategoryDialog, NewCategoryEditHdl, Edit&, void) IMPL_LINK_NOARG(SfxTemplateCategoryDialog, SelectCategoryHdl, ListBox&, void) { - if(mpLBCategory->GetSelectEntryPos() == 0) + if(mpLBCategory->GetSelectedEntryPos() == 0) { msSelectedCategory = OUString(); mpOKButton->Disable(); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 3c352bb901db..7fc552c9f8a2 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -1785,7 +1785,7 @@ IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox&, rListBox, void ) IMPL_LINK_NOARG( SmSymDefineDialog, SubsetChangeHdl, ListBox&, void ) { - sal_Int32 nPos = pFontsSubsetLB->GetSelectEntryPos(); + sal_Int32 nPos = pFontsSubsetLB->GetSelectedEntryPos(); if (LISTBOX_ENTRY_NOTFOUND != nPos) { const Subset* pSubset = static_cast<const Subset*> (pFontsSubsetLB->GetEntryData( nPos )); diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx index 87cf3e1cdc79..fdcb438fb952 100644 --- a/starmath/source/utility.cxx +++ b/starmath/source/utility.cxx @@ -133,7 +133,7 @@ IMPL_LINK_NOARG( SmFontPickListBox, SelectHdl, ListBox&, void ) { OUString aString; - const sal_Int32 nPos = GetSelectEntryPos(); + const sal_Int32 nPos = GetSelectedEntryPos(); if (nPos != 0) { diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 1f0083646498..c94dfaa61bf4 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -146,7 +146,7 @@ namespace svt (!pEvt->GetKeyCode().IsShift() && pEvt->GetKeyCode().IsMod1())) { // select next resp. previous entry - sal_Int32 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectedEntryPos(); int nDir = (rKey.GetCode() == KEY_DOWN ? 1 : -1); if (!((nPos == 0 && nDir == -1) || (nPos >= GetEntryCount() && nDir == 1))) { diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 9d44beb2c593..5c5205fa965e 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -267,7 +267,7 @@ Color ImpLineListData::GetColorDist( const Color& rMain, const Color& rDefault ) SvxBorderLineStyle LineListBox::GetSelectEntryStyle() const { SvxBorderLineStyle nStyle = SvxBorderLineStyle::SOLID; - sal_Int32 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { if (!m_sNone.isEmpty()) @@ -612,7 +612,7 @@ void LineListBox::UpdateEntries( long nOldWidth ) UpdatePaintLineColor( ); - sal_Int32 nSelEntry = GetSelectEntryPos(); + sal_Int32 nSelEntry = GetSelectedEntryPos(); sal_Int32 nTypePos = GetStylePos( nSelEntry, nOldWidth ); // Remove the old entries diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index f4ea43e2a29d..0a7ac213d5e7 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -327,7 +327,7 @@ IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl, ListBox&, void ) if (m_xCurrentDetails.get()) m_xCurrentDetails->show(false); - const sal_Int32 nPos = m_pLBServerType->GetSelectEntryPos( ); + const sal_Int32 nPos = m_pLBServerType->GetSelectedEntryPos( ); m_xCurrentDetails = m_aDetailsContainers[nPos]; m_nCurrentType = nPos; diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index f83b3c2032c7..4cb45ae21915 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -388,7 +388,7 @@ void CmisDetailsContainer::setPassword( const OUString& rPass ) void CmisDetailsContainer::selectRepository( ) { // Get the repo ID and call the Change listener - const sal_Int32 nPos = m_pLBRepository->GetSelectEntryPos( ); + const sal_Int32 nPos = m_pLBRepository->GetSelectedEntryPos( ); if( static_cast<size_t>(nPos) < m_aRepoIds.size() ) { m_sRepoId = m_aRepoIds[nPos]; diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 8a16ab3a3091..c8af6214faee 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -956,7 +956,7 @@ void AssignmentPersistentData::ImplCommit() "AddressBookSourceDialog::OnFieldScroll: invalid list box entry!"); // update the array where we remember the field selections - if (0 == _rListbox.GetSelectEntryPos()) + if (0 == _rListbox.GetSelectedEntryPos()) // it's the "no field selection" entry m_pImpl->aFieldAssignments[m_pImpl->nFieldScrollPos * 2 + nListBoxIndex].clear(); else diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 22b6662d5e9a..d7a8b06a7900 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -53,7 +53,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox const * pBox, PushButton* pPropBtn, Printer const * pPrinter, Printer* pTempPrinterIn ) { VclPtr<Printer> pTempPrinter( pTempPrinterIn ); - if ( pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) + if ( pBox->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { const QueueInfo* pInfo = Printer::GetQueueInfo( pBox->GetSelectedEntry(), true ); if( pInfo) @@ -109,7 +109,7 @@ Printer* ImplPrnDlgUpdatePrinter( Printer const * pPrinter, Printer* pTempPrinte void ImplPrnDlgUpdateQueueInfo( ListBox const * pBox, QueueInfo& rInfo ) { - if ( pBox->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) + if ( pBox->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ) { const QueueInfo* pInfo = Printer::GetQueueInfo( pBox->GetSelectedEntry(), true ); if( pInfo ) diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 57942a39f32a..27144326aaee 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -152,7 +152,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC { if ( bUpdateConfig ) { - sal_Int32 nUnit = mpLbSizeX->GetSelectEntryPos(); + sal_Int32 nUnit = mpLbSizeX->GetSelectedEntryPos(); if ( nUnit < 0 ) nUnit = UNIT_CM; @@ -171,7 +171,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC mpOptionsItem->WriteInt32("PixelExportUnit", nUnit); mpOptionsItem->WriteInt32("PixelExportResolution", nResolution); - mpOptionsItem->WriteInt32("PixelExportResolutionUnit", mpLbResolution->GetSelectEntryPos()); + mpOptionsItem->WriteInt32("PixelExportResolutionUnit", mpLbResolution->GetSelectedEntryPos()); } else { @@ -219,7 +219,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC { case FORMAT_JPG : { - sal_Int32 nColor = mpLbColorDepth->GetSelectEntryPos(); + sal_Int32 nColor = mpLbColorDepth->GetSelectedEntryPos(); if ( nColor == 1 ) nColor = 0; else @@ -245,7 +245,7 @@ uno::Sequence< beans::PropertyValue > ExportDialog::GetFilterData( bool bUpdateC case FORMAT_BMP : { - pFilterOptions->WriteInt32("Color", mpLbColorDepth->GetSelectEntryPos() + 1); + pFilterOptions->WriteInt32("Color", mpLbColorDepth->GetSelectedEntryPos() + 1); pFilterOptions->WriteBool("RLE_Coding", mpCbRLEEncoding->IsChecked()); } break; @@ -925,13 +925,13 @@ void ExportDialog::updateControls() { awt::Size aSize100thmm( maSize ); Size aSize( LogicToLogic( Size( aSize100thmm.Width * 100, aSize100thmm.Height * 100 ), MapUnit::Map100thMM, - MapMode( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) ) ) ); + MapMode( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ) ) ) ); mpMfSizeX->SetValue( aSize.Width() ); mpMfSizeY->SetValue( aSize.Height() ); } else { - MapUnit aMapUnit( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) ); + MapUnit aMapUnit( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ) ); if ( aMapUnit == MapUnit::MapPixel ) { // calculating pixel count via resolution and original graphic size mpMfSizeX->SetDecimalDigits( 0 ); @@ -944,7 +944,7 @@ void ExportDialog::updateControls() mpMfSizeX->SetDecimalDigits( 2 ); mpMfSizeY->SetDecimalDigits( 2 ); double fRatio; - switch( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) ) + switch( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ) ) { case MapUnit::MapInch : fRatio = static_cast< double >( maResolution.Width ) * 0.0254; break; case MapUnit::MapMM : fRatio = static_cast< double >( maResolution.Width ) * 0.001; break; @@ -957,7 +957,7 @@ void ExportDialog::updateControls() } } sal_Int32 nResolution = 0; - switch( mpLbResolution->GetSelectEntryPos() ) + switch( mpLbResolution->GetSelectedEntryPos() ) { case 0 : nResolution = maResolution.Width / 100; break; // pixels / cm case 2 : nResolution = maResolution.Width; break; // pixels / meter @@ -1082,7 +1082,7 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeX, Edit&, void) if ( mbIsPixelFormat ) { - switch( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) ) + switch( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ) ) { case MapUnit::MapInch : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.0254 * mpMfSizeX->GetValue() / 100.0 + 0.5 ); break; case MapUnit::MapCM : maSize.Width = static_cast< sal_Int32 >( static_cast< double >( maResolution.Width ) * 0.01 * mpMfSizeX->GetValue() / 100.0 + 0.5 ); break; @@ -1099,7 +1099,7 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeX, Edit&, void) sal_Int32 nWidth = mpMfSizeX->GetValue(); sal_Int32 nHeight= static_cast< sal_Int32 >( nWidth * fRatio ); const Size aSource( nWidth, nHeight ); - MapMode aSourceMapMode( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ),Point(), aFract, aFract ); + MapMode aSourceMapMode( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ),Point(), aFract, aFract ); Size aDest( LogicToLogic( aSource, aSourceMapMode, MapUnit::Map100thMM ) ); maSize.Width = aDest.Width(); @@ -1114,7 +1114,7 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY, Edit&, void) if ( mbIsPixelFormat ) { - switch( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ) ) + switch( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ) ) { case MapUnit::MapInch : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.0254 * mpMfSizeY->GetValue() / 100.0 + 0.5 ); break; case MapUnit::MapCM : maSize.Height = static_cast< sal_Int32 >( static_cast< double >( maResolution.Height ) * 0.01 * mpMfSizeY->GetValue() / 100.0 + 0.5 ); break; @@ -1131,7 +1131,7 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY, Edit&, void) sal_Int32 nHeight= mpMfSizeY->GetValue(); sal_Int32 nWidth = static_cast< sal_Int32 >( nHeight * fRatio ); const Size aSource( nWidth, nHeight ); - MapMode aSourceMapMode( GetMapUnit( mpLbSizeX->GetSelectEntryPos() ),Point(), aFract, aFract ); + MapMode aSourceMapMode( GetMapUnit( mpLbSizeX->GetSelectedEntryPos() ),Point(), aFract, aFract ); Size aDest( LogicToLogic( aSource, aSourceMapMode, MapUnit::Map100thMM ) ); maSize.Height = aDest.Height(); @@ -1143,9 +1143,9 @@ IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY, Edit&, void) IMPL_LINK_NOARG(ExportDialog, UpdateHdlNfResolution, Edit&, void) { sal_Int32 nResolution = mpNfResolution->GetValue(); - if ( mpLbResolution->GetSelectEntryPos() == 0 ) // pixels / cm + if ( mpLbResolution->GetSelectedEntryPos() == 0 ) // pixels / cm nResolution *= 100; - else if ( mpLbResolution->GetSelectEntryPos() == 1 ) // pixels / inch + else if ( mpLbResolution->GetSelectedEntryPos() == 1 ) // pixels / inch nResolution = static_cast< sal_Int32 >( ( ( static_cast< double >( nResolution ) + 0.5 ) / 0.0254 ) ); maResolution.Width = nResolution; maResolution.Height= nResolution; 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(); diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx index 870418d871b6..1a0afbb65ca5 100644 --- a/sw/source/ui/chrdlg/break.cxx +++ b/sw/source/ui/chrdlg/break.cxx @@ -46,7 +46,7 @@ void SwBreakDlg::Apply() else if(m_pPageBtn->IsChecked()) { nKind = 3; - const sal_Int32 nPos = m_pPageCollBox->GetSelectEntryPos(); + const sal_Int32 nPos = m_pPageCollBox->GetSelectedEntryPos(); if(0 != nPos && LISTBOX_ENTRY_NOTFOUND != nPos) { aTemplate = m_pPageCollBox->GetSelectedEntry(); @@ -93,7 +93,7 @@ IMPL_LINK_NOARG(SwBreakDlg, OkHdl, Button*, void) { if(m_pPageNumBox->IsChecked()) { // In case of differing page descriptions, test validity - const sal_Int32 nPos = m_pPageCollBox->GetSelectEntryPos(); + const sal_Int32 nPos = m_pPageCollBox->GetSelectedEntryPos(); // position 0 says 'Without'. const SwPageDesc *pPageDesc; if ( 0 != nPos && LISTBOX_ENTRY_NOTFOUND != nPos ) @@ -211,7 +211,7 @@ void SwBreakDlg::CheckEnable() if ( bEnable ) { // position 0 says 'Without' page template. - const sal_Int32 nPos = m_pPageCollBox->GetSelectEntryPos(); + const sal_Int32 nPos = m_pPageCollBox->GetSelectedEntryPos(); if ( 0 == nPos || LISTBOX_ENTRY_NOTFOUND == nPos ) bEnable = false; } diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 1d5d4cc1c326..096a6d637f8a 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -273,7 +273,7 @@ void SwDropCapsPict::UpdatePaintSettings() vcl::Font aFont; if (mpPage) { - if (!mpPage->m_pTemplateBox->GetSelectEntryPos()) + if (!mpPage->m_pTemplateBox->GetSelectedEntryPos()) { // query the Font at paragraph's beginning mpPage->rSh.Push(); @@ -787,7 +787,7 @@ void SwDropCapsPage::FillSet( SfxItemSet &rSet ) aFormat.GetWholeWord() = m_pWholeWordCB->IsChecked(); // template - if (m_pTemplateBox->GetSelectEntryPos()) + if (m_pTemplateBox->GetSelectedEntryPos()) aFormat.SetCharFormat(rSh.GetCharStyle(m_pTemplateBox->GetSelectedEntry())); } else diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index f0303ec5d781..2c8b4b24776c 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -72,7 +72,7 @@ SwParagraphNumTabPage::SwParagraphNumTabPage(vcl::Window* pParent, const SfxItem get(m_pRestartBX, "boxRESTART_NO"); get(m_pRestartNF, "spinNF_RESTART_PARA"); - sal_Int32 numSelectPos = m_pNumberStyleLB->GetSelectEntryPos(); + sal_Int32 numSelectPos = m_pNumberStyleLB->GetSelectedEntryPos(); if ( numSelectPos == 0 ) m_pEditNumStyleBtn->Disable(); else @@ -133,7 +133,7 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) { if( m_pOutlineLvLB->IsValueChangedFromSaved()) { - const sal_uInt16 aOutlineLv = m_pOutlineLvLB->GetSelectEntryPos(); + const sal_uInt16 aOutlineLv = m_pOutlineLvLB->GetSelectedEntryPos(); const SfxUInt16Item* pOldOutlineLv = static_cast<const SfxUInt16Item*>(GetOldItem( *rSet, SID_ATTR_PARA_OUTLINE_LEVEL)); if (pOldOutlineLv) { @@ -148,7 +148,7 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) if( m_pNumberStyleLB->IsValueChangedFromSaved()) { OUString aStyle; - if(m_pNumberStyleLB->GetSelectEntryPos()) + if(m_pNumberStyleLB->GetSelectedEntryPos()) aStyle = m_pNumberStyleLB->GetSelectedEntry(); const SfxStringItem* pOldRule = static_cast<const SfxStringItem*>(GetOldItem( *rSet, SID_ATTR_PARA_NUMRULE)); SfxStringItem* pRule = pOldRule ? static_cast<SfxStringItem*>(pOldRule->Clone()) : nullptr; @@ -330,7 +330,7 @@ IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl, Button*, void) IMPL_LINK_NOARG( SwParagraphNumTabPage, EditNumStyleSelectHdl_Impl, ListBox&, void ) { - sal_Int32 numSelectPos = m_pNumberStyleLB->GetSelectEntryPos(); + sal_Int32 numSelectPos = m_pNumberStyleLB->GetSelectedEntryPos(); if ( numSelectPos == 0 ) m_pEditNumStyleBtn->Disable(); else @@ -376,7 +376,7 @@ bool SwParagraphNumTabPage::ExecuteEditNumStyle_Impl( IMPL_LINK( SwParagraphNumTabPage, StyleHdl_Impl, ListBox&, rBox, void ) { - bool bEnable = bCurNumrule || rBox.GetSelectEntryPos() > 0; + bool bEnable = bCurNumrule || rBox.GetSelectedEntryPos() > 0; m_pNewStartCB->Enable(bEnable); NewStartHdl_Impl(m_pNewStartCB); } diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index e80658e1ecfa..875e251426e4 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -281,7 +281,7 @@ void SwCondCollPage::SelectHdl(void const * pBox) if (pBox == m_pFilterLB) { m_pStyleLB->Clear(); - const sal_Int32 nSelPos = static_cast<ListBox const *>(pBox)->GetSelectEntryPos(); + const sal_Int32 nSelPos = static_cast<ListBox const *>(pBox)->GetSelectedEntryPos(); const sal_uInt16 nSearchFlags = *static_cast<sal_uInt16*>(m_pFilterLB->GetEntryData(nSelPos)); SfxStyleSheetBasePool* pPool = m_rSh.GetView().GetDocShell()->GetStyleSheetPool(); pPool->SetSearchMask(SfxStyleFamily::Para, nSearchFlags); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 4feaf12b3684..f91b948440b2 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -255,7 +255,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet ) IMPL_LINK_NOARG(SwCompatibilityOptPage, SelectHdl, ListBox&, void) { - const sal_Int32 nPos = m_pFormattingLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pFormattingLB->GetSelectedEntryPos(); sal_uLong nOptions = reinterpret_cast<sal_uLong>(m_pFormattingLB->GetEntryData( nPos )); SetCurrentOptions( nOptions ); } diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 7d4af067ef98..42fdba0f0e2a 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -217,7 +217,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet* rSet ) bRet = true; } - const sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos(); + const sal_Int32 nMPos = m_pMetricLB->GetSelectedEntryPos(); if ( m_pMetricLB->IsValueChangedFromSaved() ) { // Double-Cast for VA3.0 @@ -378,7 +378,7 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet) IMPL_LINK_NOARG(SwLoadOptPage, MetricHdl, ListBox&, void) { - const sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos(); + const sal_Int32 nMPos = m_pMetricLB->GetSelectedEntryPos(); if(nMPos != LISTBOX_ENTRY_NOTFOUND) { // Double-Cast for VA3.0 @@ -609,7 +609,7 @@ bool SwCaptionOptPage::FillItemSet( SfxItemSet* ) sal_uLong nCheckCount = m_pCheckLB->GetCheckedEntryCount(); pModOpt->SetInsWithCaption( bHTMLMode, nCheckCount > 0 ); - sal_Int32 nPos = m_pLbCaptionOrder->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbCaptionOrder->GetSelectedEntryPos(); pModOpt->SetCaptionOrderNumberingFirst(nPos == 1); return bRet; @@ -699,7 +699,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl, SvTreeListBox*, void) bool bChecked = m_pCheckLB->IsChecked(m_pCheckLB->GetModel()->GetAbsPos(pSelEntry)); m_pSettingsGroup->Enable(bChecked); - bool bNumSep = bChecked && m_pLbCaptionOrder->GetSelectEntryPos() == 1; + bool bNumSep = bChecked && m_pLbCaptionOrder->GetSelectedEntryPos() == 1; m_pNumberingSeparatorED->Enable( bNumSep ); m_pNumberingSeparatorFT->Enable( bNumSep ); @@ -819,13 +819,13 @@ void SwCaptionOptPage::SaveEntry(SvTreeListEntry const * pEntry) pOpt->SetCategory(comphelper::string::strip(aName, ' ')); pOpt->SetNumType((sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetSelectEntryData())); pOpt->SetCaption(m_pTextEdit->IsEnabled() ? m_pTextEdit->GetText() : OUString() ); - pOpt->SetPos(m_pPosBox->GetSelectEntryPos()); - sal_Int32 nPos = m_pLbLevel->GetSelectEntryPos(); + pOpt->SetPos(m_pPosBox->GetSelectedEntryPos()); + sal_Int32 nPos = m_pLbLevel->GetSelectedEntryPos(); sal_Int32 nLevel = ( nPos > 0 && nPos != LISTBOX_ENTRY_NOTFOUND ) ? nPos - 1 : MAXLEVEL; pOpt->SetLevel(nLevel); pOpt->SetSeparator(m_pEdDelim->GetText()); pOpt->SetNumSeparator( m_pNumberingSeparatorED->GetText()); - if(!m_pCharStyleLB->GetSelectEntryPos()) + if(!m_pCharStyleLB->GetSelectedEntryPos()) pOpt->SetCharacterStyle(""); else pOpt->SetCharacterStyle(m_pCharStyleLB->GetSelectedEntry()); @@ -872,7 +872,7 @@ IMPL_LINK( SwCaptionOptPage, OrderHdl, ListBox&, rBox, void ) bChecked = m_pCheckLB->IsChecked(m_pCheckLB->GetModel()->GetAbsPos(pSelEntry)); } - sal_Int32 nPos = rBox.GetSelectEntryPos(); + sal_Int32 nPos = rBox.GetSelectedEntryPos(); m_pNumberingSeparatorFT->Enable( bChecked && nPos == 1 ); m_pNumberingSeparatorED->Enable( bChecked && nPos == 1 ); } @@ -884,10 +884,10 @@ void SwCaptionOptPage::InvalidatePreview() if( m_pCategoryBox->GetText() != m_sNone) { //#i61007# order of captions - bool bOrderNumberingFirst = m_pLbCaptionOrder->GetSelectEntryPos() == 1; + bool bOrderNumberingFirst = m_pLbCaptionOrder->GetSelectedEntryPos() == 1; // number const sal_uInt16 nNumFormat = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatBox->GetEntryData( - m_pFormatBox->GetSelectEntryPos() )); + m_pFormatBox->GetSelectedEntryPos() )); if( SVX_NUM_NUMBER_NONE != nNumFormat ) { //#i61007# order of captions diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index c51a3f6905ba..6692394ca951 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -264,7 +264,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) if(bRet) bRet = nullptr != rSet->Put(aElem); - sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos(); + sal_Int32 nMPos = m_pMetricLB->GetSelectedEntryPos(); sal_Int32 nGlobalMetricPos = nMPos; if ( m_pMetricLB->IsValueChangedFromSaved() ) { @@ -274,7 +274,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) bRet = true; } - nMPos = m_pHMetric->GetSelectEntryPos(); + nMPos = m_pHMetric->GetSelectedEntryPos(); if ( m_pHMetric->IsValueChangedFromSaved() || nMPos != nGlobalMetricPos ) { // Double-Cast for VA3.0 @@ -282,7 +282,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet) rSet->Put( SfxUInt16Item( FN_HSCROLL_METRIC, nFieldUnit ) ); bRet = true; } - nMPos = m_pVMetric->GetSelectEntryPos(); + nMPos = m_pVMetric->GetSelectedEntryPos(); if ( m_pVMetric->IsValueChangedFromSaved() || nMPos != nGlobalMetricPos ) { // Double-Cast for VA3.0 @@ -1829,7 +1829,7 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) ColorData nOldMarkColor = pOpt->GetMarkAlignColor().GetColor(); sal_uInt16 nOldMarkMode = pOpt->GetMarkAlignMode(); - sal_Int32 nPos = m_pInsertLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pInsertLB->GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) { pAttr = static_cast<CharAttr *>(m_pInsertLB->GetEntryData(nPos)); @@ -1839,7 +1839,7 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) pOpt->SetInsertAuthorAttr(aInsertedAttr); } - nPos = m_pDeletedLB->GetSelectEntryPos(); + nPos = m_pDeletedLB->GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) { pAttr = static_cast<CharAttr *>(m_pDeletedLB->GetEntryData(nPos)); @@ -1849,7 +1849,7 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) pOpt->SetDeletedAuthorAttr(aDeletedAttr); } - nPos = m_pChangedLB->GetSelectEntryPos(); + nPos = m_pChangedLB->GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) { pAttr = static_cast<CharAttr *>(m_pChangedLB->GetEntryData(nPos)); @@ -1860,7 +1860,7 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) } nPos = 0; - switch (m_pMarkPosLB->GetSelectEntryPos()) + switch (m_pMarkPosLB->GetSelectedEntryPos()) { case 0: nPos = text::HoriOrientation::NONE; break; case 1: nPos = text::HoriOrientation::LEFT; break; @@ -1998,7 +1998,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, AttribHdl, ListBox&, rLB, void ) rCJKFont.SetColor(aColor); } - sal_Int32 nPos = rLB.GetSelectEntryPos(); + sal_Int32 nPos = rLB.GetSelectedEntryPos(); if( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos = 0; @@ -2072,7 +2072,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, SvxColorListBox&, rListBox, void ) SvxFont& rFont = pPrev->GetFont(); SvxFont& rCJKFont = pPrev->GetCJKFont(); - sal_Int32 nPos = pLB->GetSelectEntryPos(); + sal_Int32 nPos = pLB->GetSelectedEntryPos(); if( nPos == LISTBOX_ENTRY_NOTFOUND ) nPos = 0; @@ -2115,7 +2115,7 @@ IMPL_LINK( SwRedlineOptionsTabPage, ColorHdl, SvxColorListBox&, rListBox, void ) void SwRedlineOptionsTabPage::ChangedMaskPrev() { - m_pMarkPreviewWN->SetMarkPos(m_pMarkPosLB->GetSelectEntryPos()); + m_pMarkPreviewWN->SetMarkPos(m_pMarkPosLB->GetSelectedEntryPos()); m_pMarkPreviewWN->SetColor(m_pMarkColorLB->GetSelectEntryColor().GetColor()); m_pMarkPreviewWN->Invalidate(); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index ea59468ae7b6..f3bf43e9959c 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -782,7 +782,7 @@ IMPL_LINK_NOARG(SwFindEntryDialog, FindHdl_Impl, Button*, void) { sal_Int32 nColumn = -1; if(m_pFindOnlyCB->IsChecked()) - nColumn = m_pFindOnlyLB->GetSelectEntryPos(); + nColumn = m_pFindOnlyLB->GetSelectedEntryPos(); if(nColumn != LISTBOX_ENTRY_NOTFOUND) m_pParent->Find(m_pFindED->GetText(), nColumn); } diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx index 1e2851cc4324..613860b020e7 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx +++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx @@ -83,7 +83,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressListDialog, ListBoxSelectHdl_Impl, ListBox&, v IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButton, void) { bool bRename = pButton == m_pRenamePB; - sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pFieldsLB->GetSelectedEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) nPos = 0; @@ -107,7 +107,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButton, voi } else { - if ( m_pFieldsLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) + if ( m_pFieldsLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ) ++nPos; // append the new entry behind the selected //add the new column m_pNewData->aDBColumnHeaders.insert(m_pNewData->aDBColumnHeaders.begin() + nPos, sNew); @@ -126,8 +126,8 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, Button*, pButton, voi IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl, Button*, void) { - sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos(); - m_pFieldsLB->RemoveEntry(m_pFieldsLB->GetSelectEntryPos()); + sal_Int32 nPos = m_pFieldsLB->GetSelectedEntryPos(); + m_pFieldsLB->RemoveEntry(m_pFieldsLB->GetSelectedEntryPos()); m_pFieldsLB->SelectEntryPos(nPos > m_pFieldsLB->GetEntryCount() - 1 ? nPos - 1 : nPos); //remove the column @@ -143,7 +143,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl, Button*, void) IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, Button*, pButton, void) { sal_Int32 nPos; - sal_Int32 nOldPos = nPos = m_pFieldsLB->GetSelectEntryPos(); + sal_Int32 nOldPos = nPos = m_pFieldsLB->GetSelectedEntryPos(); OUString aTemp = m_pFieldsLB->GetEntry(nPos); m_pFieldsLB->RemoveEntry( nPos ); if(pButton == m_pUpPB) @@ -169,7 +169,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, Button*, pButton, void) void SwCustomizeAddressListDialog::UpdateButtons() { - sal_Int32 nPos = m_pFieldsLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pFieldsLB->GetSelectedEntryPos(); sal_Int32 nEntries = m_pFieldsLB->GetEntryCount(); m_pUpPB->Enable(nPos > 0 && nEntries > 0); m_pDownPB->Enable(nPos < nEntries -1); diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx index a644749f6794..fc4ad77224b0 100644 --- a/sw/source/ui/dbui/dbinsdlg.cxx +++ b/sw/source/ui/dbui/dbinsdlg.cxx @@ -508,7 +508,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void ) { bEnableTo = false; - sal_Int32 n, nInsPos = m_pLbTableCol->GetSelectEntryPos(), + sal_Int32 n, nInsPos = m_pLbTableCol->GetSelectedEntryPos(), nCnt = m_pLbTableDbColumn->GetEntryCount(); if( LISTBOX_APPEND == nInsPos ) for( n = 0; n < nCnt; ++n ) @@ -521,10 +521,10 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void ) m_pLbTableDbColumn->SelectEntryPos( LISTBOX_APPEND ); } else if( pButton == m_pIbDbcolOneTo && - LISTBOX_ENTRY_NOTFOUND != m_pLbTableDbColumn->GetSelectEntryPos() ) + LISTBOX_ENTRY_NOTFOUND != m_pLbTableDbColumn->GetSelectedEntryPos() ) { - sal_Int32 nInsPos = m_pLbTableCol->GetSelectEntryPos(), - nDelPos = m_pLbTableDbColumn->GetSelectEntryPos(), + sal_Int32 nInsPos = m_pLbTableCol->GetSelectedEntryPos(), + nDelPos = m_pLbTableDbColumn->GetSelectedEntryPos(), nTopPos = m_pLbTableDbColumn->GetTopEntry(); m_pLbTableCol->InsertEntry( m_pLbTableDbColumn->GetEntry( nDelPos ), nInsPos ); m_pLbTableDbColumn->RemoveEntry( nDelPos ); @@ -539,10 +539,10 @@ IMPL_LINK( SwInsertDBColAutoPilot, TableToFromHdl, Button*, pButton, void ) } else if( pButton == m_pIbDbcolOneFrom ) { - if( LISTBOX_ENTRY_NOTFOUND != m_pLbTableCol->GetSelectEntryPos() ) + if( LISTBOX_ENTRY_NOTFOUND != m_pLbTableCol->GetSelectedEntryPos() ) { sal_Int32 nInsPos, - nDelPos = m_pLbTableCol->GetSelectEntryPos(), + nDelPos = m_pLbTableCol->GetSelectedEntryPos(), nTopPos = m_pLbTableCol->GetTopEntry(); // look for the right InsertPos!! diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 802309818f5d..17ee1512e736 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -928,7 +928,7 @@ void SwAssignFieldsControl::Init(SwMailMergeConfigItem& rConfigItem) else //otherwise the current column name may match one of the db columns pNewLB->SelectEntry(rHeader); //then the preview can be filled accordingly - if(xColAccess.is() && pNewLB->GetSelectEntryPos() > 0 && + if(xColAccess.is() && pNewLB->GetSelectedEntryPos() > 0 && xColAccess->hasByName(pNewLB->GetSelectedEntry())) { uno::Any aCol = xColAccess->getByName(pNewLB->GetSelectedEntry()); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 5f9a4636b13a..5f11cd94177c 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -65,7 +65,7 @@ static void lcl_StoreGreetingsBox(ListBox const & rBox, for(sal_Int32 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry) pEntries[nEntry] = rBox.GetEntry(nEntry); rConfig.SetGreetings(eType, aEntries); - rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos()); + rConfig.SetCurrentGreeting(eType, rBox.GetSelectedEntryPos()); } static void lcl_StoreGreetingsBox(ComboBox const & rBox, @@ -77,7 +77,7 @@ static void lcl_StoreGreetingsBox(ComboBox const & rBox, for(sal_Int32 nEntry = 0; nEntry < rBox.GetEntryCount(); ++nEntry) pEntries[nEntry] = rBox.GetEntry(nEntry); rConfig.SetGreetings(eType, aEntries); - rConfig.SetCurrentGreeting(eType, rBox.GetSelectEntryPos()); + rConfig.SetCurrentGreeting(eType, rBox.GetSelectedEntryPos()); } IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl, Button*, void) @@ -501,7 +501,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl, Button*, void) { const SwDBData& rDBData = m_rConfigItem.GetCurrentDBData(); Sequence< OUString> aAssignment = m_rConfigItem.GetColumnAssignment( rDBData ); - sal_Int32 nPos = m_pFemaleColumnLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pFemaleColumnLB->GetSelectedEntryPos(); if(aAssignment.getLength() < MM_PART_GENDER) aAssignment.realloc(MM_PART_GENDER); if( nPos > 0 ) diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 7c08f53d24a5..7f2085d08f3b 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -665,7 +665,7 @@ IMPL_LINK(SwMailMergeLayoutPage, ZoomHdl_Impl, ListBox&, rBox, void) { sal_Int16 eType = DocumentZoomType::BY_VALUE; short nZoom = 50; - switch(rBox.GetSelectEntryPos()) + switch(rBox.GetSelectedEntryPos()) { case 0 : eType = DocumentZoomType::ENTIRE_PAGE; break; case 1 : nZoom = 50; break; diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index d803c6a194c6..f7df31f1064e 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -762,7 +762,7 @@ IMPL_LINK(SwMMResultPrintDialog, PrinterChangeHdl_Impl, ListBox&, rBox, void) SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem = pView->GetMailMergeConfigItem(); assert(xConfigItem); - if (rBox.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) + if (rBox.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND) { const QueueInfo* pInfo = Printer::GetQueueInfo( rBox.GetSelectedEntry(), false ); diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 4d1a897bfd8b..a9b1f2923447 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -240,7 +240,7 @@ IMPL_LINK( SwEnvFormatPage, ModifyHdl, SpinField&, rEdit, void ) m_pSizeFormatBox->SelectEntryPos(static_cast<sal_Int32>(i)); // remember user size - if (aIDs[m_pSizeFormatBox->GetSelectEntryPos()] == (sal_uInt16)PAPER_USER) + if (aIDs[m_pSizeFormatBox->GetSelectedEntryPos()] == (sal_uInt16)PAPER_USER) { lUserW = lWidth ; lUserH = lHeight; @@ -391,7 +391,7 @@ IMPL_LINK_NOARG(SwEnvFormatPage, FormatHdl, ListBox&, void) long lAddrFromLeft; long lAddrFromTop; - const sal_uInt16 nPaper = aIDs[m_pSizeFormatBox->GetSelectEntryPos()]; + const sal_uInt16 nPaper = aIDs[m_pSizeFormatBox->GetSelectedEntryPos()]; if (nPaper != (sal_uInt16)PAPER_USER) { Size aSz = SvxPaperInfo::GetPaperSize((Paper)nPaper); @@ -486,7 +486,7 @@ void SwEnvFormatPage::FillItem(SwEnvItem& rItem) rItem.lSendFromLeft = static_cast< sal_Int32 >(GetFieldVal(*m_pSendLeftField)); rItem.lSendFromTop = static_cast< sal_Int32 >(GetFieldVal(*m_pSendTopField )); - const sal_uInt16 nPaper = aIDs[m_pSizeFormatBox->GetSelectEntryPos()]; + const sal_uInt16 nPaper = aIDs[m_pSizeFormatBox->GetSelectedEntryPos()]; if (nPaper == (sal_uInt16)PAPER_USER) { long lWVal = static_cast< long >(GetFieldVal(*m_pSizeWidthField )); diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 18f77a30fbb5..1b55475e4937 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -709,7 +709,7 @@ void SwVisitingCardPage::Reset(const SfxItemSet* rSet) } if(bFound) { - if(m_pAutoTextGroupLB->GetSelectEntryPos() != i) + if(m_pAutoTextGroupLB->GetSelectedEntryPos() != i) { m_pAutoTextGroupLB->SelectEntryPos(i); AutoTextSelectHdl(*m_pAutoTextGroupLB); diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 1e96b826fc5d..0905145ca975 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -76,7 +76,7 @@ void SwVisitingCardPage::InitFrameControl() } if(m_pAutoTextGroupLB->GetEntryCount()) { - if(LISTBOX_ENTRY_NOTFOUND == m_pAutoTextGroupLB->GetSelectEntryPos()) + if(LISTBOX_ENTRY_NOTFOUND == m_pAutoTextGroupLB->GetSelectedEntryPos()) m_pAutoTextGroupLB->SelectEntryPos(0); const OUString *pCurGroupName( static_cast<const OUString*>(m_pAutoTextGroupLB->GetSelectEntryData())); @@ -110,7 +110,7 @@ IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl, SwOneExampleFram uno::Reference< text::XTextCursor > & xCursor = pExampleFrame->GetTextCursor(); OUString uEntry(sEntry); - if(LISTBOX_ENTRY_NOTFOUND != m_pAutoTextGroupLB->GetSelectEntryPos()) + if(LISTBOX_ENTRY_NOTFOUND != m_pAutoTextGroupLB->GetSelectedEntryPos()) { const OUString *pGroup( static_cast<const OUString*>(m_pAutoTextGroupLB->GetSelectEntryData()) ); uno::Any aGroup = m_xAutoText->getByName(*pGroup); diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index b9caab70328d..e7398689f06d 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -514,7 +514,7 @@ bool SwMailMergeDlg::ExecQryShell() if (!AskUserFilename()) { pModOpt->SetNameFromColumn(m_pColumnLB->GetSelectedEntry()); - if( m_pFilterLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) + if( m_pFilterLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND) m_sSaveFilter = *static_cast<const OUString*>(m_pFilterLB->GetSelectEntryData()); m_sFilename = OUString(); } else { diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 34eae4c72523..b1d22c730d59 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -99,7 +99,7 @@ void SwFieldDBPage::Reset(const SfxItemSet*) Init(); // Allgemeine initialisierung m_pTypeLB->SetUpdateMode(false); - const sal_Int32 nOldPos = m_pTypeLB->GetSelectEntryPos(); + const sal_Int32 nOldPos = m_pTypeLB->GetSelectedEntryPos(); m_sOldDBName = m_pDatabaseTLB->GetDBName(m_sOldTableName, m_sOldColumnName); m_pTypeLB->Clear(); @@ -240,7 +240,7 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* ) case TYP_DBSETNUMBERFLD: nFormat = reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( - m_pFormatLB->GetSelectEntryPos() )); + m_pFormatLB->GetSelectedEntryPos() )); break; } @@ -285,7 +285,7 @@ void SwFieldDBPage::TypeHdl( ListBox const * pBox ) const sal_Int32 nOld = GetTypeSel(); // current ListBoxPos - SetTypeSel(m_pTypeLB->GetSelectEntryPos()); + SetTypeSel(m_pTypeLB->GetSelectedEntryPos()); if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND) { @@ -491,7 +491,7 @@ IMPL_LINK_NOARG(SwFieldDBPage, ModifyHdl, Edit&, void) void SwFieldDBPage::FillUserData() { - const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos(); + const sal_Int32 nEntryPos = m_pTypeLB->GetSelectedEntryPos(); const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos ) ? USHRT_MAX : (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData( nEntryPos )); SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel )); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index f7b4df0f28fb..3b7b357289db 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -214,7 +214,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* ) if (IsFieldEdit()) { - nOldSel = m_pSelectionLB->GetSelectEntryPos(); + nOldSel = m_pSelectionLB->GetSelectedEntryPos(); nOldFormat = GetCurField()->GetFormat(); m_pFixedCB->SaveValue(); } @@ -242,7 +242,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void) IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void) { sal_uInt16 nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData()); - sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos(); sal_uInt16 nExtSubType; sal_uInt16 nNewType = 0; @@ -332,7 +332,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void) if (IsFieldEdit()) { - nPos = m_pSelectionLB->GetSelectEntryPos(); + nPos = m_pSelectionLB->GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND ) { nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos)); @@ -364,7 +364,7 @@ IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void) m_pFormat->Enable(bEnable); - if (bEnable && m_pFormatLB->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND) + if (bEnable && m_pFormatLB->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND) { m_pFormatLB->SelectEntryPos(0); } @@ -432,7 +432,7 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* ) sal_uInt32 nFormat = 0; - sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos(); OUString aName; if (DI_CUSTOM == nSubType) @@ -444,11 +444,11 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* ) if (m_pFixedCB->IsChecked()) nSubType |= DI_SUB_FIXED; - nPos = m_pFormatLB->GetSelectEntryPos(); + nPos = m_pFormatLB->GetSelectedEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) nFormat = m_pFormatLB->GetFormat(); - if (!IsFieldEdit() || nOldSel != m_pSelectionLB->GetSelectEntryPos() || + if (!IsFieldEdit() || nOldSel != m_pSelectionLB->GetSelectedEntryPos() || nOldFormat != nFormat || m_pFixedCB->IsValueChangedFromSaved() || (DI_CUSTOM == nSubType && aName != m_sOldCustomFieldName )) { diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index e4464f302241..c8701bcb223e 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -194,7 +194,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* ) if (IsFieldEdit()) { - nOldSel = m_pSelectionLB->GetSelectEntryPos(); + nOldSel = m_pSelectionLB->GetSelectedEntryPos(); nOldFormat = GetCurField()->GetFormat(); m_pFixedCB->SaveValue(); m_pValueED->SaveValue(); @@ -209,7 +209,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void) const sal_Int32 nOld = GetTypeSel(); // current ListBoxPos - SetTypeSel(m_pTypeLB->GetSelectEntryPos()); + SetTypeSel(m_pTypeLB->GetSelectedEntryPos()); if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND) { @@ -361,7 +361,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void) if (IsFieldEdit()) { const sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( - m_pFormatLB->GetSelectEntryPos() )); + m_pFormatLB->GetSelectedEntryPos() )); if(SVX_NUM_CHAR_SPECIAL != nTmp) { @@ -443,7 +443,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void) if (IsFieldEdit()) m_pFixedCB->Check( (GetCurField()->GetFormat() & AF_FIXED) != 0 && bFixed ); - if (m_pNumFormatLB->GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND) + if (m_pNumFormatLB->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND) m_pNumFormatLB->SelectEntryPos(0); m_pValueFT->Enable(bValue || bLevel || bOffset); m_pValueED->Enable(bValue); @@ -458,7 +458,7 @@ void SwFieldDokPage::AddSubType(sal_uInt16 nTypeId) IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void) { - sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) nPos = 0; @@ -475,7 +475,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void) case TYP_PREVPAGEFLD: case TYP_NEXTPAGEFLD: pTextRes = SVX_NUM_CHAR_SPECIAL == (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( - m_pFormatLB->GetSelectEntryPos() )) + m_pFormatLB->GetSelectedEntryPos() )) ? STR_VALUE : STR_OFFSET; break; @@ -529,7 +529,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void) if (nTypeId == USHRT_MAX) { - sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) nPos = 0; @@ -540,7 +540,7 @@ IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void) { // Prev/Next - PageNumFields special treatment: sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData( - m_pFormatLB->GetSelectEntryPos() )); + m_pFormatLB->GetSelectedEntryPos() )); const OUString sOldText( m_pValueFT->GetText() ); const OUString sNewText( SwResId( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE : STR_OFFSET )); @@ -559,7 +559,7 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* ) if (nTypeId == USHRT_MAX) { - sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) nPos = 0; nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos)); @@ -571,14 +571,14 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* ) if (m_pFormatLB->IsEnabled()) { - sal_Int32 nPos = m_pFormatLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pFormatLB->GetSelectedEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) nFormat = reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(nPos)); } if (m_pSelectionLB->IsEnabled()) { - sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pSelectionLB->GetSelectedEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nPos)); } @@ -632,7 +632,7 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* ) } if (!IsFieldEdit() || - nOldSel != m_pSelectionLB->GetSelectEntryPos() || + nOldSel != m_pSelectionLB->GetSelectedEntryPos() || nOldFormat != nFormat || m_pFixedCB->IsValueChangedFromSaved() || m_pValueED->IsValueChangedFromSaved() || @@ -658,7 +658,7 @@ sal_uInt16 SwFieldDokPage::GetGroup() void SwFieldDokPage::FillUserData() { - const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos(); + const sal_Int32 nEntryPos = m_pTypeLB->GetSelectedEntryPos(); const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos ) ? USHRT_MAX : sal::static_int_cast< sal_uInt16 > (reinterpret_cast< sal_uIntPtr >(m_pTypeLB->GetEntryData( nEntryPos ))); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index fb7632e91cad..c0a08921a92e 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -225,7 +225,7 @@ IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void) const sal_Int32 nOld = GetTypeSel(); // current ListBoxPos - SetTypeSel(m_pTypeLB->GetSelectEntryPos()); + SetTypeSel(m_pTypeLB->GetSelectedEntryPos()); if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND) { @@ -446,7 +446,7 @@ void SwFieldFuncPage::ListModifyHdl(Control const * pControl) } else if(m_pListItemsLB->GetSelectEntryCount()) { - sal_Int32 nSelPos = m_pListItemsLB->GetSelectEntryPos(); + sal_Int32 nSelPos = m_pListItemsLB->GetSelectedEntryPos(); if(pControl == m_pListRemovePB) { m_pListItemsLB->RemoveEntry(nSelPos); @@ -491,9 +491,9 @@ IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl, Edit&, void) LISTBOX_ENTRY_NOTFOUND == m_pListItemsLB->GetEntryPos(m_pListItemED->GetText())); bool bEnableButtons = m_pListItemsLB->GetSelectEntryCount() > 0; m_pListRemovePB->Enable(bEnableButtons); - m_pListUpPB->Enable(bEnableButtons && (m_pListItemsLB->GetSelectEntryPos() > 0)); + m_pListUpPB->Enable(bEnableButtons && (m_pListItemsLB->GetSelectedEntryPos() > 0)); m_pListDownPB->Enable(bEnableButtons && - (m_pListItemsLB->GetSelectEntryPos() < (m_pListItemsLB->GetEntryCount() - 1))); + (m_pListItemsLB->GetSelectedEntryPos() < (m_pListItemsLB->GetEntryCount() - 1))); } // renew types in SelectionBox @@ -552,7 +552,7 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* ) sal_uInt16 nSubType = 0; - const sal_Int32 nEntryPos = m_pFormatLB->GetSelectEntryPos(); + const sal_Int32 nEntryPos = m_pFormatLB->GetSelectedEntryPos(); const sal_uLong nFormat = (nEntryPos == LISTBOX_ENTRY_NOTFOUND) ? 0 : reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(nEntryPos)); @@ -622,7 +622,7 @@ sal_uInt16 SwFieldFuncPage::GetGroup() void SwFieldFuncPage::FillUserData() { - const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos(); + const sal_Int32 nEntryPos = m_pTypeLB->GetSelectedEntryPos(); const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos ) ? USHRT_MAX : sal::static_int_cast< sal_uInt16 > diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index fba7a511d820..4f9e85afad4f 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -305,7 +305,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) const sal_Int32 nOld = GetTypeSel(); // current ListBoxPos - SetTypeSel(m_pTypeLB->GetSelectEntryPos()); + SetTypeSel(m_pTypeLB->GetSelectedEntryPos()); if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND) { @@ -369,7 +369,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) } m_pTypeLB->SelectEntry(sName); - SetTypeSel(m_pTypeLB->GetSelectEntryPos()); + SetTypeSel(m_pTypeLB->GetSelectedEntryPos()); } else { @@ -402,7 +402,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) case TYP_GETREFFLD: if (REFFLDFLAG & (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(nOld))) // the old one stays - nFieldDlgFormatSel = m_pFormatLB->GetSelectEntryPos(); + nFieldDlgFormatSel = m_pFormatLB->GetSelectedEntryPos(); bName = true; break; @@ -419,7 +419,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) const sal_uInt16 nOldId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(nOld)); if( nOldId & REFFLDFLAG || nOldId == TYP_GETREFFLD ) // then the old one stays - nFieldDlgFormatSel = m_pFormatLB->GetSelectEntryPos(); + nFieldDlgFormatSel = m_pFormatLB->GetSelectedEntryPos(); } break; } @@ -504,7 +504,7 @@ void SwFieldRefPage::UpdateSubType(const OUString& filterString) // #i83479# if ( m_pSelectionLB->IsVisible() ) { - const sal_Int32 nSelectionSel = m_pSelectionLB->GetSelectEntryPos(); + const sal_Int32 nSelectionSel = m_pSelectionLB->GetSelectedEntryPos(); if (nSelectionSel != LISTBOX_ENTRY_NOTFOUND) { sOldSel = m_pSelectionLB->GetEntry(nSelectionSel); @@ -773,7 +773,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) { OUString sOldSel; - sal_Int32 nFormatSel = m_pFormatLB->GetSelectEntryPos(); + sal_Int32 nFormatSel = m_pFormatLB->GetSelectedEntryPos(); if (nFormatSel != LISTBOX_ENTRY_NOTFOUND) sOldSel = m_pFormatLB->GetEntry(nFormatSel); @@ -879,7 +879,7 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* ) sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); sal_uInt16 nSubType = 0; - const sal_Int32 nEntryPos = m_pFormatLB->GetSelectEntryPos(); + const sal_Int32 nEntryPos = m_pFormatLB->GetSelectedEntryPos(); const sal_uLong nFormat = (nEntryPos == LISTBOX_ENTRY_NOTFOUND) ? 0 : reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData(nEntryPos)); @@ -1067,12 +1067,12 @@ sal_uInt16 SwFieldRefPage::GetGroup() void SwFieldRefPage::FillUserData() { - const sal_Int32 nEntryPos = m_pTypeLB->GetSelectEntryPos(); + const sal_Int32 nEntryPos = m_pTypeLB->GetSelectedEntryPos(); const sal_uInt16 nTypeSel = ( LISTBOX_ENTRY_NOTFOUND == nEntryPos ) ? USHRT_MAX : sal::static_int_cast< sal_uInt16 > (reinterpret_cast< sal_uIntPtr >(m_pTypeLB->GetEntryData( nEntryPos ))); - const sal_Int32 nFormatEntryPos = m_pFormatLB->GetSelectEntryPos(); + const sal_Int32 nFormatEntryPos = m_pFormatLB->GetSelectedEntryPos(); const sal_uInt32 nFormatSel = LISTBOX_ENTRY_NOTFOUND == nFormatEntryPos ? USHRT_MAX : nFormatEntryPos; SetUserData( USER_DATA_VERSION ";" + OUString::number( nTypeSel ) + ";" + diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index e7899ba4caa8..e0d41c8eda0c 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -213,7 +213,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl, ListBox&, void) const sal_Int32 nOld = GetTypeSel(); // current ListBoxPos - SetTypeSel(m_pTypeLB->GetSelectEntryPos()); + SetTypeSel(m_pTypeLB->GetSelectedEntryPos()); if(GetTypeSel() == LISTBOX_ENTRY_NOTFOUND) { @@ -245,7 +245,7 @@ IMPL_LINK( SwFieldVarPage, SubTypeListBoxHdl, ListBox&, rBox, void ) void SwFieldVarPage::SubTypeHdl(ListBox const * pBox) { sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel())); - sal_Int32 nSelPos = m_pSelectionLB->GetSelectEntryPos(); + sal_Int32 nSelPos = m_pSelectionLB->GetSelectedEntryPos(); size_t nSelData = SIZE_MAX; if (nSelPos != LISTBOX_ENTRY_NOTFOUND) @@ -574,7 +574,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox) { case TYP_FORMELFLD: { - nSelPos = m_pSelectionLB->GetSelectEntryPos(); + nSelPos = m_pSelectionLB->GetSelectedEntryPos(); if (nSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -595,7 +595,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox) // renew types in SelectionBox void SwFieldVarPage::UpdateSubType() { - SetSelectionSel(m_pSelectionLB->GetSelectEntryPos()); + SetSelectionSel(m_pSelectionLB->GetSelectedEntryPos()); OUString sOldSel; if (GetSelectionSel() != LISTBOX_ENTRY_NOTFOUND) @@ -703,13 +703,13 @@ void SwFieldVarPage::UpdateSubType() void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId) { OUString sOldSel; - const sal_Int32 nFormatSel = m_pFormatLB->GetSelectEntryPos(); + const sal_Int32 nFormatSel = m_pFormatLB->GetSelectedEntryPos(); if (nFormatSel != LISTBOX_ENTRY_NOTFOUND) sOldSel = m_pFormatLB->GetEntry(nFormatSel); OUString sOldNumSel; sal_uLong nOldNumFormat = 0; - sal_Int32 nNumFormatSel = m_pNumFormatLB->GetSelectEntryPos(); + sal_Int32 nNumFormatSel = m_pNumFormatLB->GetSelectedEntryPos(); if (nNumFormatSel != LISTBOX_ENTRY_NOTFOUND) { sOldNumSel = m_pNumFormatLB->GetEntry(nNumFormatSel); @@ -994,7 +994,7 @@ IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) OUString sName(m_pNameED->GetText()), sValue(m_pValueED->GetText()); SwFieldType* pType = nullptr; SwFieldIds nId = SwFieldIds::Database; - sal_Int32 nNumFormatPos = m_pNumFormatLB->GetSelectEntryPos(); + sal_Int32 nNumFormatPos = m_pNumFormatLB->GetSelectedEntryPos(); switch (nTypeId) { @@ -1004,7 +1004,7 @@ IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) } pType = GetFieldMgr().GetFieldType(nId, sName); - sal_uLong nFormat = m_pFormatLB->GetSelectEntryPos(); + sal_uLong nFormat = m_pFormatLB->GetSelectedEntryPos(); if (nFormat != LISTBOX_ENTRY_NOTFOUND) nFormat = reinterpret_cast<sal_uLong>(m_pFormatLB->GetEntryData((sal_Int32)nFormat)); @@ -1098,7 +1098,7 @@ IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void ) IMPL_LINK_NOARG(SwFieldVarPage, ChapterHdl, ListBox&, void) { - bool bEnable = m_pChapterLevelLB->GetSelectEntryPos() != 0; + bool bEnable = m_pChapterLevelLB->GetSelectedEntryPos() != 0; m_pSeparatorED->Enable(bEnable); m_pSeparatorFT->Enable(bEnable); @@ -1108,7 +1108,7 @@ IMPL_LINK_NOARG(SwFieldVarPage, ChapterHdl, ListBox&, void) IMPL_LINK_NOARG(SwFieldVarPage, SeparatorHdl, Edit&, void) { bool bEnable = !m_pSeparatorED->GetText().isEmpty() || - m_pChapterLevelLB->GetSelectEntryPos() == 0; + m_pChapterLevelLB->GetSelectedEntryPos() == 0; EnableInsert(bEnable); } @@ -1119,7 +1119,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* ) OUString aVal(m_pValueED->GetText()); OUString aName(m_pNameED->GetText()); - const sal_Int32 nSubPos = m_pSelectionLB->GetSelectEntryPos(); + const sal_Int32 nSubPos = m_pSelectionLB->GetSelectedEntryPos(); sal_uInt16 nSubType = (nSubPos == LISTBOX_ENTRY_NOTFOUND) ? 0 : (sal_uInt16)reinterpret_cast<sal_uLong>(m_pSelectionLB->GetEntryData(nSubPos)); @@ -1127,7 +1127,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* ) if (!m_pNumFormatLB->IsVisible()) { - sal_Int32 nFormatPos = m_pFormatLB->GetSelectEntryPos(); + sal_Int32 nFormatPos = m_pFormatLB->GetSelectedEntryPos(); if(nFormatPos == LISTBOX_ENTRY_NOTFOUND) nFormat = 0; @@ -1203,7 +1203,7 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* ) } case TYP_SEQFLD: { - nSubType = static_cast< sal_uInt16 >(m_pChapterLevelLB->GetSelectEntryPos()); + nSubType = static_cast< sal_uInt16 >(m_pChapterLevelLB->GetSelectedEntryPos()); if (nSubType == 0) nSubType = 0x7f; else @@ -1300,7 +1300,7 @@ void SwFieldVarPage::FillUserData() { OUString sData(USER_DATA_VERSION); sData += ";"; - sal_Int32 nTypeSel = m_pTypeLB->GetSelectEntryPos(); + sal_Int32 nTypeSel = m_pTypeLB->GetSelectedEntryPos(); if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) nTypeSel = USHRT_MAX; else diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 3e46fb47b272..c44835795009 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -650,7 +650,7 @@ bool SwColumnPage::FillItemSet(SfxItemSet *rSet) } if( m_pTextDirectionLB->IsVisible()) { - const sal_Int32 nPos = m_pTextDirectionLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pTextDirectionLB->GetSelectedEntryPos(); if ( m_pTextDirectionLB->IsValueChangedFromSaved() ) { SvxFrameDirection eDirection = static_cast<SvxFrameDirection>( @@ -736,7 +736,7 @@ IMPL_LINK_NOARG( SwColumnPage, UpdateColMgr, Edit&, void ) nLineWidth, m_pLineColorDLB->GetSelectEntryColor() ); m_pColMgr->SetAdjust( SwColLineAdj( - m_pLinePosDLB->GetSelectEntryPos() + 1) ); + m_pLinePosDLB->GetSelectedEntryPos() + 1) ); m_pColMgr->SetLineHeightPercent((short)m_pLineHeightEdit->GetValue()); bEnable = m_pColMgr->GetLineHeightPercent() != 100; } @@ -841,7 +841,7 @@ void SwColumnPage::Init() bool SwColumnPage::isLineNotNone() const { // nothing is turned off - const sal_Int32 nPos = m_pLineTypeDLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLineTypeDLB->GetSelectedEntryPos(); return nPos != LISTBOX_ENTRY_NOTFOUND && nPos != 0; } diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index dcead58ebc91..5470fb7bfcaa 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -73,7 +73,7 @@ public: void SetApplyBorderAndShadow( bool bSet ) { m_pApplyBorderAndShadowCB->Check(bSet); } //#i61007# order of captions - bool IsOrderNumberingFirst() const {return m_pLbCaptionOrder->GetSelectEntryPos() == 1;} + bool IsOrderNumberingFirst() const {return m_pLbCaptionOrder->GetSelectedEntryPos() == 1;} void SetOrderNumberingFirst(bool bSet) { m_pLbCaptionOrder->SelectEntryPos( bSet ? 1 : 0 ); } void SetCharacterStyle(const OUString& rStyle); @@ -269,7 +269,7 @@ void SwCaptionDialog::Apply() aOpt.SetNumType( (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pFormatBox->GetSelectEntryData()) ); aOpt.SetSeparator( m_pSepEdit->IsEnabled() ? m_pSepEdit->GetText() : OUString() ); aOpt.SetCaption( m_pTextEdit->GetText() ); - aOpt.SetPos( m_pPosBox->GetSelectEntryPos() ); + aOpt.SetPos( m_pPosBox->GetSelectedEntryPos() ); aOpt.IgnoreSeqOpts() = true; aOpt.CopyAttributes() = bCopyAttributes; aOpt.SetCharacterStyle( sCharacterStyle ); @@ -486,7 +486,7 @@ void SwSequenceOptionDialog::Apply() SwSetExpFieldType* pFieldType = static_cast<SwSetExpFieldType*>(rSh.GetFieldType( SwFieldIds::SetExp, aFieldTypeName )); - sal_Int8 nLvl = (sal_Int8)( m_pLbLevel->GetSelectEntryPos() - 1); + sal_Int8 nLvl = (sal_Int8)( m_pLbLevel->GetSelectedEntryPos() - 1); sal_Unicode cDelim = m_pEdDelim->GetText()[0]; bool bUpdate = true; @@ -512,7 +512,7 @@ void SwSequenceOptionDialog::Apply() OUString SwSequenceOptionDialog::GetCharacterStyle() const { - if(m_pLbCharStyle->GetSelectEntryPos()) + if(m_pLbCharStyle->GetSelectedEntryPos()) return m_pLbCharStyle->GetSelectedEntry(); return OUString(); } diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index ab0b5340a2b2..6447156f4689 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1174,7 +1174,7 @@ bool SwFramePage::FillItemSet(SfxItemSet *rSet) const SwFormatFrameSize& rOldSize = static_cast<const SwFormatFrameSize& >(rOldSet.Get(RES_FRM_SIZE)); SwFormatFrameSize aSz( rOldSize ); - sal_Int32 nRelWidthRelation = m_pRelWidthRelationLB->GetSelectEntryPos(); + sal_Int32 nRelWidthRelation = m_pRelWidthRelationLB->GetSelectedEntryPos(); if (nRelWidthRelation != LISTBOX_ENTRY_NOTFOUND) { if (nRelWidthRelation == 0) @@ -1182,7 +1182,7 @@ bool SwFramePage::FillItemSet(SfxItemSet *rSet) else if (nRelWidthRelation == 1) aSz.SetWidthPercentRelation(text::RelOrientation::PAGE_FRAME); } - sal_Int32 nRelHeightRelation = m_pRelHeightRelationLB->GetSelectEntryPos(); + sal_Int32 nRelHeightRelation = m_pRelHeightRelationLB->GetSelectedEntryPos(); if (nRelHeightRelation != LISTBOX_ENTRY_NOTFOUND) { if (nRelHeightRelation == 0) @@ -1271,22 +1271,22 @@ void SwFramePage::InitPos(RndStdIds eId, long nX, long nY) { - sal_Int32 nPos = m_pVerticalDLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pVerticalDLB->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && m_pVMap ) { m_nOldV = m_pVMap[nPos].nAlign; - nPos = m_pVertRelationLB->GetSelectEntryPos(); + nPos = m_pVertRelationLB->GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) m_nOldVRel = static_cast<RelationMap *>(m_pVertRelationLB->GetEntryData(nPos))->nRelation; } - nPos = m_pHorizontalDLB->GetSelectEntryPos(); + nPos = m_pHorizontalDLB->GetSelectedEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && m_pHMap ) { m_nOldH = m_pHMap[nPos].nAlign; - nPos = m_pHoriRelationLB->GetSelectEntryPos(); + nPos = m_pHoriRelationLB->GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) m_nOldHRel = static_cast<RelationMap *>(m_pHoriRelationLB->GetEntryData(nPos))->nRelation; } @@ -1630,7 +1630,7 @@ void SwFramePage::FillRelLB( const FrameMap* _pMap, sal_Int16 SwFramePage::GetRelation(ListBox const &rRelationLB) { - const sal_Int32 nPos = rRelationLB.GetSelectEntryPos(); + const sal_Int32 nPos = rRelationLB.GetSelectedEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND) { @@ -1657,7 +1657,7 @@ sal_Int16 SwFramePage::GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, if ( pMap != aVAsCharHtmlMap && pMap != aVAsCharMap && pMap != aVCharMap ) return pMap[nMapPos].nAlign; - if (rRelationLB.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND) + if (rRelationLB.GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND) return 0; const RelationMap *const pRelationMap = static_cast<const RelationMap *>( @@ -1677,7 +1677,7 @@ sal_Int16 SwFramePage::GetAlignment(FrameMap *pMap, sal_Int32 nMapPos, sal_Int32 SwFramePage::GetMapPos( const FrameMap *pMap, ListBox const &rAlignLB ) { sal_Int32 nMapPos = 0; - sal_Int32 nLBSelPos = rAlignLB.GetSelectEntryPos(); + sal_Int32 nLBSelPos = rAlignLB.GetSelectedEntryPos(); if (nLBSelPos != LISTBOX_ENTRY_NOTFOUND) { @@ -1978,7 +1978,7 @@ IMPL_LINK( SwFramePage, 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); @@ -2002,7 +2002,7 @@ IMPL_LINK( SwFramePage, PosHdl, ListBox&, rLB, void ) // right is allowed only above - from the left only above // from the left at character -> below if((text::HoriOrientation::LEFT == nAlign || text::HoriOrientation::RIGHT == nAlign) && - 0 == m_pVerticalDLB->GetSelectEntryPos()) + 0 == m_pVerticalDLB->GetSelectedEntryPos()) { if(text::RelOrientation::FRAME == nRel) m_pVerticalDLB->SelectEntryPos(1); @@ -2010,12 +2010,12 @@ IMPL_LINK( SwFramePage, PosHdl, ListBox&, rLB, void ) m_pVerticalDLB->SelectEntryPos(0); bSet = true; } - else if(text::HoriOrientation::LEFT == nAlign && 1 == m_pVerticalDLB->GetSelectEntryPos()) + else if(text::HoriOrientation::LEFT == nAlign && 1 == m_pVerticalDLB->GetSelectedEntryPos()) { m_pVerticalDLB->SelectEntryPos(0); bSet = true; } - else if(text::HoriOrientation::NONE == nAlign && 1 == m_pVerticalDLB->GetSelectEntryPos()) + else if(text::HoriOrientation::NONE == nAlign && 1 == m_pVerticalDLB->GetSelectedEntryPos()) { m_pVerticalDLB->SelectEntryPos(0); bSet = true; @@ -2027,7 +2027,7 @@ IMPL_LINK( SwFramePage, PosHdl, ListBox&, rLB, void ) { if(text::VertOrientation::TOP == nAlign) { - if(1 == m_pHorizontalDLB->GetSelectEntryPos()) + if(1 == m_pHorizontalDLB->GetSelectedEntryPos()) { m_pHorizontalDLB->SelectEntryPos(0); bSet = true; @@ -2036,7 +2036,7 @@ IMPL_LINK( SwFramePage, PosHdl, ListBox&, rLB, void ) } else if(text::VertOrientation::CHAR_BOTTOM == nAlign) { - if(2 == m_pHorizontalDLB->GetSelectEntryPos()) + if(2 == m_pHorizontalDLB->GetSelectedEntryPos()) { m_pHorizontalDLB->SelectEntryPos(0); bSet = true; @@ -2067,11 +2067,11 @@ IMPL_LINK( SwFramePage, RelHdl, ListBox&, rLB, void ) if(bHori) { const sal_Int16 nRel = GetRelation(*m_pHoriRelationLB); - if(text::RelOrientation::PRINT_AREA == nRel && 0 == m_pVerticalDLB->GetSelectEntryPos()) + if(text::RelOrientation::PRINT_AREA == nRel && 0 == m_pVerticalDLB->GetSelectedEntryPos()) { m_pVerticalDLB->SelectEntryPos(1); } - else if(text::RelOrientation::CHAR == nRel && 1 == m_pVerticalDLB->GetSelectEntryPos()) + else if(text::RelOrientation::CHAR == nRel && 1 == m_pVerticalDLB->GetSelectedEntryPos()) { m_pVerticalDLB->SelectEntryPos(0); } @@ -2123,7 +2123,7 @@ IMPL_LINK( SwFramePage, ModifyHdl, Edit&, rEdit, void ) void SwFramePage::UpdateExample() { - sal_Int32 nPos = m_pHorizontalDLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pHorizontalDLB->GetSelectedEntryPos(); if ( m_pHMap && nPos != LISTBOX_ENTRY_NOTFOUND ) { const sal_Int32 nMapPos = GetMapPos(m_pHMap, *m_pHorizontalDLB); @@ -2131,7 +2131,7 @@ void SwFramePage::UpdateExample() m_pExampleWN->SetHoriRel(GetRelation(*m_pHoriRelationLB)); } - nPos = m_pVerticalDLB->GetSelectEntryPos(); + nPos = m_pVerticalDLB->GetSelectedEntryPos(); if ( m_pVMap && nPos != LISTBOX_ENTRY_NOTFOUND ) { const sal_Int32 nMapPos = GetMapPos(m_pVMap, *m_pVerticalDLB); @@ -3147,7 +3147,7 @@ bool SwFrameAddPage::FillItemSet(SfxItemSet *rSet) // textflow if( m_pTextFlowLB->IsVisible() ) { - sal_Int32 nPos = m_pTextFlowLB->GetSelectEntryPos(); + sal_Int32 nPos = m_pTextFlowLB->GetSelectedEntryPos(); if( m_pTextFlowLB->IsValueChangedFromSaved() ) { SvxFrameDirection eDirection = static_cast<SvxFrameDirection>( @@ -3161,9 +3161,9 @@ bool SwFrameAddPage::FillItemSet(SfxItemSet *rSet) if (pFormat) { OUString sCurrentPrevChain, sCurrentNextChain; - if(m_pPrevLB->GetSelectEntryPos()) + if(m_pPrevLB->GetSelectedEntryPos()) sCurrentPrevChain = m_pPrevLB->GetSelectedEntry(); - if(m_pNextLB->GetSelectEntryPos()) + if(m_pNextLB->GetSelectedEntryPos()) sCurrentNextChain = m_pNextLB->GetSelectedEntry(); const SwFormatChain &rChain = pFormat->GetChain(); const SwFlyFrameFormat* pFlyFormat; @@ -3183,7 +3183,7 @@ bool SwFrameAddPage::FillItemSet(SfxItemSet *rSet) if(m_pVertAlignLB->IsValueChangedFromSaved()) { SdrTextVertAdjust nAdjust; - switch(m_pVertAlignLB->GetSelectEntryPos()) + switch(m_pVertAlignLB->GetSelectedEntryPos()) { default: case 0 : nAdjust = SDRTEXTVERTADJUST_TOP; break; @@ -3215,9 +3215,9 @@ void SwFrameAddPage::SetFormatUsed(bool bFormatUsed) IMPL_LINK(SwFrameAddPage, ChainModifyHdl, ListBox&, rBox, void) { OUString sCurrentPrevChain, sCurrentNextChain; - if(m_pPrevLB->GetSelectEntryPos()) + if(m_pPrevLB->GetSelectedEntryPos()) sCurrentPrevChain = m_pPrevLB->GetSelectedEntry(); - if(m_pNextLB->GetSelectEntryPos()) + if(m_pNextLB->GetSelectedEntryPos()) sCurrentNextChain = m_pNextLB->GetSelectedEntry(); SwFrameFormat* pFormat = m_pWrtSh->GetFlyFrameFormat(); if (pFormat) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 56e02a7fa898..778824461355 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1140,7 +1140,7 @@ void SwTOXSelectTabPage::FillTOXDescription() CurTOXType aCurType = pTOXDlg->GetCurrentTOXType(); SwTOXDescription& rDesc = pTOXDlg->GetTOXDescription(aCurType); rDesc.SetTitle(m_pTitleED->GetText()); - rDesc.SetFromChapter(1 == m_pAreaLB->GetSelectEntryPos()); + rDesc.SetFromChapter(1 == m_pAreaLB->GetSelectedEntryPos()); SwTOXElement nContentOptions = SwTOXElement::NONE; if(m_pTOXMarksCB->IsVisible() && m_pTOXMarksCB->IsChecked()) nContentOptions |= SwTOXElement::Mark; @@ -1192,7 +1192,7 @@ void SwTOXSelectTabPage::FillTOXDescription() case TOX_TABLES : rDesc.SetCreateFromObjectNames(m_pFromObjectNamesRB->IsChecked()); rDesc.SetSequenceName(m_pCaptionSequenceLB->GetSelectedEntry()); - rDesc.SetCaptionDisplay((SwCaptionDisplay)m_pDisplayTypeLB->GetSelectEntryPos()); + rDesc.SetCaptionDisplay((SwCaptionDisplay)m_pDisplayTypeLB->GetSelectedEntryPos()); break; case TOX_OBJECTS: { @@ -1211,7 +1211,7 @@ void SwTOXSelectTabPage::FillTOXDescription() case TOX_AUTHORITIES: case TOX_BIBLIOGRAPHY : { - if(m_pBracketLB->GetSelectEntryPos()) + if(m_pBracketLB->GetSelectedEntryPos()) rDesc.SetAuthBrackets(m_pBracketLB->GetSelectedEntry()); else rDesc.SetAuthBrackets(aEmptyOUStr); @@ -1460,7 +1460,7 @@ void SwTOXSelectTabPage::LanguageHdl( ListBox const * pBox ) m_pSortAlgorithmLB->SelectEntryPos( nInsPos ); } - if( LISTBOX_ENTRY_NOTFOUND == m_pSortAlgorithmLB->GetSelectEntryPos() ) + if( LISTBOX_ENTRY_NOTFOUND == m_pSortAlgorithmLB->GetSelectedEntryPos() ) m_pSortAlgorithmLB->SelectEntryPos( 0 ); if(pBox) @@ -2248,7 +2248,7 @@ VclPtr<SfxTabPage> SwTOXEntryTabPage::Create( vcl::Window* pParent, const Sf IMPL_LINK_NOARG(SwTOXEntryTabPage, EditStyleHdl, Button*, void) { - if( LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectEntryPos()) + if( LISTBOX_ENTRY_NOTFOUND != m_pCharStyleLB->GetSelectedEntryPos()) { SfxStringItem aStyle(SID_STYLE_EDIT, m_pCharStyleLB->GetSelectedEntry()); SfxUInt16Item aFamily(SID_STYLE_FAMILY, (sal_uInt16)SfxStyleFamily::Char); @@ -2264,7 +2264,7 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, Button*, pButton, void) bool bInsert = pButton == m_pAuthInsertPB; if(bInsert) { - sal_Int32 nSelPos = m_pAuthFieldsLB->GetSelectEntryPos(); + sal_Int32 nSelPos = m_pAuthFieldsLB->GetSelectedEntryPos(); const OUString sToInsert(m_pAuthFieldsLB->GetSelectedEntry()); SwFormToken aInsert(TOKEN_AUTHORITY); aInsert.nAuthorityField = (sal_uInt16)reinterpret_cast<sal_uIntPtr>(m_pAuthFieldsLB->GetEntryData(nSelPos)); @@ -2585,7 +2585,7 @@ IMPL_LINK(SwTOXEntryTabPage, StyleSelectHdl, ListBox&, rBox, void) IMPL_LINK(SwTOXEntryTabPage, ChapterInfoHdl, ListBox&, rBox, void) { - sal_Int32 nPos = rBox.GetSelectEntryPos(); + sal_Int32 nPos = rBox.GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) { Control* pCtrl = m_pTokenWIN->GetActiveControl(); @@ -2611,7 +2611,7 @@ IMPL_LINK(SwTOXEntryTabPage, ChapterInfoOutlineHdl, Edit&, rEdit, void) IMPL_LINK(SwTOXEntryTabPage, NumberFormatHdl, ListBox&, rBox, void) { - const sal_Int32 nPos = rBox.GetSelectEntryPos(); + const sal_Int32 nPos = rBox.GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) { @@ -3776,7 +3776,7 @@ VclPtr<SfxTabPage> SwTOXStylesTabPage::Create( vcl::Window* pParent, IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, Button *, void) { - if( LISTBOX_ENTRY_NOTFOUND != m_pParaLayLB->GetSelectEntryPos()) + if( LISTBOX_ENTRY_NOTFOUND != m_pParaLayLB->GetSelectedEntryPos()) { SfxStringItem aStyle(SID_STYLE_EDIT, m_pParaLayLB->GetSelectedEntry()); SfxUInt16Item aFamily(SID_STYLE_FAMILY, (sal_uInt16)SfxStyleFamily::Para); @@ -3790,8 +3790,8 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, Button *, void) // allocate templates IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl, Button*, void) { - sal_Int32 nLevPos = m_pLevelLB->GetSelectEntryPos(); - sal_Int32 nTemplPos = m_pParaLayLB->GetSelectEntryPos(); + sal_Int32 nLevPos = m_pLevelLB->GetSelectedEntryPos(); + sal_Int32 nTemplPos = m_pParaLayLB->GetSelectedEntryPos(); if(nLevPos != LISTBOX_ENTRY_NOTFOUND && nTemplPos != LISTBOX_ENTRY_NOTFOUND) { @@ -3811,7 +3811,7 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, AssignHdl, Button*, void) IMPL_LINK_NOARG(SwTOXStylesTabPage, StdHdl, Button*, void) { - const sal_Int32 nPos = m_pLevelLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pLevelLB->GetSelectedEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) { const OUString aStr(m_pLevelLB->GetEntry(nPos).getToken(0, aDeliStart)); @@ -3828,22 +3828,22 @@ IMPL_LINK_NOARG(SwTOXStylesTabPage, DoubleClickHdl, ListBox&, void) const OUString aTmpName( m_pParaLayLB->GetSelectedEntry() ); SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(); - if(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND && - (m_pLevelLB->GetSelectEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName))) + if(m_pParaLayLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND && + (m_pLevelLB->GetSelectedEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName))) AssignHdl(m_pAssignBT); } // enable only when selected IMPL_LINK_NOARG(SwTOXStylesTabPage, EnableSelectHdl, ListBox&, void) { - m_pStdBT->Enable(m_pLevelLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND); + m_pStdBT->Enable(m_pLevelLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND); SwWrtShell& rSh = static_cast<SwMultiTOXTabDialog*>(GetTabDialog())->GetWrtShell(); const OUString aTmpName(m_pParaLayLB->GetSelectedEntry()); - m_pAssignBT->Enable(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND && - LISTBOX_ENTRY_NOTFOUND != m_pLevelLB->GetSelectEntryPos() && - (m_pLevelLB->GetSelectEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName))); - m_pEditStyleBT->Enable(m_pParaLayLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); + m_pAssignBT->Enable(m_pParaLayLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND && + LISTBOX_ENTRY_NOTFOUND != m_pLevelLB->GetSelectedEntryPos() && + (m_pLevelLB->GetSelectedEntryPos() == 0 || SwMultiTOXTabDialog::IsNoNum(rSh, aTmpName))); + m_pEditStyleBT->Enable(m_pParaLayLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND ); } void SwTOXStylesTabPage::Modify() diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 239a345c6deb..c53f6aa1702b 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -45,10 +45,10 @@ SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr) IMPL_LINK( SwMultiTOXMarkDlg, SelectHdl, ListBox&, rBox, void ) { - if(rBox.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND) - { SwTOXMark* pMark = rMgr.GetTOXMark(rBox.GetSelectEntryPos()); + if(rBox.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND) + { SwTOXMark* pMark = rMgr.GetTOXMark(rBox.GetSelectedEntryPos()); m_pTextFT->SetText(pMark->GetTOXType()->GetTypeName()); - nPos = rBox.GetSelectEntryPos(); + nPos = rBox.GetSelectedEntryPos(); } } diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 958e28055ecd..aed8a53195ec 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -1593,7 +1593,7 @@ OUString SwCreateAuthEntryDlg_Impl::GetEntryText(ToxAuthorityField eField) cons if( AUTH_FIELD_AUTHORITY_TYPE == eField ) { OSL_ENSURE(pTypeListBox, "No ListBox"); - return OUString::number(pTypeListBox->GetSelectEntryPos()); + return OUString::number(pTypeListBox->GetSelectedEntryPos()); } if( AUTH_FIELD_IDENTIFIER == eField && !m_bNewEntryMode) diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index ebe8748c8def..97a123b4dc96 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -271,7 +271,7 @@ void SwEndNoteOptionPage::SelectNumbering(SwFootnoteNum const eNum) SwFootnoteNum SwEndNoteOptionPage::GetNumbering() const { - const sal_Int32 nPos = m_pNumCountBox->GetSelectEntryPos(); + const sal_Int32 nPos = m_pNumCountBox->GetSelectedEntryPos(); return static_cast<SwFootnoteNum>((bPosDoc) ? nPos + 2 : nPos); } @@ -307,7 +307,7 @@ IMPL_LINK_NOARG(SwEndNoteOptionPage, PosPageHdl, Button*, void) IMPL_LINK_NOARG(SwEndNoteOptionPage, NumCountHdl, ListBox&, void) { bool bEnable = true; - if( m_pNumCountBox->GetEntryCount() - 1 != m_pNumCountBox->GetSelectEntryPos() ) + if( m_pNumCountBox->GetEntryCount() - 1 != m_pNumCountBox->GetSelectedEntryPos() ) { bEnable = false; m_pOffsetField->SetValue(1); @@ -370,7 +370,7 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) m_pFootnoteCharAnchorTemplBox->GetSelectedEntry() ) ); // paragraph template - sal_Int32 nPos = m_pParaTemplBox->GetSelectEntryPos(); + sal_Int32 nPos = m_pParaTemplBox->GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) { const OUString aFormatName( m_pParaTemplBox->GetSelectedEntry() ); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index de294a1e90c7..bfd8ac5a9b6f 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -217,7 +217,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl, Button*, void) { OUString sGroup = m_pNameED->GetText() + OUStringLiteral1(GLOS_DELIM) - + OUString::number(m_pPathLB->GetSelectEntryPos()); + + OUString::number(m_pPathLB->GetSelectedEntryPos()); OSL_ENSURE(!pGlosHdl->FindGroupName(sGroup), "group already available!"); m_InsertedArr.push_back(sGroup); const OUString sTemp(m_pNameED->GetText() + "\t" + m_pPathLB->GetSelectedEntry()); @@ -290,7 +290,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl, Button*, void) const OUString sNewTitle(m_pNameED->GetText()); OUString sNewName = sNewTitle + OUStringLiteral1(GLOS_DELIM) - + OUString::number(m_pPathLB->GetSelectEntryPos()); + + OUString::number(m_pPathLB->GetSelectedEntryPos()); OSL_ENSURE(!pGlosHdl->FindGroupName(sNewName), "group already available!"); // if the name to be renamed is among the new ones - replace diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx index 90b1c529c35b..7da52e4b8172 100644 --- a/sw/source/ui/misc/linenum.cxx +++ b/sw/source/ui/misc/linenum.cxx @@ -219,7 +219,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, OKHdl, Button*, void) aInf.SetNumType(aType); // position - aInf.SetPos((LineNumberPosition)m_pPosLB->GetSelectEntryPos()); + aInf.SetPos((LineNumberPosition)m_pPosLB->GetSelectedEntryPos()); // offset aInf.SetPosFromLeft((sal_uInt16)m_pOffsetMF->Denormalize(m_pOffsetMF->GetValue(FUNIT_TWIP))); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index c2349a5d660b..940ad4cde4e9 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -596,8 +596,8 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, EditModifyHdl, ListBox&, void) SwNumFormat aNumFormat(pActNum->Get(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; @@ -762,7 +762,7 @@ IMPL_LINK_NOARG(SwNumPositionTabPage, 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/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 3efaf233abdf..11ec095da04e 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -73,7 +73,7 @@ public: virtual void dispose() override; void SetUserNames(const OUString *pList[]); OUString GetName() const { return m_pFormEdit->GetText(); } - sal_Int32 GetCurEntryPos() const { return m_pFormBox->GetSelectEntryPos(); } + sal_Int32 GetCurEntryPos() const { return m_pFormBox->GetSelectedEntryPos(); } }; SwNumNamesDlg::~SwNumNamesDlg() diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 6cc57d017542..a05ee2b06086 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -266,7 +266,7 @@ bool SwFootNotePage::FillItemSet(SfxItemSet *rSet) rFootnoteInfo.SetLineColor( m_pLineColorBox->GetSelectEntryColor() ); // Position - rFootnoteInfo.SetAdj((css::text::HorizontalAdjust)m_pLinePosBox->GetSelectEntryPos()); + rFootnoteInfo.SetAdj((css::text::HorizontalAdjust)m_pLinePosBox->GetSelectedEntryPos()); // Width rFootnoteInfo.SetWidth(Fraction( static_cast< long >(m_pLineLengthEdit->GetValue()), 100)); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 0087e359fcd6..d293aabb1252 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -295,9 +295,9 @@ void SwSortDlg::Apply() nCol2 = (sal_uInt16)m_pColEdt2->GetValue(); nCol3 = (sal_uInt16)m_pColEdt3->GetValue(); - nType1 = m_pTypDLB1->GetSelectEntryPos(); - nType2 = m_pTypDLB2->GetSelectEntryPos(); - nType3 = m_pTypDLB3->GetSelectEntryPos(); + nType1 = m_pTypDLB1->GetSelectedEntryPos(); + nType2 = m_pTypDLB2->GetSelectedEntryPos(); + nType3 = m_pTypDLB3->GetSelectedEntryPos(); bAsc1 = m_pSortUp1RB->IsChecked(); bAsc2 = m_pSortUp2RB->IsChecked(); @@ -474,7 +474,7 @@ void SwSortDlg::LanguageHdl(ListBox const * pLBox) ListBox* pL = aLstArr[ n ]; if( !pLBox ) pL->SelectEntryPos( *aTypeArr[n] ); - else if( LISTBOX_ENTRY_NOTFOUND == pL->GetSelectEntryPos() ) + else if( LISTBOX_ENTRY_NOTFOUND == pL->GetSelectedEntryPos() ) pL->SelectEntryPos( 0 ); } } diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 2a5214c82a37..0516b65be652 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -417,7 +417,7 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet ) if( m_pTextDirectionLB->IsVisible() ) { - const sal_Int32 nPos = m_pTextDirectionLB->GetSelectEntryPos(); + const sal_Int32 nPos = m_pTextDirectionLB->GetSelectedEntryPos(); if ( m_pTextDirectionLB->IsValueChangedFromSaved() ) { SvxFrameDirection nDirection = static_cast<SvxFrameDirection>( @@ -1417,7 +1417,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet ) if(m_pVertOrientLB->IsValueChangedFromSaved()) { sal_uInt16 nOrient = USHRT_MAX; - switch(m_pVertOrientLB->GetSelectEntryPos()) + switch(m_pVertOrientLB->GetSelectedEntryPos()) { case 0 : nOrient = text::VertOrientation::NONE; break; case 1 : nOrient = text::VertOrientation::CENTER; break; diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx index 82476761d9c5..b4262c440982 100644 --- a/sw/source/ui/table/tautofmt.cxx +++ b/sw/source/ui/table/tautofmt.cxx @@ -469,7 +469,7 @@ IMPL_LINK_NOARG(SwAutoFormatDlg, RenameHdl, Button*, void) IMPL_LINK_NOARG(SwAutoFormatDlg, SelFormatHdl, ListBox&, void) { bool bBtnEnable = false; - sal_uInt8 nSelPos = (sal_uInt8) m_pLbFormat->GetSelectEntryPos(), nOldIdx = nIndex; + sal_uInt8 nSelPos = (sal_uInt8) m_pLbFormat->GetSelectedEntryPos(), nOldIdx = nIndex; if( nSelPos >= nDfltStylePos ) { nIndex = nSelPos - nDfltStylePos; diff --git a/sw/source/uibase/inc/selglos.hxx b/sw/source/uibase/inc/selglos.hxx index 0fa5e8a6b058..20d8eef9ec76 100644 --- a/sw/source/uibase/inc/selglos.hxx +++ b/sw/source/uibase/inc/selglos.hxx @@ -44,7 +44,7 @@ public: } sal_Int32 GetSelectedIdx() const { - return m_pGlosBox->GetSelectEntryPos(); + return m_pGlosBox->GetSelectedEntryPos(); } void SelectEntryPos(sal_Int32 nIdx) { diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 425fc75b3823..8b69df017eef 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -167,7 +167,7 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) SvxNumType SwNumberingTypeListBox::GetSelectedNumberingType() { SvxNumType nRet = SVX_NUM_CHARS_UPPER_LETTER; - sal_Int32 nSelPos = GetSelectEntryPos(); + sal_Int32 nSelPos = GetSelectedEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nSelPos) nRet = (SvxNumType)reinterpret_cast<sal_uLong>(GetEntryData(nSelPos)); #if OSL_DEBUG_LEVEL > 0 diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 1e90edefb888..45563df56b18 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -750,7 +750,7 @@ void NavElementBox_Impl::Select() if ( !IsTravelSelect() ) { - sal_uInt16 nPos = GetSelectEntryPos(); + sal_uInt16 nPos = GetSelectedEntryPos(); // adjust array index for Ids after NID_PREV in aNavigationInsertIds if ( nPos >= NID_COUNT/2 - 1 ) ++nPos; diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx index 221eefcadb61..a2437cc0eb6c 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.cxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx @@ -247,7 +247,7 @@ IMPL_LINK_NOARG( PageFooterPanel, FooterSpacingHdl, ListBox&, void ) } IMPL_LINK_NOARG( PageFooterPanel, FooterLayoutHdl, ListBox&, void ) { - sal_uInt16 nVal = mpFooterLayoutLB->GetSelectEntryPos(); + sal_uInt16 nVal = mpFooterLayoutLB->GetSelectedEntryPos(); mpFooterLayoutItem->SetValue(nVal); GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_FOOTER_LAYOUT, SfxCallMode::RECORD, { mpFooterLayoutItem.get() } ); diff --git a/sw/source/uibase/sidebar/PageFormatPanel.cxx b/sw/source/uibase/sidebar/PageFormatPanel.cxx index e94c03fad98c..4823efb4fee1 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.cxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.cxx @@ -154,7 +154,7 @@ void PageFormatPanel::NotifyItemUpdate( mpPaperWidth->SetValue( mpPaperWidth->Normalize( aPaperSize.Width() ), FUNIT_TWIP ); mpPaperHeight->SetValue( mpPaperHeight->Normalize( aPaperSize.Height() ), FUNIT_TWIP ); - if(mpPaperOrientation->GetSelectEntryPos() == 1) + if(mpPaperOrientation->GetSelectedEntryPos() == 1) Swap(aPaperSize); Paper ePaper = SvxPaperInfo::GetSvxPaper(aPaperSize, meUnit,true); @@ -217,10 +217,10 @@ IMPL_LINK_NOARG(PageFormatPanel, PaperFormatModifyHdl, ListBox&, void) Paper ePaper = mpPaperSizeBox->GetSelection(); Size aSize(SvxPaperInfo::GetPaperSize(ePaper, meUnit)); - if(mpPaperOrientation->GetSelectEntryPos() == 1) + if(mpPaperOrientation->GetSelectedEntryPos() == 1) Swap(aSize); - mpPageItem->SetLandscape(mpPaperOrientation->GetSelectEntryPos() == 1); + mpPageItem->SetLandscape(mpPaperOrientation->GetSelectedEntryPos() == 1); SvxSizeItem aSizeItem(SID_ATTR_PAGE_SIZE, aSize); mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_SIZE, SfxCallMode::RECORD, { &aSizeItem, mpPageItem.get() }); } @@ -236,7 +236,7 @@ IMPL_LINK_NOARG(PageFormatPanel, PaperModifyMarginHdl, ListBox&, void) { bool bMirrored = false; bool bApplyNewPageMargins = true; - switch ( mpMarginSelectBox->GetSelectEntryPos() ) + switch ( mpMarginSelectBox->GetSelectedEntryPos() ) { case 0: SetNone(mnPageLeftMargin, mnPageRightMargin, mnPageTopMargin, mnPageBottomMargin, bMirrored); diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx index af19cf1d1df6..251e369764fb 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx @@ -249,7 +249,7 @@ IMPL_LINK_NOARG( PageHeaderPanel, HeaderSpacingHdl, ListBox&, void ) } IMPL_LINK_NOARG( PageHeaderPanel, HeaderLayoutHdl, ListBox&, void ) { - sal_uInt16 nVal = mpHeaderLayoutLB->GetSelectEntryPos(); + sal_uInt16 nVal = mpHeaderLayoutLB->GetSelectedEntryPos(); mpHeaderLayoutItem->SetValue(nVal); GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_HEADER_LAYOUT, SfxCallMode::RECORD, { mpHeaderLayoutItem.get() } ); diff --git a/sw/source/uibase/sidebar/PageStylesPanel.cxx b/sw/source/uibase/sidebar/PageStylesPanel.cxx index 9edc8044612a..65a67c2a038d 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.cxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.cxx @@ -168,7 +168,7 @@ void PageStylesPanel::Initialize() void PageStylesPanel::Update() { - const eFillStyle eXFS = (eFillStyle)mpBgFillType->GetSelectEntryPos(); + const eFillStyle eXFS = (eFillStyle)mpBgFillType->GetSelectedEntryPos(); SfxObjectShell* pSh = SfxObjectShell::Current(); switch(eXFS) { @@ -459,7 +459,7 @@ void PageStylesPanel::NotifyItemUpdate( IMPL_LINK_NOARG( PageStylesPanel, ModifyColumnCountHdl, ListBox&, void ) { - sal_uInt16 nColumnType = mpColumnCount->GetSelectEntryPos() + 1; + sal_uInt16 nColumnType = mpColumnCount->GetSelectedEntryPos() + 1; mpPageColumnItem->SetValue( nColumnType ); mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE_COLUMN, SfxCallMode::RECORD, { mpPageColumnItem.get() }); @@ -467,21 +467,21 @@ IMPL_LINK_NOARG( PageStylesPanel, ModifyColumnCountHdl, ListBox&, void ) IMPL_LINK_NOARG( PageStylesPanel, ModifyNumberingHdl, ListBox&, void ) { - SvxNumType nEntryData = static_cast<SvxNumType>(reinterpret_cast<sal_uLong>(mpNumberSelectLB->GetEntryData(mpNumberSelectLB->GetSelectEntryPos()))); + SvxNumType nEntryData = static_cast<SvxNumType>(reinterpret_cast<sal_uLong>(mpNumberSelectLB->GetEntryData(mpNumberSelectLB->GetSelectedEntryPos()))); mpPageItem->SetNumType(nEntryData); mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE, SfxCallMode::RECORD, { mpPageItem.get() }); } IMPL_LINK_NOARG( PageStylesPanel, ModifyLayoutHdl, ListBox&, void ) { - sal_uInt16 nUse = mpLayoutSelectLB->GetSelectEntryPos(); + sal_uInt16 nUse = mpLayoutSelectLB->GetSelectedEntryPos(); mpPageItem->SetPageUsage(PosToPageUsage_Impl(nUse)); mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_PAGE, SfxCallMode::RECORD, { mpPageItem.get() }); } IMPL_LINK_NOARG(PageStylesPanel, ModifyFillStyleHdl, ListBox&, void) { - const eFillStyle eXFS = (eFillStyle)mpBgFillType->GetSelectEntryPos(); + const eFillStyle eXFS = (eFillStyle)mpBgFillType->GetSelectedEntryPos(); Update(); switch (eXFS) @@ -530,7 +530,7 @@ IMPL_LINK_NOARG(PageStylesPanel, ModifyFillStyleHdl, ListBox&, void) void PageStylesPanel::ModifyFillColor() { - const eFillStyle eXFS = (eFillStyle)mpBgFillType->GetSelectEntryPos(); + const eFillStyle eXFS = (eFillStyle)mpBgFillType->GetSelectedEntryPos(); SfxObjectShell* pSh = SfxObjectShell::Current(); switch(eXFS) { @@ -553,7 +553,7 @@ void PageStylesPanel::ModifyFillColor() case HATCH: { const SvxHatchListItem aHatchListItem(*static_cast<const SvxHatchListItem*>(pSh->GetItem(SID_HATCH_LIST))); - sal_uInt16 nPos = mpBgHatchingLB->GetSelectEntryPos(); + sal_uInt16 nPos = mpBgHatchingLB->GetSelectedEntryPos(); XHatch aHatch = aHatchListItem.GetHatchList()->GetHatch(nPos)->GetHatch(); const OUString aHatchName = aHatchListItem.GetHatchList()->GetHatch(nPos)->GetName(); @@ -564,7 +564,7 @@ void PageStylesPanel::ModifyFillColor() case BITMAP: case PATTERN: { - sal_Int16 nPos = mpBgBitmapLB->GetSelectEntryPos(); + sal_Int16 nPos = mpBgBitmapLB->GetSelectedEntryPos(); GraphicObject aBitmap; OUString aBitmapName; diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx index 5e3f9c4d373b..dbdeef511e3e 100644 --- a/sw/source/uibase/uiview/viewling.cxx +++ b/sw/source/uibase/uiview/viewling.cxx @@ -887,7 +887,7 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox&, rBox, void ) { if ( !rBox.IsTravelSelect() ) { - sal_Int32 selection = rBox.GetSelectEntryPos(); + sal_Int32 selection = rBox.GetSelectedEntryPos(); if ( selection >= 0 ) { OUString sKey = ODF_FORMDROPDOWN_RESULT; diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx index ea1d0205a67d..96d7212643a1 100644 --- a/sw/source/uibase/utlui/gloslst.cxx +++ b/sw/source/uibase/utlui/gloslst.cxx @@ -95,7 +95,7 @@ IMPL_LINK_NOARG(SwGlossDecideDlg, DoubleClickHdl, ListBox&, void) IMPL_LINK_NOARG(SwGlossDecideDlg, SelectHdl, ListBox&, void) { - m_pOk->Enable(LISTBOX_ENTRY_NOTFOUND != m_pListLB->GetSelectEntryPos()); + m_pOk->Enable(LISTBOX_ENTRY_NOTFOUND != m_pListLB->GetSelectedEntryPos()); } SwGlossaryList::SwGlossaryList() : @@ -166,9 +166,9 @@ bool SwGlossaryList::GetShortName(const OUString& rLongName, rLB.SelectEntryPos(0); if(RET_OK == aDlg->Execute() && - LISTBOX_ENTRY_NOTFOUND != rLB.GetSelectEntryPos()) + LISTBOX_ENTRY_NOTFOUND != rLB.GetSelectedEntryPos()) { - const TripleString& rTriple(aTripleStrings[rLB.GetSelectEntryPos()]); + const TripleString& rTriple(aTripleStrings[rLB.GetSelectedEntryPos()]); rShortName = rTriple.sShort; rGroupName = rTriple.sGroup; bRet = true; diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 8d014f8b9826..a2a37758e587 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -142,7 +142,7 @@ static void lcl_UnSelectFrame(SwWrtShell *pSh) IMPL_LINK( SwNavigationPI, DocListBoxSelectHdl, ListBox&, rBox, void ) { - int nEntryIdx = rBox.GetSelectEntryPos(); + int nEntryIdx = rBox.GetSelectedEntryPos(); SwView *pView ; pView = SwModule::GetFirstView(); while (nEntryIdx-- && pView) diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx index f5881a9f3985..094e5529fea3 100644 --- a/sw/source/uibase/utlui/numfmtlb.cxx +++ b/sw/source/uibase/utlui/numfmtlb.cxx @@ -327,14 +327,14 @@ void NumFormatListBox::SetDefFormat(const sal_uInt32 nDefaultFormat) sal_uInt32 NumFormatListBox::GetFormat() const { - sal_Int32 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectedEntryPos(); return static_cast<sal_uInt32>(reinterpret_cast<sal_uIntPtr>(GetEntryData(nPos))); } IMPL_LINK( NumFormatListBox, SelectHdl, ListBox&, rBox, void ) { - const sal_Int32 nPos = rBox.GetSelectEntryPos(); + const sal_Int32 nPos = rBox.GetSelectedEntryPos(); OUString sDefine(SwResId( STR_DEFINE_NUMBERFORMAT )); SwView *pView = GetActiveView(); diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 8eea2d7b3013..1d7186ce3486 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -1623,7 +1623,7 @@ sal_Int16 VCLXListBox::getSelectedItemPos() { SolarMutexGuard aGuard; VclPtr< ListBox > pBox = GetAs< ListBox >(); - return pBox ? pBox->GetSelectEntryPos() : 0; + return pBox ? pBox->GetSelectedEntryPos() : 0; } css::uno::Sequence<sal_Int16> VCLXListBox::getSelectedItemsPos() @@ -1637,7 +1637,7 @@ css::uno::Sequence<sal_Int16> VCLXListBox::getSelectedItemsPos() const sal_Int32 nSelEntries = pBox->GetSelectEntryCount(); aSeq = css::uno::Sequence<sal_Int16>( nSelEntries ); for ( sal_Int32 n = 0; n < nSelEntries; ++n ) - aSeq.getArray()[n] = pBox->GetSelectEntryPos( n ); + aSeq.getArray()[n] = pBox->GetSelectedEntryPos( n ); } return aSeq; } @@ -2027,7 +2027,7 @@ void VCLXListBox::ImplCallItemListeners() aEvent.Highlighted = 0; // Set to 0xFFFF on multiple selection, selected entry ID otherwise - aEvent.Selected = (pListBox->GetSelectEntryCount() == 1 ) ? pListBox->GetSelectEntryPos() : 0xFFFF; + aEvent.Selected = (pListBox->GetSelectEntryCount() == 1 ) ? pListBox->GetSelectedEntryPos() : 0xFFFF; maItemListeners.itemStateChanged( aEvent ); } diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index 8687e6850110..f41b5123a583 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -141,7 +141,7 @@ bool FilterDialog::AskForFilter( FilterNameListPtr& pSelectedItem ) OUString sEntry = m_pLbFilters->GetSelectedEntry(); if( !sEntry.isEmpty() ) { - int nPos = m_pLbFilters->GetSelectEntryPos(); + int nPos = m_pLbFilters->GetSelectedEntryPos(); if( nPos < (int)(m_pFilterNames->size()) ) { pSelectedItem = m_pFilterNames->begin(); diff --git a/vcl/inc/listbox.hxx b/vcl/inc/listbox.hxx index 09e1d0dbcd55..e7699b736064 100644 --- a/vcl/inc/listbox.hxx +++ b/vcl/inc/listbox.hxx @@ -131,7 +131,7 @@ public: sal_Int32 GetSelectEntryCount() const; OUString GetSelectedEntry( sal_Int32 nIndex ) const; - sal_Int32 GetSelectEntryPos( sal_Int32 nIndex ) const; + sal_Int32 GetSelectedEntryPos( sal_Int32 nIndex ) const; bool IsEntryPosSelected( sal_Int32 nIndex ) const; void SetLastSelected( sal_Int32 nPos ) { mnLastSelected = nPos; } diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 316677f9a102..54fb097c4c6c 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -384,7 +384,7 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) sal_Int32 nSelectedEntries = m_pImplLB->GetEntryList()->GetSelectEntryCount(); for ( sal_Int32 n = 0; n < nSelectedEntries; n++ ) { - sal_Int32 nP = m_pImplLB->GetEntryList()->GetSelectEntryPos( n ); + sal_Int32 nP = m_pImplLB->GetEntryList()->GetSelectedEntryPos( n ); if ( !aSelInText.count( nP ) ) { if (!aText.isEmpty() && (aText[aText.getLength()-1] != m_cMultiSep)) @@ -842,7 +842,7 @@ void ComboBox::Impl::ImplUpdateFloatSelection() } else { - nSelect = m_pImplLB->GetEntryList()->GetSelectEntryPos( 0 ); + nSelect = m_pImplLB->GetEntryList()->GetSelectedEntryPos( 0 ); if( nSelect != LISTBOX_ENTRY_NOTFOUND ) m_pImplLB->SelectEntry( nSelect, false ); m_pImplLB->ResetCurrentPos(); @@ -1347,9 +1347,9 @@ sal_Int32 ComboBox::GetSelectEntryCount() const return m_pImpl->m_pImplLB->GetEntryList()->GetSelectEntryCount(); } -sal_Int32 ComboBox::GetSelectEntryPos( sal_Int32 nIndex ) const +sal_Int32 ComboBox::GetSelectedEntryPos( sal_Int32 nIndex ) const { - sal_Int32 nPos = m_pImpl->m_pImplLB->GetEntryList()->GetSelectEntryPos( nIndex ); + sal_Int32 nPos = m_pImpl->m_pImplLB->GetEntryList()->GetSelectedEntryPos( nIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { if (nPos < m_pImpl->m_pImplLB->GetEntryList()->GetMRUCount()) diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index a06e2c31a01e..90b1c6bd9043 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -393,10 +393,10 @@ sal_Int32 ImplEntryList::GetSelectEntryCount() const OUString ImplEntryList::GetSelectedEntry( sal_Int32 nIndex ) const { - return GetEntryText( GetSelectEntryPos( nIndex ) ); + return GetEntryText( GetSelectedEntryPos( nIndex ) ); } -sal_Int32 ImplEntryList::GetSelectEntryPos( sal_Int32 nIndex ) const +sal_Int32 ImplEntryList::GetSelectedEntryPos( sal_Int32 nIndex ) const { sal_Int32 nSelEntryPos = LISTBOX_ENTRY_NOTFOUND; sal_Int32 nSel = 0; @@ -688,7 +688,7 @@ void ImplListBoxWindow::ImplCallSelect() if ( !IsTravelSelect() && GetEntryList()->GetMaxMRUCount() ) { // Insert the selected entry as MRU, if not already first MRU - sal_Int32 nSelected = GetEntryList()->GetSelectEntryPos( 0 ); + sal_Int32 nSelected = GetEntryList()->GetSelectedEntryPos( 0 ); sal_Int32 nMRUCount = GetEntryList()->GetMRUCount(); OUString aSelected = GetEntryList()->GetEntryText( nSelected ); sal_Int32 nFirstMatchingEntryPos = GetEntryList()->FindEntry( aSelected, true ); @@ -837,7 +837,7 @@ void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt ) if( nSelect != LISTBOX_ENTRY_NOTFOUND ) { if ( !mbMulti && GetEntryList()->GetSelectEntryCount() ) - mnTrackingSaveSelection = GetEntryList()->GetSelectEntryPos( 0 ); + mnTrackingSaveSelection = GetEntryList()->GetSelectedEntryPos( 0 ); else mnTrackingSaveSelection = LISTBOX_ENTRY_NOTFOUND; @@ -901,7 +901,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) // Select only visible Entries with MouseMove, otherwise Tracking... if ( IsVisible( nSelect ) && mpEntryList->IsEntrySelectable( nSelect ) && - ( ( nSelect != mnCurrentPos ) || !GetEntryList()->GetSelectEntryCount() || ( nSelect != GetEntryList()->GetSelectEntryPos( 0 ) ) ) ) + ( ( nSelect != mnCurrentPos ) || !GetEntryList()->GetSelectEntryCount() || ( nSelect != GetEntryList()->GetSelectedEntryPos( 0 ) ) ) ) { mbTrackingSelect = true; if ( SelectEntries( nSelect, LET_TRACKING ) ) @@ -929,7 +929,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) if ( rMEvt.IsLeft() && !rMEvt.IsSynthetic() ) { if ( !mbMulti && GetEntryList()->GetSelectEntryCount() ) - mnTrackingSaveSelection = GetEntryList()->GetSelectEntryPos( 0 ); + mnTrackingSaveSelection = GetEntryList()->GetSelectedEntryPos( 0 ); else mnTrackingSaveSelection = LISTBOX_ENTRY_NOTFOUND; @@ -946,7 +946,7 @@ void ImplListBoxWindow::DeselectAll() { while ( GetEntryList()->GetSelectEntryCount() ) { - sal_Int32 nS = GetEntryList()->GetSelectEntryPos( 0 ); + sal_Int32 nS = GetEntryList()->GetSelectedEntryPos( 0 ); SelectEntry( nS, false ); } } @@ -961,7 +961,7 @@ void ImplListBoxWindow::SelectEntry( sal_Int32 nPos, bool bSelect ) if( !mbMulti ) { // deselect the selected entry - sal_Int32 nDeselect = GetEntryList()->GetSelectEntryPos( 0 ); + sal_Int32 nDeselect = GetEntryList()->GetSelectedEntryPos( 0 ); if( nDeselect != LISTBOX_ENTRY_NOTFOUND ) { //SelectEntryPos( nDeselect, false ); @@ -1011,7 +1011,7 @@ bool ImplListBoxWindow::SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bo // here (Single-ListBox) only one entry can be deselected if( !mbMulti ) { - sal_Int32 nDeselect = mpEntryList->GetSelectEntryPos( 0 ); + sal_Int32 nDeselect = mpEntryList->GetSelectedEntryPos( 0 ); if( nSelect != nDeselect ) { SelectEntry( nSelect, true ); @@ -1076,7 +1076,7 @@ bool ImplListBoxWindow::SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bo sal_Int32 nAnchor = mpEntryList->GetSelectionAnchor(); if( ( nAnchor == LISTBOX_ENTRY_NOTFOUND ) && ( mpEntryList->GetSelectEntryCount() || mbStackMode ) ) { - nAnchor = mbStackMode ? 0 : mpEntryList->GetSelectEntryPos( mpEntryList->GetSelectEntryCount() - 1 ); + nAnchor = mbStackMode ? 0 : mpEntryList->GetSelectedEntryPos( mpEntryList->GetSelectEntryCount() - 1 ); } if( nAnchor != LISTBOX_ENTRY_NOTFOUND ) { @@ -1265,7 +1265,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt ) if ( !mbMulti && GetEntryList()->GetSelectEntryCount() ) { mbTrackingSelect = true; - SelectEntry( GetEntryList()->GetSelectEntryPos( 0 ), false ); + SelectEntry( GetEntryList()->GetSelectedEntryPos( 0 ), false ); mbTrackingSelect = false; } else if ( mbStackMode ) @@ -2261,8 +2261,8 @@ void ImplListBox::ImplCheckScrollBars() // check of the scrolled-out region if( GetEntryList()->GetSelectEntryCount() == 1 && - GetEntryList()->GetSelectEntryPos( 0 ) != LISTBOX_ENTRY_NOTFOUND ) - ShowProminentEntry( GetEntryList()->GetSelectEntryPos( 0 ) ); + GetEntryList()->GetSelectedEntryPos( 0 ) != LISTBOX_ENTRY_NOTFOUND ) + ShowProminentEntry( GetEntryList()->GetSelectedEntryPos( 0 ) ); else SetTopEntry( GetTopEntry() ); // MaxTop is being checked... } @@ -2298,8 +2298,8 @@ void ImplListBox::ImplCheckScrollBars() // check of the scrolled-out region if( GetEntryList()->GetSelectEntryCount() == 1 && - GetEntryList()->GetSelectEntryPos( 0 ) != LISTBOX_ENTRY_NOTFOUND ) - ShowProminentEntry( GetEntryList()->GetSelectEntryPos( 0 ) ); + GetEntryList()->GetSelectedEntryPos( 0 ) != LISTBOX_ENTRY_NOTFOUND ) + ShowProminentEntry( GetEntryList()->GetSelectedEntryPos( 0 ) ); else SetTopEntry( GetTopEntry() ); // MaxTop is being checked... } @@ -3050,7 +3050,7 @@ void ImplListBoxFloatingWindow::StartFloat( bool bStartTracking ) SetSizePixel( aFloatSz ); mpImplLB->SetSizePixel( GetOutputSizePixel() ); - sal_Int32 nPos = mpImplLB->GetEntryList()->GetSelectEntryPos( 0 ); + sal_Int32 nPos = mpImplLB->GetEntryList()->GetSelectedEntryPos( 0 ); mnPopupModeStartSaveSelection = nPos; Size aSz = GetParent()->GetSizePixel(); diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index 0a9475b01c0b..1a36cc9e6879 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -185,11 +185,11 @@ IMPL_LINK_NOARG(ListBox, ImplSelectHdl, LinkParamNone*, void) mpImplWin->GrabFocus(); } - mpImplWin->SetItemPos( GetSelectEntryPos() ); + mpImplWin->SetItemPos( GetSelectedEntryPos() ); mpImplWin->SetString( GetSelectedEntry() ); if( mpImplLB->GetEntryList()->HasImages() ) { - Image aImage = mpImplLB->GetEntryList()->GetEntryImage( GetSelectEntryPos() ); + Image aImage = mpImplLB->GetEntryList()->GetEntryImage( GetSelectedEntryPos() ); mpImplWin->SetImage( aImage ); } mpImplWin->Invalidate(); @@ -1018,7 +1018,7 @@ sal_Int32 ListBox::GetEntryCount() const OUString ListBox::GetSelectedEntry(sal_Int32 nIndex) const { - return GetEntry( GetSelectEntryPos( nIndex ) ); + return GetEntry( GetSelectedEntryPos( nIndex ) ); } sal_Int32 ListBox::GetSelectEntryCount() const @@ -1028,12 +1028,12 @@ sal_Int32 ListBox::GetSelectEntryCount() const return mpImplLB->GetEntryList()->GetSelectEntryCount(); } -sal_Int32 ListBox::GetSelectEntryPos( sal_Int32 nIndex ) const +sal_Int32 ListBox::GetSelectedEntryPos( sal_Int32 nIndex ) const { if (!mpImplLB || !mpImplLB->GetEntryList()) return LISTBOX_ENTRY_NOTFOUND; - sal_Int32 nPos = mpImplLB->GetEntryList()->GetSelectEntryPos( nIndex ); + sal_Int32 nPos = mpImplLB->GetEntryList()->GetSelectedEntryPos( nIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { if ( nPos < mpImplLB->GetEntryList()->GetMRUCount() ) diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index f5d00639009c..27d6ffee522e 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -990,7 +990,7 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent ) IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl, ListBox&, void) { - SelectTabPage( GetPageId( mpTabCtrlData->mpListBox->GetSelectEntryPos() ) ); + SelectTabPage( GetPageId( mpTabCtrlData->mpListBox->GetSelectedEntryPos() ) ); } IMPL_LINK( TabControl, ImplWindowEventListener, VclWindowEvent&, rEvent, void ) diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx index c977b7d56391..40b1f0bb9246 100644 --- a/vcl/source/uitest/uiobject.cxx +++ b/vcl/source/uitest/uiobject.cxx @@ -826,7 +826,7 @@ StringMap ListBoxUIObject::get_state() aMap["MultiSelect"] = OUString::boolean(mxListBox->IsMultiSelectionEnabled()); aMap["EntryCount"] = OUString::number(mxListBox->GetEntryCount()); aMap["SelectEntryCount"] = OUString::number(mxListBox->GetSelectEntryCount()); - aMap["SelectEntryPos"] = OUString::number(mxListBox->GetSelectEntryPos()); + aMap["SelectEntryPos"] = OUString::number(mxListBox->GetSelectedEntryPos()); aMap["SelectEntryText"] = mxListBox->GetSelectedEntry(); return aMap; @@ -841,7 +841,7 @@ OUString ListBoxUIObject::get_action(VclEventId nEvent) const { if (nEvent == VclEventId::ListboxSelect) { - sal_Int32 nPos = mxListBox->GetSelectEntryPos(); + sal_Int32 nPos = mxListBox->GetSelectedEntryPos(); return "Action on element: " + mxListBox->get_id() + " with action : SELECT and content {\"POS\": \"" + OUString::number(nPos) + "\"}"; } else diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 949ebaf7745f..34c605d43117 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -790,7 +790,7 @@ void PrintDialog::storeToSettings() bool PrintDialog::isPrintToFile() { - return ( maJobPage.mpPrinters->GetSelectEntryPos() == 0 ); + return ( maJobPage.mpPrinters->GetSelectedEntryPos() == 0 ); } bool PrintDialog::isCollate() @@ -1487,9 +1487,9 @@ void PrintDialog::updateNup() aMPS.bDrawBorder = maNUpPage.mpBorderCB->IsChecked(); - aMPS.nOrder = (NupOrderType)maNUpPage.mpNupOrderBox->GetSelectEntryPos(); + aMPS.nOrder = (NupOrderType)maNUpPage.mpNupOrderBox->GetSelectedEntryPos(); - int nOrientationMode = maNUpPage.mpNupOrientationBox->GetSelectEntryPos(); + int nOrientationMode = maNUpPage.mpNupOrientationBox->GetSelectedEntryPos(); if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE ) aMPS.aPaperSize = maNupLandscapeSize; else if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT ) @@ -1519,7 +1519,7 @@ IMPL_LINK( PrintDialog, SelectHdl, ListBox&, rBox, void ) if( &rBox == maJobPage.mpPrinters ) { - if ( rBox.GetSelectEntryPos() != 0) + if ( rBox.GetSelectedEntryPos() != 0) { OUString aNewPrinter( rBox.GetSelectedEntry() ); // set new printer @@ -1804,7 +1804,7 @@ IMPL_LINK( PrintDialog, UIOption_SelectHdl, ListBox&, i_rBox, void ) { makeEnabled( &i_rBox ); - sal_Int32 nVal( i_rBox.GetSelectEntryPos() ); + sal_Int32 nVal( i_rBox.GetSelectedEntryPos() ); pVal->Value <<= nVal; //If we are in impress we start in print slides mode and get a diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 4d24260e8fbd..c692e1ec8304 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -282,7 +282,7 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox&, rBox, void ) } else if( &rBox == m_pOrientBox ) { - m_pParent->m_aJobData.m_eOrientation = m_pOrientBox->GetSelectEntryPos() == 0 ? orientation::Portrait : orientation::Landscape; + m_pParent->m_aJobData.m_eOrientation = m_pOrientBox->GetSelectedEntryPos() == 0 ? orientation::Portrait : orientation::Landscape; } if( pKey ) { @@ -408,7 +408,7 @@ void RTSDevicePage::dispose() sal_uLong RTSDevicePage::getDepth() { - sal_uInt16 nSelectPos = m_pDepthBox->GetSelectEntryPos(); + sal_uInt16 nSelectPos = m_pDepthBox->GetSelectedEntryPos(); if (nSelectPos == 0) return 8; else @@ -417,7 +417,7 @@ sal_uLong RTSDevicePage::getDepth() sal_uLong RTSDevicePage::getColorDevice() { - sal_uInt16 nSelectPos = m_pSpaceBox->GetSelectEntryPos(); + sal_uInt16 nSelectPos = m_pSpaceBox->GetSelectedEntryPos(); switch (nSelectPos) { case 0: diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index f7f7a29fabf2..e343d6a319e0 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -97,7 +97,7 @@ public: void update(); - sal_Int32 getOrientation() const { return m_pOrientBox->GetSelectEntryPos(); } + sal_Int32 getOrientation() const { return m_pOrientBox->GetSelectedEntryPos(); } }; class RTSDevicePage : public TabPage diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index d6ea287da761..9155fb7db3ad 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1922,7 +1922,7 @@ public: IMPL_LINK_NOARG(DemoWidgets, GLTestClick, Button*, void) { - sal_Int32 nSelected = mpGLCombo->GetSelectEntryPos(); + sal_Int32 nSelected = mpGLCombo->GetSelectedEntryPos(); TimeValue aDelay; aDelay.Seconds = 0; diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 7616d5fd9992..e434dc093c13 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -207,7 +207,7 @@ void MacroSecurityTrustedSourcesTP::ImplCheckButtons() m_pViewCertPB->Enable( bCertSelected ); m_pRemoveCertPB->Enable( bCertSelected && !mbAuthorsReadonly); - bool bLocationSelected = m_pTrustFileLocLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND; + bool bLocationSelected = m_pTrustFileLocLB->GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND; m_pRemoveLocPB->Enable( bLocationSelected && !mbURLsReadonly); } @@ -286,7 +286,7 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl, Button*, void) IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, Button*, void) { - sal_Int32 nSel = m_pTrustFileLocLB->GetSelectEntryPos(); + sal_Int32 nSel = m_pTrustFileLocLB->GetSelectedEntryPos(); if( nSel != LISTBOX_ENTRY_NOTFOUND ) { m_pTrustFileLocLB->RemoveEntry( nSel ); |