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

[Caolán McNamara (via logerrit)]

 sw/source/ui/dbui/mmdocselectpage.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit e49e10f8fecac4b65f913c1bab9f2e3e9ba154ad
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Nov 4 12:01:31 2020 +0000
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Thu Nov 5 17:45:28 2020 +0100

    don't select entry 0 if there are no entries
    
    Change-Id: I99b13796501dca1551d32eb966db1afcca16e225
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105220
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 1336a7dc8374..f19089126a03 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -71,11 +71,10 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(weld::Container* pPage, SwMai
         //insert in reverse order
         m_xRecentDocLB->insert_text(0, rDoc);
     }
-    m_xRecentDocLB->set_active(0);
-    if(!rDocs.hasElements())
-    {
+    if (!rDocs.hasElements())
         m_xRecentDocRB->set_sensitive(false);
-    }
+    else
+        m_xRecentDocLB->set_active(0);
 }
 
 SwMailMergeDocSelectPage::~SwMailMergeDocSelectPage()