[Libreoffice-commits] core.git: chart2/source cui/source include/sfx2 include/svtools sc/source sd/source svtools/source svx/source sw/source
Samuel Mehrbrodt
Samuel.Mehrbrodt at cib.de
Fri Mar 23 07:26:44 UTC 2018
chart2/source/controller/dialogs/tp_ChartType.cxx | 2 +-
cui/source/dialogs/hangulhanjadlg.cxx | 2 +-
cui/source/options/optchart.cxx | 2 +-
cui/source/tabpages/align.cxx | 2 +-
cui/source/tabpages/backgrnd.cxx | 2 +-
cui/source/tabpages/border.cxx | 6 +++---
cui/source/tabpages/labdlg.cxx | 4 ++--
cui/source/tabpages/numpages.cxx | 8 ++++----
cui/source/tabpages/tpbitmap.cxx | 6 +++---
cui/source/tabpages/tpcolor.cxx | 6 +++---
cui/source/tabpages/tpgradnt.cxx | 8 ++++----
cui/source/tabpages/tphatch.cxx | 8 ++++----
cui/source/tabpages/tppattern.cxx | 8 ++++----
include/sfx2/controlwrapper.hxx | 2 +-
include/svtools/valueset.hxx | 4 ++--
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 6 +++---
sc/source/ui/sidebar/CellLineStyleControl.cxx | 2 +-
sd/source/filter/html/pubdlg.cxx | 4 ++--
sd/source/ui/animations/SlideTransitionPane.cxx | 6 +++---
sd/source/ui/controller/displaymodecontroller.cxx | 8 ++++----
sd/source/ui/controller/slidelayoutcontroller.cxx | 4 ++--
sd/source/ui/dlg/sdpreslt.cxx | 2 +-
sd/source/ui/sidebar/LayoutMenu.cxx | 10 +++++-----
sd/source/ui/sidebar/MasterPagesSelector.cxx | 6 +++---
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx | 2 +-
sd/source/ui/table/TableDesignPane.cxx | 4 ++--
svtools/source/control/toolbarmenu.cxx | 4 ++--
svtools/source/control/valueacc.cxx | 2 +-
svx/source/dialog/_bmpmask.cxx | 8 ++++----
svx/source/gallery2/galbrws2.cxx | 4 ++--
svx/source/sidebar/line/LineWidthPopup.cxx | 2 +-
svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 2 +-
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 4 ++--
svx/source/tbxctrls/SvxPresetListBox.cxx | 2 +-
svx/source/tbxctrls/bulletsnumbering.cxx | 2 +-
svx/source/tbxctrls/colrctrl.cxx | 2 +-
svx/source/tbxctrls/extrusioncontrols.cxx | 4 ++--
svx/source/tbxctrls/fontworkgallery.cxx | 2 +-
svx/source/tbxctrls/linectrl.cxx | 2 +-
svx/source/tbxctrls/tbcontrl.cxx | 6 +++---
sw/source/ui/frmdlg/column.cxx | 2 +-
sw/source/uibase/sidebar/PageSizeControl.cxx | 2 +-
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 2 +-
sw/source/uibase/sidebar/ThemePanel.cxx | 2 +-
44 files changed, 89 insertions(+), 89 deletions(-)
New commits:
commit a82cdccb0c276ec10c35beec46fa7fa25fc95cd5
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date: Thu Mar 22 17:36:51 2018 +0100
Typo: GetSelectItemId -> GetSelectedItemId
Change-Id: Ieebb50b73f1f341c924693f3966f8cd2b09a136b
Reviewed-on: https://gerrit.libreoffice.org/51750
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 28c5b015a27f..ba21b3018581 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -786,7 +786,7 @@ void ChartTypeTabPage::dispose()
ChartTypeParameter ChartTypeTabPage::getCurrentParamter() const
{
ChartTypeParameter aParameter;
- aParameter.nSubTypeIndex = static_cast<sal_Int32>( m_pSubTypeList->GetSelectItemId() );
+ aParameter.nSubTypeIndex = static_cast<sal_Int32>( m_pSubTypeList->GetSelectedItemId() );
m_pDim3DLookResourceGroup->fillParameter( aParameter );
m_pStackingResourceGroup->fillParameter( aParameter );
m_pSplineResourceGroup->fillParameter( aParameter );
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 9f66d58eef85..3c1a74fedac7 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -497,7 +497,7 @@ namespace svx
}
else
{
- sal_uInt16 nPos = m_aValueSet->GetSelectItemId()-1; //itemid == pos+1 (id 0 has special meaning)
+ sal_uInt16 nPos = m_aValueSet->GetSelectedItemId()-1; //itemid == pos+1 (id 0 has special meaning)
m_aListBox->SelectEntryPos( nPos );
}
m_bInSelectionUpdate = false;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 608336cae751..d3c452ca4922 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -335,7 +335,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, void)
sal_Int32 nIdx = m_pLbChartColors->GetSelectedEntryPos();
if( nIdx != LISTBOX_ENTRY_NOTFOUND )
{
- const XColorEntry aEntry( m_pValSetColorBox->GetItemColor( m_pValSetColorBox->GetSelectItemId() ), m_pLbChartColors->GetSelectedEntry() );
+ const XColorEntry aEntry( m_pValSetColorBox->GetItemColor( m_pValSetColorBox->GetSelectedItemId() ), m_pLbChartColors->GetSelectedEntry() );
ModifyColorEntry(aEntry, nIdx);
pColorConfig->ReplaceColorByIndex( nIdx, aEntry );
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 373d96c0f8e5..3401cfa45c67 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -340,7 +340,7 @@ void AlignmentTabPage::DataChanged( const DataChangedEvent& rDCEvt )
void AlignmentTabPage::InitVsRefEgde()
{
// remember selection - is deleted in call to ValueSet::Clear()
- sal_uInt16 nSel = m_pVsRefEdge->GetSelectItemId();
+ sal_uInt16 nSel = m_pVsRefEdge->GetSelectedItemId();
BitmapEx aBottomLock(RID_SVXBMP_BOTTOMLOCK);
BitmapEx aTopLock(RID_SVXBMP_TOPLOCK);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 36f46778a6aa..3742c34d9c00 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1044,7 +1044,7 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl()
/** Handler, called when color selection is changed */
IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl, ValueSet*, void)
{
- sal_uInt16 nItemId = m_pBackgroundColorSet->GetSelectItemId();
+ sal_uInt16 nItemId = m_pBackgroundColorSet->GetSelectedItemId();
Color aColor = nItemId ? ( m_pBackgroundColorSet->GetItemColor( nItemId ) ) : COL_TRANSPARENT;
aBgdColor = aColor;
m_bColorSelected = true;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 2b08011cd1c9..6d5f8e00b661 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -591,7 +591,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
SelColHdl_Impl(*m_pLbLineColor);
}
- bool bEnable = m_pWndShadows->GetSelectItemId() > 1 ;
+ bool bEnable = m_pWndShadows->GetSelectedItemId() > 1 ;
m_pFtShadowSize->Enable(bEnable);
m_pEdShadowSize->Enable(bEnable);
m_pFtShadowColor->Enable(bEnable);
@@ -875,7 +875,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void)
m_pFrameSel->DeselectAllBorders();
// Using image ID to find correct line in table above.
- sal_uInt16 nLine = GetPresetImageId( m_pWndPresets->GetSelectItemId() ) - 1;
+ sal_uInt16 nLine = GetPresetImageId( m_pWndPresets->GetSelectedItemId() ) - 1;
// Apply all styles from the table
for( int nBorder = 0; nBorder < svx::FRAMEBORDERTYPE_COUNT; ++nBorder )
@@ -911,7 +911,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl, ValueSet*, void)
IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl, ValueSet*, void)
{
- bool bEnable = m_pWndShadows->GetSelectItemId() > 1;
+ bool bEnable = m_pWndShadows->GetSelectedItemId() > 1;
m_pFtShadowSize->Enable(bEnable);
m_pEdShadowSize->Enable(bEnable);
m_pFtShadowColor->Enable(bEnable);
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 969ad25fcf0d..5f41df9975f4 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -171,7 +171,7 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs)
MapUnit eUnit;
- nCaptionType = static_cast<SdrCaptionType>(m_pCT_CAPTTYPE->GetSelectItemId()-1);
+ nCaptionType = static_cast<SdrCaptionType>(m_pCT_CAPTTYPE->GetSelectedItemId()-1);
_rOutAttrs->Put( SdrCaptionTypeItem( nCaptionType ) );
@@ -454,7 +454,7 @@ IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton, void )
IMPL_LINK_NOARG(SvxCaptionTabPage, SelectCaptTypeHdl_Impl, ValueSet*, void)
{
- SetupType_Impl( static_cast<SdrCaptionType>(m_pCT_CAPTTYPE->GetSelectItemId()) );
+ SetupType_Impl( static_cast<SdrCaptionType>(m_pCT_CAPTTYPE->GetSelectedItemId()) );
}
void SvxCaptionTabPage::SetupType_Impl( SdrCaptionType nType )
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index e4ecdd842a25..2577fd8fbef4 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -323,7 +323,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void)
{
bPreset = false;
bModified = true;
- sal_uInt16 nIdx = m_pExamplesVS->GetSelectItemId() - 1;
+ sal_uInt16 nIdx = m_pExamplesVS->GetSelectedItemId() - 1;
DBG_ASSERT(aNumSettingsArr.size() > nIdx, "wrong index");
if(aNumSettingsArr.size() <= nIdx)
return;
@@ -487,7 +487,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl, ValueSet*, void)
{
bPreset = false;
bModified = true;
- sal_Unicode cChar = aBulletTypes[m_pExamplesVS->GetSelectItemId() - 1];
+ sal_Unicode cChar = aBulletTypes[m_pExamplesVS->GetSelectedItemId() - 1];
const vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
sal_uInt16 nMask = 1;
@@ -691,7 +691,7 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl, ValueSet*, void)
const FontList* pList = nullptr;
- SvxNumSettingsArr_Impl& rItemArr = aNumSettingsArrays[m_pExamplesVS->GetSelectItemId() - 1];
+ SvxNumSettingsArr_Impl& rItemArr = aNumSettingsArrays[m_pExamplesVS->GetSelectedItemId() - 1];
const vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
SvxNumSettings_Impl* pLevelSettings = nullptr;
@@ -944,7 +944,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl, ValueSet*, void)
{
bPreset = false;
bModified = true;
- sal_uInt16 nIdx = m_pExamplesVS->GetSelectItemId() - 1;
+ sal_uInt16 nIdx = m_pExamplesVS->GetSelectedItemId() - 1;
sal_uInt16 nMask = 1;
for(sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++)
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 8c58641bdb1a..1d0854cbe255 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -206,7 +206,7 @@ bool SvxBitmapTabPage::FillItemSet( SfxItemSet* rAttrs )
if(VALUESET_ITEM_NOTFOUND != nPos)
{
const XBitmapEntry* pXBitmapEntry = m_pBitmapList->GetBitmap(nPos);
- const OUString aString(m_pBitmapLB->GetItemText( m_pBitmapLB->GetSelectItemId() ));
+ const OUString aString(m_pBitmapLB->GetItemText( m_pBitmapLB->GetSelectedItemId() ));
rAttrs->Put(XFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject()));
}
@@ -552,7 +552,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyBitmapHdl, ValueSet*, void)
IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void)
{
- sal_uInt16 nId = m_pBitmapLB->GetSelectItemId();
+ sal_uInt16 nId = m_pBitmapLB->GetSelectedItemId();
size_t nPos = m_pBitmapLB->GetSelectItemPos();
if( nPos != VALUESET_ITEM_NOTFOUND )
@@ -594,7 +594,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickRenameHdl, SvxPresetListBox*, void)
IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl, SvxPresetListBox*, void)
{
- sal_uInt16 nId = m_pBitmapLB->GetSelectItemId();
+ sal_uInt16 nId = m_pBitmapLB->GetSelectedItemId();
size_t nPos = m_pBitmapLB->GetSelectItemPos();
if( nPos != VALUESET_ITEM_NOTFOUND )
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index b5aa6d0f39ea..0c015d40e92b 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -434,7 +434,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl, Button*, void)
{
- sal_uInt16 nId = m_pValSetColorList->GetSelectItemId();
+ sal_uInt16 nId = m_pValSetColorList->GetSelectedItemId();
size_t nPos = m_pValSetColorList->GetSelectItemPos();
if(m_pSelectPalette->GetSelectedEntryPos() == 0 && nPos != VALUESET_ITEM_NOTFOUND )
{
@@ -500,7 +500,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectPaletteLBHdl, ListBox&, void)
IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, pValSet, void)
{
- sal_Int32 nPos = pValSet->GetSelectItemId();
+ sal_Int32 nPos = pValSet->GetSelectedItemId();
if( nPos != 0 )
{
Color aColor = pValSet->GetItemColor( nPos );
@@ -513,7 +513,7 @@ IMPL_LINK(SvxColorTabPage, SelectValSetHdl_Impl, ValueSet*, pValSet, void)
if(pValSet == m_pValSetColorList)
{
m_pValSetRecentList->SetNoSelection();
- if(m_pSelectPalette->GetSelectedEntryPos() == 0 && m_pValSetColorList->GetSelectItemId() != 0)
+ if(m_pSelectPalette->GetSelectedEntryPos() == 0 && m_pValSetColorList->GetSelectedItemId() != 0)
m_pBtnDelete->Enable();
else
m_pBtnDelete->Disable();
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index a9da9b9887f0..3b36e963d6a0 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -228,7 +228,7 @@ bool SvxGradientTabPage::FillItemSet( SfxItemSet* rSet )
if( nPos != VALUESET_ITEM_NOTFOUND )
{
pXGradient.reset(new XGradient( m_pGradientList->GetGradient( static_cast<sal_uInt16>(nPos) )->GetGradient() ));
- aString = m_pGradientLB->GetItemText( m_pGradientLB->GetSelectItemId() );
+ aString = m_pGradientLB->GetItemText( m_pGradientLB->GetSelectedItemId() );
}
else
// gradient was passed (unidentified)
@@ -432,7 +432,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void)
{
- sal_uInt16 nId = m_pGradientLB->GetSelectItemId();
+ sal_uInt16 nId = m_pGradientLB->GetSelectedItemId();
size_t nPos = m_pGradientLB->GetSelectItemPos();
if ( nPos != VALUESET_ITEM_NOTFOUND )
@@ -463,7 +463,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void)
{
- sal_uInt16 nId = m_pGradientLB->GetSelectItemId();
+ sal_uInt16 nId = m_pGradientLB->GetSelectedItemId();
size_t nPos = m_pGradientLB->GetSelectItemPos();
if( nPos != VALUESET_ITEM_NOTFOUND )
@@ -492,7 +492,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void
IMPL_LINK_NOARG(SvxGradientTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void)
{
- sal_uInt16 nId = m_pGradientLB->GetSelectItemId();
+ sal_uInt16 nId = m_pGradientLB->GetSelectedItemId();
size_t nPos = m_pGradientLB->GetSelectItemPos();
if ( nPos != VALUESET_ITEM_NOTFOUND )
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index a90e5d24305e..7621583f12cd 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -254,7 +254,7 @@ bool SvxHatchTabPage::FillItemSet( SfxItemSet* rSet )
if( nPos != VALUESET_ITEM_NOTFOUND )
{
pXHatch.reset(new XHatch( m_pHatchingList->GetHatch( static_cast<sal_uInt16>(nPos) )->GetHatch() ));
- aString = m_pHatchLB->GetItemText( m_pHatchLB->GetSelectItemId() );
+ aString = m_pHatchLB->GetItemText( m_pHatchLB->GetSelectedItemId() );
}
// unidentified hatch has been passed
else
@@ -491,7 +491,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void)
{
- sal_uInt16 nId = m_pHatchLB->GetSelectItemId();
+ sal_uInt16 nId = m_pHatchLB->GetSelectedItemId();
size_t nPos = m_pHatchLB->GetSelectItemPos();
if( nPos != VALUESET_ITEM_NOTFOUND )
@@ -523,7 +523,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void)
{
- sal_uInt16 nId = m_pHatchLB->GetSelectItemId();
+ sal_uInt16 nId = m_pHatchLB->GetSelectedItemId();
size_t nPos = m_pHatchLB->GetSelectItemPos();
if( nPos != VALUESET_ITEM_NOTFOUND )
@@ -549,7 +549,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void)
IMPL_LINK_NOARG(SvxHatchTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void )
{
- sal_uInt16 nId = m_pHatchLB->GetSelectItemId();
+ sal_uInt16 nId = m_pHatchLB->GetSelectedItemId();
size_t nPos = m_pHatchLB->GetSelectItemPos();
if( nPos != VALUESET_ITEM_NOTFOUND )
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 6f0a6aa5ff74..1e338d04cf11 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -211,7 +211,7 @@ bool SvxPatternTabPage::FillItemSet( SfxItemSet* _rOutAttrs )
if(VALUESET_ITEM_NOTFOUND != nPos)
{
const XBitmapEntry* pXBitmapEntry = m_pPatternList->GetBitmap( static_cast<sal_uInt16>(nPos) );
- const OUString aString( m_pPatternLB->GetItemText( m_pPatternLB->GetSelectItemId() ) );
+ const OUString aString( m_pPatternLB->GetItemText( m_pPatternLB->GetSelectedItemId() ) );
_rOutAttrs->Put(XFillBitmapItem(aString, pXBitmapEntry->GetGraphicObject()));
}
@@ -430,7 +430,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxPatternTabPage, ClickModifyHdl_Impl, Button*, void)
{
- sal_uInt16 nId = m_pPatternLB->GetSelectItemId();
+ sal_uInt16 nId = m_pPatternLB->GetSelectedItemId();
size_t nPos = m_pPatternLB->GetSelectItemPos();
if ( nPos != VALUESET_ITEM_NOTFOUND )
@@ -455,7 +455,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickModifyHdl_Impl, Button*, void)
IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void)
{
size_t nPos = m_pPatternLB->GetSelectItemPos();
- sal_Int32 nId = m_pPatternLB->GetSelectItemId();
+ sal_Int32 nId = m_pPatternLB->GetSelectedItemId();
if ( nPos != VALUESET_ITEM_NOTFOUND )
{
@@ -498,7 +498,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickRenameHdl_Impl, SvxPresetListBox*, void)
IMPL_LINK_NOARG(SvxPatternTabPage, ClickDeleteHdl_Impl, SvxPresetListBox*, void)
{
- sal_uInt16 nId = m_pPatternLB->GetSelectItemId();
+ sal_uInt16 nId = m_pPatternLB->GetSelectedItemId();
size_t nPos = m_pPatternLB->GetSelectItemPos();
if( nPos != VALUESET_ITEM_NOTFOUND )
diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx
index 746a0821a9a8..8de68755da48 100644
--- a/include/sfx2/controlwrapper.hxx
+++ b/include/sfx2/controlwrapper.hxx
@@ -506,7 +506,7 @@ void ListBoxWrapper< ValueT >::SetControlValue( ValueT nValue )
template< typename ValueT >
ValueT ValueSetWrapper< ValueT >::GetControlValue() const
{
- return this->GetValueFromPos( this->GetControl().GetSelectItemId() );
+ return this->GetValueFromPos( this->GetControl().GetSelectedItemId() );
}
template< typename ValueT >
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 7ff5fc597876..000e00268874 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -85,7 +85,7 @@ WB_NAMEFIELD There is a namefield, where the name of an item will be
shown.
WB_NONEFIELD There is a NoSelection field which can be selected if
0 is passed along with SelectItem. Respectively
- GetSelectItemId() returns 0 if this field or nothing
+ GetSelectedItemId() returns 0 if this field or nothing
is selected. This field shows the text which is specified
by SetText() respectively no one, if no text was set. With
SetNoSelection() the selection can be disabled.
@@ -337,7 +337,7 @@ public:
void RecalculateItemSizes();
void SelectItem( sal_uInt16 nItemId );
- sal_uInt16 GetSelectItemId() const
+ sal_uInt16 GetSelectedItemId() const
{
return mnSelItemId;
}
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 522596bbe002..700402238913 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -114,7 +114,7 @@ void ScTabBgColorDlg::FillColorValueSets_Impl()
/// Handler, called when color selection is changed
IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, void)
{
- sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId();
+ sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectedItemId();
Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : COL_AUTO;
m_aTabBgColor = aColor;
EndDialog( RET_OK );
@@ -123,7 +123,7 @@ IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, void)
// Handler, called when the OK button is pushed
IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl, Button*, void)
{
- sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectItemId();
+ sal_uInt16 nItemId = m_pTabBgColorSet->GetSelectedItemId();
Color aColor = nItemId ? ( m_pTabBgColorSet->GetItemColor( nItemId ) ) : COL_AUTO;
m_aTabBgColor = aColor;
EndDialog( RET_OK );
@@ -164,7 +164,7 @@ void ScTabBgColorDlg::ScTabBgColorValueSet::KeyInput( const KeyEvent& rKEvt )
case KEY_SPACE:
case KEY_RETURN:
{
- sal_uInt16 nItemId = GetSelectItemId();
+ sal_uInt16 nItemId = GetSelectedItemId();
const Color& aColor = nItemId ? ( GetItemColor( nItemId ) ) : COL_AUTO;
m_pTabBgColorDlg->m_aTabBgColor = aColor;
m_pTabBgColorDlg->EndDialog(RET_OK);
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index fe3a7d881967..cd61e69c3d9d 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -103,7 +103,7 @@ IMPL_LINK(CellLineStylePopup, VSSelectHdl, ValueSet*, pControl, void)
{
if(pControl == maCellLineStyleValueSet.get())
{
- const sal_uInt16 iPos(maCellLineStyleValueSet->GetSelectItemId());
+ const sal_uInt16 iPos(maCellLineStyleValueSet->GetSelectedItemId());
SvxLineItem aLineItem(SID_FRAME_LINESTYLE);
SvxBorderLineStyle nStyle = SvxBorderLineStyle::SOLID;
sal_uInt16 n1 = 0;
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index d28cead6f6cc..41cfa5431dea 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -887,7 +887,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
if( !pPage5_TextOnly->IsChecked() )
{
aValue.Name = "UseButtonSet";
- aValue.Value <<= static_cast<sal_Int32>(pPage5_Buttons->GetSelectItemId() - 1);
+ aValue.Value <<= static_cast<sal_Int32>(pPage5_Buttons->GetSelectedItemId() - 1);
aProps.push_back( aValue );
}
@@ -1479,7 +1479,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign )
if(pPage5_TextOnly->IsChecked())
pDesign->m_nButtonThema = -1;
else
- pDesign->m_nButtonThema = pPage5_Buttons->GetSelectItemId() - 1;
+ pDesign->m_nButtonThema = pPage5_Buttons->GetSelectedItemId() - 1;
pDesign->m_bUserAttr = pPage6_User->IsChecked();
pDesign->m_aBackColor = m_aBackColor;
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 0fe9d7292996..f47e611216af 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -808,11 +808,11 @@ impl::TransitionEffect SlideTransitionPane::getTransitionEffectFromControls() co
// check first (aResult might be overwritten)
if( mpVS_TRANSITION_ICONS->IsEnabled() &&
!mpVS_TRANSITION_ICONS->IsNoSelection() &&
- mpVS_TRANSITION_ICONS->GetSelectItemId() > 0 )
+ mpVS_TRANSITION_ICONS->GetSelectedItemId() > 0 )
{
const sd::TransitionPresetList& rPresetList = sd::TransitionPreset::getTransitionPresetList();
auto aSelected = rPresetList.begin();
- std::advance( aSelected, mpVS_TRANSITION_ICONS->GetSelectItemId() - 1);
+ std::advance( aSelected, mpVS_TRANSITION_ICONS->GetSelectedItemId() - 1);
if( mpLB_VARIANT->GetSelectedEntryPos() == LISTBOX_ENTRY_NOTFOUND )
{
@@ -1046,7 +1046,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, PlayButtonClicked, Button*, void)
IMPL_LINK_NOARG(SlideTransitionPane, TransitionSelected, ValueSet *, void)
{
- updateVariants( mpVS_TRANSITION_ICONS->GetSelectItemId() - 1 );
+ updateVariants( mpVS_TRANSITION_ICONS->GetSelectedItemId() - 1 );
applyToSelectedPages();
}
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx
index da3de53d4855..cfa7e70f7d29 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -208,12 +208,12 @@ void DisplayModeToolbarMenu::SelectHdl(void const * pControl)
OUString sImage;
if( pControl == mpDisplayModeSet1 ) {
- sCommandURL = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].msUnoCommand);
- sImage = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectItemId() - 1 ].msBmpResId);
+ sCommandURL = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectedItemId() - 1 ].msUnoCommand);
+ sImage = OUString::createFromAscii(editmodes[mpDisplayModeSet1->GetSelectedItemId() - 1 ].msBmpResId);
}
else if( pControl == mpDisplayModeSet2 ) {
- sCommandURL = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].msUnoCommand);
- sImage = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectItemId() - 5 ].msBmpResId);
+ sCommandURL = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectedItemId() - 5 ].msUnoCommand);
+ sImage = OUString::createFromAscii(mastermodes[mpDisplayModeSet2->GetSelectedItemId() - 5 ].msBmpResId);
}
if (!sCommandURL.isEmpty())
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 2f51e50c0f90..7e2842305781 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -284,11 +284,11 @@ void LayoutToolbarMenu::SelectHdl(void const * pControl)
if( pControl == mpLayoutSet1 )
{
- eLayout = static_cast< AutoLayout >(mpLayoutSet1->GetSelectItemId()-1);
+ eLayout = static_cast< AutoLayout >(mpLayoutSet1->GetSelectedItemId()-1);
}
else if( pControl == mpLayoutSet2 )
{
- eLayout = static_cast< AutoLayout >(mpLayoutSet2->GetSelectItemId()-1);
+ eLayout = static_cast< AutoLayout >(mpLayoutSet2->GetSelectedItemId()-1);
}
if( eLayout != AUTOLAYOUT_END )
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 27998d39e311..c4d16cd7037e 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -110,7 +110,7 @@ void SdPresLayoutDlg::Reset()
*/
void SdPresLayoutDlg::GetAttr(SfxItemSet& rOutAttrs)
{
- short nId = m_pVS->GetSelectItemId();
+ short nId = m_pVS->GetSelectedItemId();
bool bLoad = nId > mnLayoutCount;
rOutAttrs.Put( SfxBoolItem( ATTR_PRESLAYOUT_LOAD, bLoad ) );
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 935f34d7be00..36dd97722232 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -219,9 +219,9 @@ AutoLayout LayoutMenu::GetSelectedAutoLayout()
{
AutoLayout aResult = AUTOLAYOUT_NONE;
- if ( ! IsNoSelection() && GetSelectItemId()!=0)
+ if ( ! IsNoSelection() && GetSelectedItemId()!=0)
{
- AutoLayout* pLayout = static_cast<AutoLayout*>(GetItemData(GetSelectItemId()));
+ AutoLayout* pLayout = static_cast<AutoLayout*>(GetItemData(GetSelectedItemId()));
if (pLayout != nullptr)
aResult = *pLayout;
}
@@ -579,9 +579,9 @@ void LayoutMenu::Command (const CommandEvent& rEvent)
}
else
{
- if (GetSelectItemId() == sal_uInt16(-1))
+ if (GetSelectedItemId() == sal_uInt16(-1))
return;
- ::tools::Rectangle aBBox (GetItemRect(GetSelectItemId()));
+ ::tools::Rectangle aBBox (GetItemRect(GetSelectedItemId()));
aMenuPosition = aBBox.Center();
}
@@ -675,7 +675,7 @@ void LayoutMenu::UpdateSelection()
if (*static_cast<AutoLayout*>(GetItemData(nId)) == aLayout)
{
// do not set selection twice to the same item
- if (GetSelectItemId() != nId)
+ if (GetSelectedItemId() != nId)
{
SetNoSelection();
SelectItem(nId);
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 53d13a1112e9..8fa6a644069b 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -205,7 +205,7 @@ void MasterPagesSelector::Command (const CommandEvent& rEvent)
{
// Use the currently selected item and show the popup menu in its
// center.
- const sal_uInt16 nIndex = PreviewValueSet::GetSelectItemId();
+ const sal_uInt16 nIndex = PreviewValueSet::GetSelectedItemId();
if (nIndex > 0)
{
// The position of the upper left corner of the context menu is
@@ -305,7 +305,7 @@ void MasterPagesSelector::ExecuteCommand(const OString &rIdent)
SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher();
if (pDispatcher != nullptr)
{
- sal_uInt16 nIndex = PreviewValueSet::GetSelectItemId();
+ sal_uInt16 nIndex = PreviewValueSet::GetSelectedItemId();
pDispatcher->Execute(SID_MASTERPAGE, SfxCallMode::SYNCHRON);
PreviewValueSet::SelectItem (nIndex);
mrBase.GetDrawController().setCurrentPage(xSelectedMaster);
@@ -324,7 +324,7 @@ SdPage* MasterPagesSelector::GetSelectedMasterPage()
const ::osl::MutexGuard aGuard (maMutex);
SdPage* pMasterPage = nullptr;
- sal_uInt16 nIndex = PreviewValueSet::GetSelectItemId();
+ sal_uInt16 nIndex = PreviewValueSet::GetSelectedItemId();
UserData* pData = GetUserData(nIndex);
if (pData != nullptr)
{
diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
index e06efb6994a7..0cfbdb0ce0af 100644
--- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
@@ -129,7 +129,7 @@ void RecentMasterPagesSelector::AssignMasterPageToPageList (
SdPage* pMasterPage,
const std::shared_ptr<std::vector<SdPage*> >& rpPageList)
{
- sal_uInt16 nSelectedItemId = PreviewValueSet::GetSelectItemId();
+ sal_uInt16 nSelectedItemId = PreviewValueSet::GetSelectedItemId();
MasterPagesSelector::AssignMasterPageToPageList(pMasterPage, rpPageList);
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index c686ebab5305..2d4d751b6afb 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -168,7 +168,7 @@ void TableDesignWidget::ApplyStyle()
try
{
OUString sStyleName;
- sal_Int32 nIndex = static_cast< sal_Int32 >( m_pValueSet->GetSelectItemId() ) - 1;
+ sal_Int32 nIndex = static_cast< sal_Int32 >( m_pValueSet->GetSelectedItemId() ) - 1;
if( (nIndex >= 0) && (nIndex < mxTableFamily->getCount()) )
{
@@ -715,7 +715,7 @@ const BitmapEx CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle
void TableDesignWidget::FillDesignPreviewControl()
{
- sal_uInt16 nSelectedItem = m_pValueSet->GetSelectItemId();
+ sal_uInt16 nSelectedItem = m_pValueSet->GetSelectedItemId();
m_pValueSet->Clear();
try
{
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index 1685f115b621..dd94ed5fd8f3 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -366,7 +366,7 @@ void ToolbarMenu_Impl::notifyHighlightedEntry()
// todo: if other controls than ValueSet are allowed, adapt this code
ValueSet* pValueSet = dynamic_cast< ValueSet* >( pEntry->mpControl.get() );
if( pValueSet )
- nChildIndex = static_cast< sal_Int32 >( pValueSet->GetItemPos( pValueSet->GetSelectItemId() ) );
+ nChildIndex = static_cast< sal_Int32 >( pValueSet->GetItemPos( pValueSet->GetSelectedItemId() ) );
if( (nChildIndex >= pEntry->getAccessibleChildCount()) || (nChildIndex < 0) )
return;
@@ -925,7 +925,7 @@ static bool implCheckSubControlCursorMove( Control* pControl, bool bUp, int& nLa
ValueSet* pValueSet = dynamic_cast< ValueSet* >( pControl );
if( pValueSet )
{
- size_t nItemPos = pValueSet->GetItemPos( pValueSet->GetSelectItemId() );
+ size_t nItemPos = pValueSet->GetItemPos( pValueSet->GetSelectedItemId() );
if( nItemPos != VALUESET_ITEM_NOTFOUND )
{
const sal_uInt16 nColCount = pValueSet->GetColCount();
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index b5cb0ef17f89..443dfc875d70 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -861,7 +861,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getA
// pStateSet->AddState( accessibility::AccessibleStateType::FOCUSABLE );
// SELECTED
- if( mpParent->mrParent.GetSelectItemId() == mpParent->mnId )
+ if( mpParent->mrParent.GetSelectedItemId() == mpParent->mnId )
{
pStateSet->AddState( accessibility::AccessibleStateType::SELECTED );
// pStateSet->AddState( accessibility::AccessibleStateType::FOCUSED );
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 33fd03046fc9..d436061d9511 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -530,28 +530,28 @@ void SvxBmpMask::SetColor( const Color& rColor )
void SvxBmpMask::PipetteClicked()
{
- if( m_pQSet1->GetSelectItemId() == 1 )
+ if( m_pQSet1->GetSelectedItemId() == 1 )
{
m_pCbx1->Check();
pData->CbxHdl(m_pCbx1);
m_pQSet1->SetItemColor( 1, aPipetteColor );
m_pQSet1->SetFormat();
}
- else if( m_pQSet2->GetSelectItemId() == 1 )
+ else if( m_pQSet2->GetSelectedItemId() == 1 )
{
m_pCbx2->Check();
pData->CbxHdl(m_pCbx2);
m_pQSet2->SetItemColor( 1, aPipetteColor );
m_pQSet2->SetFormat();
}
- else if( m_pQSet3->GetSelectItemId() == 1 )
+ else if( m_pQSet3->GetSelectedItemId() == 1 )
{
m_pCbx3->Check();
pData->CbxHdl(m_pCbx3);
m_pQSet3->SetItemColor( 1, aPipetteColor );
m_pQSet3->SetFormat();
}
- else if( m_pQSet4->GetSelectItemId() == 1 )
+ else if( m_pQSet4->GetSelectedItemId() == 1 )
{
m_pCbx4->Check();
pData->CbxHdl(m_pCbx4);
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 34eb599082bd..32fee03bee82 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -925,7 +925,7 @@ sal_uInt32 GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point&
if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
{
- nRet = ( ( GALLERYBROWSERMODE_ICON == meLastMode ) ? mpIconView->GetSelectItemId() : ( mpListView->FirstSelectedRow() + 1 ) );
+ nRet = ( ( GALLERYBROWSERMODE_ICON == meLastMode ) ? mpIconView->GetSelectedItemId() : ( mpListView->FirstSelectedRow() + 1 ) );
if( pSelPos )
rSelPos = GetPointerPosPixel();
@@ -941,7 +941,7 @@ sal_uInt32 GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point&
}
else
{
- nRet = mpIconView->GetSelectItemId();
+ nRet = mpIconView->GetSelectedItemId();
rSelPos = mpIconView->GetItemRect(nRet).Center();
}
}
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index 72516cdc59d7..b3f4e3cbdb2e 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -112,7 +112,7 @@ LineWidthPopup::~LineWidthPopup()
IMPL_LINK(LineWidthPopup, VSSelectHdl, ValueSet*, /*pControl*/, void)
{
- sal_uInt16 iPos = m_xVSWidth->GetSelectItemId();
+ sal_uInt16 iPos = m_xVSWidth->GetSelectedItemId();
if (iPos >= 1 && iPos <= 8)
{
sal_IntPtr nVal = LogicToLogic(reinterpret_cast<sal_IntPtr>(m_xVSWidth->GetItemData( iPos )), MapUnit::MapPoint, m_eMapUnit);
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
index dc074df94e6c..671eeeba55b4 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
@@ -112,7 +112,7 @@ IMPL_LINK(DefaultShapesPanel, ShapeSelectHdl, ValueSet*, rValueSet, void)
{
if(rValueSet == aSetMap.first)
{
- int aSelection = aSetMap.first->GetSelectItemId();
+ int aSelection = aSetMap.first->GetSelectedItemId();
comphelper::dispatchCommand(aSetMap.second[aSelection], {});
}
else
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 64bf618597a4..1f71d291fe23 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -69,7 +69,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt )
{
//draw background
- if ( GetSelectItemId() == nItemId )
+ if ( GetSelectedItemId() == nItemId )
{
tools::Rectangle aBackRect = aRect;
aBackRect.AdjustTop(3 );
@@ -83,7 +83,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt )
pDev->DrawRect(aRect);
}
- if ( GetSelectItemId() == nItemId )
+ if ( GetSelectedItemId() == nItemId )
{
aFont.SetColor( sfx2::sidebar::Theme::GetColor( sfx2::sidebar::Theme::Color_HighlightText ) );
}
diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx
index ba58a567313d..212e51f85653 100644
--- a/svx/source/tbxctrls/SvxPresetListBox.cxx
+++ b/svx/source/tbxctrls/SvxPresetListBox.cxx
@@ -55,7 +55,7 @@ void SvxPresetListBox::Command( const CommandEvent& rEvent )
{
case CommandEventId::ContextMenu:
{
- const sal_uInt16 nIndex = GetSelectItemId();
+ const sal_uInt16 nIndex = GetSelectedItemId();
if(nIndex > 0)
{
Point aPos(rEvent.GetMousePosPixel());
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index e010842c1adb..d01abc43ee0b 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -161,7 +161,7 @@ void NumberingPopup::VSSelectHdl(void const * pControl)
if ( pControl == mpValueSet )
{
- sal_uInt16 nSelItem = mpValueSet->GetSelectItemId();
+ sal_uInt16 nSelItem = mpValueSet->GetSelectedItemId();
if ( mePageType == NumberingPageType::BULLET )
{
auto aArgs( comphelper::InitPropertySequence( { { "SetBullet", css::uno::makeAny( nSelItem ) } } ) );
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 20af198b7c8d..637f2c4872ba 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -337,7 +337,7 @@ bool SvxColorDockingWindow::Close()
IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl, ValueSet*, void)
{
SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
- sal_uInt16 nPos = aColorSet->GetSelectItemId();
+ sal_uInt16 nPos = aColorSet->GetSelectedItemId();
Color aColor( aColorSet->GetItemColor( nPos ) );
OUString aStr( aColorSet->GetItemText( nPos ) );
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index b2ac8546c4d9..2b8ddd842639 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -271,7 +271,7 @@ void ExtrusionDirectionWindow::SelectHdl(void const * pControl)
{
Sequence< PropertyValue > aArgs( 1 );
aArgs[0].Name = OUString(g_sExtrusionDirection).copy(5);
- aArgs[0].Value <<= static_cast<sal_Int32>(gSkewList[mpDirectionSet->GetSelectItemId()-1]);
+ aArgs[0].Value <<= static_cast<sal_Int32>(gSkewList[mpDirectionSet->GetSelectedItemId()-1]);
mrController.dispatchCommand( g_sExtrusionDirection, aArgs );
}
@@ -785,7 +785,7 @@ void ExtrusionLightingWindow::SelectHdl(void const * pControl)
}
else
{
- sal_Int32 nDirection = mpLightingSet->GetSelectItemId();
+ sal_Int32 nDirection = mpLightingSet->GetSelectedItemId();
if( (nDirection > 0) && (nDirection < 10) )
{
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index c77ec207f98e..cca40d210b01 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -185,7 +185,7 @@ void FontWorkGalleryDialog::SetSdrObjectRef( SdrObject** ppSdrObject, SdrModel*
void FontWorkGalleryDialog::insertSelectedFontwork()
{
- sal_uInt16 nItemId = mpCtlFavorites->GetSelectItemId();
+ sal_uInt16 nItemId = mpCtlFavorites->GetSelectedItemId();
if( nItemId > 0 )
{
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index e7424b6af23c..e03effe1e119 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -312,7 +312,7 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl, ValueSet*, void)
{
std::unique_ptr<XLineEndItem> pLineEndItem;
std::unique_ptr<XLineStartItem> pLineStartItem;
- sal_uInt16 nId = mpLineEndSet->GetSelectItemId();
+ sal_uInt16 nId = mpLineEndSet->GetSelectedItemId();
if( nId == 1 )
{
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 212afa8efe89..6ec04a941513 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1385,8 +1385,8 @@ void SvxColorWindow::KeyInput( const KeyEvent& rKEvt )
NamedColor SvxColorWindow::GetSelectEntryColor(ValueSet const * pColorSet)
{
- Color aColor = pColorSet->GetItemColor(pColorSet->GetSelectItemId());
- OUString sColorName = pColorSet->GetItemText(pColorSet->GetSelectItemId());
+ Color aColor = pColorSet->GetItemColor(pColorSet->GetSelectedItemId());
+ OUString sColorName = pColorSet->GetItemText(pColorSet->GetSelectedItemId());
return std::make_pair(aColor, sColorName);
}
@@ -1804,7 +1804,7 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void)
*pRight = nullptr,
*pTop = nullptr,
*pBottom = nullptr;
- sal_uInt16 nSel = aFrameSet->GetSelectItemId();
+ sal_uInt16 nSel = aFrameSet->GetSelectedItemId();
sal_uInt16 nModifier = aFrameSet->GetModifier();
FrmValidFlags nValidFlags = FrmValidFlags::NONE;
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index af958e54abb2..4d8913ee84b4 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1312,7 +1312,7 @@ DeactivateRC SwColumnPage::DeactivatePage(SfxItemSet *_pSet)
IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS, void )
{
- const sal_uInt16 nItem = pVS->GetSelectItemId();
+ const sal_uInt16 nItem = pVS->GetSelectedItemId();
if( nItem < 4 )
{
m_pCLNrEdt->SetValue( nItem );
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 9dbb836ccb31..eb189fa7935a 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -223,7 +223,7 @@ IMPL_LINK(PageSizeControl, ImplSizeHdl, ValueSet*, pControl, void)
mpSizeValueSet->SetNoSelection();
if ( pControl == mpSizeValueSet )
{
- const sal_uInt16 nSelectedPaper = mpSizeValueSet->GetSelectItemId();
+ const sal_uInt16 nSelectedPaper = mpSizeValueSet->GetSelectedItemId();
const Paper ePaper = maPaperList[nSelectedPaper - 1];
ExecuteSizeChange( ePaper );
}
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index 5001363ad2fc..da9d88b2d59a 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -201,7 +201,7 @@ void StylePresetsPanel::dispose()
IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl, ValueSet*, void)
{
- sal_Int32 nItemId = mpValueSet->GetSelectItemId();
+ sal_Int32 nItemId = mpValueSet->GetSelectedItemId();
TemplateEntry* pEntry = static_cast<TemplateEntry*>(mpValueSet->GetItemData(nItemId));
SwDocShell* pDocSh = static_cast<SwDocShell*>(SfxObjectShell::Current());
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx
index 59a2b2334c08..5560e5520fa4 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -495,7 +495,7 @@ void ThemePanel::DoubleClickHdl()
if (pDocSh)
{
OUString sEntryFonts = mpListBoxFonts->GetSelectedEntry();
- sal_uInt32 nItemId = mpValueSetColors->GetSelectItemId();
+ sal_uInt32 nItemId = mpValueSetColors->GetSelectedItemId();
OUString sEntryColors = maColorSets.getColorSet(nItemId).getName();
StyleSet aStyleSet = setupThemes();
More information about the Libreoffice-commits
mailing list