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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/dialogs/iconcdlg.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 6e800d257be5..bf90a98a1af4 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -250,9 +250,9 @@ void IconChoiceDialog::dispose() if (m_pIconCtrl) { // remove Userdata from Icons - for ( sal_uLong i=0; i < m_pIconCtrl->GetEntryCount(); i++) + for ( sal_Int32 i=0; i < m_pIconCtrl->GetEntryCount(); i++) { - SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry ( i ); + SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry( i ); delete static_cast<sal_uInt16*>(pEntry->GetUserData()); } } @@ -358,13 +358,11 @@ void IconChoiceDialog::ShowPage(sal_uInt16 nId) \**********************************************************************/ IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl) { - sal_uLong nPos; - - SvxIconChoiceCtrlEntry *pEntry = m_pIconCtrl->GetSelectedEntry ( nPos ); + SvxIconChoiceCtrlEntry *pEntry = m_pIconCtrl->GetSelectedEntry(); if ( !pEntry ) pEntry = m_pIconCtrl->GetCursor( ); - sal_uInt16 *pId = static_cast<sal_uInt16*>(pEntry->GetUserData ()); + sal_uInt16 *pId = static_cast<sal_uInt16*>(pEntry->GetUserData()); if( *pId != mnCurrentPageId ) { @@ -841,7 +839,7 @@ short IconChoiceDialog::Ok() void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId ) { // set focus to icon for the current visible page - for ( sal_uLong i=0; i<m_pIconCtrl->GetEntryCount(); i++) + for ( sal_Int32 i=0; i<m_pIconCtrl->GetEntryCount(); i++) { SvxIconChoiceCtrlEntry* pEntry = m_pIconCtrl->GetEntry ( i ); sal_uInt16* pUserData = static_cast<sal_uInt16*>(pEntry->GetUserData()); |