[Libreoffice-commits] help.git: 2 commits - helpers/help_hid.lst source/text

Caolán McNamara caolanm at redhat.com
Thu May 16 07:29:22 PDT 2013


 helpers/help_hid.lst                     |    2 -
 source/text/shared/optionen/01020100.xhp |   29 +++++++---------
 source/text/shared/optionen/01060500.xhp |   55 +++++++++++++++----------------
 3 files changed, 41 insertions(+), 45 deletions(-)

New commits:
commit 6e411048d9eb0628a54cfb23647a181efe85cd92
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu May 16 15:28:52 2013 +0100

    update help ids for proxy options page conversion
    
    Change-Id: Id43a7d02edc9a9c9ba01e29cd894c4c39c549726

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 18ed830..a73fe62 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2668,7 +2668,6 @@ HID_OPTIONS_JAVA_PARAMETER,39998,
 HID_OPTIONS_LINGU,33812,
 HID_OPTIONS_MULTIPATH_LIST,40056,
 HID_OPTIONS_PATHS_SELECTFOLDER,39876,
-HID_OPTIONS_PROXY,33844,
 HID_OPTLOAD_PAGE,53230,
 HID_OPTMAKECHANGES,41151,
 HID_OPTPATH_CTL_PATH,33888,
diff --git a/source/text/shared/optionen/01020100.xhp b/source/text/shared/optionen/01020100.xhp
index 13377ac..0d2a016 100644
--- a/source/text/shared/optionen/01020100.xhp
+++ b/source/text/shared/optionen/01020100.xhp
@@ -33,7 +33,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147577"><bookmark_value>settings; proxies</bookmark_value>
 <bookmark_value>proxy settings</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/CUI_HID_OPTIONS_PROXY" id="bm_id3154927" localize="false"/><paragraph role="heading" id="hd_id3156414" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01020100.xhp" name="Proxy">Proxy</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/OptProxyPage" id="bm_id3154927" localize="false"/><paragraph role="heading" id="hd_id3156414" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01020100.xhp" name="Proxy">Proxy</link></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3145090" xml-lang="en-US" l10n="U" oldref="32"><link href="text/shared/00/00000002.xhp#proxy" name="Proxy servers">Proxy servers</link> for accessing the Internet can be set up manually as needed.</paragraph>
 <section id="howtoget">
@@ -41,8 +41,8 @@
 </section>
 <paragraph role="heading" id="hd_id3147577" xml-lang="en-US" level="2" l10n="U" oldref="3">Settings</paragraph>
 <paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="4">Defines the settings for the <link href="text/shared/00/00000002.xhp#proxy" name="proxy server">proxy server</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="8">Proxy server</paragraph>
-<paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE">Specifies the type of proxy definition.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/proxymode" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="8">Proxy server</paragraph>
+<paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="cui/ui/optproxypage/proxymode">Specifies the type of proxy definition.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147574" xml-lang="en-US" level="4" l10n="U" oldref="10">None</paragraph>
 <paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="11">Accesses the Internet without a proxy server. Allows you to set up a connection directly on your computer to an Internet provider that does not use a proxy.</paragraph>
 <paragraph role="heading" id="hd_id3150984" xml-lang="en-US" level="4" l10n="U" oldref="14">Manual</paragraph>
@@ -50,19 +50,18 @@
 <paragraph role="tip" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="29">Type server names without the protocol prefix. For example, type www.example.com, not http://www.example.com.</paragraph>
 <paragraph role="heading" id="par_idN10684" xml-lang="en-US" level="4" l10n="NEW">System</paragraph>
 <paragraph role="paragraph" id="par_idN10688" xml-lang="en-US" l10n="NEW">On Windows or UNIX systems using GNOME or KDE, this option tells %PRODUCTNAME to use the system settings. You must restart %PRODUCTNAME to initiate this setting.<comment>UFI: see spec "System-Settings"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY" id="bm_id3154346" localize="false"/><paragraph role="heading" id="hd_id3148948" xml-lang="en-US" level="3" l10n="U" oldref="16">HTTP proxy</paragraph>
