cui/source/options/optjava.cxx | 3 +++
cui/uiconfig/ui/optadvancedpage.ui | 5 ++++-
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 7 +++++++
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 137de1dce92f4cf05adefc3d0dbe09d6a2a339af
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu Dec 12 21:22:43 2013 +0100
Expert config: 6px between lines + center the button.
Change-Id: I91899493479eb60c955dac3891a38913ad871376
diff --git a/cui/uiconfig/ui/optadvancedpage.ui
b/cui/uiconfig/ui/optadvancedpage.ui
index 4554014..7f06e78 100644
--- a/cui/uiconfig/ui/optadvancedpage.ui
+++ b/cui/uiconfig/ui/optadvancedpage.ui
@@ -326,6 +326,7 @@
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkCheckButton" id="experimental">
<property name="label" translatable="yes">Enable
experimental features</property>
@@ -361,10 +362,12 @@
</child>
<child>
<object class="GtkButton" id="expertconfig">
- <property name="label" translatable="yes">Expert Config
Page</property>
+ <property name="label" translatable="yes">Expert
Configuration</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="halign">center</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">0</property>
commit 189573c14ba39eb791350c15578f7a794ff6976c
Author: Jan Holesovsky <ke...@collabora.com>
Date: Thu Dec 12 21:15:45 2013 +0100
Expert config: Introduce configuration key to disable expert config.
It is /org.openoffice.Office.Common/Security/EnableExpertConfiguration with
values true/false; defaults to true.
Change-Id: I5a18d16182c28a13169677b11f68884f34c11c63
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 1841c40..ce5c162 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -23,6 +23,7 @@
#include "optjava.hxx"
#include <dialmgr.hxx>
+#include <officecfg/Office/Common.hxx>
#include <svtools/miscopt.hxx>
#include <cuires.hrc>
@@ -183,6 +184,8 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent,
const SfxItemSet& rSet
m_aResetTimer.SetTimeout( RESET_TIMEOUT );
m_pExpertConfigBtn->SetClickHdl( LINK( this, SvxJavaOptionsPage,
ExpertConfigHdl_Impl) );
+ if (!officecfg::Office::Common::Security::EnableExpertConfiguration::get())
+ m_pExpertConfigBtn->Disable();
xDialogListener->SetDialogClosedLink( LINK( this, SvxJavaOptionsPage,
DialogClosedHdl ) );
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 069a128..affd280 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2417,6 +2417,13 @@
<info>
<desc>Contains security specific Office settings.</desc>
</info>
+ <prop oor:name="EnableExpertConfiguration" oor:type="xs:boolean"
oor:nillable="false">
+ <info>
+ <desc>Determines if the user has access to the entire
+ configuration via the Expert Configuration button.</desc>
+ </info>
+ <value>true</value>
+ </prop>
<group oor:name="Scripting">
<info>
<desc>Contains security settings regarding Basic scripts.</desc>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
