helpers/help_hid.lst               |   10 -------
 source/text/shared/01/05040300.xhp |   51 ++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 35 deletions(-)

New commits:
commit 071306b8f2e8d419a76ba2d493b7b8377fde2eff
Author: Caolán McNamara <caol...@redhat.com>
Date:   Tue Mar 5 12:44:22 2013 +0000

    update help ids for header/footer tab page .ui conversion
    
    Change-Id: Id91e2bd462896a2b5c1707463ccbf1b882f97b84

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index f6d8dfd..5311cf2 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1801,7 +1801,6 @@ HID_FOOTNOTE_OPTIONS,53215,
 HID_FOOTNOTE_PAGE,53175,
 HID_FORMAT_COLUMN,52789,
 HID_FORMAT_FOOTER,33790,
-HID_FORMAT_HEADER,33789,
 HID_FORMAT_NAME_OBJECT_NAME,53076,
 HID_FORMAT_PARAGRAPH_ALIGN,33795,
 HID_FORMAT_PARAGRAPH_STD,33793,
@@ -7543,10 +7542,6 @@ 
svx_CheckBox_RID_SVXPAGE_GRID_CBX_SNAP_HELPLINES,703202329,
 svx_CheckBox_RID_SVXPAGE_GRID_CBX_SNAP_POINTS,703202332,
 svx_CheckBox_RID_SVXPAGE_GRID_CBX_SYNCHRONIZE,703202309,
 svx_CheckBox_RID_SVXPAGE_GRID_CBX_USE_GRIDSNAP,703202308,
-svx_CheckBox_RID_SVXPAGE_HEADER_CB_DYNSPACING,701154326,
-svx_CheckBox_RID_SVXPAGE_HEADER_CB_HEIGHT_DYN,701154319,
-svx_CheckBox_RID_SVXPAGE_HEADER_CB_SHARED,701154324,
-svx_CheckBox_RID_SVXPAGE_HEADER_CB_TURNON,701154314,
 svx_CheckBox_RID_SVXPAGE_HYPERLINK_INTERNET_CBX_ANONYMOUS,704447499,
 svx_CheckBox_RID_SVXPAGE_INET_MOZPLUGIN_CB_MOZPLUGIN_CODE,736117762,
 svx_CheckBox_RID_SVXPAGE_JSEARCH_OPTIONS_CB_IGNORE_MIDDLE_DOT,714474700,
@@ -7986,10 +7981,6 @@ 
svx_MetricField_RID_SVXPAGE_GRID_MTR_FLD_DRAW_Y,703207945,
 svx_MetricField_RID_SVXPAGE_GRID_MTR_FLD_SNAP_AREA,703207966,
 svx_MetricField_RID_SVXPAGE_HATCH_MTR_FLD_ANGLE,701651459,
 svx_MetricField_RID_SVXPAGE_HATCH_MTR_FLD_DISTANCE,701651457,
-svx_MetricField_RID_SVXPAGE_HEADER_ED_DIST,701159948,
-svx_MetricField_RID_SVXPAGE_HEADER_ED_HEIGHT,701159950,
-svx_MetricField_RID_SVXPAGE_HEADER_ED_LMARGIN,701159953,
-svx_MetricField_RID_SVXPAGE_HEADER_ED_RMARGIN,701159955,
 svx_MetricField_RID_SVXPAGE_LINE_DEF_MTR_FLD_DISTANCE,701569537,
 svx_MetricField_RID_SVXPAGE_LINE_DEF_MTR_FLD_LENGTH_1,701569539,
 svx_MetricField_RID_SVXPAGE_LINE_DEF_MTR_FLD_LENGTH_2,701569540,
@@ -8229,7 +8220,6 @@ svx_PushButton_RID_SVXPAGE_GRFCROP_PB_ORGSIZE,704614934,
 svx_PushButton_RID_SVXPAGE_HATCH_BTN_ADD,701649409,
 svx_PushButton_RID_SVXPAGE_HATCH_BTN_DELETE,701649412,
 svx_PushButton_RID_SVXPAGE_HATCH_BTN_MODIFY,701649411,
-svx_PushButton_RID_SVXPAGE_HEADER_BTN_EXTRAS,701157928,
 svx_PushButton_RID_SVXPAGE_IMPROVEMENT_PB_SHOWDATA,705663507,
 svx_PushButton_RID_SVXPAGE_INET_MAIL_PB_MAILERURL,703255045,
 svx_PushButton_RID_SVXPAGE_INET_SEARCH_PB_ADD,703337015,
diff --git a/source/text/shared/01/05040300.xhp 
b/source/text/shared/01/05040300.xhp
index 807a391..fed4893 100644
--- a/source/text/shared/01/05040300.xhp
+++ b/source/text/shared/01/05040300.xhp
@@ -28,9 +28,9 @@
    </meta>
    <body>
       <section id="kopfzeile">