-<paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY">Type the name of the proxy server for <link href="text/shared/00/00000002.xhp#http" name="HTTP">HTTP</link>.</ahelp> Type the port in the right-hand field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY" id="bm_id431531" localize="false"/><paragraph role="heading" id="hd_id9971922" xml-lang="en-US" level="3" l10n="NEW">HTTPS proxy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/http" id="bm_id3154346" localize="false"/><paragraph role="heading" id="hd_id3148948" xml-lang="en-US" level="3" l10n="U" oldref="16">HTTP proxy</paragraph>
+<paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="cui/ui/optproxypage/http">Type the name of the proxy server for <link href="text/shared/00/00000002.xhp#http" name="HTTP">HTTP</link>.</ahelp> Type the port in the right-hand field.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/https" id="bm_id431531" localize="false"/><paragraph role="heading" id="hd_id9971922" xml-lang="en-US" level="3" l10n="NEW">HTTPS proxy</paragraph>
 <paragraph role="paragraph" id="par_id5319071" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Type the name of the proxy server for HTTPS. Type the port in the right-hand field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY" id="bm_id3153360" localize="false"/><paragraph role="heading" id="hd_id3150543" xml-lang="en-US" level="3" l10n="U" oldref="33">FTP proxy</paragraph>
-<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX_EDIT_RID_SVXPAGE_INET_PROXY_ED_FTP_PROXY">Type the name of the proxy server for <link href="text/shared/00/00000002.xhp#ftp" name="FTP">FTP</link>.</ahelp> Type the port in the right-hand field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR" id="bm_id3154908" localize="false"/><paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="3" l10n="U" oldref="24">No proxy for</paragraph>
-<paragraph role="paragraph" id="par_id3151178" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR">Specifies the names of the servers that do not require any proxy servers, separated by semicolons.</ahelp> These are servers addressed in your local network, and servers used for video and audio streaming, for example.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/ftp" id="bm_id3153360" localize="false"/><paragraph role="heading" id="hd_id3150543" xml-lang="en-US" level="3" l10n="U" oldref="33">FTP proxy</paragraph>
+<paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="cui/ui/optproxypage/ftp">Type the name of the proxy server for <link href="text/shared/00/00000002.xhp#ftp" name="FTP">FTP</link>.</ahelp> Type the port in the right-hand field.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/noproxy" id="bm_id3154908" localize="false"/><paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="3" l10n="U" oldref="24">No proxy for</paragraph>
+<paragraph role="paragraph" id="par_id3151178" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="cui/ui/optproxypage/noproxy">Specifies the names of the servers that do not require any proxy servers, separated by semicolons.</ahelp> These are servers addressed in your local network, and servers used for video and audio streaming, for example.</paragraph>
 <paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="26">You can also use placeholders for the names of hosts and domains. For example, type *.sun.com to address all the hosts in the sun.com domain without proxy.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT" id="bm_id3152920" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT" id="bm_id3139439" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT" id="bm_id3147229" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT" id="bm_id3148674" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="27">Port</paragraph>
-<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT">Type the port for the corresponding proxy server.</ahelp> The maximum value of a port number is fixed at 65535.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/httpport" id="bm_id3152920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/httpsport" id="bm_id3139439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optproxypage/ftpport" id="bm_id3147229" localize="false"/>
+<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="cui/ui/optproxypage/ftpport">Type the port for the corresponding proxy server.</ahelp> The maximum value of a port number is fixed at 65535.</paragraph>
 </body>
 </helpdocument>
