Date: prev next · Thread: first prev next last
2011 Archives by date, by thread · List index


Hi,

please review this patch for inclusion in 3-3-1. Because the previous
fix seemed too risky, we will disable the EMF+ altogether for this
release.

Cheers
Radek

diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx
index 1dd5c64..4bb7643 100644
--- a/svtools/source/filter.vcl/wmf/enhwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx
@@ -344,12 +344,8 @@ BOOL EnhWMFReader::ReadEnhWMF()
     sal_Bool   bFlag, bStatus = ReadHeader();
     sal_Bool    bHaveDC = false;
 
-#ifdef UNX
-    static sal_Bool bEnableEMFPlus = ( getenv( "EMF_PLUS_DISABLE" ) == NULL );
-#else
-    // TODO: make it possible to disable emf+ on windows
+    // disable EMF+ temporarily on all platforms
     static sal_Bool bEnableEMFPlus = sal_False;
-#endif
 
     while( bStatus && nRecordCount-- )
     {



Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.