[Libreoffice-commits] help.git: help3xsl/index2.html
help3xsl/index2.html |2 ++
1 file changed, 2 insertions(+)
New commits:
commit c13eb798f7eb33dbaa98fdd09ddb5374c5fbf0fc
Author: Rafael Lima
AuthorDate: Wed Aug 2 01:38:49 2023 +0200
Commit: Olivier Hallot
CommitDate: Wed Aug 2 10:59:28 2023 +0200
tdf#156573 Correctly resolve HID with "?" character
Change-Id: I1642e5c56d0d67fe4170358a61ec786f313029e1
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/155184
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index c08335e08c..2394c084e1 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -45,6 +45,8 @@
window.location.replace(lang + '/' + defaultFile + '?System='
+ system + '&DbPAR=' + module);
}
var bookmark = target.slice(target.indexOf('/') + 1,
target.length);
+// tdf#156573 Replace character "?" by "%3F"
+bookmark = bookmark.replace("?", "%3F");
var file = hid2fileMap[bookmark];
// check first if a root bookmark @@nowidget@@ can be used
if (file === undefined) {
[Libreoffice-commits] help.git: help3xsl/index2.html source/text
help3xsl/index2.html|4
source/text/shared/main0108.xhp |3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 54a17bfbc795bedaccd9f1846b1a49d57722b5b4
Author: Olivier Hallot
AuthorDate: Wed Feb 20 11:52:46 2019 -0300
Commit: Olivier Hallot
CommitDate: Wed Feb 20 18:23:05 2019 +0100
Fix call of main Help page from app Help menu
The Application Help menu sends //.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
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 @@
-
$[officename] Help
Opens the main page of the $[officename] Help for the
current application. You can scroll through the Help pages and you can
search for index terms or any text.
@@ -105,4 +104,4 @@
-
\ No newline at end of file
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/index2.html help3xsl/online_transform.xsl
help3xsl/index2.html |2 +-
help3xsl/online_transform.xsl |5 +
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit a8306cd14aa3c94db34799abe7c3a322a6fb03c5
Author: Olivier Hallot
AuthorDate: Thu Sep 20 17:13:12 2018 -0300
Commit: Olivier Hallot
CommitDate: Wed Sep 26 08:32:34 2018 +0200
Add debug info for HID in new help
To enable Help page debug, add '&Debug=1' to the page URL.
This patch pass the HID in the URL of the help page and
displays it in the debug div in the bottom of the page.
It should help to locate missing pages for a given HID.
Change-Id: I671feb2dc34baaef5230028ba918a407d4cfea76
Reviewed-on: https://gerrit.libreoffice.org/60843
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 2de168ba1..01bfb442f 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -51,7 +51,7 @@
var indx = file.indexOf('#');
var bm = file.substr(indx,file.length);
file = file.substr(0,indx);
-var newURL = lang + '/' + file + '?System=' + system + '&DbPAR=' +
module + bm;
+var newURL = lang + '/' + file + '?System=' + system + '&DbPAR=' +
module + '&HID=' + bookmark + bm;
}
window.location.href = newURL;
} else {
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 90b8a44a2..a7c3fd1e4 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -236,6 +236,7 @@
Title is:
+
@@ -248,12 +249,14 @@
@@ -261,6 +264,7 @@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/index2.html
help3xsl/index2.html |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 38e128a7d8e71e5bf1fdb43e4299dab1562fca52
Author: Olivier Hallot
AuthorDate: Thu Sep 20 16:44:04 2018 -0300
Commit: Adolfo Jayme Barrientos
CommitDate: Fri Sep 21 04:41:22 2018 +0200
tdf#119230 Chart help page opens empty
Chart module was missing in selection of default entry help page.
+ fix main entry page for Help, when no module specified.
Change-Id: Id79ae7fe4fd6170034348bc799e22d71e286f38c
Reviewed-on: https://gerrit.libreoffice.org/60839
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 503e6d149..2de168ba1 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -29,12 +29,13 @@
switch (smodule) {
case "swriter":
{defaultFile='text/swriter/main.html';module="WRITER";break;}
case "scalc":
{defaultFile='text/scalc/main.html';module="CALC";break;}
+case "schart":
{defaultFile='text/schart/main.html';module="CHART";break;}
case "simpress":
{defaultFile='text/simpress/main.html';module="IMPRESS";break;}
case "sdraw":
{defaultFile='text/sdraw/main.html';module="DRAW";break;}
case "smath":
{defaultFile='text/smath/main.html';module="MATH";break;}
case "sdatabase":
{defaultFile='text/shared/explorer/database/main.html';module="BASE";break;}
case "sbasic":
{defaultFile='text/sbasic/shared/main0601.html';module="BASIC";break;}
-default:
{defaultFile='text/shared/main.html';module="WRITER";break;}
+default:
{defaultFile='text/shared/05/new_help.html';module="WRITER";break;}
}
var bookmark = target.slice(target.indexOf('/') + 1, target.length);
var file = hid2fileMap[bookmark];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/index2.html
help3xsl/index2.html |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8d728edf4a9bbf066c3173a0349798d9465bad61
Author: Jan Holesovsky
AuthorDate: Wed Aug 15 09:06:34 2018 +0200
Commit: Jan Holesovsky
CommitDate: Thu Aug 16 09:19:52 2018 +0200
Try to detect the system at least a bit.
Change-Id: I5c5243d56cf85eeb7cd857c7d9f6da5cd305b429
Reviewed-on: https://gerrit.libreoffice.org/59049
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 8b58a4f6e..e09b68e6f 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -21,7 +21,7 @@
// the URL came from LibreOffice help (F1)
var target = getParameterByName("Target",url);
var lang = existingLang(getParameterByName("Language", url));
-var system = getParameterByName("System",url);
+var system = getParameterByName("System", url);
var module;
var defaultFile;
var smodule = target.substr(0, target.indexOf('/'));
@@ -54,7 +54,10 @@
window.location.href = newURL;
} else {
// URL came from elsewhere, direct access to webroot, we redirect to
main Help page
-window.location.href = existingLang(navigator.language) +
'/text/shared/main0108.html?&DbPAR=WRITER&System=WIN';
+var system = 'WIN';
+if (navigator.userAgent.indexOf("Mac") != -1) system = 'MAC';
+if (navigator.userAgent.indexOf("Linux") != -1) system = 'UNIX';
+window.location.href = existingLang(navigator.language) +
'/text/shared/main0108.html?&DbPAR=WRITER&System=' + system;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/index2.html source/text
help3xsl/index2.html |6 +-
source/text/shared/optionen/01090100.xhp | 10 ++
source/text/smath/01/0501.xhp|1 +
source/text/smath/01/05010100.xhp|7 +++
source/text/smath/01/0502.xhp|1 +
source/text/smath/01/0503.xhp|1 +
source/text/smath/01/0504.xhp|2 +-
source/text/smath/01/0601.xhp|1 +
source/text/smath/01/06010100.xhp|1 +
9 files changed, 16 insertions(+), 14 deletions(-)
New commits:
commit e366cf4f207e1fcbfa0bc11c83916fb89c7e6eae
Author: Olivier Hallot
Date: Fri Jul 13 11:18:15 2018 -0300
tdf#115524 Some branch bookmarks are not working 1
With .ui dialogs, the Help system sends specific URL
associated to the higlighted widget in the .ui dislog.
Not every help page associated to the dialog has
for all widgets of the dialog. As consequence, some URLs
were not addressed and the default module entry page
was displayed, instead of the dialog help page.
The solution is to define a dumy bookmark '@@nowidget@@' to the
help page associated to the dialog, and if the widget bookmark
is missing in the help page then use the dummy target,
thus offering a help page with the right contents anyway.
This patch covers help pages for smath.
Change-Id: I40b592271b0c336d4d3bacc33d2f3d19107ae702
Reviewed-on: https://gerrit.libreoffice.org/57393
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index b7872710b..6ca41cc90 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -37,6 +37,11 @@
}
var bookmark = rest.slice(rest.indexOf('/')+1, rest.indexOf('?'));
var file = map[bookmark];
+// check first if a root bookmark @@nowidget@@ can be used
+if (file === undefined){
+var b2 = bookmark.substring(0, bookmark.lastIndexOf("/")) +
'/@@nowidget@@';
+file = map[b2];
+}
// rebuild URL
if (file === undefined){
var newURL = lang + '/' + defaultFile + '?System=' + system + '&DbPAR=' +
module;
@@ -58,4 +63,3 @@
-
diff --git a/source/text/shared/optionen/01090100.xhp
b/source/text/shared/optionen/01090100.xhp
index def3baaec..69a4bbe6a 100644
--- a/source/text/shared/optionen/01090100.xhp
+++ b/source/text/shared/optionen/01090100.xhp
@@ -1,7 +1,4 @@
-
-
-
-
-
+
Settings
@@ -41,6 +37,7 @@
scaling; printing in $[officename] Math
fitting to pages;print settings in Math
mw inserted "fitting..."
+
Settings
Defines
formula settings that will be valid for all documents.
@@ -69,8 +66,5 @@
Embed only used symbols (smaller file size)
Saves only those symbols with each formula that are used in that
formula. In earlier versions of $[officename], all symbols were saved
with each formula.
-
-
-
diff --git a/source/text/smath/01/0501.xhp
b/source/text/smath/01/0501.xhp
index 1e891621f..5f1140b9e 100644
--- a/source/text/smath/01/0501.xhp
+++ b/source/text/smath/01/0501.xhp
@@ -36,6 +36,7 @@
+
Fonts
Defines the fonts that can be
applied to formula elements.
diff --git a/source/text/smath/01/05010100.xhp
b/source/text/smath/01/05010100.xhp
index 3e77a406a..22c2c7b23 100644
--- a/source/text/smath/01/05010100.xhp
+++ b/source/text/smath/01/05010100.xhp
@@ -30,10 +30,9 @@
-
-
-
- Fonts
+
+
+ Fonts
Use this
dialog to select the font for the respective category in the Fonts
dialog.
diff --git a/source/text/smath/01/0502.xhp
b/source/text/smath/01/0502.xhp
index bca5302d7..8b315cc93 100644
--- a/source/text/smath/01/0502.xhp
+++ b/source/text/smath/01/0502.xhp
@@ -32,6 +32,7 @@
font sizes; in $[officename]
Math
sizes; of fonts in $[officename] Math
+
Font Sizes
Use this dialog to specify
the font sizes for your formula. Select a base size and all elements of the
formula will be scaled in relation to this base.
diff --git a/source/text/smath/01/0503.xhp
b/source/text/smath/01/0503.xhp
index b032fd0d9..75e7e5c80 100644
--- a/source/text/smath/01/0503.xhp
+++ b/source/text/smath/01/0503.xhp
@@ -33,6 +33,7 @@
formulas;element spacing
+
Spacing
Use this dialog to determine
the spacing between formula elements. The spacing is specified as a percentage
in relation to the base size defined under Format - Font
Size.
diff --git a/source/text/smath/01/0504.xhp
b/source/text/smath/01/0504.xhp
index c3cbc1b1a..40b6d0c13 100644
--- a/source/text/smath/01/0504.xhp
+++ b/source/text/smath/01/0504.xhp
@@ -27,7 +27,7 @@
-
+
aligning; multi-line
formulasmulti-line formulas;
aligning
diff --git a/source/text/smath/01/0601.xhp
b/source/text/smath/01/0601.xhp
index 0bdc22f37..7fa427187 100644
--- a/source/text/smath/01/0601.xhp
+++ b/source/text/smath/01/0601.xhp
@@ -39,6 +39,7 @@
+
diff
[Libreoffice-commits] help.git: help3xsl/index2.html
help3xsl/index2.html |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f4c54d3af32ca4c6d02afff71532dbf10147fd33 Author: Stephan Bergmann Date: Tue Apr 17 16:00:48 2018 +0200 Include help2.js not help.js Otherwise, causes a ReferenceError: getParameterByName is not defined when loading in the browser. Change-Id: I13cdd36e44859a74c9a1b4e3b020fed2f56edda0 Reviewed-on: https://gerrit.libreoffice.org/53048 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/index2.html b/help3xsl/index2.html index c7a6b6ee1..b7872710b 100644 --- a/help3xsl/index2.html +++ b/help3xsl/index2.html @@ -9,7 +9,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/index2.html
help3xsl/index2.html |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 0ddb36aafd052ca3a10c4a873f6a7b5ccf0f9c82
Author: Olivier Hallot
Date: Mon Mar 5 15:28:05 2018 -0300
Drop undefined navigator property
Change-Id: I42a37211bfc6d6e3b91061593f252feb6c38a8b6
Reviewed-on: https://gerrit.libreoffice.org/50782
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 43816853c..b2040fbaf 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -49,7 +49,10 @@
window.open(newURL,'_self');
}else{
// URL came from elsewhere, direct access to webroot, we redirect to main
Help page
-var userLang = navigator.language || navigator.userLanguage;
+var userLang = navigator.language;
+if(userLang === undefined ){
+userlang="en-US";
+}
window.open(userLang +
'/text/shared/main0108.html?&DbPAR=WRITER&System=WIN','_self');
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/index2.html
help3xsl/index2.html |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1b361a83c014ff9c8c2b80bbe779387ef0a209f5
Author: Olivier Hallot
Date: Mon Feb 12 15:10:39 2018 -0200
Better handling of user language in help online
Change-Id: I6a14081321cfd94fe1efb1f2b5fd23f20d4a27fc
Reviewed-on: https://gerrit.libreoffice.org/49613
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 58a17f627..43816853c 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -49,7 +49,8 @@
window.open(newURL,'_self');
}else{
// URL came from elsewhere, direct access to webroot, we redirect to main
Help page
-
window.open('en-US/text/shared/main0108.html?&DbPAR=WRITER&System=WIN','_self');
+var userLang = navigator.language || navigator.userLanguage;
+window.open(userLang +
'/text/shared/main0108.html?&DbPAR=WRITER&System=WIN','_self');
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/index2.html
help3xsl/index2.html |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 145fe1d4c0d697cd15619dd682c622d3c146d95f
Author: Olivier Hallot
Date: Fri Feb 9 16:14:47 2018 -0200
Better handling of help URLs anchors
Change-Id: I25a6b105f4a809839575e43cd4834cf96a1e5e7c
Reviewed-on: https://gerrit.libreoffice.org/49516
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 578acbbd2..58a17f627 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -39,12 +39,13 @@
var file = map[bookmark];
// rebuild URL
if (file === undefined){
-file = defaultFile;
-}
+var newURL = lang + '/' + defaultFile + '?System=' + system + '&DbPAR=' +
module;
+}else{
var indx = file.indexOf('#');
var bm = file.substr(indx,file.length);
file = file.substr(0,indx);
var newURL = lang + '/' + file + '?System=' + system + '&DbPAR=' + module
+ bm;
+}
window.open(newURL,'_self');
}else{
// URL came from elsewhere, direct access to webroot, we redirect to main
Help page
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/index2.html
help3xsl/index2.html |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ea4a7345bc1cbcbff3fb4355d0e4f4954f8afa7d
Author: Olivier Hallot
Date: Thu Jan 18 22:36:18 2018 -0200
Fix detection of bad help call
remove single quotes
Change-Id: Ia7951508cbf0a49ae029588e1d254de5f3942f12
Reviewed-on: https://gerrit.libreoffice.org/48165
Reviewed-by: Olivier Hallot
Tested-by: Olivier Hallot
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 6f4fc7f39..f30348b98 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -38,10 +38,10 @@
var bookmark = rest.slice(rest.indexOf('/')+1, rest.indexOf('?'));
var file = map[bookmark];
// rebuild URL
-if (file=='undefined'){
+if (file === undefined){
file = defaultFile;
}
-var newURL = lang+'/'+file+'?System='+system+'&DbPAR='+module;
+var newURL = lang + '/' + file + '?System=' + system + '&DbPAR=' + module;
window.open(newURL,'_self');
}else{
// URL came from elsewhere, direct access to webroot, we redirect to main
Help page
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
