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 /dbaccess/source/ui/app | |
| 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 'dbaccess/source/ui/app')
| -rw-r--r-- | dbaccess/source/ui/app/AppSwapWindow.cxx | 9 | ||||
| -rw-r--r-- | dbaccess/source/ui/app/AppSwapWindow.hxx | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index d3654738e329..b7ddc1500474 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -114,8 +114,7 @@ void OApplicationSwapWindow::DataChanged( const DataChangedEvent& rDCEvt ) void OApplicationSwapWindow::clearSelection() { m_aIconControl->SetNoSelection(); - sal_uLong nPos = 0; - SvxIconChoiceCtrlEntry* pEntry = m_aIconControl->GetSelectedEntry(nPos); + SvxIconChoiceCtrlEntry* pEntry = m_aIconControl->GetSelectedEntry(); if ( pEntry ) m_aIconControl->InvalidateEntry(pEntry); m_aIconControl->GetClickHdl().Call(m_aIconControl.get()); @@ -138,8 +137,7 @@ bool OApplicationSwapWindow::interceptKeyInput( const KeyEvent& _rEvent ) ElementType OApplicationSwapWindow::getElementType() const { - sal_uLong nPos = 0; - SvxIconChoiceCtrlEntry* pEntry = m_aIconControl->GetSelectedEntry(nPos); + SvxIconChoiceCtrlEntry* pEntry = m_aIconControl->GetSelectedEntry(); return ( pEntry ) ? *static_cast<ElementType*>(pEntry->GetUserData()) : E_NONE; } @@ -161,8 +159,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType ) IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl) { - sal_uLong nPos = 0; - SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry( nPos ); + SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry(); ElementType eType = E_NONE; if ( pEntry ) { diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index b655dd8e4dc1..077bc165a219 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -56,7 +56,7 @@ namespace dbaui void cut() SAL_OVERRIDE { } void paste() SAL_OVERRIDE { } - inline sal_uLong GetEntryCount() const { return m_aIconControl->GetEntryCount(); } + inline sal_Int32 GetEntryCount() const { return m_aIconControl->GetEntryCount(); } inline SvxIconChoiceCtrlEntry* GetEntry( sal_uLong nPos ) const { return m_aIconControl->GetEntry(nPos); } inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl->GetBoundingBox(pEntry); } |