summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorGabor Kelemen <kelemeng@ubuntu.com>2017-04-04 17:49:54 +0200
committerAndras Timar <andras.timar@collabora.com>2017-04-12 17:16:52 +0200
commita79f05a6e805eeee0e899d5fb5a8f98679cee716 (patch)
tree4262b652558546869f19f06988d28c9494e71ba4 /cui
parentc51dc04cc3cd48e7d5ab51a1f88e36bda8707c73 (diff)
tdf#106943 Lock down Experimental features and Macro recording
Visually disable these features if they are locked by system administrators Change-Id: Ib35840312ad9c506e689ec6c9d432a88c07a5c28 Reviewed-on: https://gerrit.libreoffice.org/36095 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/36319 Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 75c1af593e94c049972fd929c810a9b0be23cb20)
Diffstat (limited to 'cui')
-rw-r--r--cui/source/options/optjava.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index c8bb0cb241eb..a53fc4b46c20 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -192,6 +192,12 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( vcl::Window* pParent, const SfxItemSet&
if (!officecfg::Office::Common::Security::EnableExpertConfiguration::get())
m_pExpertConfigBtn->Disable();
+ if (officecfg::Office::Common::Misc::MacroRecorderMode::isReadOnly())
+ m_pMacroCB->Disable();
+
+ if (officecfg::Office::Common::Misc::ExperimentalMode::isReadOnly())
+ m_pExperimentalCB->Disable();
+
xDialogListener->SetDialogClosedLink( LINK( this, SvxJavaOptionsPage, DialogClosedHdl ) );
EnableHdl_Impl(m_pJavaEnableCB);