diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-18 14:03:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-08-18 21:22:35 +0200 |
| commit | 1f42157e2457e30a7f18fdf9d7bb5bddfb819f04 (patch) | |
| tree | 83a16b5eed4a8eaf419f3ae68612bbe70a3c75e1 /sd/source | |
| parent | c1cd505c67a53a0a27589889b34641612d10946d (diff) | |
tdf#143353 defer tip of the day until impress template dialog is gone
wait until that dialog is dismissed before showing the tip dialog
Change-Id: Id0e7e28f09c5a9727e10eda55e468adb56bfda70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120675
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 64a149a1334d..8ac21d2258d9 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -489,6 +489,15 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest const & rReq ) //pFrame is loaded with the desired template if (!aTemplDlg.getTemplatePath().isEmpty()) pFrame = CreateFromTemplate(aTemplDlg.getTemplatePath(), xTargetFrame, false); + + // show tip-of-the-day dialog if it was deferred because SfxTemplateSelectionDlg + // was open + if (pFrame && SfxApplication::IsTipOfTheDayDue() && !SfxApplication::IsHeadlessOrUITest()) + { + // tdf#127946 pass in argument for dialog parent + SfxUnoFrameItem aDocFrame(SID_FILLFRAME, pFrame->GetFrameInterface()); + GetDispatcher()->ExecuteList(SID_TIPOFTHEDAY, SfxCallMode::SLOT, {}, { &aDocFrame }); + } } } |