commit c1c2a9e4a98939e3229813b40101cdf99a8cf346
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu May 16 15:22:08 2013 +0100

    update help ids for calculation opt page .ui conversion
    
    Change-Id: I45a3e8154d4e84a548f03393f41fdee6f21f9c85

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b8e60ae..18ed830 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3221,7 +3221,6 @@ HID_SCH_TRENDLINE_SHOW_R_SQUARED,63381,
 HID_SCH_WIN_DOCUMENT,63289,
 HID_SCH_WIZARD_ROADMAP,63365,
 HID_SCPAGE_AREAS,58882,
-HID_SCPAGE_CALC,58879,
 HID_SCPAGE_CONTENT,58892,
 HID_SCPAGE_LAYOUT,58893,
 HID_SCPAGE_OPREDLINE,58933,
diff --git a/source/text/shared/optionen/01060500.xhp b/source/text/shared/optionen/01060500.xhp
index 34874ba..ffbad49 100644
--- a/source/text/shared/optionen/01060500.xhp
+++ b/source/text/shared/optionen/01060500.xhp
@@ -43,7 +43,7 @@
          <bookmark_value>search criteria for database functions in cells</bookmark_value>
          <bookmark_value>Excel; search criteria</bookmark_value>
 </bookmark><comment>UFI: removed a double entry</comment><comment>mw changed "cell contents;" to "case sensitivity;.."</comment><comment>mw deleted "numbers;decimal places (Calc)"</comment>
-<bookmark xml-lang="en-US" branch="hid/SC_HID_SCPAGE_CALC" id="bm_id3149095" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/OptCalculatePage" id="bm_id3149095" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3145071" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060500.xhp" name="Calculate">Calculate</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3147576" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Defines the calculation settings for spreadsheets.</ahelp> Defines the behavior of spreadsheets with iterative references, the date settings, the number of decimal places, and if capitalization or lower cases are to be considered when searching within sheets.</paragraph>
       </section>
@@ -52,9 +52,9 @@
       </section>
       <paragraph xml-lang="en-US" id="hd_id3149399" role="heading" level="2" l10n="U" oldref="3">Iterative references</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="4">In this section you can delimit the number of approximation steps carried out during iterative calculations. In addition, you can specify the degree of precision of the answer.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_ITERATE" id="bm_id3156153" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/iterate" id="bm_id3156153" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154142" role="heading" level="3" l10n="U" oldref="5">Iterations</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_ITERATE">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</ahelp> If the<emph> Iterations </emph>box is not marked, an iterative reference in the table will cause an error message.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149795" role="paragraph" l10n="U" oldref="6"><ahelp hid="modules/scalc/ui/optcalculatepage/iterate">Specifies whether formulas with iterative references (formulas that are continuously repeated until the problem is solved) are calculated after a specific number of repetitions.</ahelp> If the<emph> Iterations </emph>box is not marked, an iterative reference in the table will cause an error message.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3148686" role="paragraph" l10n="CHG" oldref="7">
          <emph>Example:</emph> calculating the cost of an item without the value-added tax.</paragraph>
       <list type="ordered">
@@ -117,44 +117,44 @@
          </tablerow>
       </table>
 
