helpers/help_hid.lst | 9 -------
source/text/shared/optionen/01040900.xhp | 36 +++++++++++++++----------------
source/text/shared/optionen/01041000.xhp | 4 ---
3 files changed, 18 insertions(+), 31 deletions(-)
New commits:
commit 7de50a3f88322f0de1f334c2811bcfd73d816cf5
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jul 4 09:00:42 2013 +0100
update help ids for writer general opt page .ui conversion
Change-Id: I180c3a10578a125bc1e2f803a653d650ce80100d
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index af7c2aa..cbd5724 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2657,7 +2657,6 @@ HID_OPTIONS_JAVA_PARAMETER,39998,
HID_OPTIONS_LINGU,33812,
HID_OPTIONS_MULTIPATH_LIST,40056,
HID_OPTIONS_PATHS_SELECTFOLDER,39876,
-HID_OPTLOAD_PAGE,53230,
HID_OPTMAKECHANGES,41151,
HID_OPTPATH_CTL_PATH,33888,
HID_OPTPATH_HEADERBAR,34069,
@@ -7932,9 +7931,6 @@ sw_CheckBox_TP_LINENUMBERING_CB_RESTART_PAGE,878887959,
sw_CheckBox_TP_MAILCONFIG_CB_REPLYTO,879363078,
sw_CheckBox_TP_MAILCONFIG_CB_SECURE,879363086,
sw_CheckBox_TP_OPTCAPTION_PAGE_CB_APPLYBORDER,878937117,
-sw_CheckBox_TP_OPTLOAD_PAGE_CB_AUTO_UPDATE_CHARTS,878969873,
-sw_CheckBox_TP_OPTLOAD_PAGE_CB_AUTO_UPDATE_FIELDS,878969872,
-sw_CheckBox_TP_OPTLOAD_PAGE_CB_USE_SQUARE_PAGE_MODE,878969879,
sw_CheckBox_TP_OPTSHDWCRSR_CB_ALLOW_IN_PROT,878806028,
sw_CheckBox_TP_OPTSHDWCRSR_CB_BREAK,878806027,
sw_CheckBox_TP_OPTSHDWCRSR_CB_CHAR_HIDDEN,878806077,
@@ -8204,7 +8200,6 @@ sw_ListBox_TP_OPTCAPTION_PAGE_LB_CHARSTYLE,878939676,
sw_ListBox_TP_OPTCAPTION_PAGE_LB_LEVEL,878939671,
sw_ListBox_TP_OPTCAPTION_PAGE_LB_ORDER,878939680,
sw_ListBox_TP_OPTCOMPATIBILITY_PAGE_LB_FORMATTING,879349260,
-sw_ListBox_TP_OPTLOAD_PAGE_LB_METRIC,878972435,
sw_ListBox_TP_REDLINE_OPT_LB_CHG_ATTR,878874124,
sw_ListBox_TP_REDLINE_OPT_LB_CHG_COL,878874126,
sw_ListBox_TP_REDLINE_OPT_LB_DEL_ATTR,878874119,
@@ -8287,7 +8282,6 @@ sw_MetricField_TP_LAB_FMT_FLD_UPPER,909711885,
sw_MetricField_TP_LAB_FMT_FLD_VDIST,909711877,
sw_MetricField_TP_LAB_FMT_FLD_WIDTH,909711879,
sw_MetricField_TP_LINENUMBERING_MF_OFFSET,878893577,
-sw_MetricField_TP_OPTLOAD_PAGE_MF_TAB,878975510,
sw_MetricField_TP_OPTTABLE_PAGE_MF_COLINSERT,878582391,
sw_MetricField_TP_OPTTABLE_PAGE_MF_COLMOVE,878582386,
sw_MetricField_TP_OPTTABLE_PAGE_MF_ROWINSERT,878582389,
@@ -8500,9 +8494,6 @@ sw_RadioButton_TP_LAB_LAB_BTN_CONT,909689353,
sw_RadioButton_TP_LAB_LAB_BTN_SHEET,909689354,
sw_RadioButton_TP_LAB_PRT_BTN_PAGE,909722113,
sw_RadioButton_TP_LAB_PRT_BTN_SINGLE,909722114,
-sw_RadioButton_TP_OPTLOAD_PAGE_RB_ALWAYS,878969356,
-sw_RadioButton_TP_OPTLOAD_PAGE_RB_NEVER,878969358,
-sw_RadioButton_TP_OPTLOAD_PAGE_RB_REQUEST,878969357,
sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLINDENT,878805510,
sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLMARGIN,878805509,
sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLSPACE,878805512,
diff --git a/source/text/shared/optionen/01040900.xhp
b/source/text/shared/optionen/01040900.xhp
index e41c7b3..a87b045 100644
--- a/source/text/shared/optionen/01040900.xhp
+++ b/source/text/shared/optionen/01040900.xhp
@@ -43,8 +43,8 @@
<bookmark_value>tab stops; spacing in text documents</bookmark_value>
<bookmark_value>spacing; tab stops in text documents</bookmark_value>
</bookmark>
-<bookmark xml-lang="en-US" branch="hid/SW_HID_OPTLOAD_PAGE" id="bm_id3150443"
localize="false"/><paragraph role="heading" id="hd_id3155892" xml-lang="en-US"
level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040900.xhp"
name="General">General</link></paragraph>
-<paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="U"
oldref="2"><ahelp hid="HID_OPTLOAD_PAGE">Specifies general settings for text
documents.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optgeneralpage/OptGeneralPage" id="bm_id3150443"
localize="false"/><paragraph role="heading" id="hd_id3155892" xml-lang="en-US"
level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040900.xhp"
name="General">General</link></paragraph>
+<paragraph role="paragraph" id="par_id3145382" xml-lang="en-US" l10n="U"
oldref="2"><ahelp
hid="modules/swriter/ui/optgeneralpage/OptGeneralPag">Specifies general
settings for text documents.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#laden"/>
@@ -53,22 +53,22 @@
<paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="2"
l10n="U" oldref="45">Update</paragraph>
<paragraph role="heading" id="hd_id3145119" xml-lang="en-US" level="3"
l10n="U" oldref="3">Update links when loading</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/scgeneralpage/alwaysrb" id="bm_id3150985"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/sw:RadioButton:TP_OPTLOAD_PAGE:RB_ALWAYS" id="bm_id3149416"
localize="false"/><paragraph role="heading" id="hd_id3155136" xml-lang="en-US"
level="4" l10n="U" oldref="4">Always</paragraph>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U"
oldref="11"><ahelp hid="SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_ALWAYS">Always
updates links while loading a document.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optgeneralpage/always" id="bm_id3149416"
localize="false"/><paragraph role="heading" id="hd_id3155136" xml-lang="en-US"
level="4" l10n="U" oldref="4">Always</paragraph>
+<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="U"
oldref="11"><ahelp hid="modules/swriter/ui/optgeneralpage/always">Always
updates links while loading a document.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/scgeneralpage/requestrb" id="bm_id3153542"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/sw:RadioButton:TP_OPTLOAD_PAGE:RB_REQUEST" id="bm_id3154898"
localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US"
level="4" l10n="U" oldref="5">On request</paragraph>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U"
oldref="12"><ahelp hid="SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_REQUEST">Updates
links only on request while loading a document.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optgeneralpage/onrequest" id="bm_id3154898"
localize="false"/><paragraph role="heading" id="hd_id3155449" xml-lang="en-US"
level="4" l10n="U" oldref="5">On request</paragraph>
+<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="U"
oldref="12"><ahelp hid="modules/swriter/ui/optgeneralpage/onrequest">Updates
links only on request while loading a document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/scgeneralpage/neverrb"
id="bm_id3147530" localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/sw:RadioButton:TP_OPTLOAD_PAGE:RB_NEVER" id="bm_id3149669"
localize="false"/><paragraph role="heading" id="hd_id3151384" xml-lang="en-US"
level="4" l10n="U" oldref="6">Never</paragraph>
-<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U"
oldref="13"><ahelp hid="SW_RADIOBUTTON_TP_OPTLOAD_PAGE_RB_NEVER">Links are
never updated while loading a document.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optgeneralpage/never" id="bm_id3149669"
localize="false"/><paragraph role="heading" id="hd_id3151384" xml-lang="en-US"
level="4" l10n="U" oldref="6">Never</paragraph>
+<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US" l10n="U"
oldref="13"><ahelp hid="modules/swriter/ui/optgeneralpage/never">Links are
never updated while loading a document.</ahelp></paragraph>
</section>
<paragraph role="heading" id="hd_id3154347" xml-lang="en-US" level="3"
l10n="U" oldref="25">Automatically</paragraph>
<switch select="appl">
<case select="WRITER"><paragraph role="paragraph" id="par_id8801538"
xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/06990000.xhp">To update
fields manually</link></paragraph><comment>i81240</comment>
</case>
</switch>
-<bookmark xml-lang="en-US"
branch="hid/sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS"
id="bm_id3153380" localize="false"/><paragraph role="heading" id="hd_id3148664"
xml-lang="en-US" level="4" l10n="U" oldref="21">Fields</paragraph>
-<paragraph role="paragraph" id="par_id3154071" xml-lang="en-US" l10n="CHG"
oldref="23"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS">The
contents of all fields are updated automatically whenever the screen contents
are displayed as new. Even with this box unchecked, some fields are updated
each time a special condition takes place.</ahelp> The following table lists
the fields that are updated without regard to this checkbox.</paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optgeneralpage/updatefields" id="bm_id3153380"
localize="false"/><paragraph role="heading" id="hd_id3148664" xml-lang="en-US"
level="4" l10n="U" oldref="21">Fields</paragraph>
+<paragraph role="paragraph" id="par_id3154071" xml-lang="en-US" l10n="CHG"
oldref="23"><ahelp hid="modules/swriter/ui/optgeneralpage/updatefields">The
contents of all fields are updated automatically whenever the screen contents
are displayed as new. Even with this box unchecked, some fields are updated
each time a special condition takes place.</ahelp> The following table lists
the fields that are updated without regard to this checkbox.</paragraph>
<table id="tbl_id4289681">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -135,16 +135,16 @@
</tablecell>
</tablerow>
</table>
-<bookmark xml-lang="en-US"
branch="hid/sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS"
id="bm_id3154684" localize="false"/><paragraph role="heading" id="hd_id3159149"
xml-lang="en-US" level="4" l10n="U" oldref="22">Charts</paragraph>
-<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="CHG"
oldref="24"><ahelp
hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS">Specifies whether to
automatically update charts. Whenever a Writer table cell value changes and the
cursor leaves that cell, the chart that displays the cell value is updated
automatically.</ahelp><comment>see message "[sw-features] changed/CWS
chart2mst3 : Automatic update for charts in Writer" by Thomas
Lange</comment></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optgeneralpage/updatecharts" id="bm_id3154684"
localize="false"/><paragraph role="heading" id="hd_id3159149" xml-lang="en-US"
level="4" l10n="U" oldref="22">Charts</paragraph>
+<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="CHG"
oldref="24"><ahelp
hid="modules/swriter/ui/optgeneralpage/updatecharts">Specifies whether to
automatically update charts. Whenever a Writer table cell value changes and the
cursor leaves that cell, the chart that displays the cell value is updated
automatically.</ahelp><comment>see message "[sw-features] changed/CWS
chart2mst3 : Automatic update for charts in Writer" by Thomas
Lange</comment></paragraph>
<paragraph role="heading" id="hd_id3146976" xml-lang="en-US" level="2"
l10n="U" oldref="46">Settings</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:ListBox:TP_OPTLOAD_PAGE:LB_METRIC"
id="bm_id3152578" localize="false"/><paragraph role="heading" id="hd_id3153364"
xml-lang="en-US" level="3" l10n="U" oldref="31">Measurement unit</paragraph>
-<paragraph role="paragraph" id="par_id3146147" xml-lang="en-US" l10n="CHG"
oldref="32"><ahelp hid="SW_LISTBOX_TP_OPTLOAD_PAGE_LB_METRIC">Specifies the
<link href="text/shared/00/00000003.xhp#metrik" name="unit of measurement">unit
of measurement</link> for text documents.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:MetricField:TP_OPTLOAD_PAGE:MF_TAB"
id="bm_id3154729" localize="false"/><paragraph role="heading" id="hd_id3154944"
xml-lang="en-US" level="3" l10n="U" oldref="33">Tab stops</paragraph>
-<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U"
oldref="34"><ahelp hid="SW_METRICFIELD_TP_OPTLOAD_PAGE_MF_TAB">Specifies the
spacing between the individual tab stops.</ahelp> The horizontal ruler displays
the selected spacing.</paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sw:CheckBox:TP_OPTLOAD_PAGE:CB_USE_CHAR_UNIT" id="bm_id3154749"
localize="false"/><paragraph role="heading" id="hd_id3154946" xml-lang="en-US"
level="3">Enable char unit</paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optgeneralpage/metric" id="bm_id3152578"
localize="false"/><paragraph role="heading" id="hd_id3153364" xml-lang="en-US"
level="3" l10n="U" oldref="31">Measurement unit</paragraph>
+<paragraph role="paragraph" id="par_id3146147" xml-lang="en-US" l10n="CHG"
oldref="32"><ahelp hid="modules/swriter/ui/optgeneralpage/metric">Specifies the
<link href="text/shared/00/00000003.xhp#metrik" name="unit of measurement">unit
of measurement</link> for text documents.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/optgeneralpage/tab"
id="bm_id3154729" localize="false"/><paragraph role="heading" id="hd_id3154944"
xml-lang="en-US" level="3" l10n="U" oldref="33">Tab stops</paragraph>
+<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U"
oldref="34"><ahelp hid="modules/swriter/ui/optgeneralpage/tab">Specifies the
spacing between the individual tab stops.</ahelp> The horizontal ruler displays
the selected spacing.</paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optgeneralpage/usecharunit" id="bm_id3154749"
localize="false"/><paragraph role="heading" id="hd_id3154946" xml-lang="en-US"
level="3">Enable char unit</paragraph>
<paragraph role="paragraph" id="par_id3150419" xml-lang="en-US"><ahelp
hid=".">When this setting is enabled, the measurement units of indents and
spacing on <emph>Format - Paragraph - Indents & Spacing</emph> tab will be
character (ch) and line.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/sw:CheckBox:TP_OPTLOAD_PAGE:CB_USE_SQUARE_PAGE_MODE"
id="bm_id3154739" localize="false"/><paragraph role="heading" id="hd_id3154945"
xml-lang="en-US" level="3">Use square page mode for text grid</paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/optgeneralpage/squaremode" id="bm_id3154739"
localize="false"/><paragraph role="heading" id="hd_id3154945" xml-lang="en-US"
level="3">Use square page mode for text grid</paragraph>
<paragraph role="paragraph" id="par_id3150418" xml-lang="en-US"><ahelp
hid=".">When this setting is enabled, the text grid will look like square
page.</ahelp> Square page is a kind of page layout which is used to train
students to write articles in China and Japan.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/optionen/01041000.xhp
b/source/text/shared/optionen/01041000.xhp
index 976094c..768e25f 100644
--- a/source/text/shared/optionen/01041000.xhp
+++ b/source/text/shared/optionen/01041000.xhp
@@ -48,21 +48,17 @@
</section>
<paragraph role="note" id="par_id3153876" xml-lang="en-US" l10n="CHG"
oldref="17">Some of the settings defined here are only valid for the current
document and must be defined separately for each document.</paragraph>
<section id="printermetrics">
-<!-- removed HID SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS -->
<bookmark xml-lang="en-US"
branch="hid/sd:CheckBox:TP_OPTIONS_MISC:CB_USE_PRINTER_METRICS"
id="bm_id3149922" localize="false"/><comment>UFI: added bookmarks due to bug
#i24216#</comment><comment>UFI: this one called also from Impress
options</comment>
<paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="3"
l10n="U" oldref="47">Use printer metrics for document formatting</paragraph>
<paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="U"
oldref="48"><ahelp
hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS">Specifies that printer
metrics are applied for printing and also for formatting the display on the
screen.</ahelp> If this box is not checked, a printer independent layout will
be used for screen display and printing.</paragraph>
<paragraph role="note" id="par_id3155768" xml-lang="en-US" l10n="U"
oldref="49">If you set this option for the current document and then save the
document, for example, in an older binary format, this option will not be
saved. If you later open the file from the older format, this option will be
set by default.</paragraph>
</section>
-<!-- removed HID SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST -->
<paragraph role="heading" id="hd_id3145640" xml-lang="en-US" level="3"
l10n="CHG" oldref="9">Add spacing between paragraphs and tables (in current
document)</paragraph>
<paragraph role="paragraph" id="par_id3147339" xml-lang="en-US" l10n="U"
oldref="18">In $[officename] Writer, paragraph spacing is defined differently
than in MS Word documents. If you have defined spacing between two paragraphs
or tables, spacing is also added in the corresponding MS Word
documents.</paragraph>
<paragraph role="paragraph" id="par_id3151250" xml-lang="en-US" l10n="U"
oldref="19"><ahelp
hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST">Specifies whether to add
MS Word-compatible spacing between paragraphs and tables in $[officename]
Writer text documents.</ahelp></paragraph>
-<!-- removed HID SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART -->
<paragraph role="heading" id="hd_id3146317" xml-lang="en-US" level="3"
l10n="CHG" oldref="29">Add paragraph and table spacing at tops of pages (in
current document)</paragraph>
<paragraph role="paragraph" id="par_id3155333" xml-lang="en-US" l10n="CHG"
oldref="30"><ahelp
hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART">Specifies
whether paragraph spacing at the top of a page will also be effective at the
beginning of a page or column if the paragraph is positioned on the first page
of the document.</ahelp> The same applies for a page break.</paragraph>
<paragraph role="note" id="par_id3145789" xml-lang="en-US" l10n="U"
oldref="20">If you import an MS Word document, the spaces are automatically
added during the conversion.</paragraph>
-<!-- removed HID SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT -->
<paragraph role="heading" id="hd_id3149964" xml-lang="en-US" level="3"
l10n="CHG" oldref="42">Use OpenOffice.org 1.1 tab stop formatting<comment>UFI:
spec "Tab Stop Compatibility"</comment></paragraph>
<paragraph role="paragraph" id="par_id3152777" xml-lang="en-US" l10n="CHG"
oldref="43"><ahelp hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT">Specifies
how to align text at tab stops beyond the right margin, how to handle decimal
tab stops, and how to handle tab stops close to a line break.</ahelp> If this
check box is not selected, tab stops are handled in the same way as in other
Office applications.</paragraph>
<paragraph role="paragraph" id="par_idN10810" xml-lang="en-US" l10n="NEW">In
text documents created by your current version of Writer, the new tab stop
handling is used by default. In text documents created by Writer versions prior
to StarOffice 8 or OpenOffice.org 2.0, the old tab stop handling is
applied.</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
