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-- )
{
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
