[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/source

[ekuiitr]

 sw/source/ui/envelp/label1.cxx |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit c4aa77b3a90102d6987e2eb31438c03d03e69157
Author: ekuiitr <jhaekansh80 at gmail.com>
Date:   Tue Feb 6 22:49:11 2018 +0530

    tdf#88802 disable arrow if database or table or field not selected
    
    Change-Id: I5a29b58f6e8981ee3de73ccaa83ed04e4ee71dc6
    Reviewed-on: https://gerrit.libreoffice.org/49314
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 9cb54f6973406faec7fa46038cd9332c6d76db70)
    Reviewed-on: https://gerrit.libreoffice.org/49948
    Reviewed-by: Heiko Tietze <tietze.heiko at gmail.com>

diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index f4fa9edfdc72..3f8daf71e599 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -265,7 +265,11 @@ SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet)
     m_pAddrBox->SetClickHdl (LINK(this, SwLabPage, AddrHdl         ));
     m_pDatabaseLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl     ));
     m_pTableLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl     ));
+    m_pDBFieldLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl     ));
     m_pInsertBT->SetClickHdl (LINK(this, SwLabPage, FieldHdl        ));
+    // Disable insert button first,
+    // it'll be enabled if m_pDatabaseLB, m_pTableLB and m_pInsertBT are filled
+    m_pInsertBT->Disable();
     m_pContButton->SetClickHdl (LINK(this, SwLabPage, PageHdl         ));
     m_pSheetButton->SetClickHdl (LINK(this, SwLabPage, PageHdl         ));
     m_pMakeBox->SetSelectHdl(LINK(this, SwLabPage, MakeHdl         ));
@@ -342,7 +346,14 @@ IMPL_LINK( SwLabPage, DatabaseHdl, ListBox&, rListBox, void )
     if (&rListBox == m_pDatabaseLB)
         GetDBManager()->GetTableNames(m_pTableLB, sActDBName);
 
-    GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectedEntry());
+    if (&rListBox == m_pDatabaseLB || &rListBox == m_pTableLB)
+        GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectedEntry());
+
+    if (!m_pDatabaseLB->GetSelectedEntry().isEmpty() && !m_pTableLB->GetSelectedEntry().isEmpty()
+            && !m_pDBFieldLB->GetSelectedEntry().isEmpty())
+        m_pInsertBT->Enable(true);
+    else
+        m_pInsertBT->Enable(false);
 }
 
 IMPL_LINK_NOARG(SwLabPage, FieldHdl, Button*, void)