ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Typo: GetSelectItemId -> GetSelectedItemId

Browse Source 
Change-Id: Ieebb50b73f1f341c924693f3966f8cd2b09a136b
Reviewed-on: https://gerrit.libreoffice.org/51750
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Samuel Mehrbrodt
2018-03-23 08:26:14 +01:00
parent c12fc29365
commit a82cdccb0c
44 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/source/controller/dialogs/tp_ChartType.cxx
+1 -1
View File
@@ -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 );
cui/source/dialogs/hangulhanjadlg.cxx
+1 -1
View File
@@ -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;
cui/source/options/optchart.cxx
+1 -1
View File
@@ -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 );
cui/source/tabpages/align.cxx
+1 -1
View File
@@ -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);
cui/source/tabpages/backgrnd.cxx
+1 -1
View File
@@ -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;
cui/source/tabpages/border.cxx
+3 -3
View File
@@ -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);
cui/source/tabpages/labdlg.cxx
+2 -2
View File
@@ -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 )
cui/source/tabpages/numpages.cxx
+4 -4
View File
@@ -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++)
cui/source/tabpages/tpbitmap.cxx
+3 -3
View File
@@ -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 )
cui/source/tabpages/tpcolor.cxx
+3 -3
View File
@@ -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();
cui/source/tabpages/tpgradnt.cxx
+4 -4
View File
@@ -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 )
cui/source/tabpages/tphatch.cxx
+4 -4
View File
@@ -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 )
cui/source/tabpages/tppattern.cxx
+4 -4
View File
@@ -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 )
include/sfx2/controlwrapper.hxx
+1 -1
View File
@@ -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 >
include/svtools/valueset.hxx
+2 -2
View File
@@ -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;
}
sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+3 -3
View File
@@ -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);
sc/source/ui/sidebar/CellLineStyleControl.cxx
+1 -1
View File
@@ -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;
sd/source/filter/html/pubdlg.cxx
+2 -2
View File
@@ -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;
sd/source/ui/animations/SlideTransitionPane.cxx
+3 -3
View File
@@ -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();
}
sd/source/ui/controller/displaymodecontroller.cxx
+4 -4
View File
@@ -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())
sd/source/ui/controller/slidelayoutcontroller.cxx
+2 -2
View File
@@ -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 )
sd/source/ui/dlg/sdpreslt.cxx
+1 -1
View File
@@ -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 ) );
sd/source/ui/sidebar/LayoutMenu.cxx
+5 -5
View File
@@ -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);
sd/source/ui/sidebar/MasterPagesSelector.cxx
+3 -3
View File
@@ -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)
{
sd/source/ui/sidebar/RecentMasterPagesSelector.cxx
+1 -1
View File
@@ -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);
sd/source/ui/table/TableDesignPane.cxx
+2 -2
View File
@@ -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
{
svtools/source/control/toolbarmenu.cxx
+2 -2
View File
@@ -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();
svtools/source/control/valueacc.cxx
+1 -1
View File
@@ -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 );
svx/source/dialog/_bmpmask.cxx
+4 -4
View File
@@ -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);
svx/source/gallery2/galbrws2.cxx
+2 -2
View File
@@ -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();
}
}
svx/source/sidebar/line/LineWidthPopup.cxx
+1 -1
View File
@@ -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);
svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+1 -1
View File
@@ -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
svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+2 -2
View File
@@ -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 ) );
}
svx/source/tbxctrls/SvxPresetListBox.cxx
+1 -1
View File
@@ -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());
svx/source/tbxctrls/bulletsnumbering.cxx
+1 -1
View File
@@ -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 ) } } ) );
svx/source/tbxctrls/colrctrl.cxx
+1 -1
View File
@@ -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 ) );
svx/source/tbxctrls/extrusioncontrols.cxx
+2 -2
View File
@@ -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) )
{
svx/source/tbxctrls/fontworkgallery.cxx
+1 -1
View File
@@ -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 )
{
svx/source/tbxctrls/linectrl.cxx
+1 -1
View File
@@ -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 )
{
svx/source/tbxctrls/tbcontrl.cxx
+3 -3
View File
@@ -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;
sw/source/ui/frmdlg/column.cxx
+1 -1
View File
@@ -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 );
sw/source/uibase/sidebar/PageSizeControl.cxx
+1 -1
View File
@@ -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 );
}
sw/source/uibase/sidebar/StylePresetsPanel.cxx
+1 -1
View File
@@ -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());
sw/source/uibase/sidebar/ThemePanel.cxx
+1 -1
View File
@@ -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();