sw/source/uibase/uiview/view.cxx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 8ca83e3801ee8e6359159ab4c222eedbf76e63dc
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue May 11 20:58:50 2021 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed May 12 06:16:55 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.kagan...@collabora.com>
(cherry picked from commit 2009af1c0fb4fead653dd7688347c15d74eaa1b0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115286
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 3e10ab192e5a..ff6f2bc82349 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -439,9 +439,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.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
