Kaydet (Commit) b7c79fc2 authored tarafından Michael Stahl's avatar Michael Stahl

sax: replace Min/Max macros with std::max

üst 7191b52c
...@@ -29,10 +29,6 @@ ...@@ -29,10 +29,6 @@
#include <sax/dllapi.h> #include <sax/dllapi.h>
// TODO: Woher?
#define Max( a, b ) (((a)>(b)) ? (a) : (b) )
#define Min( a, b ) (((a)<(b)) ? (a) : (b) )
/* /*
* *
* Text2UnicodeConverter * Text2UnicodeConverter
......
...@@ -27,12 +27,13 @@ ...@@ -27,12 +27,13 @@
************************************************************************/ ************************************************************************/
#include <string.h> #include <string.h>
#include <algorithm>
#include <sal/types.h> #include <sal/types.h>
#include <rtl/textenc.h> #include <rtl/textenc.h>
#include <rtl/tencinfo.h> #include <rtl/tencinfo.h>
#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XInputStream.hpp>
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
...@@ -54,8 +55,9 @@ sal_Int32 XMLFile2UTFConverter::readAndConvert( Sequence<sal_Int8> &seq , sal_In ...@@ -54,8 +55,9 @@ sal_Int32 XMLFile2UTFConverter::readAndConvert( Sequence<sal_Int8> &seq , sal_In
throw NotConnectedException(); throw NotConnectedException();
} }
if( ! m_bStarted ) { if( ! m_bStarted ) {
nMaxToRead = Max( 512 , nMaxToRead ); // it should be possible to find the encoding attribute // it should be possible to find the encoding attribute
// within the first 512 bytes == 128 chars in UCS-4 // within the first 512 bytes == 128 chars in UCS-4
nMaxToRead = ::std::max( 512 , nMaxToRead );
} }
sal_Int32 nRead; sal_Int32 nRead;
......
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