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 /svx/source/dialog/frmdirlbox.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 'svx/source/dialog/frmdirlbox.cxx')
| -rw-r--r-- | svx/source/dialog/frmdirlbox.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index 114a36b29a3c..04a8454d6e25 100644 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx @@ -55,22 +55,22 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFrameDirectionListBox(Windo } -void FrameDirectionListBox::InsertEntryValue( const OUString& rString, SvxFrameDirection eDirection, sal_uInt16 nPos ) +void FrameDirectionListBox::InsertEntryValue( const OUString& rString, SvxFrameDirection eDirection, sal_Int32 nPos ) { - sal_uInt16 nRealPos = InsertEntry( rString, nPos ); + sal_Int32 nRealPos = InsertEntry( rString, nPos ); SetEntryData( nRealPos, lclEnumToVoid( eDirection ) ); } void FrameDirectionListBox::RemoveEntryValue( SvxFrameDirection eDirection ) { - sal_uInt16 nPos = GetEntryPos( lclEnumToVoid( eDirection ) ); + sal_Int32 nPos = GetEntryPos( lclEnumToVoid( eDirection ) ); if( nPos != LISTBOX_ENTRY_NOTFOUND ) RemoveEntry( nPos ); } void FrameDirectionListBox::SelectEntryValue( SvxFrameDirection eDirection ) { - sal_uInt16 nPos = GetEntryPos( lclEnumToVoid( eDirection ) ); + sal_Int32 nPos = GetEntryPos( lclEnumToVoid( eDirection ) ); if( nPos == LISTBOX_ENTRY_NOTFOUND ) SetNoSelection(); else @@ -79,7 +79,7 @@ void FrameDirectionListBox::SelectEntryValue( SvxFrameDirection eDirection ) SvxFrameDirection FrameDirectionListBox::GetSelectEntryValue() const { - sal_uInt16 nPos = GetSelectEntryPos(); + sal_Int32 nPos = GetSelectEntryPos(); if( nPos == LISTBOX_ENTRY_NOTFOUND ) return static_cast< SvxFrameDirection >( 0xFFFF ); return lclVoidToEnum( GetEntryData( nPos ) ); |