mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#1038321 Unintended sign extension

Browse Source 
and

coverity#1038320 Unintended sign extension
coverity#1038319 Unintended sign extension
coverity#1038318 Unintended sign extension
coverity#1038317 Unintended sign extension
coverity#1038316 Unintended sign extension
coverity#1038315 Unintended sign extension
coverity#1038314 Unintended sign extension

Change-Id: Ib8015baf8ffec48e1b2d6ce1e7ce284fb36303b0
This commit is contained in:
Caolán McNamara
2014-07-01 16:11:14 +01:00
parent 8a9bc476df
commit 4d22b8f7b4
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
starmath/inc/dialog.hxx
View File

@@ -259,9 +259,9 @@ class SmShowSymbolSetWindow : public Control
SymbolPtrVec_t aSymbolSet;
Link aSelectHdlLink;
Link aDblClickHdlLink;
sal_uInt16 nLen;
sal_uInt16 nRows, nColumns;
sal_uInt16 nXOffset, nYOffset;
long nLen;
long nRows, nColumns;
long nXOffset, nYOffset;
sal_uInt16 nSelectSymbol;
void SetScrollBarRange();

12
starmath/source/dialog.cxx
View File

@@ -1200,16 +1200,16 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSmShowSymbolSet(Window *pPa
void SmShowSymbolSetWindow::calccols()
{
// Height of 16pt in pixels (matching 'aOutputSize')
nLen = (sal_uInt16) LogicToPixel(Size(0, 16), MapMode(MAP_POINT)).Height();
nLen = LogicToPixel(Size(0, 16), MapMode(MAP_POINT)).Height();
Size aOutputSize = GetOutputSizePixel();
nColumns = sal::static_int_cast< sal_uInt16 >(aOutputSize.Width() / nLen);
nColumns = aOutputSize.Width() / nLen;
if (nColumns > 2 && nColumns % 2 != 0)
--nColumns;
nRows = sal::static_int_cast< sal_uInt16 >(aOutputSize.Height() / nLen);
nColumns = std::max<sal_uInt16>(1, nColumns);
nRows = std::max<sal_uInt16>(1, nRows);
nRows = aOutputSize.Height() / nLen;
nColumns = std::max<long>(1, nColumns);
nRows = std::max<long>(1, nRows);
nXOffset = (aOutputSize.Width() - (nColumns * nLen)) / 2;
nYOffset = (aOutputSize.Height() - (nRows * nLen)) / 2;
@@ -1232,7 +1232,7 @@ void SmShowSymbolSetWindow::SetSymbolSet(const SymbolPtrVec_t& rSymbolSet)
void SmShowSymbolSetWindow::SetScrollBarRange()
{
if (static_cast< sal_uInt16 >(aSymbolSet.size()) > (nColumns * nRows))
if (aSymbolSet.size() > static_cast<size_t>(nColumns * nRows))
{
m_pVScrollBar->SetRange(Range(0, ((aSymbolSet.size() + (nColumns - 1)) / nColumns) - nRows));
m_pVScrollBar->Enable(true);