diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-05-21 09:35:01 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-05-23 11:38:50 +0200 |
| commit | 5c2c5ff01c23e4f7a8947746afc13a46cbef5bec (patch) | |
| tree | 2b7304c9563ac33fdda18b80131cc85114cecc45 /sw | |
| parent | 1464b94ab8ef58b2620e05d663403684deb19d0c (diff) | |
tdf#115386: Show Mail Merge toolbar for documents with MM fields
Change-Id: I357a30d72c5ac4af8c64b82b4cc61c3bd606940a
Reviewed-on: https://gerrit.libreoffice.org/54612
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/view.hxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view.cxx | 38 |
2 files changed, 39 insertions, 0 deletions
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 30e00b1e5844..91d02e252160 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -234,6 +234,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell m_bOldShellWasPagePreview : 1, m_bIsPreviewDoubleClick : 1, // #i114045# m_bMakeSelectionVisible : 1; // transport the bookmark selection + bool m_bInitOnceCompleted = false; /// LibreOfficeKit has to force the page size for PgUp/PgDown /// functionality based on the user's view, instead of using the m_aVisArea. diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 5317cb99ed00..6244a6771818 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -219,6 +219,28 @@ IMPL_LINK_NOARG(SwView, FormControlActivated, LinkParamNone*, void) } } +namespace +{ +uno::Reference<frame::XLayoutManager> getLayoutManager(const SfxViewFrame& rViewFrame) +{ + uno::Reference<frame::XLayoutManager> xLayoutManager; + uno::Reference<beans::XPropertySet> xPropSet(rViewFrame.GetFrame().GetFrameInterface(), + uno::UNO_QUERY); + if (xPropSet.is()) + { + try + { + xLayoutManager.set(xPropSet->getPropertyValue("LayoutManager"), uno::UNO_QUERY); + } + catch (const Exception& e) + { + SAL_WARN("sw.ui", "Failure getting layout manager: " + e.Message); + } + } + return xLayoutManager; +} +} + void SwView::SelectShell() { // Attention: Maintain the SelectShell for the WebView additionally @@ -420,6 +442,20 @@ void SwView::SelectShell() GetEditWin().SetInputContext( aCntxt ); } + // Show Mail Merge toolbar initially for documents with Database fields + if (!m_bInitOnceCompleted && GetWrtShell().IsAnyDatabaseFieldInDoc()) + { + if (auto xLayoutManager = getLayoutManager(*GetViewFrame())) + { + const OUString sResourceURL("private:resource/toolbar/mailmerge"); + if (!xLayoutManager->getElement(sResourceURL).is()) + { + xLayoutManager->createElement(sResourceURL); + xLayoutManager->showElement(sResourceURL); + } + } + } + // Activate the toolbar to the new selection which also was active last time. // Before a flush () must be, but does not affect the UI according to MBA and // is not a performance problem. @@ -444,6 +480,8 @@ void SwView::SelectShell() m_pWrtShell->UpdateTable(); GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged(); + + m_bInitOnceCompleted = true; } // Interaction: AttrChangedNotify() and TimeoutHdl. |