From 6219ff898a8c3ae6b7abe4272b4b68cc986093e4 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 29 Mar 2012 11:09:24 +0100 Subject: 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 ) --- distro-configs/LibreOfficeMinGW.conf | 1 + distro-configs/LibreOfficeWin32.conf | 1 + distro-configs/LibreOfficeWin64.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf index 7d4bc8a50523..32df78231594 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 f608e9ba3391..9bf76099df88 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 b4e21c68a74d..66404d450645 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 -- cgit