diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-02 10:06:54 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2015-08-16 09:10:14 +0200 |
| commit | 9869ab096f49a507f96d69a4ffbb9a0caa852bd7 (patch) | |
| tree | ca660ebf35371c3412e170b339c3669d4a3f46e0 | |
| parent | 448d3334d1daaa2da616b2fadc2241f24dd96f86 (diff) | |
sal_uInt16 to sal_Int32
Change-Id: Id15b58374df59d03e344cea7f23ae6b5963f668a
| -rw-r--r-- | vcl/source/control/combobox.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index e13bfdc3e5be..7703b30676a1 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -1294,10 +1294,10 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, D Rectangle aClip( aPos, aSize ); pDev->IntersectClipRegion( aClip ); - sal_uInt16 nLines = (sal_uInt16) ( ( nTextHeight > 0 ) ? ( (aSize.Height()-nEditHeight) / nTextHeight ) : 1 ); + sal_Int32 nLines = static_cast<sal_Int32>( nTextHeight > 0 ? (aSize.Height()-nEditHeight)/nTextHeight : 1 ); if ( !nLines ) nLines = 1; - sal_uInt16 nTEntry = IsReallyVisible() ? m_pImpl->m_pImplLB->GetTopEntry() : 0; + const sal_Int32 nTEntry = IsReallyVisible() ? m_pImpl->m_pImplLB->GetTopEntry() : 0; Rectangle aTextRect( aPos, aSize ); @@ -1307,7 +1307,7 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, D aTextRect.Bottom() = aTextRect.Top() + nTextHeight; // the drawing starts here - for ( sal_uInt16 n = 0; n < nLines; n++ ) + for ( sal_Int32 n = 0; n < nLines; ++n ) { pDev->DrawText( aTextRect, m_pImpl->m_pImplLB->GetEntryList()->GetEntryText( n+nTEntry ), nTextStyle ); aTextRect.Top() += nTextHeight; |