[Libreoffice-commits] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Radek Doulík]

 patches/dev300/apply                         |    1 +
 patches/dev300/svtools-disable-emf-plus.diff |   24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit d2e9b3ada08db9e00b0b3b48ae4a4f96afffc06a
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Jan 26 15:10:19 2011 +0100

    disable emf+ support as it is broken
    
     - drawing layer doesn't support it yet and is now used to render editing mode
    
    * patches/dev300/apply:
    * patches/dev300/svtools-disable-emf-plus.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index cc72091..66fe0d9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -4172,3 +4172,4 @@ oox-pptx-import-backport-from-LO-fix-zero-sized-shapes.diff, n#650051, rodo
 vcl-canvastools-fix-crash.diff, n#654065, rodo
 filter-fix-too-broad-deep-search.diff, rodo
 slideshow-fix-rendering-order.diff, n#656934, rodo
+svtools-disable-emf-plus.diff, n#650049, rodo
diff --git a/patches/dev300/svtools-disable-emf-plus.diff b/patches/dev300/svtools-disable-emf-plus.diff
new file mode 100644
index 0000000..80a8238
--- /dev/null
+++ b/patches/dev300/svtools-disable-emf-plus.diff
@@ -0,0 +1,24 @@
+diff -rup svtools/source/filter.vcl/wmf-orig/enhwmf.cxx svtools/source/filter.vcl/wmf/enhwmf.cxx
+--- svtools/source/filter.vcl/wmf-orig/enhwmf.cxx	2011-01-26 14:48:00.000000000 +0100
++++ svtools/source/filter.vcl/wmf/enhwmf.cxx	2011-01-26 14:53:30.000000000 +0100
+@@ -344,10 +344,17 @@ BOOL EnhWMFReader::ReadEnhWMF()
+     sal_Bool    bHaveDC = false;
+ 
+ #ifdef UNX
+-    static sal_Bool bEnableEMFPlus = ( getenv( "EMF_PLUS_DISABLE" ) == NULL );
++    static sal_Bool bEnableEMFPlus = sal_False; // disable it for now as
++                                                // drawing layer changed the
++                                                // way the editing mode is
++                                                // rendered and emf+ support
++                                                // doesn't work anymore
++                                                // ( getenv( "EMF_PLUS_DISABLE" ) == NULL );
+ #else
+     // TODO: make it possible to disable emf+ on windows
+-    static sal_Bool bEnableEMFPlus = sal_True;
++    // static sal_Bool bEnableEMFPlus = sal_True;
++    // disable it on windows as well (see above)
++    static sal_Bool bEnableEMFPlus = sal_False;
+ #endif
+ 
+     while( bStatus && nRecordCount-- )
+Only in svtools/source/filter.vcl/wmf: enhwmf.cxx~