diff options
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/attarray.hxx | 2 | ||||
| -rw-r--r-- | sc/inc/bigrange.hxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index 66db88a2094b..965e316a7f66 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -225,7 +225,7 @@ inline const ScPatternAttr* ScAttrIterator::Next( SCROW& rTop, SCROW& rBottom ) if ( nPos < pArray->nCount && nRow <= nEndRow ) { rTop = nRow; - rBottom = Min( pArray->pData[nPos].nRow, nEndRow ); + rBottom = std::min( pArray->pData[nPos].nRow, nEndRow ); pRet = pArray->pData[nPos].pPattern; nRow = rBottom + 1; ++nPos; diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index d36fa9ab8d14..a3efe5ade28c 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -222,9 +222,9 @@ inline sal_Bool ScBigRange::In( const ScBigRange& r ) const inline sal_Bool ScBigRange::Intersects( const ScBigRange& r ) const { return !( - Min( aEnd.Col(), r.aEnd.Col() ) < Max( aStart.Col(), r.aStart.Col() ) - || Min( aEnd.Row(), r.aEnd.Row() ) < Max( aStart.Row(), r.aStart.Row() ) - || Min( aEnd.Tab(), r.aEnd.Tab() ) < Max( aStart.Tab(), r.aStart.Tab() ) + std::min( aEnd.Col(), r.aEnd.Col() ) < std::max( aStart.Col(), r.aStart.Col() ) + || std::min( aEnd.Row(), r.aEnd.Row() ) < std::max( aStart.Row(), r.aStart.Row() ) + || std::min( aEnd.Tab(), r.aEnd.Tab() ) < std::max( aStart.Tab(), r.aStart.Tab() ) ); } |