diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-27 20:21:22 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-27 20:21:22 +0200 |
| commit | 8c500373f437b05ba2f4f74c9521da62c8271346 (patch) | |
| tree | b052d189e21574fdb34fe0c661e17c56f7efc3a1 | |
| parent | d5b438fc8dbedbe40813ff3ba99d59eedc78fe0b (diff) | |
pushed goodies-eps-filter-unix.diff into git
| -rw-r--r-- | patches/dev300/apply | 3 | ||||
| -rw-r--r-- | patches/dev300/goodies-eps-filter-unix.diff | 36 |
2 files changed, 0 insertions, 39 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 4471109f9..77ddb386e 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -1071,9 +1071,6 @@ palette-enhanced-hatch.diff #configures-explicit-arch.diff icu-arm.diff, doko -[ Fixes ] -goodies-eps-filter-unix.diff, n#200053, rodo - [ OxygenOfficeDefaultSettings ] # Always enable extended tips i27928-extended-tips-on.diff diff --git a/patches/dev300/goodies-eps-filter-unix.diff b/patches/dev300/goodies-eps-filter-unix.diff deleted file mode 100644 index 0b1879667..000000000 --- a/patches/dev300/goodies-eps-filter-unix.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- filter/source/graphicfilter/eps/eps.cxx -+++ filter/source/graphicfilter/eps/eps.cxx -@@ -293,7 +293,11 @@ BOOL PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter - // default values for the dialog options - mnLevel = 2; - mbGrayScale = sal_False; -+#ifdef UNX // don't compress by default on unix as ghostscript is unable to read LZW compressed eps -+ mbCompression = sal_False; -+#else - mbCompression = sal_True; -+#endif - mnTextMode = 0; // default0 : export glyph outlines - - // try to get the dialog selection -@@ -310,12 +314,20 @@ BOOL PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter - String aVersionStr( RTL_CONSTASCII_USTRINGPARAM( "Version" ) ); - String aColorStr( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) ); - String aComprStr( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) ); -+#ifdef UNX // don't put binary tiff preview ahead of postscript code by default on unix as ghostscript is unable to read it -+ mnPreview = pFilterConfigItem->ReadInt32( aPreviewStr, 0 ); -+#else - mnPreview = pFilterConfigItem->ReadInt32( aPreviewStr, 1 ); -+#endif - mnLevel = pFilterConfigItem->ReadInt32( aVersionStr, 2 ); - if ( mnLevel != 1 ) - mnLevel = 2; - mbGrayScale = pFilterConfigItem->ReadInt32( aColorStr, 1 ) == 2; -- mbCompression = pFilterConfigItem->ReadInt32( aComprStr, 1 ) == 1; -+#ifdef UNX // don't compress by default on unix as ghostscript is unable to read LZW compressed eps -+ mbCompression = pFilterConfigItem->ReadInt32( aComprStr, 0 ) != 0; -+#else -+ mbCompression = pFilterConfigItem->ReadInt32( aComprStr, 1 ) == 1; -+#endif - String sTextMode( RTL_CONSTASCII_USTRINGPARAM( "TextMode" ) ); - mnTextMode = pFilterConfigItem->ReadInt32( sTextMode, 0 ); - if ( mnTextMode > 2 ) |