diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-28 16:23:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-28 16:23:56 +0100 |
| commit | 53423cb1f177369f72938ad45aa8a24568104e8e (patch) | |
| tree | 7c2390679e5ef5b77b380261b693d8903604f8ab /sw/inc/view.hxx | |
| parent | add another uui dependency (diff) | |
| download | core-53423cb1f177369f72938ad45aa8a24568104e8e.tar.gz core-53423cb1f177369f72938ad45aa8a24568104e8e.zip | |
Resolves: tdf#98793 create a MailMergeConfigItem if toolbar is active...
and one hasn't been set yet via the mail merge wizard. This
should have the same effect as launching mail merge and cancelling
it, which is given as the workaround
Change-Id: I9deb8173d2e18ccde705a923a74ef8a1175e9393
Diffstat (limited to 'sw/inc/view.hxx')
| -rw-r--r-- | sw/inc/view.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 66ce27e9d499..c9cccd04e6bb 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -614,7 +614,8 @@ public: // store MailMerge data while "Back to Mail Merge Wizard" FloatingWindow is active // or to support printing void SetMailMergeConfigItem(SwMailMergeConfigItem* pConfigItem, sal_uInt16 nRestart, bool bIsSource); - SwMailMergeConfigItem* GetMailMergeConfigItem(); + SwMailMergeConfigItem* GetMailMergeConfigItem(); + SwMailMergeConfigItem* EnsureMailMergeConfigItem(const SfxItemSet* pArgs = nullptr, sal_uInt16 nWizardRestartPage = 0); void ExecFormatPaintbrush(SfxRequest &); void StateFormatPaintbrush(SfxItemSet &); |