diff options
| author | Eike Rathke <erack@redhat.com> | 2014-03-01 03:13:28 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2014-03-05 07:31:19 -0600 |
| commit | 68ec95b3f80408ae50897b043eed69a07d084df9 (patch) | |
| tree | 5d32076e843fae44f28e3c8d9dbbacf7648fecbc /sfx2/source/dialog/srchdlg.cxx | |
| parent | c3403ac888c2e62edaf8befe7982f5f8cc95c16f (diff) | |
made ListBox handle more than 64k elements, fdo#61520 related
ListBox and related now handle up to sal_Int32 elements correctly.
sal_Int32 instead of sal_Size or size_t because of UNO and a11y API.
Also disentangled some of the mess of SvTreeList and other containers
regarding sal_uInt16, sal_uLong, long, size_t, ... type mixtures.
Change-Id: Idb6e0ae689dc5bc2cf980721972b57b0261e688a
Reviewed-on: https://gerrit.libreoffice.org/8460
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sfx2/source/dialog/srchdlg.cxx')
| -rw-r--r-- | sfx2/source/dialog/srchdlg.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 3dada2fd5621..51744cf97cf3 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -100,7 +100,7 @@ void SearchDialog::SaveConfig() SvtViewOptions aViewOpt( E_DIALOG, m_sConfigName ); aViewOpt.SetWindowState(OStringToOUString(m_sWinState, RTL_TEXTENCODING_ASCII_US)); OUString sUserData; - sal_uInt16 i = 0, nCount = std::min( m_pSearchEdit->GetEntryCount(), MAX_SAVE_COUNT ); + sal_Int32 i = 0, nCount = std::min( m_pSearchEdit->GetEntryCount(), static_cast<sal_Int32>(MAX_SAVE_COUNT) ); for ( ; i < nCount; ++i ) { sUserData += m_pSearchEdit->GetEntry(i); @@ -123,7 +123,7 @@ void SearchDialog::SaveConfig() IMPL_LINK_NOARG(SearchDialog, FindHdl) { OUString sSrchTxt = m_pSearchEdit->GetText(); - sal_uInt16 nPos = m_pSearchEdit->GetEntryPos( sSrchTxt ); + sal_Int32 nPos = m_pSearchEdit->GetEntryPos( sSrchTxt ); if ( nPos > 0 && nPos != COMBOBOX_ENTRY_NOTFOUND ) m_pSearchEdit->RemoveEntryAt(nPos); if ( nPos > 0 ) |