[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - cui/source

[Michael Weghorn (via logerrit)]

 cui/source/options/optjava.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 59be25c3dc69076a433f077f551ec7019a4d861e
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Oct 22 14:01:07 2020 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Fri Oct 23 18:02:29 2020 +0200

    Don't make list of JREs active when parent frame is inactive
    
    When the Java framework's direct mode is used,
    there is no use in allowing the user to change the Java
    options in the "Advanced" options page, so the corresponding
    frame is grayed out, s. commit
    2976590ed9f727c24064c97d80a51e9891253119
    ("Gray out Java options when framework's direct mode is used",
    2020-10-21).
    
    For the native gtk3 implementation, this also means that the
    child widget holding the list of JREs ('m_xJavaList')
    automatically remains grayed out as long as the parent widget
    ('m_xJavaFrame') is.
    However, it turns out that this is not true for the
    plain VCL implementation (used e.g. by the gen or kf5 VCL
    plugins) where the child widget can be
    made sensitive while the parent widget is insensitive.
    
    Therefore, commit 3935a0bd3bcf747aa9bede59b045d23ab598f2d4
    ("Properly (un)tick Java checkbox in Java options in direct
    mode", 2020-10-21) resulted in the widget holding the
    list of JREs becoming active again when the
    'EnableHdl_Impl' handler was called in the non-gtk3 case
    (while the parent widget and the buttons to add JREs, edit
    Java parameters and classpath would remained grayed out).
    
    Make sure the widget holding the list of JREs remains
    grayed out along with the whole frame holding the Java
    options.
    
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104657
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit cb44cf2f36e4da74ea7dcc3d06f51a85e825a497)
    
     Conflicts:
            cui/source/options/optjava.cxx
    
    Change-Id: Ic46bf317afec9bc566493ec56ab5319a78050da0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104667
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 210903fb3c85..3609ee89ec81 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -206,7 +206,7 @@ void SvxJavaOptionsPage::dispose()
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl, Button*, void)
 {
-    bool bEnable = m_pJavaEnableCB->IsChecked();
+    bool bEnable = get<vcl::Window>("javaframe")->IsEnabled() && m_pJavaEnableCB->IsChecked();
     m_pJavaBox->Enable(bEnable);
     bEnable ? m_pJavaList->EnableTable() : m_pJavaList->DisableTable();
 }