[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sw/source

[Mike Kaganski (via logerrit)]

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

New commits:
commit 4c9e939eb5f994c63c71fb6cc70d8868e0499060
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue May 11 20:58:50 2021 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Wed May 12 18:53:19 2021 +0200

    Revert "tdf#141015: Show Mail Merge toolbar when DBData has data source"
    
    This reverts commit 346153f08c907739ca310934ad45814379971027.
    It seems to create more problems than expected, and there's no
    way to remove DB association other than editing document XML.
    
    Change-Id: I93171f17c01e231abbcfa9a816fdadce83c983ec
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115283
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 2009af1c0fb4fead653dd7688347c15d74eaa1b0)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115286
    (cherry picked from commit 8ca83e3801ee8e6359159ab4c222eedbf76e63dc)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115288
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

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