From 68ec95b3f80408ae50897b043eed69a07d084df9 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Sat, 1 Mar 2014 03:13:28 +0100 Subject: 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 Tested-by: Eike Rathke --- cui/source/tabpages/textanim.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cui/source/tabpages/textanim.cxx') diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 3bdb1cd4c90f..139c3d179b55 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -151,7 +151,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) if( pItem ) { eAniKind = ( ( const SdrTextAniKindItem* )pItem )->GetValue(); - m_pLbEffect->SelectEntryPos( sal::static_int_cast< sal_uInt16 >(eAniKind) ); + m_pLbEffect->SelectEntryPos( sal::static_int_cast< sal_Int32 >(eAniKind) ); } else m_pLbEffect->SetNoSelection(); @@ -335,7 +335,7 @@ void SvxTextAnimationPage::Reset( const SfxItemSet& rAttrs ) sal_Bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) { sal_Bool bModified = sal_False; - sal_uInt16 nPos; + sal_Int32 nPos; TriState eState; // animation type @@ -459,7 +459,7 @@ SfxTabPage* SvxTextAnimationPage::Create( Window* pWindow, IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl) { - sal_uInt16 nPos = m_pLbEffect->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbEffect->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { eAniKind = (SdrTextAniKind) nPos; -- cgit