diff options
author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-14 00:59:45 -0500 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-09-14 00:59:45 -0500 |
commit | f6606de5181af7f7c034f43c7ca6187c89877fed (patch) | |
tree | cbeb5316febe8b95f17dda02dd629dc192e33fa0 | |
parent | 6d81663a63d209db10fc67d875e054b27d7e45b8 (diff) |
remove SAL_MAX() macro user
-rw-r--r-- | binfilter/bf_so3/source/persist/transprt.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/binfilter/bf_so3/source/persist/transprt.cxx b/binfilter/bf_so3/source/persist/transprt.cxx index 2151d9485..e40beb27b 100644 --- a/binfilter/bf_so3/source/persist/transprt.cxx +++ b/binfilter/bf_so3/source/persist/transprt.cxx @@ -566,8 +566,14 @@ ErrCode UcbTransportLockBytes::ReadAt ( if (pRead) *pRead = ULONG(nSize); - sal_uInt32 nRead = SAL_MAX(m_nRead, nPos + nSize); - (const_cast< UcbTransportLockBytes* >(this))->m_nRead = nRead; + if(m_nRead > nPos + nSize) + { + (const_cast< UcbTransportLockBytes* >(this))->m_nRead = m_nRead; + } + else + { + (const_cast< UcbTransportLockBytes* >(this))->m_nRead = nPos + nSize; + } return ERRCODE_NONE; } |