changed scripting javascript/beanshell switches in distro configs

Change-Id: I28219b9d7500a5d162c554903cf92656cb25a01b

6 files changed, 13 insertions, 12 deletions

diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index b51aa95636ec..242820fede46 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -28,13 +28,13 @@
 --enable-gstreamer-0-10
 --enable-evolution2
 --enable-gnome-vfs
+--enable-scripting-beanshell
+--enable-scripting-javascript
 --enable-ext-wiki-publisher
 --enable-ext-report-builder
 --enable-ext-presenter-minimizer
 --enable-ext-presenter-console
 --enable-ext-pdfimport
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
 --enable-ext-nlpsolver
 --enable-epm
 --enable-binfilter
@@ -44,3 +44,4 @@
 --disable-randr-link
 --disable-kde4
 --disable-dbus
+	
\ No newline at end of file
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 20a66ddb7268..ab0fa362c1a0 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -2,13 +2,13 @@
 --enable-epm
 --enable-binfilter
 --with-java-target-version=1.5
+--enable-scripting-beanshell
+--enable-scripting-javascript
 --enable-ext-presenter-minimizer
 --enable-ext-presenter-console
 --enable-ext-pdfimport
 --enable-ext-wiki-publisher
 --enable-ext-report-builder
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
 --enable-ext-nlpsolver
 --enable-extension-integration
 --enable-online-update
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 7273ed41b861..4ebd45931f22 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -8,8 +8,8 @@
 --with-java-target-version=1.5
 --disable-gtk
 --enable-binfilter
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
+--enable-scripting-beanshell
+--enable-scripting-javascript
 --enable-ext-wiki-publisher
 --enable-ext-report-builder
 --enable-ext-presenter-minimizer
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index 344551eeca4a..8db7f58f246c 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -3,5 +3,5 @@
 --with-java-target-version=1.5
 --enable-cl-x64
 --disable-gtk
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
+--enable-scripting-beanshell
+--enable-scripting-javascript
diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf
index 274dd9e1934b..2be6a5d5add7 100644
--- a/distro-configs/OxygenOfficeLinux.conf
+++ b/distro-configs/OxygenOfficeLinux.conf
@@ -41,8 +41,8 @@
 --enable-ext-presenter-minimizer
 --enable-ext-presenter-console
 --enable-ext-pdfimport
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
+--enable-scripting-beanshell
+--enable-scripting-javascript
 --enable-ext-google-docs
 --enable-ext-hunart
 --enable-ext-nlpsolver
diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf
index 3faac6d9f952..5cc637c03a66 100644
--- a/distro-configs/OxygenOfficeWin32.conf
+++ b/distro-configs/OxygenOfficeWin32.conf
@@ -19,8 +19,8 @@
 --enable-ext-presenter-minimizer
 --enable-ext-presenter-console
 --enable-ext-pdfimport
---enable-ext-scripting-beanshell
---enable-ext-scripting-javascript
+--enable-scripting-beanshell
+--enable-scripting-javascript
 --enable-ext-google-docs
 --enable-ext-hunart
 --enable-ext-nlpsolver