Kaydet (Commit) e05a2002 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Remove unnecessary ZCODEC_DEFAULT macro

Change-Id: I57a5a14a51c0441e0fed006457ac95057f188462
üst 201d429a
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
#define ZCODEC_GZ_LIB (0x00020000UL) #define ZCODEC_GZ_LIB (0x00020000UL)
#define ZCODEC_PNG_DEFAULT ( ZCODEC_NO_COMPRESSION | ZCODEC_UPDATE_CRC ) #define ZCODEC_PNG_DEFAULT ( ZCODEC_NO_COMPRESSION | ZCODEC_UPDATE_CRC )
#define ZCODEC_DEFAULT ( ZCODEC_DEFAULT_COMPRESSION )
class SvStream; class SvStream;
...@@ -60,7 +59,7 @@ public: ...@@ -60,7 +59,7 @@ public:
ZCodec( sal_uIntPtr nInBuf = 0x8000UL, sal_uIntPtr nOutBuf = 0x8000UL ); ZCodec( sal_uIntPtr nInBuf = 0x8000UL, sal_uIntPtr nOutBuf = 0x8000UL );
virtual ~ZCodec(); virtual ~ZCodec();
virtual void BeginCompression( sal_uIntPtr nCompressMethod = ZCODEC_DEFAULT ); virtual void BeginCompression( sal_uIntPtr nCompressMethod = ZCODEC_DEFAULT_COMPRESSION );
virtual long EndCompression(); virtual long EndCompression();
bool IsFinished () const { return mbFinish; } bool IsFinished () const { return mbFinish; }
...@@ -83,7 +82,7 @@ class GZCodec : public ZCodec ...@@ -83,7 +82,7 @@ class GZCodec : public ZCodec
public: public:
GZCodec(){}; GZCodec(){};
virtual ~GZCodec(){}; virtual ~GZCodec(){};
virtual void BeginCompression( sal_uIntPtr nCompressMethod = ZCODEC_DEFAULT ) SAL_OVERRIDE virtual void BeginCompression( sal_uIntPtr nCompressMethod = ZCODEC_DEFAULT_COMPRESSION ) SAL_OVERRIDE
{ {
ZCodec::BeginCompression( nCompressMethod | ZCODEC_GZ_LIB ); ZCodec::BeginCompression( nCompressMethod | ZCODEC_GZ_LIB );
}; };
......
...@@ -320,7 +320,7 @@ void PPDDecompressStream::Open( const OUString& i_rFile ) ...@@ -320,7 +320,7 @@ void PPDDecompressStream::Open( const OUString& i_rFile )
if( aLine.getLength() > 1 && static_cast<unsigned char>(aLine[0]) == 0x1f ) if( aLine.getLength() > 1 && static_cast<unsigned char>(aLine[0]) == 0x1f )
{ {
if( static_cast<unsigned char>(aLine[1]) == 0x8b ) // check for gzip if( static_cast<unsigned char>(aLine[1]) == 0x8b ) // check for gzip
nCompressMethod = ZCODEC_DEFAULT | ZCODEC_GZ_LIB; nCompressMethod = ZCODEC_DEFAULT_COMPRESSION | ZCODEC_GZ_LIB;
} }
if( nCompressMethod != 0 ) if( nCompressMethod != 0 )
......
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