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 /xmlsecurity | |
| 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 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 1e06c985ea14..924ff89549e3 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -265,13 +265,13 @@ IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl) IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl) { - sal_uInt16 nSel = m_pTrustFileLocLB->GetSelectEntryPos(); + sal_Int32 nSel = m_pTrustFileLocLB->GetSelectEntryPos(); if( nSel != LISTBOX_ENTRY_NOTFOUND ) { m_pTrustFileLocLB->RemoveEntry( nSel ); // Trusted Path could not be removed (#i33584#) // after remove an entry, select another one if exists - sal_uInt16 nNewCount = m_pTrustFileLocLB->GetEntryCount(); + sal_Int32 nNewCount = m_pTrustFileLocLB->GetEntryCount(); if ( nNewCount > 0 ) { if ( nSel >= nNewCount ) @@ -405,11 +405,11 @@ void MacroSecurityTrustedSourcesTP::ActivatePage() void MacroSecurityTrustedSourcesTP::ClosePage( void ) { - sal_uInt16 nEntryCnt = m_pTrustFileLocLB->GetEntryCount(); + sal_Int32 nEntryCnt = m_pTrustFileLocLB->GetEntryCount(); if( nEntryCnt ) { css::uno::Sequence< OUString > aSecureURLs( nEntryCnt ); - for( sal_uInt16 i = 0 ; i < nEntryCnt ; ++i ) + for( sal_Int32 i = 0 ; i < nEntryCnt ; ++i ) { OUString aURL( m_pTrustFileLocLB->GetEntry( i ) ); osl::FileBase::getFileURLFromSystemPath( aURL, aURL ); |