[Libreoffice-commits] core.git: sw/source

[Gabor Kelemen]

 sw/source/ui/dbui/mailmergewizard.cxx |   30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

New commits:
commit 9b59b3195b2ae26d8af56baa4159f1fec4b15feb
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Tue Mar 7 00:18:04 2017 +0100

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 6bc5eb3..7550a04 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;