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 /extensions/source/dbpilots | |
| 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 'extensions/source/dbpilots')
| -rw-r--r-- | extensions/source/dbpilots/gridwizard.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index af38f74f0de7..6ddfa06f5b20 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -414,7 +414,7 @@ namespace dbp // the (original) relative position of the entry sal_IntPtr nRelativeIndex = reinterpret_cast<sal_IntPtr>(bMoveRight ? m_aExistFields.GetEntryData(nSelected) : m_aSelFields.GetEntryData(nSelected)); - sal_uInt16 nInsertPos = LISTBOX_APPEND; + sal_uInt16 nInsertPos = SAL_MAX_UINT16; if (!bMoveRight) { // need to determine an insert pos which reflects the original nInsertPos = 0; @@ -437,7 +437,7 @@ namespace dbp // remove the entry from it's old list if (bMoveRight) { - sal_uInt16 nSelectPos = m_aExistFields.GetSelectEntryPos(); + sal_Int32 nSelectPos = m_aExistFields.GetSelectEntryPos(); m_aExistFields.RemoveEntry(nSelected); if ((LISTBOX_ENTRY_NOTFOUND != nSelectPos) && (nSelectPos < m_aExistFields.GetEntryCount())) m_aExistFields.SelectEntryPos(nSelectPos); @@ -446,7 +446,7 @@ namespace dbp } else { - sal_uInt16 nSelectPos = m_aSelFields.GetSelectEntryPos(); + sal_Int32 nSelectPos = m_aSelFields.GetSelectEntryPos(); m_aSelFields.RemoveEntry(nSelected); if ((LISTBOX_ENTRY_NOTFOUND != nSelectPos) && (nSelectPos < m_aSelFields.GetEntryCount())) m_aSelFields.SelectEntryPos(nSelectPos); |