diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-03-22 17:36:51 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-03-23 08:26:14 +0100 |
commit | a82cdccb0c276ec10c35beec46fa7fa25fc95cd5 (patch) | |
tree | 73ad8a19584e75b18229f5c1c410569f2f6c8aec /cui/source | |
parent | c12fc293650a860d5e05c32000f904afaf0958b6 (diff) |
Typo: GetSelectItemId -> GetSelectedItemId
Change-Id: Ieebb50b73f1f341c924693f3966f8cd2b09a136b
Reviewed-on: https://gerrit.libreoffice.org/51750
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'cui/source')
-rw-r--r-- | cui/source/dialogs/hangulhanjadlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optchart.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/align.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/border.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/labdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/tpcolor.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/tpgradnt.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/tphatch.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/tppattern.cxx | 8 |
12 files changed, 31 insertions, 31 deletions
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 ) |