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 /starmath/source/dialog.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 'starmath/source/dialog.cxx')
| -rw-r--r-- | starmath/source/dialog.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 2cd5f43c17d9..b05a37b1c836 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -283,7 +283,7 @@ IMPL_LINK_INLINE_END( SmFontDialog, FontSelectHdl, ComboBox *, pComboBox ) IMPL_LINK( SmFontDialog, FontModifyHdl, ComboBox *, pComboBox ) { // if font is available in list then use it - sal_uInt16 nPos = pComboBox->GetEntryPos( pComboBox->GetText() ); + sal_Int32 nPos = pComboBox->GetEntryPos( pComboBox->GetText() ); if (COMBOBOX_ENTRY_NOTFOUND != nPos) { FontSelectHdl( pComboBox ); @@ -1516,7 +1516,7 @@ void SmSymbolDialog::DataChanged( const DataChangedEvent& rDCEvt ) bool SmSymbolDialog::SelectSymbolSet(const OUString &rSymbolSetName) { bool bRet = false; - sal_uInt16 nPos = m_pSymbolSets->GetEntryPos(rSymbolSetName); + sal_Int32 nPos = m_pSymbolSets->GetEntryPos(rSymbolSetName); aSymbolSetName = OUString(); aSymbolSet.clear(); @@ -1762,7 +1762,7 @@ IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, EMPTYARG pListBox ) IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, EMPTYARG pListBox ) { (void) pListBox; - sal_uInt16 nPos = aFontsSubsetLB.GetSelectEntryPos(); + sal_Int32 nPos = aFontsSubsetLB.GetSelectEntryPos(); if (LISTBOX_ENTRY_NOTFOUND != nPos) { const Subset* pSubset = reinterpret_cast<const Subset*> (aFontsSubsetLB.GetEntryData( nPos )); @@ -2144,7 +2144,7 @@ bool SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox, rComboBox.SetText(aNormName); bool bRet = false; - sal_uInt16 nPos = rComboBox.GetEntryPos(aNormName); + sal_Int32 nPos = rComboBox.GetEntryPos(aNormName); if (nPos != COMBOBOX_ENTRY_NOTFOUND) { @@ -2221,7 +2221,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox, rComboBox.SetText(aNormName); bool bRet = false; - sal_uInt16 nPos = rComboBox.GetEntryPos(aNormName); + sal_Int32 nPos = rComboBox.GetEntryPos(aNormName); bool bIsOld = &rComboBox == &aOldSymbols; @@ -2319,7 +2319,7 @@ void SmSymDefineDialog::SetFont(const OUString &rFontName, const OUString &rStyl bool SmSymDefineDialog::SelectFont(const OUString &rFontName, bool bApplyFont) { bool bRet = false; - sal_uInt16 nPos = aFonts.GetEntryPos(rFontName); + sal_Int32 nPos = aFonts.GetEntryPos(rFontName); if (nPos != LISTBOX_ENTRY_NOTFOUND) { @@ -2347,7 +2347,7 @@ bool SmSymDefineDialog::SelectFont(const OUString &rFontName, bool bApplyFont) bool SmSymDefineDialog::SelectStyle(const OUString &rStyleName, bool bApplyFont) { bool bRet = false; - sal_uInt16 nPos = aStyles.GetEntryPos(rStyleName); + sal_Int32 nPos = aStyles.GetEntryPos(rStyleName); // if the style is not available take the first available one (if existent) if (nPos == COMBOBOX_ENTRY_NOTFOUND && aStyles.GetEntryCount() > 0) |