diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-06-16 14:36:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-06-29 07:25:44 +0000 |
| commit | 497c589802a788de78af28ea88cec947b25355b3 (patch) | |
| tree | 00d08d81fa59230420618164315302762fdbf85e /svtools/source/contnr/ivctrl.cxx | |
| parent | e57314f61f67b093510c5a8a8f34a62126ba8734 (diff) | |
sal_uLong->sal_Int32 in SvtIconChoiceCtrl
and drop the pass-by-reference param from GetSelected, nothing
uses it
Change-Id: I6d616a2b147912af9305410625af6e7afae34e59
Reviewed-on: https://gerrit.libreoffice.org/16312
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svtools/source/contnr/ivctrl.cxx')
| -rw-r--r-- | svtools/source/contnr/ivctrl.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 5378693828e5..73e5c5e6959b 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -150,7 +150,7 @@ void SvtIconChoiceCtrl::ArrangeIcons() Size aFullSize; Rectangle aEntryRect; - for ( sal_uLong i = 0; i < GetEntryCount(); i++ ) + for ( sal_Int32 i = 0; i < GetEntryCount(); i++ ) { SvxIconChoiceCtrlEntry* pEntry = GetEntry ( i ); aEntryRect = _pImp->GetEntryBoundRect ( pEntry ); @@ -165,7 +165,7 @@ void SvtIconChoiceCtrl::ArrangeIcons() Size aFullSize; Rectangle aEntryRect; - for ( sal_uLong i = 0; i < GetEntryCount(); i++ ) + for ( sal_Int32 i = 0; i < GetEntryCount(); i++ ) { SvxIconChoiceCtrlEntry* pEntry = GetEntry ( i ); aEntryRect = _pImp->GetEntryBoundRect ( pEntry ); @@ -208,8 +208,7 @@ void SvtIconChoiceCtrl::GetFocus() { _pImp->GetFocus(); Control::GetFocus(); - sal_uLong nPos; - SvxIconChoiceCtrlEntry* pSelectedEntry = GetSelectedEntry ( nPos ); + SvxIconChoiceCtrlEntry* pSelectedEntry = GetSelectedEntry(); if ( pSelectedEntry ) _pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pSelectedEntry ); } @@ -267,12 +266,12 @@ void SvtIconChoiceCtrl::SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIc } #endif -sal_uLong SvtIconChoiceCtrl::GetEntryCount() const +sal_Int32 SvtIconChoiceCtrl::GetEntryCount() const { return _pImp ? _pImp->GetEntryCount() : 0; } -SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( sal_uLong nPos ) const +SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( sal_Int32 nPos ) const { return _pImp ? _pImp->GetEntry( nPos ) : NULL; } @@ -282,15 +281,14 @@ void SvtIconChoiceCtrl::CreateAutoMnemonics( MnemonicGenerator& _rUsedMnemonics _pImp->CreateAutoMnemonics( &_rUsedMnemonics ); } -SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetSelectedEntry( sal_uLong& rPos ) const +SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetSelectedEntry() const { - return _pImp ? _pImp->GetFirstSelectedEntry( rPos ) : NULL; + return _pImp ? _pImp->GetFirstSelectedEntry() : NULL; } void SvtIconChoiceCtrl::ClickIcon() { - sal_uLong nPos; - GetSelectedEntry ( nPos ); + GetSelectedEntry(); _aClickIconHdl.Call( this ); } bool SvtIconChoiceCtrl::IsEntryEditing() const @@ -323,7 +321,7 @@ bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt ) _pCurKeyEvent = NULL; return bHandled; } -sal_uLong SvtIconChoiceCtrl::GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const +sal_Int32 SvtIconChoiceCtrl::GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const { return _pImp->GetEntryListPos( pEntry ); } |