[Libreoffice-commits] .: Branch 'libreoffice-3-3-1' - svtools/source

[Radek Doulík]

 svtools/source/filter.vcl/wmf/enhwmf.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit a16f31f3c8c5371718de7db6f1de6063c4e13d84
Author: Radek Doulik <rodo at novell.com>
Date:   Tue Feb 15 18:23:27 2011 +0100

    disable EMF+ support on all platforms for 3-3-1 release

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-- )
     {