source/text/shared/02/09070000.xhp | 14 +++++++-------
source/text/shared/02/09070100.xhp | 6 +++---
source/text/shared/02/09070200.xhp | 6 +++---
source/text/shared/02/09070300.xhp | 4 ++--
source/text/shared/02/09070400.xhp | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit f631d6e7e4ac83a998edb66a6906ede9b9321f1c
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Sun Feb 25 17:09:45 2018 +0100
Replace custom HIDs with default ones in Hyperlink dialog pages
Add some missing ahelp too
This way the dialog source could be simplified a bit
Change-Id: I5694eaa75c681b2d45ce9a7623574edf423dbd9a
Reviewed-on: https://gerrit.libreoffice.org/50314
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/shared/02/09070000.xhp
b/source/text/shared/02/09070000.xhp
index 68d0568dd..8176ffe44 100644
--- a/source/text/shared/02/09070000.xhp
+++ b/source/text/shared/02/09070000.xhp
@@ -50,7 +50,7 @@
</table>
</section>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_ICCDIALOG_CHOICECTRL"
id="bm_id3149177" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkdialog/icon_control"
id="bm_id3149177" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3155391" role="paragraph"><ahelp
hid=".">Select the type of hyperlink to be inserted.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:OpenHyperlinkOnCursor"
id="bm_id7868083" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3153683" role="paragraph"><ahelp
hid=".uno:OpenHyperlinkOnCursor" visibility="hidden">Opens the hyperlink in
your default web browser.</ahelp></paragraph>
@@ -64,17 +64,17 @@
<embed href="text/shared/02/09070200.xhp#mailnews"/>
<embed href="text/shared/02/09070300.xhp#dokument"/>
<embed href="text/shared/02/09070400.xhp#neuesdokument"/>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_ICCDIALOG_OK_BTN"
id="bm_id3149811" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkdialog/apply"
id="bm_id3149811" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3166410" role="heading"
level="3">Apply</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph"><ahelp
hid="HID_ICCDIALOG_OK_BTN">Applies the data to your
document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_ICCDIALOG_CANCEL_BTN"
id="bm_id3159166" localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph"><ahelp
hid=".">Applies the data to your document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkdialog/cancel"
id="bm_id3159166" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3149398" role="heading"
level="3">Close</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149734" role="paragraph"><ahelp
hid="HID_ICCDIALOG_CANCEL_BTN">Closes the dialog without
saving.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149734" role="paragraph"><ahelp
hid=".">Closes the dialog without saving.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3153700" role="heading"
level="3">Help</paragraph>
<paragraph xml-lang="en-US" id="par_id3150943" role="paragraph">Opens
the Help.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_ICCDIALOG_RESET_BTN"
id="bm_id3155434" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkdialog/reset"
id="bm_id3155434" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3156192" role="heading"
level="3">Reset</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149234" role="paragraph"><ahelp
hid="HID_ICCDIALOG_RESET_BTN">Resets the entries in the dialog to their
original state.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149234" role="paragraph"><ahelp
hid=".">Resets the entries in the dialog to their original
state.</ahelp></paragraph>
<section id="relatedtopics">
<embed
href="text/shared/guide/hyperlink_insert.xhp#hyperlink_insert"/>
</section>
diff --git a/source/text/shared/02/09070100.xhp
b/source/text/shared/02/09070100.xhp
index d0f89349a..8c0e20e51 100644
--- a/source/text/shared/02/09070100.xhp
+++ b/source/text/shared/02/09070100.xhp
@@ -31,7 +31,7 @@
<body>
<section id="internet">
<bookmark xml-lang="en-US"
branch="hid/cui/ui/hyperlinkinternetpage/HyperlinkInternetPage"
id="bm_id3149119" localize="false"/><paragraph role="heading" id="hd_id3151100"
xml-lang="en-US" level="1"><link href="text/shared/02/09070100.xhp"
name="Internet">Internet</link></paragraph>
-<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US">Use the
<emph>Internet</emph> page of the <link href="text/shared/02/09070000.xhp"
name="Hyperlink dialog">Hyperlink dialog</link> to edit hyperlinks with WWW or
FTP addresses.</paragraph>
+<paragraph role="paragraph" id="par_id3154230" xml-lang="en-US"><ahelp
hid=".">Use the <emph>Internet</emph> page of the <link
href="text/shared/02/09070000.xhp" name="Hyperlink dialog">Hyperlink
dialog</link> to edit hyperlinks with WWW or FTP addresses.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000403.xhp#hypdiainternet"/>
@@ -44,8 +44,8 @@
<bookmark xml-lang="en-US"
branch="hid/cui/ui/hyperlinkinternetpage/linktyp_ftp" id="bm_id3153311"
localize="false"/><paragraph role="heading" id="hd_id3153683" xml-lang="en-US"
level="3">FTP</paragraph>
<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkinternetpage/linktyp_ftp">Creates an FTP
hyperlink.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_HYPERDLG_INET_PATH"
id="bm_id3146797" localize="false"/><paragraph role="heading" id="hd_id3150443"
xml-lang="en-US" level="3">URL</paragraph>
-<paragraph role="paragraph" id="par_id9887081" xml-lang="en-US"><ahelp
hid="CUI_HID_HYPERDLG_INET_PATH">Enter a URL for the file that you want to open
when you click the hyperlink. If you do not specify a target frame, the file
opens in the current document or frame.</ahelp><comment>see
i48946</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkinternetpage/target"
id="bm_id3146797" localize="false"/><paragraph role="heading" id="hd_id3150443"
xml-lang="en-US" level="3">URL</paragraph>
+<paragraph role="paragraph" id="par_id9887081" xml-lang="en-US"><ahelp
hid=".">Enter a URL for the file that you want to open when you click the
hyperlink. If you do not specify a target frame, the file opens in the current
document or frame.</ahelp><comment>see i48946</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmarkdialog/TreeListBox"
id="bm_id3159167" localize="false"/><paragraph role="paragraph"
id="par_id3147335" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkmarkdialog/TreeListBox" visibility="hidden">Specifies the
position in the target document where you wish to jump to.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmarkdialog/apply"
id="bm_id3159177" localize="false"/><paragraph role="paragraph"
id="par_id3149164" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkmarkdialog/apply" visibility="hidden">Inserts the target
in the <emph>Target</emph> field of the <emph>Hyperlink</emph>
dialog.</ahelp></paragraph>
diff --git a/source/text/shared/02/09070200.xhp
b/source/text/shared/02/09070200.xhp
index 4cf1f72f3..d0fc1f56e 100644
--- a/source/text/shared/02/09070200.xhp
+++ b/source/text/shared/02/09070200.xhp
@@ -31,15 +31,15 @@
<body>
<section id="mailnews">
<bookmark xml-lang="en-US"
branch="hid/cui/ui/hyperlinkmailpage/HyperlinkMailPage" id="bm_id3152918"
localize="false"/><paragraph role="heading" id="hd_id3147102" xml-lang="en-US"
level="1"><link href="text/shared/02/09070200.xhp"
name="Mail">Mail</link></paragraph>
-<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US">On the
<emph>Mail</emph> page in the <link href="text/shared/02/09070000.xhp"
name="Hyperlink dialog">Hyperlink dialog</link> you can edit hyperlinks for
e-mail addresses.</paragraph>
+<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US"><ahelp
hid=".">On the <emph>Mail</emph> page in the <link
href="text/shared/02/09070000.xhp" name="Hyperlink dialog">Hyperlink
dialog</link> you can edit hyperlinks for e-mail addresses.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000403.xhp#hypdiamailnews"/>
</section>
<paragraph role="heading" id="hd_id3153528" xml-lang="en-US"
level="2">Mail</paragraph>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_HYPERDLG_MAIL_PATH"
id="bm_id3144438" localize="false"/><paragraph role="heading" id="hd_id3149580"
xml-lang="en-US" level="3">Recipient</paragraph>
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US"><ahelp
hid="CUI_HID_HYPERDLG_MAIL_PATH">Assigns the specified e-mail address to the
hyperlink.</ahelp> Clicking the new hyperlink in the document will open a new
message document, addressed to the receiver specified in the
<emph>Recipient</emph> field.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmailpage/receiver"
id="bm_id3144438" localize="false"/><paragraph role="heading" id="hd_id3149580"
xml-lang="en-US" level="3">Recipient</paragraph>
+<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US"><ahelp
hid=".">Assigns the specified e-mail address to the hyperlink.</ahelp> Clicking
the new hyperlink in the document will open a new message document, addressed
to the receiver specified in the <emph>Recipient</emph> field.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmailpage/adressbook"
id="bm_id3155449" localize="false"/><paragraph role="heading" id="hd_id3143270"
xml-lang="en-US" level="3">Data Sources</paragraph>
<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US"><ahelp
hid="cui/ui/hyperlinkmailpage/adressbook">Hides or shows the data source
browser.</ahelp> Drag the receiver's <emph>E-mail</emph> data field from the
data source browser into the <emph>Recipient</emph> text field.</paragraph>
diff --git a/source/text/shared/02/09070300.xhp
b/source/text/shared/02/09070300.xhp
index da608a7b6..e4156ccc5 100644
--- a/source/text/shared/02/09070300.xhp
+++ b/source/text/shared/02/09070300.xhp
@@ -31,14 +31,14 @@
<body>
<section id="dokument">
<bookmark xml-lang="en-US"
branch="hid/cui/ui/hyperlinkdocpage/HyperlinkDocPage" id="bm_id3154094"
localize="false"/><paragraph role="heading" id="hd_id3143284" xml-lang="en-US"
level="1"><link href="text/shared/02/09070300.xhp"
name="Document">Document</link></paragraph>
-<paragraph role="paragraph" id="par_id3154682" xml-lang="en-US">Hyperlinks to
any document or targets in documents can be edited using the
<emph>Document</emph> tab from the <link href="text/shared/02/09070000.xhp"
name="Hyperlink dialog">Hyperlink dialog</link>.</paragraph>
+<paragraph role="paragraph" id="par_id3154682" xml-lang="en-US"><ahelp
hid=".">Hyperlinks to any document or targets in documents can be edited using
the <emph>Document</emph> tab from the <link href="text/shared/02/09070000.xhp"
name="Hyperlink dialog">Hyperlink dialog</link></ahelp>.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000403.xhp#hypdiadok"/>
</section>
<paragraph role="heading" id="hd_id3150808" xml-lang="en-US"
level="2">Document</paragraph>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_HYPERDLG_DOC_PATH"
id="bm_id3155552" localize="false"/><paragraph role="heading" id="hd_id3150710"
xml-lang="en-US" level="3">Path</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkdocpage/path"
id="bm_id3155552" localize="false"/><paragraph role="heading" id="hd_id3150710"
xml-lang="en-US" level="3">Path</paragraph>
<paragraph role="paragraph" id="par_id9462263" xml-lang="en-US"><ahelp
hid=".">Enter a URL for the file that you want to open when you click the
hyperlink. If you do not specify a target frame, the file opens in the current
document or frame.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkdocpage/fileopen"
id="bm_id3147571" localize="false"/><paragraph role="heading" id="hd_id3145136"
xml-lang="en-US" level="3">Open File</paragraph>
diff --git a/source/text/shared/02/09070400.xhp
b/source/text/shared/02/09070400.xhp
index 1c5bfd400..ee51f336f 100644
--- a/source/text/shared/02/09070400.xhp
+++ b/source/text/shared/02/09070400.xhp
@@ -31,7 +31,7 @@
<body>
<section id="neuesdokument">
<bookmark xml-lang="en-US"
branch="hid/cui/ui/hyperlinknewdocpage/HyperlinkNewDocPage" id="bm_id3159224"
localize="false"/><paragraph role="heading" id="hd_id3154873" xml-lang="en-US"
level="1"><link href="text/shared/02/09070400.xhp" name="New Document">New
Document</link></paragraph>
-<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US">Use the
<emph>New Document</emph> tab from the <link href="text/shared/02/09070000.xhp"
name="Hyperlink dialog">Hyperlink dialog</link> to set up a hyperlink to a new
document and create the new document simultaneously.</paragraph>
+<paragraph role="paragraph" id="par_id3150445" xml-lang="en-US"><ahelp
hid=".">Use the <emph>New Document</emph> tab from the <link
href="text/shared/02/09070000.xhp" name="Hyperlink dialog">Hyperlink
dialog</link> to set up a hyperlink to a new document and create the new
document simultaneously.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000403.xhp#hypdianeudok"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