-<bookmark xml-lang="en-US" branch="hid/SVX_HID_FORMAT_HEADER" 
id="bm_id3154926" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/headfootformatpage/HFFormatPage" 
id="bm_id3154926" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3155599" role="heading" level="1" 
l10n="U" oldref="1"><link href="text/shared/01/05040300.xhp" 
name="Header">Header</link></paragraph>
-         <paragraph xml-lang="en-US" id="par_id3156027" role="paragraph" 
l10n="U" oldref="2"><ahelp hid="HID_FORMAT_HEADER">Adds a header to the current 
page style. A header is an area in the top page margin, where you can add text 
or graphics.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3156027" role="paragraph" 
l10n="U" oldref="2"><ahelp hid="svx/ui/headfootformatpage/HFFormatPage">Adds a 
header to the current page style. A header is an area in the top page margin, 
where you can add text or graphics.</ahelp></paragraph>
       </section>
       <paragraph xml-lang="en-US" id="par_id3150693" role="paragraph" l10n="U" 
oldref="33">If you want, you can also add borders or a background fill to a 
header.</paragraph>
 <switch select="appl">
@@ -51,53 +51,54 @@
 </switch>
 <paragraph xml-lang="en-US" id="hd_id3152360" role="heading" level="2" 
l10n="U" oldref="4">Header</paragraph>
       <paragraph xml-lang="en-US" id="par_id3154924" role="paragraph" l10n="U" 
oldref="5">Set the properties of the header.</paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON" id="bm_id3158209" 
localize="false"/>
+<bookmark xml-lang="en-US" 
branch="hid/svx/ui/headfootformatpage/checkHeaderOn" id="bm_id3158209" 
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_id3147304" role="heading" level="3" 
l10n="U" oldref="7">Header on</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154388" role="paragraph" l10n="U" 
oldref="8"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_TURNON">Adds a header 
to the current page style.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED" id="bm_id3150543" 
localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3154388" role="paragraph" l10n="U" 
oldref="8"><ahelp hid="svx/ui/headfootformatpage/checkFooterOn">Adds a header 
to the current page style.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/headfootformatpage/checkSameLR" 
id="bm_id3150543" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154936" role="heading" level="3" l10n="U"
                  oldref="21">Same content 
left/right<comment>i80087</comment></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154938" role="paragraph" 
l10n="CHG" oldref="22"><ahelp 
hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_SHARED">Even and odd pages share the 
same content.<switchinline select="appl"><caseinline select="CALC"> To assign a 
different header to even and odd pages, clear this option, and then click 
<emph>Edit</emph>. 
+      <paragraph xml-lang="en-US" id="par_id3154938" role="paragraph" 
l10n="CHG" oldref="22"><ahelp hid="svx/ui/headfootformatpage/checkSameLR">Even 
and odd pages share the same content.<switchinline select="appl"><caseinline 
select="CALC"> To assign a different header 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_HEADER:CB_SHARED_FIRST" id="bm_id3150544" 
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/headfootformatpage/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:CHECKBOX:RID_SVXPAGE_HEADER:CB_SHARED_FIRST">
+<paragraph xml-lang="en-US" id="par_id3154939" role="paragraph" l10n="CHG" 
oldref="22"><ahelp hid="svx/ui/headfootformatpage/checkSameFP">
 First and even/odd pages share the same content.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN" id="bm_id3154153" 
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/headfootformatpage/spinMargLeft" 
id="bm_id3154153" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3145202" role="heading" level="3" l10n="U"
                  oldref="17">Left margin</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" 
oldref="18"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_LMARGIN">Enter 
the amount of space to leave between the left edge of the page and the left 
edge of the header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN" id="bm_id3151041" 
localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" 
oldref="18"><ahelp hid="svx/ui/headfootformatpage/spinMargLeft">Enter the 
amount of space to leave between the left edge of the page and the left edge of 
the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" 
branch="hid/svx/ui/headfootformatpage/spinMargRight" id="bm_id3151041" 
localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="3" l10n="U"
                  oldref="19">Right margin</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3157322" role="paragraph" l10n="U" 
