From 0ef9ed2628d7c5d14fcbe91be2f8f29383d4fec7 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Thu, 12 Dec 2013 21:15:45 +0100
Subject: 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
---
 cui/source/options/optjava.cxx                             | 3 +++
 officecfg/registry/schema/org/openoffice/Office/Common.xcs | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 1841c40a700a..ce5c162df13a 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 069a12870ebe..affd280d0bde 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>
-- 
cgit