diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-26 09:50:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-03 10:37:51 +0200 |
| commit | 8bc951daf79decbd8a599a409c6d33c5456710e0 (patch) | |
| tree | 61d220d83e90a176fbcbe667827eee4b9631a4ca /vcl/source/control/combobox.cxx | |
| parent | 10eefdfa6c0250c6069e641e404f34e5a91fe993 (diff) | |
long->sal_Int32 in tools/gen.hxx
which triggered a lot of changes in sw/
Change-Id: Ia2aa22ea3f76463a85ea077a411246fcfed00bf6
Reviewed-on: https://gerrit.libreoffice.org/48806
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/control/combobox.cxx')
| -rw-r--r-- | vcl/source/control/combobox.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 7b14c8da64c2..abb0a5e0c677 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -311,7 +311,7 @@ IMPL_LINK(ComboBox::Impl, ImplAutocompleteHdl, Edit&, rEdit, void) { OUString aFullText = rEdit.GetText(); - OUString aStartText = aFullText.copy( 0, static_cast<sal_Int32>(aSel.Max()) ); + OUString aStartText = aFullText.copy( 0, aSel.Max() ); sal_Int32 nStart = m_pImplLB->GetCurrentPos(); if ( nStart == LISTBOX_ENTRY_NOTFOUND ) @@ -1039,7 +1039,7 @@ Size ComboBox::CalcMinimumSize() const if (m_pImpl->m_nMaxWidthChars != -1) { long nMaxWidth = m_pImpl->m_nMaxWidthChars * approximate_char_width(); - aSz.setWidth( std::min(aSz.Width(), nMaxWidth) ); + aSz.setWidth( std::min<sal_Int32>(aSz.Width(), nMaxWidth) ); } if (IsDropDownBox()) |