oldref="20"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_RMARGIN">Enter 
the amount of space to leave between the right edge of the page and the right 
edge of the header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST" id="bm_id3149167" 
localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3157322" role="paragraph" l10n="U" 
oldref="20"><ahelp hid="svx/ui/headfootformatpage/spinMargRight">Enter the 
amount of space to leave between the right edge of the page and the right edge 
of the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/headfootformatpage/spinSpacing" 
id="bm_id3149167" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3148672" role="heading" level="3" 
l10n="U" oldref="9">Spacing</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153970" role="paragraph" l10n="U" 
oldref="10"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_DIST">Enter the 
amount of space that you want to maintain between the bottom edge of the header 
and the top edge of the document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_DYNSPACING" id="bm_id3144432" 
localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3153970" role="paragraph" l10n="U" 
oldref="10"><ahelp hid="svx/ui/headfootformatpage/spinSpacing">Enter the amount 
of space that you want to maintain between the bottom edge of the header and 
the top edge of the document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" 
branch="hid/svx/ui/headfootformatpage/checkDynSpacing" id="bm_id3144432" 
localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154330" role="heading" level="4" l10n="U"
                  oldref="35">Use dynamic spacing</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3148453" role="paragraph" l10n="U" 
oldref="36"><ahelp 
hid="SVX_CHECKBOX_RID_SVXPAGE_HEADER_CB_DYNSPACING">Overrides the <emph>Spacing 
</emph>setting, and allows the header to expand into the area between the 
header and the document text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT" id="bm_id3153056" 
localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3148453" role="paragraph" l10n="U" 
oldref="36"><ahelp hid="svx/ui/headfootformatpage/checkDynSpacing">Overrides 
the <emph>Spacing </emph>setting, and allows the header to expand into the area 
between the header and the document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/headfootformatpage/spinHeight" 
id="bm_id3153056" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3150290" role="heading" level="3" l10n="U"
                  oldref="13">Height</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155429" role="paragraph" l10n="U" 
oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_HEADER:ED_HEIGHT">Enter the 
height that you want for the header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" 
branch="hid/svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN" id="bm_id3154300" 
localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3155429" role="paragraph" l10n="U" 
oldref="14"><ahelp hid="svx/ui/headfootformatpage/spinHeight">Enter the height 
that you want for the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/headfootformatpage/checkAutofit" 
id="bm_id3154300" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156543" role="heading" level="3" l10n="U"
                  oldref="15">AutoFit height</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153095" role="paragraph" l10n="U" 
oldref="16"><ahelp 
hid="SVX:CHECKBOX:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN">Automatically adjusts the 
height of the header to fit the content that you enter.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153095" role="paragraph" l10n="U" 
oldref="16"><ahelp hid="svx/ui/headfootformatpage/checkAutofit">Automatically 
adjusts the height of the header to fit the content that you 
enter.</ahelp></paragraph>
       <embed href="text/shared/00/00000001.xhp#vorschau"/>
-<bookmark xml-lang="en-US" 
branch="hid/svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS" id="bm_id3147434" 
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/headfootformatpage/buttonMore" 
id="bm_id3147434" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3145271" role="heading" level="2" l10n="U"
                  oldref="24">More</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3145367" role="paragraph" l10n="U" 
oldref="25"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_HEADER:BTN_EXTRAS">Defines a 
border, a background color, or a background pattern for the 
header.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_SC_HEADER_EDIT" 
id="bm_id3145592" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3145367" role="paragraph" l10n="U" 
oldref="25"><ahelp hid="svx/ui/headfootformatpage/buttonMore">Defines a border, 
a background color, or a background pattern for the header.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/svx/ui/headfootformatpage/buttonEdit" 
id="bm_id3145592" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3155306" role="heading" level="2" l10n="U"
                  oldref="27"><switchinline select="appl"><caseinline 
select="CALC">Edit 
 </caseinline></switchinline></paragraph>
       <paragraph xml-lang="en-US" id="par_id0609200910261473" role="paragraph" 
l10n="NEW"><ahelp hid="." visibility="hidden">Add or edit header 
text.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3145749" role="paragraph" l10n="U" 
oldref="28"><ahelp hid="HID_SC_HEADER_EDIT"><switchinline 
select="appl"><caseinline select="CALC"><link href="text/scalc/01/02120000.xhp" 
name="Add or edit">Add or edit</link> header text. 
+      <paragraph xml-lang="en-US" id="par_id3145749" role="paragraph" l10n="U" 
oldref="28"><ahelp hid="svx/ui/headfootformatpage/buttonEdit"><switchinline 
select="appl"><caseinline select="CALC"><link href="text/scalc/01/02120000.xhp" 
name="Add or edit">Add or edit</link> header text. 
 </caseinline></switchinline></ahelp></paragraph>
       <section id="relatedtopics">
          <paragraph xml-lang="en-US" id="par_id3163716" role="paragraph" 
l10n="C"><link href="text/swriter/01/04220000.xhp" 
name="Headers">Headers</link></paragraph>
@@ -106,4 +107,4 @@ First and even/odd pages share the same 
content.</ahelp></paragraph>
          <paragraph xml-lang="en-US" id="par_id3147326" role="paragraph" 
l10n="C"><link href="text/shared/01/05030600.xhp" 
name="Backgrounds">Backgrounds</link></paragraph>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to