diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2017-03-07 00:18:04 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-03-08 10:13:18 +0000 |
| commit | 9b59b3195b2ae26d8af56baa4159f1fec4b15feb (patch) | |
| tree | fb86d440c50bfc1b82a7eb83f403fb38333284e4 /sw | |
| parent | 26639083526855c0f5e1e18c96a02057c8bb7c89 (diff) | |
tdf#52986 Set default help IDs of the Mail Merge Wizard
Set help ID using SetRoadmapHelpId for all pages
so that when by default the focus is on the left side pane of
the wizard the relevant help page is displayed when hitting
the Help / F1 button
Change-Id: I62e3300027c3e96f627b1c84f2da11edb92678aa
Reviewed-on: https://gerrit.libreoffice.org/34935
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/mailmergewizard.cxx | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 6bc5eb36751b..7550a04e2bad 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -91,11 +91,31 @@ VclPtr<TabPage> SwMailMergeWizard::createPage(WizardState _nState) VclPtr<OWizardPage> pRet; switch(_nState) { - case MM_DOCUMENTSELECTPAGE : pRet = VclPtr<SwMailMergeDocSelectPage>::Create(this); break; - case MM_OUTPUTTYPETPAGE : pRet = VclPtr<SwMailMergeOutputTypePage>::Create(this); break; - case MM_ADDRESSBLOCKPAGE : pRet = VclPtr<SwMailMergeAddressBlockPage>::Create(this); break; - case MM_GREETINGSPAGE : pRet = VclPtr<SwMailMergeGreetingsPage>::Create(this); break; - case MM_LAYOUTPAGE : pRet = VclPtr<SwMailMergeLayoutPage>::Create(this); break; + case MM_DOCUMENTSELECTPAGE : + pRet = VclPtr<SwMailMergeDocSelectPage>::Create(this); + + /* tdf#52986 Set help ID using SetRoadmapHelpId for all pages + so that when by default the focus is on the left side pane of + the wizard the relevant help page is displayed when hitting + the Help / F1 button */ + SetRoadmapHelpId("modules/swriter/ui/mmselectpage/MMSelectPage"); + break; + case MM_OUTPUTTYPETPAGE : + pRet = VclPtr<SwMailMergeOutputTypePage>::Create(this); + SetRoadmapHelpId("modules/swriter/ui/mmoutputtypepage/MMOutputTypePage"); + break; + case MM_ADDRESSBLOCKPAGE : + pRet = VclPtr<SwMailMergeAddressBlockPage>::Create(this); + SetRoadmapHelpId("modules/swriter/ui/mmaddressblockpage/MMAddressBlockPage"); + break; + case MM_GREETINGSPAGE : + pRet = VclPtr<SwMailMergeGreetingsPage>::Create(this); + SetRoadmapHelpId("modules/swriter/ui/mmsalutationpage/MMSalutationPage"); + break; + case MM_LAYOUTPAGE : + pRet = VclPtr<SwMailMergeLayoutPage>::Create(this); + SetRoadmapHelpId("modules/swriter/ui/mmlayoutpage/MMLayoutPage"); + break; } OSL_ENSURE(pRet, "no page created in ::createPage"); return pRet; |