diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-09 13:28:35 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-01-15 10:36:17 +0100 |
| commit | 34d8710fff4859d455b51a7e0d90fe3a35bf2e6b (patch) | |
| tree | f69c1932eed74971e614eb8712a6f66ee1dc1f15 /sot | |
| parent | e9f521d409845a0824752a39d7574f4fad7989d4 (diff) | |
remove local copies of std::min,std::max
Change-Id: I067c4dcabad55180e4734fb06338a8e843713936
Reviewed-on: https://gerrit.libreoffice.org/47692
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 71403d35e82f..148c23fefaa5 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -309,8 +309,6 @@ void FileStreamWrapper_Impl::checkError() #define COMMIT_RESULT_NOTHING_TO_DO 1 #define COMMIT_RESULT_SUCCESS 2 -#define min( x, y ) (( x < y ) ? x : y) - SotClipboardFormatId GetFormatId_Impl( const SvGlobalName& aName ) { if ( aName == SvGlobalName( SO3_SW_CLASSID_60 ) ) @@ -803,7 +801,7 @@ sal_uInt64 UCBStorageStream_Impl::ReadSourceWriteTemporary(sal_uInt64 aLength) for (sal_uInt64 nInd = 0; nInd < aLength && aReaded == 32000 ; nInd += 32000) { - sal_uLong aToCopy = min( aLength - nInd, 32000 ); + sal_uLong aToCopy = std::min<sal_uInt64>( aLength - nInd, 32000 ); aReaded = m_rSource->readBytes( aData, aToCopy ); aResult += m_pStream->WriteBytes(aData.getArray(), aReaded); } |