[Libreoffice-commits] core.git: dbaccess/source

[Libreoffice Gerrit user]

 dbaccess/source/ui/dlg/advancedsettings.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 2c7b55db30127494637f082c4ba1f9a0235b5d3c
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sun Mar 10 11:44:11 2019 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sun Mar 10 11:46:29 2019 +0100

    Make m_xAsBeforeCorrelationName depend on m_xAppendTableAlias
    
    Regression from commit 5481ca586df8eed2c832e00bc5f7e910fa2cd174
    
    Change-Id: I082625475b6e36cca5cd46c3500c91ca6e901c66
    Reviewed-on: https://gerrit.libreoffice.org/69003
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 2837361ff32a..3a60598aac8f 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -117,7 +117,7 @@ namespace dbaui
         if (&rBtn == m_xAppendTableAlias.get() && m_xAsBeforeCorrelationName)
         {
             // make m_xAsBeforeCorrelationName depend on m_xAppendTableAlias
-            m_xAsBeforeCorrelationName->set_active(m_xAppendTableAlias->get_active());
+            m_xAsBeforeCorrelationName->set_sensitive(m_xAppendTableAlias->get_active());
         }
         OnControlModifiedButtonClick(rBtn);
     }
@@ -205,6 +205,12 @@ namespace dbaui
             }
         }
 
+        if (m_xAppendTableAlias && m_xAsBeforeCorrelationName)
+        {
+            // make m_xAsBeforeCorrelationName depend on m_xAppendTableAlias
+            m_xAsBeforeCorrelationName->set_sensitive(m_xAppendTableAlias->get_active());
+        }
+
         // the non-boolean items
         if ( m_bHasBooleanComparisonMode )
         {