[Libreoffice-commits] help.git: source/text
Gabor Kelemen
kelemeng at gnome.hu
Sun Jan 1 16:17:11 UTC 2017
source/text/shared/01/05040400.xhp | 80 +++++++++++++++++++------------------
1 file changed, 42 insertions(+), 38 deletions(-)
New commits:
commit f59c4d42dc78c25641c7ee9da62abb49c313f93a
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date: Fri Dec 30 00:23:06 2016 +0100
Reconnect 'Page Style - Footer' tabpage and help content
Need to use custom HIDs so that the shared UI elements in
headfootformatpage.ui can be linked to different paragraphs
Change-Id: Ie9599ef8eb42336815b4f3127de0b3e9231b5b56
Reviewed-on: https://gerrit.libreoffice.org/32501
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/source/text/shared/01/05040400.xhp b/source/text/shared/01/05040400.xhp
index 5866aa1..1a9aa1c 100644
--- a/source/text/shared/01/05040400.xhp
+++ b/source/text/shared/01/05040400.xhp
@@ -28,9 +28,9 @@
</meta>
<body>
<section id="fusszeile">
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_FORMAT_FOOTER" id="bm_id3145348" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/headfootformatpage/HFFormatPage" id="bm_id3154927" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155620" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05040400.xhp" name="Footer">Footer</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156553" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_FOOTER">Adds a footer to the current page style. A footer is an area in the bottom page margin, where you can add text or graphics.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156553" role="paragraph" l10n="U" oldref="2"><ahelp hid="svx/ui/headfootformatpage/HFFormatPage">Adds a footer to the current page style. A footer is an area in the bottom page margin, where you can add text or graphics.</ahelp></paragraph>
</section>
<paragraph xml-lang="en-US" id="par_id3145136" role="paragraph" l10n="U" oldref="32">If you want, you can also add borders or a background fill to a footer.</paragraph>
<switch select="appl">
@@ -51,46 +51,50 @@
</switch>
<paragraph xml-lang="en-US" id="hd_id3150504" role="heading" level="2" l10n="U" oldref="3">Footer</paragraph>
<paragraph xml-lang="en-US" id="par_id3149235" role="paragraph" l10n="U" oldref="4">Set the properties of the footer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON" id="bm_id3155434" localize="false"/>
+
+<bookmark xml-lang="en-US" branch="hid/svx/ui/headfootformatpage/checkFooterOn" id="bm_id3158208" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154380" role="heading" level="3" l10n="U" oldref="6">Footer on</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153348" role="paragraph" l10n="U" oldref="7"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_TURNON">Adds a footer to the current page style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED" id="bm_id3149244" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145087" role="heading" level="3" l10n="U"
- oldref="20">Same content left/right</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149575" role="paragraph" l10n="CHG" oldref="21"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_SHARED">Even and odd pages share the same content.<switchinline select="appl"><caseinline select="CALC"> To assign a different footer to even and odd pages, clear this option, and then click <emph>Edit</emph>.
+ <paragraph xml-lang="en-US" id="par_id3153348" role="paragraph" l10n="U" oldref="7"><ahelp hid="svx/ui/headfootformatpage/checkFooterOn">Adds a footer to the current page style.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_FOOTER_CHECKSAMELR" id="bm_id3149244" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3145087" role="heading" level="3" l10n="U" oldref="20">Same content left/right</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149575" role="paragraph" l10n="CHG" oldref="21"><ahelp hid="SVX_HID_FOOTER_CHECKSAMELR">Even and odd pages share the same content.<switchinline select="appl"><caseinline select="CALC"> To assign a different footer to even and odd pages, clear this option, and then click <emph>Edit</emph>.
</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED_FIRST" id="bm_id3150544" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154937" role="heading" level="3" l10n="U"
- oldref="21">Same content on first page</paragraph>
-<paragraph xml-lang="en-US" id="par_id3154939" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_SHARED_FIRST">First and even/odd pages share the same content.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN" id="bm_id3149457" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147264" role="heading" level="3" l10n="U"
- oldref="16">Left margin</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156434" role="paragraph" l10n="U" oldref="17"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_LMARGIN">Enter the amount of space to leave between the left edge of the page and the left edge of the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN" id="bm_id3153360" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154073" role="heading" level="3" l10n="U"
- oldref="18">Right margin</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154224" role="paragraph" l10n="U" oldref="19"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_RMARGIN">Enter the amount of space to leave between the right edge of the page and the right edge of the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST" id="bm_id3154123" localize="false"/>
+
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_FOOTER_CHECKSAMEFP" id="bm_id3150544" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154937" role="heading" level="3" l10n="U" oldref="21">Same content on first page</paragraph>
+<paragraph xml-lang="en-US" id="par_id3154939" role="paragraph" l10n="CHG" oldref="22"><ahelp hid="SVX_HID_FOOTER_CHECKSAMEFP">First and even/odd pages share the same content.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_FOOTER_SPINMARGLEFT" id="bm_id3149457" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3147264" role="heading" level="3" l10n="U" oldref="16">Left margin</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156434" role="paragraph" l10n="U" oldref="17"><ahelp hid="SVX_HID_FOOTER_SPINMARGLEFT">Enter the amount of space to leave between the left edge of the page and the left edge of the footer.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_FOOTER_SPINMARGRIGHT" id="bm_id3153360" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154073" role="heading" level="3" l10n="U" oldref="18">Right margin</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154224" role="paragraph" l10n="U" oldref="19"><ahelp hid="SVX_HID_FOOTER_SPINMARGRIGHT">Enter the amount of space to leave between the right edge of the page and the right edge of the footer.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_FOOTER_SPINSPACING" id="bm_id3154123" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154140" role="heading" level="3" l10n="U" oldref="8">Spacing</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154908" role="paragraph" l10n="U" oldref="9"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_DIST">Enter the amount of space that you want to maintain between the bottom edge of the document text and the top edge of the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_DYNSPACING" id="bm_id3152933" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3158409" role="heading" level="4" l10n="U"
- oldref="34">Use dynamic spacing</paragraph>
- <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="35"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_FOOTER_CB_DYNSPACING">Overrides the <emph>Spacing </emph>setting and allows the footer to expand into the area between the footer and document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT" id="bm_id3150495" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154821" role="heading" level="3" l10n="U"
- oldref="12">Height</paragraph>
- <paragraph xml-lang="en-US" id="par_id3125865" role="paragraph" l10n="U" oldref="13"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_FOOTER:ED_HEIGHT">Enter the height you want for the footer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN" id="bm_id3153968" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3150742" role="heading" level="3" l10n="U"
- oldref="14">AutoFit height</paragraph>
- <paragraph xml-lang="en-US" id="par_id3145744" role="paragraph" l10n="U" oldref="15"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN">Automatically adjusts the height of the footer to fit the content you enter.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154908" role="paragraph" l10n="U" oldref="9"><ahelp hid="SVX_HID_FOOTER_SPINSPACING">Enter the amount of space that you want to maintain between the bottom edge of the document text and the top edge of the footer.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_FOOTER_CHECKDYNSPACING" id="bm_id3152933" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3158409" role="heading" level="4" l10n="U" oldref="34">Use dynamic spacing</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="35"><ahelp hid="SVX_HID_FOOTER_CHECKDYNSPACING">Overrides the <emph>Spacing </emph>setting and allows the footer to expand into the area between the footer and document text.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_FOOTER_SPINHEIGHT" id="bm_id3150495" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3154821" role="heading" level="3" l10n="U" oldref="12">Height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3125865" role="paragraph" l10n="U" oldref="13"><ahelp hid="SVX_HID_FOOTER_SPINHEIGHT">Enter the height you want for the footer.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_FOOTER_CHECKAUTOFIT" id="bm_id3153968" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150742" role="heading" level="3" l10n="U" oldref="14">AutoFit height</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145744" role="paragraph" l10n="U" oldref="15"><ahelp hid="SVX_HID_FOOTER_CHECKAUTOFIT">Automatically adjusts the height of the footer to fit the content you enter.</ahelp></paragraph>
+
<embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS" id="bm_id3147084" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3149807" role="heading" level="2" l10n="U"
- oldref="23">More</paragraph>
- <paragraph xml-lang="en-US" id="par_id3145421" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_FOOTER:BTN_EXTRAS">Defines a border, a background color, or a background pattern for the footer.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_FOOTER_BUTTONMORE" id="bm_id3147084" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3149807" role="heading" level="2" l10n="U" oldref="23">More</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145421" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX_HID_FOOTER_BUTTONMORE">Defines a border, a background color, or a background pattern for the footer.</ahelp></paragraph>
+
<bookmark xml-lang="en-US" branch="hid/SC_HID_SC_FOOTER_EDIT" id="bm_id3145787" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3157892" role="heading" level="2" l10n="U"
oldref="26"><switchinline select="appl"><caseinline select="CALC">Edit
More information about the Libreoffice-commits
mailing list