sw/source/uibase/uiview/view.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 346153f08c907739ca310934ad45814379971027 Author: Mike Kaganski <[email protected]> AuthorDate: Sun Mar 14 12:08:25 2021 +0300 Commit: Mike Kaganski <[email protected]> CommitDate: Sun Mar 14 10:57:15 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 <[email protected]> diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 2a2ff5a563b6..82a64e7e3525 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. _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