-<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCPAGE_CALC:ED_STEPS" id="bm_id3146119" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/steps" id="bm_id3146119" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3145750" role="heading" level="3" l10n="U"
                  oldref="22">Steps</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="23"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_STEPS">Sets the maximum number of iteration steps.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:Edit:RID_SCPAGE_CALC:ED_EPS" id="bm_id3145273" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3152576" role="paragraph" l10n="U" oldref="23"><ahelp hid="modules/scalc/ui/optcalculatepage/steps">Sets the maximum number of iteration steps.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/minchange" id="bm_id3145273" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153728" role="heading" level="3" l10n="U"
                  oldref="24">Minimum Change</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153139" role="paragraph" l10n="CHG" oldref="25"><ahelp hid="SC:EDIT:RID_SCPAGE_CALC:ED_EPS">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153139" role="paragraph" l10n="CHG" oldref="25"><ahelp hid="modules/scalc/ui/optcalculatepage/minchange">Specifies the difference between two consecutive iteration step results. If the result of the iteration is lower than the minimum change value, then the iteration will stop.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id3147125" role="heading" level="2" l10n="U"
                  oldref="45">Date</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155416" role="paragraph" l10n="U" oldref="46">Select the start date for the internal conversion from days to numbers.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESTD" id="bm_id3153159" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/datestd" id="bm_id3153159" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3147396" role="heading" level="3" l10n="U"
                  oldref="47">12/30/1899 (default)</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3145646" role="paragraph" l10n="U" oldref="48"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESTD">Sets 12/30/1899 as day zero.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESC10" id="bm_id3150715" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3145646" role="paragraph" l10n="U" oldref="48"><ahelp hid="modules/scalc/ui/optcalculatepage/datestd">Sets 12/30/1899 as day zero.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/datesc10" id="bm_id3150715" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156283" role="heading" level="3" l10n="U"
                  oldref="49">01/01/1900 (StarCalc 1.0)</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154018" role="paragraph" l10n="U" oldref="50"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATESC10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:RadioButton:RID_SCPAGE_CALC:BTN_DATE1904" id="bm_id3147173" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3154018" role="paragraph" l10n="U" oldref="50"><ahelp hid="modules/scalc/ui/optcalculatepage/datesc10">Sets 1/1/1900 as day zero. Use this setting for StarCalc 1.0 spreadsheets containing date entries.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/date1904" id="bm_id3147173" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156181" role="heading" level="3" l10n="U"
                  oldref="51">01/01/1904</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153948" role="paragraph" l10n="U" oldref="52"><ahelp hid="SC:RADIOBUTTON:RID_SCPAGE_CALC:BTN_DATE1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_CASE" id="bm_id3151205" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3153948" role="paragraph" l10n="U" oldref="52"><ahelp hid="modules/scalc/ui/optcalculatepage/date1904">Sets 1/1/1904 as day zero. Use this setting for spreadsheets that are imported in a foreign format.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/case" id="bm_id3151205" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153838" role="heading" level="2" l10n="U"
                  oldref="26">Case sensitive</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3146793" role="paragraph" l10n="U" oldref="27"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CASE">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3146793" role="paragraph" l10n="U" oldref="27"><ahelp hid="modules/scalc/ui/optcalculatepage/case">Specifies whether to distinguish between upper and lower case in texts when comparing cell contents.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="28">
          <emph>Example:</emph> Type the text 'Test' in cell A1; and the text 'test' in B1. Then type the formula "=A1=B1" in cell C1. If the <emph>Case sensitive</emph> box is marked, FALSE will appear in the cell; otherwise, TRUE will appear in the cell.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153965" role="note" l10n="U" oldref="29">The EXACT text function is always case-sensitive, independent of the settings in this dialog.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_CALC" id="bm_id3145766" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/calc" id="bm_id3145766" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U"
                  oldref="30">Precision as shown</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150644" role="paragraph" l10n="CHG" oldref="31"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_CALC">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the <emph>Precision as shown</emph> option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_MATCH" id="bm_id3150364" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3150644" role="paragraph" l10n="CHG" oldref="31"><ahelp hid="modules/scalc/ui/optcalculatepage/calc">Specifies whether to make calculations using the rounded values displayed in the sheet. Charts will be shown with the displayed values. If the <emph>Precision as shown</emph> option is not marked, the displayed numbers are rounded, but they are calculated internally using the non-rounded number.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/match" id="bm_id3150364" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3152581" role="heading" level="2" l10n="U"
                  oldref="32">Search criteria = and <> must apply to whole cells</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="CHG" oldref="33"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_MATCH">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When the <emph>Search criteria = and <> must apply to whole cells</emph> box is marked, $[officename] Calc behaves exactly as MS Excel when searching cells in the database functions.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="CHG" oldref="33"><ahelp hid="modules/scalc/ui/optcalculatepage/match">Specifies that the search criteria you set for the Calc database functions must match the whole cell exactly. When the <emph>Search criteria = and <> must apply to whole cells</emph> box is marked, $[officename] Calc behaves exactly as MS Excel when searching cells in the database functions.</ahelp></paragraph>
       <table id="tbl_id3149814">
          <tablerow>
             <tablecell>
