[Libreoffice-commits] .: Branch 'libreoffice-3-5' - distro-configs/LibreOfficeMinGW.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf

[Fridrich Strba]

 distro-configs/LibreOfficeMinGW.conf |    1 +
 distro-configs/LibreOfficeWin32.conf |    1 +
 distro-configs/LibreOfficeWin64.conf |    1 +
 3 files changed, 3 insertions(+)

New commits:
commit 92330ae0ae1c584903f8024b24d89e9723cbf6a6
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu Mar 29 11:09:24 2012 +0100

    Disable cairo canvas on Windows fdo#46901 fdo#46532
    
     We never used cairocanvas on Win, this got accidentally enabled
    due to configure.in cleanups. Not that we shouldn't, but it needs
    some more fixing ( Analog of Thorsten's Mac commit for fdo#45584 )
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf
index fcca57a..e0529e4 100644
--- a/distro-configs/LibreOfficeMinGW.conf
+++ b/distro-configs/LibreOfficeMinGW.conf
@@ -22,6 +22,7 @@
 --without-myspell-dicts
 --disable-activex
 --disable-binfilter
+--disable-cairo-canvas
 --disable-build-mozilla
 --disable-directx
 --disable-extension-integration
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index f608e9b..9bf7609 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -8,6 +8,7 @@
 --with-java-target-version=1.5
 --disable-activex-component
 --enable-binfilter
+--disable-cairo-canvas
 --enable-ext-scripting-beanshell
 --enable-ext-scripting-javascript
 --enable-ext-wiki-publisher
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index b4e21c6..66404d4 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -2,6 +2,7 @@
 --without-agfa-monotype-fonts
 --with-java-target-version=1.5
 --enable-cl-x64
+--disable-cairo-canvas
 --disable-activex-component
 --enable-ext-scripting-beanshell
 --enable-ext-scripting-javascript