diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2017-02-21 04:20:49 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-03-02 18:25:57 +0000 |
| commit | 51c0054a6fb956ff758206b4113ae2e76f82f5d4 (patch) | |
| tree | 432fded7203897f56a4b2f5229548e6e0036f71c | |
| parent | a735164f154daa1e090c35868ef7b23d77a04773 (diff) | |
tdf#60874 Set custom HID for Protect Document window
The window has its own help page but the SfxPasswordDialog
has a default help page as well. We need to use custom help IDs here.
The Password entry already has a custom HID however it is used on
the default help page of SfxPasswordDialog.
We need to set a custom help ID for the Confirm entry and
use it in the scalc/01/06060200.xhp file like the one belonging
to the Password entry.
Change-Id: I9344c85cf362a1829202664315f8c8be0a265b59
Reviewed-on: https://gerrit.libreoffice.org/34501
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | include/sfx2/passwd.hxx | 7 | ||||
| -rw-r--r-- | sc/inc/helpids.h | 1 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh3.cxx | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 1c8984f1b5ac..7c1a5c79b598 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -112,6 +112,13 @@ public: { mpPassword1ED->SetHelpId( rId ); } + /* tdf#60874 we need a custom help ID for the Confirm + field of the Protect Document window */ + void SetConfirmHelpId(const OString& rId) + { + mpConfirm1ED->SetHelpId( rId ); + } + void ShowExtras(SfxShowExtras nExtras) { mnExtras = nExtras; diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index aff92df68d95..af47f5b2890a 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -67,6 +67,7 @@ // Help IDs for Submenus (max.50) -------------------------------------------- #define HID_PASSWD_TABLE "SC_HID_PASSWD_TABLE" #define HID_PASSWD_DOC "SC_HID_PASSWD_DOC" +#define HID_PASSWD_DOC_CONFIRM "SC_HID_PASSWD_DOC_CONFIRM" // Other help IDs (max.70) --------------------------------------------------- diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index a8f077644c45..1ef15d9f6ed6 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -1080,6 +1080,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand() ); pDlg->SetEditHelpId( HID_PASSWD_DOC ); pDlg->ShowExtras( SfxShowExtras::CONFIRM ); + pDlg->SetConfirmHelpId( HID_PASSWD_DOC_CONFIRM ); if (pDlg->Execute() == RET_OK) { |