@@ -199,26 +199,25 @@
       </table>
 
       <paragraph xml-lang="en-US" id="par_id3148814" role="paragraph" l10n="U" oldref="44">If <emph>Search criteria = and <> must apply to whole cells </emph>is not enabled, the "win" search pattern acts like ".*win.*". The search pattern can be at any position within the cell when searching with the Calc database functions.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_REGEX" id="bm_id3154419" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/regex" id="bm_id3154419" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156448" role="heading" level="2" l10n="U"
                  oldref="58">Enable regular expressions in formulas</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" oldref="59"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CALC_BTN_REGEX">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH.
+      <paragraph xml-lang="en-US" id="par_id3155092" role="paragraph" l10n="U" oldref="59"><ahelp hid="modules/scalc/ui/optcalculatepage/regex">Specifies that regular expressions are enabled when searching and also for character string comparisons.</ahelp><switchinline select="appl"><caseinline select="CALC"> This relates to the <link href="text/scalc/01/04060101.xhp" name="database functions">database functions</link>, and to VLOOKUP, HLOOKUP and SEARCH.
 </caseinline></switchinline><comment>Sorry, no more switches allowed inside AVIS tags</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_LOOKUP" id="bm_id3152901" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/lookup" id="bm_id3152901" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156199" role="heading" level="2" l10n="U"
                  oldref="55">Automatically find column and row labels</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="CHG" oldref="56"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_CALC:BTN_LOOKUP">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3153818" role="paragraph" l10n="CHG" oldref="56"><ahelp hid="modules/scalc/ui/optcalculatepage/lookup">Specifies that you can use the text in any cell as a label for the column below the text or the row to the right of the text. The text must consist of at least one word and must not contain any operators.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id3151242" role="paragraph" l10n="U" oldref="57">
          <emph>Example</emph>: Cell E5 contains the text "Europe". Below, in cell E6, is the value 100 and in cell E7 the value 200. If the <emph>Automatically find column and row labels</emph> box is marked, you can write the following formula in cell A1: =SUM(Europe).</paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCPAGE_CALC:BTN_GENERAL_PREC" id="bm_id315342901" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCPAGE_CALC:ED_PREC" id="bm_id315442901" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/generalprec" id="bm_id315342901" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id315634199" role="heading" level="2" l10n="NEW">Limit decimals for general number format</paragraph>
 <paragraph xml-lang="en-US" id="par_id315343818" role="paragraph" l10n="NEW"><ahelp hid=".">You can specify the maximum number of decimal places that are shown by default for cells with General number format. If not enabled, cells with General number format show as many decimal places as the column width allows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sc:NumericField:RID_SCPAGE_CALC:ED_PREC" id="bm_id3147362" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optcalculatepage/prec" id="bm_id3147362" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3145231" role="heading" level="2" l10n="U"
                  oldref="53">Decimal places</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149568" role="paragraph" l10n="CHG" oldref="54"><ahelp hid="SC:NUMERICFIELD:RID_SCPAGE_CALC:ED_PREC">Defines the number of decimals to be displayed for numbers with the <emph>Standard</emph> number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149568" role="paragraph" l10n="CHG" oldref="54"><ahelp hid="modules/scalc/ui/optcalculatepage/prec">Defines the number of decimals to be displayed for numbers with the <emph>Standard</emph> number format. The numbers are displayed as rounded numbers, but are not saved as rounded numbers.</ahelp></paragraph>
 
 </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>


More information about the Libreoffice-commits mailing list