[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - cui/source

[Gabor Kelemen]

 cui/source/options/optjava.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 75c1af593e94c049972fd929c810a9b0be23cb20
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Tue Apr 4 17:49:54 2017 +0200

    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 at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/36319
    Tested-by: Jenkins <ci at libreoffice.org>

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);