summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2019-02-20 11:52:46 -0300
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2019-02-21 18:57:56 +0100
commit7f8f2aefb437aa6c08c597cb2ea99cd1b67696e9 (patch)
tree001710a834141af98bf21e03b519e5d165b44fc4
parent9af370151723302e5df5e413604351ade70a40a9 (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/68103 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--help3xsl/index2.html4
-rw-r--r--source/text/shared/main0108.xhp3
2 files changed, 5 insertions, 2 deletions
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 01bfb442f..0321b7a39 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 9f0932ff6..e8f8d4d60 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>