diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:33:58 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:33:58 +0200 |
| commit | a95376174ec70c4a75569ce6dafacb0f696b21bc (patch) | |
| tree | c1b813dddd1c32efb22913cc3b2f5813e6d901ff /distro-configs | |
| parent | edb451c490fe72ced8df20829c7fbc0da93e672c (diff) | |
| parent | 6760b5695c4461126a34a84f64fd7114eff23143 (diff) | |
Merge commit 'libreoffice-3.4.2.3'
Conflicts:
Makefile.in
configure.in
instsetoo_native/util/makefile.mk
instsetoo_native/util/openoffice.lst
ooo.lst.in
set_soenv.in
solenv/inc/minor.mk
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/LibreOfficeMacOSX.conf | 1 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeWin32.conf | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 5e654a9a702c..01142b9080fa 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -2,6 +2,7 @@ --enable-epm --enable-binfilter --with-java-target-version=1.5 +--disable-online-update --enable-ext-presenter-minimizer --enable-ext-presenter-console --enable-ext-pdfimport diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index c8c993fed023..600ec23d8895 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -7,6 +7,7 @@ --with-java-target-version=1.5 --disable-xrender-link --disable-activex-component +--disable-online-update --enable-binfilter --enable-ext-scripting-beanshell --enable-ext-scripting-javascript |