strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

enforce inside bounds

Browse source
This commit is contained in:
Caolán McNamara 2011-07-25 09:36:05 +01:00
parent 3f1e287e46
commit 78641a71ad
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sw/source/filter/ww8/ww8par2.cxx
View file

@ -132,6 +132,11 @@ struct WW8TabBandDesc
bool bExist[MAX_COL]; // Existiert diese Zelle ?
sal_uInt8 nTransCell[MAX_COL + 2]; // UEbersetzung WW-Index -> SW-Index
sal_uInt8 transCell(sal_uInt8 nWwCol) const
{
return nWwCol < SAL_N_ELEMENTS(nTransCell) ? nTransCell[nWwCol] : 0xFF;
}
WW8TabBandDesc();
WW8TabBandDesc(WW8TabBandDesc& rBand); // tief kopieren
~WW8TabBandDesc();
@ -2838,7 +2843,9 @@ bool WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact,
bool WW8TabDesc::IsValidCell(short nCol) const
{
return pActBand->bExist[nCol] && (sal_uInt16)nAktRow < pTabLines->Count();
return (static_cast<size_t>(nCol) < SAL_N_ELEMENTS(pActBand->bExist)) &&
pActBand->bExist[nCol] &&
(sal_uInt16)nAktRow < pTabLines->Count();
}
bool WW8TabDesc::InFirstParaInCell() const
@ -2880,7 +2887,7 @@ bool WW8TabDesc::SetPamInCell(short nWwCol, bool bPam)
{
OSL_ENSURE( pActBand, "pActBand ist 0" );
sal_uInt16 nCol = pActBand->nTransCell[nWwCol];
sal_uInt16 nCol = pActBand->transCell(nWwCol);
if ((sal_uInt16)nAktRow >= pTabLines->Count())
{