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 /cui/source/tabpages/tpbitmap.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 'cui/source/tabpages/tpbitmap.cxx')
| -rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index daf46ac8847c..9602ab38d91a 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -136,8 +136,8 @@ void SvxBitmapTabPage::Construct() void SvxBitmapTabPage::ActivatePage( const SfxItemSet& ) { - sal_uInt16 nPos; - sal_uInt16 nCount; + sal_Int32 nPos; + sal_Int32 nCount; if( nDlgType == 0 ) // area dialog { @@ -232,7 +232,7 @@ sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs ) if(PT_BITMAP == *pPageType) { _rOutAttrs.Put(XFillStyleItem(XFILL_BITMAP)); - sal_uInt16 nPos = m_pLbBitmaps->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); if(LISTBOX_ENTRY_NOTFOUND != nPos) { const XBitmapEntry* pXBitmapEntry = pBitmapList->GetBitmap(nPos); @@ -419,7 +419,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl) long SvxBitmapTabPage::CheckChanges_Impl() { - sal_uInt16 nPos = m_pLbBitmaps->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { if( bBmpChanged ) @@ -661,7 +661,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) { - sal_uInt16 nPos = m_pLbBitmaps->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -726,7 +726,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl) IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl) { - sal_uInt16 nPos = m_pLbBitmaps->GetSelectEntryPos(); + sal_Int32 nPos = m_pLbBitmaps->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND ) { |