diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-05-21 11:08:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-05-21 15:30:15 +0200 |
| commit | e05a20024989a4a1a51f7d2278d5bc55f06e5570 (patch) | |
| tree | dbebb3a79780ea2488e4c5f86e3ca548af11a401 | |
| parent | 201d429ad0e8f212c8546ae2133af384f9076a3e (diff) | |
Remove unnecessary ZCODEC_DEFAULT macro
Change-Id: I57a5a14a51c0441e0fed006457ac95057f188462
| -rw-r--r-- | include/tools/zcodec.hxx | 5 | ||||
| -rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/tools/zcodec.hxx b/include/tools/zcodec.hxx index 540f2aa68449..456cdd7f9a58 100644 --- a/include/tools/zcodec.hxx +++ b/include/tools/zcodec.hxx @@ -31,7 +31,6 @@ #define ZCODEC_GZ_LIB (0x00020000UL) #define ZCODEC_PNG_DEFAULT ( ZCODEC_NO_COMPRESSION | ZCODEC_UPDATE_CRC ) -#define ZCODEC_DEFAULT ( ZCODEC_DEFAULT_COMPRESSION ) class SvStream; @@ -60,7 +59,7 @@ public: ZCodec( sal_uIntPtr nInBuf = 0x8000UL, sal_uIntPtr nOutBuf = 0x8000UL ); virtual ~ZCodec(); - virtual void BeginCompression( sal_uIntPtr nCompressMethod = ZCODEC_DEFAULT ); + virtual void BeginCompression( sal_uIntPtr nCompressMethod = ZCODEC_DEFAULT_COMPRESSION ); virtual long EndCompression(); bool IsFinished () const { return mbFinish; } @@ -83,7 +82,7 @@ class GZCodec : public ZCodec public: 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 ); }; diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 3a818d242a50..3c09f8bc3312 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -320,7 +320,7 @@ void PPDDecompressStream::Open( const OUString& i_rFile ) if( aLine.getLength() > 1 && static_cast<unsigned char>(aLine[0]) == 0x1f ) { 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 ) |