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

[Michael Meeks]

 cui/source/options/optgdlg.cxx |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit a1e77b96a6ec93be07e23ab13585bec5a953b950
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Aug 21 09:25:27 2015 +0100

    tdf#93547: Add basic lock-down support for OpenGL settings
    
    Change-Id: I0459c33ac5230899366dd756886d55fefbe01798
    Reviewed-on: https://gerrit.libreoffice.org/17887
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 5de00a6..c0ed6d5 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -145,8 +145,10 @@ OpenGLCfg::~OpenGLCfg()
     if (mbModified)
     {
         std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
-        officecfg::Office::Common::VCL::UseOpenGL::set(mbUseOpenGL, batch);
-        officecfg::Office::Common::VCL::ForceOpenGL::set(mbForceOpenGL, batch);
+        if (!officecfg::Office::Common::VCL::UseOpenGL::isReadOnly())
+            officecfg::Office::Common::VCL::UseOpenGL::set(mbUseOpenGL, batch);
+        if (!officecfg::Office::Common::VCL::ForceOpenGL::isReadOnly())
+            officecfg::Office::Common::VCL::ForceOpenGL::set(mbForceOpenGL, batch);
         batch->commit();
     }
 }
@@ -699,6 +701,12 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     // separate auto and other icon themes
     m_pIconStyleLB->SetSeparatorPos( 0 );
     m_pIconStyleLB->SelectEntryPos(0);
+
+    // FIXME: should really add code to show a 'lock' icon here.
+    if (officecfg::Office::Common::VCL::UseOpenGL::isReadOnly())
+        m_pUseOpenGL->Enable(false);
+    if (officecfg::Office::Common::VCL::ForceOpenGL::isReadOnly())
+        m_pForceOpenGL->Enable(false);
 }
 
 OfaViewTabPage::~OfaViewTabPage()