source/text/shared/fontwork_toolbar.xhp | 16 ++++++----------
source/text/swriter/01/mm_cusgrelin.xhp | 1 +
2 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit 606e930c1cc675add282f5439736909e2f0c06f0
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Wed May 31 23:00:32 2017 +0200
Fix bookmarks and ahelps on Fontwork toolbar page
Change-Id: Ie2851f81a644a02b314af0083442895666af9114
Reviewed-on: https://gerrit.libreoffice.org/38324
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
(cherry picked from commit ec9cc953887f7577b74b113ba477275d63f954af)
Reviewed-on: https://gerrit.libreoffice.org/38328
diff --git a/source/text/shared/fontwork_toolbar.xhp
b/source/text/shared/fontwork_toolbar.xhp
index 98f86aaf3..b47f4f252 100644
--- a/source/text/shared/fontwork_toolbar.xhp
+++ b/source/text/shared/fontwork_toolbar.xhp
@@ -33,31 +33,27 @@
</section>
<paragraph xml-lang="en-US" id="par_idN1056D" role="heading"
level="2">Fontwork Gallery</paragraph>
<paragraph xml-lang="en-US" id="par_idN10571" role="paragraph"><ahelp
hid=".">Opens the Fontwork Gallery where you can select another preview. Click
OK to apply the new set of properties to your Fontwork
object.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:FontworkShapeTypes"
id="bm_id1966307" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:FontworkShapeType"
id="bm_id1966307" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10588" role="heading"
level="2">Fontwork Shape</paragraph>
<paragraph xml-lang="en-US" id="par_idN1058C" role="paragraph"><ahelp
hid=".">Opens the Fontwork Shape toolbar. Click a shape to apply the shape to
all selected Fontwork objects.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FontworkSameLetterHeights"
id="bm_id2198858" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FontworkSameLetterHeights"
id="bm_id3509323" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105A6" role="heading"
level="2">Fontwork Same Letter Heights</paragraph>
<paragraph xml-lang="en-US" id="par_idN105AA" role="paragraph"><ahelp
hid=".">Switches the letter height of the selected Fontwork objects from normal
to the same height for all objects.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FontworkAlignmentFloater"
id="bm_id7484969" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FontworkAlignmentFloater"
id="bm_id8592791" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105C1" role="heading"
level="2">Fontwork Alignment</paragraph>
<paragraph xml-lang="en-US" id="par_idN105C5" role="paragraph"><ahelp
hid=".">Opens the Fontwork Alignment window.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/FontWork1TBO" id="bm_id734885"
localize="false"/>
-<paragraph xml-lang="en-US" id="par_idN105DC" role="paragraph"><ahelp
hid=".">Click to apply the alignment to the selected Fontwork
objects.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN105DC" role="paragraph">Click to apply
the alignment to the selected Fontwork objects.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:FontworkCharacterSpacingFloater"
id="bm_id1930906" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FontworkCharacterSpacingFloater"
id="bm_id2658162" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105F3" role="heading"
level="2">Fontwork Character Spacing</paragraph>
<paragraph xml-lang="en-US" id="par_idN105F7" role="paragraph"><ahelp
hid=".">Opens the Fontwork Character Spacing window.</ahelp></paragraph>
-<paragraph xml-lang="en-US" id="par_idN1060E" role="paragraph"><ahelp
hid=".">Click to apply the character spacing to the selected Fontwork
objects.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_idN1060E" role="paragraph">Click to apply
the character spacing to the selected Fontwork objects.</paragraph>
<paragraph xml-lang="en-US" id="par_idN1061D" role="heading"
level="3">Custom</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10621" role="paragraph"><ahelp
hid=".">Opens the Fontwork Character Spacing dialog where you can enter a new
character spacing value.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/FontWork2TBO" id="bm_id2257759"
localize="false"/>
+ <paragraph xml-lang="en-US" id="par_idN10621" role="paragraph">Opens the
Fontwork Character Spacing dialog where you can enter a new character spacing
value.</paragraph>
+<bookmark xml-lang="en-US"
branch="hid/svx/ui/fontworkspacingdialog/FontworkSpacingDialog"
id="bm_id2257759" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10638" role="heading"
level="4">Value</paragraph>
<paragraph xml-lang="en-US" id="par_idN1063C" role="paragraph"><ahelp
hid=".">Enter the Fontwork character spacing value.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN1064B" role="heading"
level="3">Kern Character Pairs</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1064F" role="paragraph"><ahelp
hid=".">Switches the <link href="text/shared/00/00000005.xhp#kerning">
kerning</link> of character pairs on and off.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1064F" role="paragraph">Switches
the <link href="text/shared/00/00000005.xhp#kerning"> kerning</link> of
character pairs on and off.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/fontwork.xhp#fontwork"/>
</section>
commit 68a7c14b19cb6543d694f8a32cd7d9f810ac1313
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Thu Jun 1 06:56:05 2017 +0200
tdf#102930 Add a missing bookmark to Custom Salutation page
Change-Id: Icf76f575849ce6c503c3bfe73ba730b40c024d74
Reviewed-on: https://gerrit.libreoffice.org/38325
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
(cherry picked from commit 904ba1a1d017477b32e5f679e4903b2e6239f43c)
Reviewed-on: https://gerrit.libreoffice.org/38329
diff --git a/source/text/swriter/01/mm_cusgrelin.xhp
b/source/text/swriter/01/mm_cusgrelin.xhp
index 402f2bd2a..a678ae26c 100644
--- a/source/text/swriter/01/mm_cusgrelin.xhp
+++ b/source/text/swriter/01/mm_cusgrelin.xhp
@@ -48,6 +48,7 @@
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/addressblockdialog/custom" id="bm_id8161564"
localize="false"/>
<paragraph role="heading" id="par_idN1056D" xml-lang="en-US"
level="2">Customize salutation</paragraph>
<paragraph role="paragraph" id="par_idN10571" xml-lang="en-US"><ahelp
hid=".">Select a value from the list for the salutation and the punctuation
mark fields.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/addressblockdialog/addrpreview"
id="bm_id8161564" localize="false"/>
<paragraph role="heading" id="par_idN10574" xml-lang="en-US"
level="2">Preview</paragraph>
<paragraph role="paragraph" id="par_idN10578" xml-lang="en-US"><ahelp
hid=".">Displays a preview of the first database record with the current
salutation layout.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/addressblockdialog/up" id="bm_id1669972"
localize="false"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
