diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2019-02-20 11:52:46 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2019-02-20 18:23:05 +0100 |
| commit | 54a17bfbc795bedaccd9f1846b1a49d57722b5b4 (patch) | |
| tree | d5ddf6eb47a766d9216f8c488fa86cc8d1d752bf | |
| parent | f134b8cd96bcbff338b60d28347328d0e63d67c9 (diff) | |
Fix call of main Help page from app Help menu
The Application Help menu sends /<module>/.uno:HelpIndex in the Help
URL.
This translates to '.uno:HelpIndex' and module name is lost, opening the
New Help default page instead of the module Help entry page.
The patch picks the right module Help entry page in this particular
case.
Change-Id: Ifbb5ba4f817b195210fbb19bcb5c2011d2cb416d
Reviewed-on: https://gerrit.libreoffice.org/68093
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
| -rw-r--r-- | help3xsl/index2.html | 4 | ||||
| -rw-r--r-- | source/text/shared/main0108.xhp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/help3xsl/index2.html b/help3xsl/index2.html index 01bfb442f4..0321b7a390 100644 --- a/help3xsl/index2.html +++ b/help3xsl/index2.html @@ -37,6 +37,10 @@ case "sbasic": {defaultFile='text/sbasic/shared/main0601.html';module="BASIC";break;} default: {defaultFile='text/shared/05/new_help.html';module="WRITER";break;} } + //Special case of application F1 or menu Help -> LibreOffice Help + if (target.indexOf('.uno:HelpIndex') != -1) { + window.location.href = lang + '/' + defaultFile + '?System=' + system + '&DbPAR=' + module; + } var bookmark = target.slice(target.indexOf('/') + 1, target.length); var file = hid2fileMap[bookmark]; // check first if a root bookmark @@nowidget@@ can be used diff --git a/source/text/shared/main0108.xhp b/source/text/shared/main0108.xhp index 9f0932ff64..e8f8d4d603 100644 --- a/source/text/shared/main0108.xhp +++ b/source/text/shared/main0108.xhp @@ -39,7 +39,6 @@ </section> <section id="helpcommand"> -<bookmark xml-lang="en-US" branch="hid/.uno:HelpIndex" id="bm_id3149178" localize="false"/> <paragraph id="hd_id3147399" role="heading" level="2" xml-lang="en-US">$[officename] Help</paragraph> <paragraph id="par_id3147576" role="paragraph" xml-lang="en-US"><ahelp hid=".uno:HelpIndex">Opens the main page of the $[officename] Help for the current application.</ahelp> You can scroll through the Help pages and you can search for index terms or any text.</paragraph> @@ -105,4 +104,4 @@ <embed href="text/shared/05/00000160.xhp#doc_title"/> </body> -</helpdocument>
\ No newline at end of file +</helpdocument> |