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

[Caolán McNamara (via logerrit)]

 sw/source/ui/index/swuiidxmrk.cxx |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 4d25be13b6d2f4d1a83efa224cc02e92f20bef11
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Apr 1 16:17:00 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Apr 1 17:56:16 2020 +0200

    tdf#131711 there are two help pages for the index dialog which has two modes
    
    so at runtime suffix the two different widget helpids depending on their
    mode to find the separate help pages for the widgets
    
    Change-Id: I464544409aad3fd34b1ac62bf68e134596e900e9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91498
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 290aa91a8ddf..b18689d9df18 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -121,7 +121,20 @@ SwIndexMarkPane::SwIndexMarkPane(const std::shared_ptr<weld::Dialog>& rDialog, w
         m_xPhoneticED2->show();
     }
 
-    m_xDialog->set_title(SwResId(m_bNewMark ? STR_IDXMRK_INSERT : STR_IDXMRK_EDIT));
+    // tdf#129726 there are two help pages for this dialog, one for each mode,
+    // where a widget/dialog appears in both, use -insert/-edit to disambiguate
+    if (m_bNewMark)
+    {
+        m_xDialog->set_title(SwResId(STR_IDXMRK_INSERT));
+        m_xDialog->set_help_id(m_xDialog->get_help_id() + "-insert");
+        m_xTypeDCB->set_help_id(m_xTypeDCB->get_help_id() + "-insert");
+    }
+    else
+    {
+        m_xDialog->set_title(SwResId(STR_IDXMRK_EDIT));
+        m_xDialog->set_help_id(m_xDialog->get_help_id() + "-edit");
+        m_xTypeDCB->set_help_id(m_xTypeDCB->get_help_id() + "-edit");
+    }
 
     m_xDelBT->connect_clicked(LINK(this,SwIndexMarkPane,        DelHdl));
     m_xPrevBT->connect_clicked(LINK(this,SwIndexMarkPane,       PrevHdl));