[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - cui/source

[Andras Timar]

 cui/source/options/optopencl.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 8993c3d11e7ff433db98afa9906c755b7ee15ed6
Author: Andras Timar <andras.ti...@collabora.com>
Date:   Wed Sep 7 21:00:35 2016 +0200

    check for read-only state of OpenCL settings
    
    Reviewed-on: https://gerrit.libreoffice.org/28730
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit 6ebca1d1094d8fd85e485e504e810a1954befcc3)
    
    Change-Id: Ia3695d5e4901e527ef847a86e737f6c7eba5085f

diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 2bf4cfe..a88ca12 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -63,8 +63,10 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, 
const SfxItemSet& rSet)
     get(mpDrvVersion,"driverversion");
 
     
mpUseSwInterpreter->Check(officecfg::Office::Common::Misc::UseSwInterpreter::get());
+    
mpUseSwInterpreter->Enable(!officecfg::Office::Common::Misc::UseSwInterpreter::isReadOnly());
 
     mpUseOpenCL->Check(maConfig.mbUseOpenCL);
+    
mpUseOpenCL->Enable(!officecfg::Office::Common::Misc::UseOpenCL::isReadOnly());
     mpUseOpenCL->SetClickHdl(LINK(this, SvxOpenCLTabPage, EnableOpenCLHdl));
 
     mpBlackListEdit->SetClickHdl(LINK(this, SvxOpenCLTabPage, 
BlackListEditHdl));
@@ -104,6 +106,9 @@ SvxOpenCLTabPage::SvxOpenCLTabPage(vcl::Window* pParent, 
const SfxItemSet& rSet)
     mpBlackList->SetTabs(aTabs, MAP_PIXEL);
     mpWhiteList->SetTabs(aTabs, MAP_PIXEL);
 
+    mpBlackListFrame->Enable(maConfig.mbUseOpenCL);
+    mpWhiteListFrame->Enable(maConfig.mbUseOpenCL);
+
 }
 
 SvxOpenCLTabPage::~SvxOpenCLTabPage()

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits