diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-14 12:08:25 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-14 10:57:15 +0100 |
| commit | 346153f08c907739ca310934ad45814379971027 (patch) | |
| tree | 2f455cd84b02f3acb55412c5842b6302da492913 | |
| parent | c880d3e30405342a5ae6239cc77f69ed3ca6cc15 (diff) | |
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@collabora.com>
| -rw-r--r-- | sw/source/uibase/uiview/view.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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. |