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

[Mike Kaganski (via logerrit)]

 sw/source/uibase/uiview/view.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b3c94568e25990b1f6b3df1f7919acecdca3ffd2
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sun Mar 14 12:08:25 2021 +0300
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Mar 17 21:14:14 2021 +0100

    tdf#141015: Show Mail Merge toolbar when DBData has data source
    
    Change-Id: I74ea06b47d851d979103599526ae970035854dae
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112465
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 346153f08c907739ca310934ad45814379971027)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112514
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index ff6f2bc82349..3e10ab192e5a 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -439,7 +439,9 @@ void SwView::SelectShell()
         }
 
         // Show Mail Merge toolbar initially for documents with Database fields
-        if (!m_bInitOnceCompleted && GetWrtShell().IsAnyDatabaseFieldInDoc())
+        if (!m_bInitOnceCompleted
+            && (GetWrtShell().IsAnyDatabaseFieldInDoc()
+                || !GetWrtShell().GetDBData().sDataSource.isEmpty()))
             ShowUIElement("private:resource/toolbar/mailmerge");
 
         // Activate the toolbar to the new selection which also was active last time.