Kaydet (Commit) e5c2fe04 authored tarafından Caolán McNamara's avatar Caolán McNamara

surely it makes no sense to ignore return of Sanitize[Col|Row]

Change-Id: I24ef940bcf4b2a7c5f40185f91ee234c844185f8
üst 7e12a6cc
......@@ -108,52 +108,52 @@ const SCROW W16MAXROW = W16MAXROWCOUNT - 1;
#endif
// old stuff defines end
inline bool ValidCol( SCCOL nCol )
SAL_WARN_UNUSED_RESULT inline bool ValidCol( SCCOL nCol )
{
return nCol >= static_cast<SCCOL>(0) && nCol <= MAXCOL;
}
inline bool ValidRow( SCROW nRow )
SAL_WARN_UNUSED_RESULT inline bool ValidRow( SCROW nRow )
{
return nRow >= static_cast<SCROW>(0) && nRow <= MAXROW;
}
inline bool ValidTab( SCTAB nTab )
SAL_WARN_UNUSED_RESULT inline bool ValidTab( SCTAB nTab )
{
return nTab >= static_cast<SCTAB>(0) && nTab <= MAXTAB;
}
inline bool ValidTab( SCTAB nTab, SCTAB nMaxTab )
SAL_WARN_UNUSED_RESULT inline bool ValidTab( SCTAB nTab, SCTAB nMaxTab )
{
return nTab >= static_cast<SCTAB>(0) && nTab <= nMaxTab;
}
inline bool ValidColRow( SCCOL nCol, SCROW nRow )
SAL_WARN_UNUSED_RESULT inline bool ValidColRow( SCCOL nCol, SCROW nRow )
{
return ValidCol( nCol) && ValidRow( nRow);
}
inline bool ValidColRowTab( SCCOL nCol, SCROW nRow, SCTAB nTab )
SAL_WARN_UNUSED_RESULT inline bool ValidColRowTab( SCCOL nCol, SCROW nRow, SCTAB nTab )
{
return ValidCol( nCol) && ValidRow( nRow) && ValidTab( nTab);
}
inline SCCOL SanitizeCol( SCCOL nCol )
SAL_WARN_UNUSED_RESULT inline SCCOL SanitizeCol( SCCOL nCol )
{
return nCol < 0 ? 0 : (nCol > MAXCOL ? MAXCOL : nCol);
}
inline SCROW SanitizeRow( SCROW nRow )
SAL_WARN_UNUSED_RESULT inline SCROW SanitizeRow( SCROW nRow )
{
return nRow < 0 ? 0 : (nRow > MAXROW ? MAXROW : nRow);
}
inline SCTAB SanitizeTab( SCTAB nTab )
SAL_WARN_UNUSED_RESULT inline SCTAB SanitizeTab( SCTAB nTab )
{
return nTab < 0 ? 0 : (nTab > MAXTAB ? MAXTAB : nTab);
}
inline SCTAB SanitizeTab( SCTAB nTab, SCTAB nMaxTab )
SAL_WARN_UNUSED_RESULT inline SCTAB SanitizeTab( SCTAB nTab, SCTAB nMaxTab )
{
return nTab < 0 ? 0 : (nTab > nMaxTab ? nMaxTab : nTab);
}
......
......@@ -304,8 +304,8 @@ bool ScDetectiveFunc::HasError( const ScRange& rRange, ScAddress& rErrPos )
Point ScDetectiveFunc::GetDrawPos( SCCOL nCol, SCROW nRow, DrawPosMode eMode ) const
{
OSL_ENSURE( ValidColRow( nCol, nRow ), "ScDetectiveFunc::GetDrawPos - invalid cell address" );
SanitizeCol( nCol );
SanitizeRow( nRow );
nCol = SanitizeCol( nCol );
nRow = SanitizeRow( nRow );
Point aPos;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment