diff options
-rw-r--r-- | sc/inc/address.hxx | 20 | ||||
-rw-r--r-- | sc/source/core/tool/detfunc.cxx | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 7fcdee159da9..2018dfed9a49 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -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 static_cast<SCCOL>(0) <= nCol && nCol <= MAXCOL; } -inline bool ValidRow( SCROW nRow ) +SAL_WARN_UNUSED_RESULT inline bool ValidRow( SCROW nRow ) { return static_cast<SCROW>(0) <= nRow && nRow <= MAXROW; } -inline bool ValidTab( SCTAB nTab ) +SAL_WARN_UNUSED_RESULT inline bool ValidTab( SCTAB nTab ) { return static_cast<SCTAB>(0) <= nTab && nTab <= MAXTAB; } -inline bool ValidTab( SCTAB nTab, SCTAB nMaxTab ) +SAL_WARN_UNUSED_RESULT inline bool ValidTab( SCTAB nTab, SCTAB nMaxTab ) { return static_cast<SCTAB>(0) <= nTab && 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); } diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index 14d6aaee5bcc..5c2439687477 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -303,8 +303,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; |